From 2176bb3427f3c307f2925f5723fc5767194b15e6 Mon Sep 17 00:00:00 2001 From: tdreyno Date: Wed, 29 Jul 2009 11:58:28 -0700 Subject: [PATCH] content_for support --- .gitmodules | 3 +++ lib/middleman.rb | 10 ++++++++++ vendor/sinatra-content-for | 1 + 3 files changed, 14 insertions(+) create mode 160000 vendor/sinatra-content-for diff --git a/.gitmodules b/.gitmodules index 3ce13bf3..8f2e45a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "vendor/rack-test"] path = vendor/rack-test url = git://github.com/brynary/rack-test.git +[submodule "vendor/sinatra-content-for"] + path = vendor/sinatra-content-for + url = git://github.com/foca/sinatra-content-for.git diff --git a/lib/middleman.rb b/lib/middleman.rb index 4954b63f..80bb1f78 100644 --- a/lib/middleman.rb +++ b/lib/middleman.rb @@ -9,6 +9,9 @@ require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-markaby', 'li # Include maruku support require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-maruku', 'lib', 'sinatra', 'maruku') +# Include content_for support +require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for') + class Middleman < Sinatra::Base set :app_file, __FILE__ set :static, true @@ -17,6 +20,13 @@ class Middleman < Sinatra::Base helpers Sinatra::Markaby helpers Sinatra::Maruku + helpers Sinatra::ContentFor + + helpers do + def link_to(title, url="#") + %Q{#{title}} + end + end def self.run!(options={}, &block) set options diff --git a/vendor/sinatra-content-for b/vendor/sinatra-content-for new file mode 160000 index 00000000..e586a107 --- /dev/null +++ b/vendor/sinatra-content-for @@ -0,0 +1 @@ +Subproject commit e586a107ed19cdee69cfb81e31c01de51f39d54d