lib/invisible/helpers.rb @@ -1,2 +1,3 @@ *.cache -*.log \ No newline at end of file +*.log +*.gem \ No newline at end of file .gitignore @@ -12,6 +12,8 @@ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.js" /> </head> <body> - <%= @content %> + <div class="container"> + <%= @content %> + </div> </body> </html> \ No newline at end of file app_generators/invisible/templates/views/layout.erb @@ -15,6 +15,6 @@ Gem::Specification.new do |s| s.extra_rdoc_files = ["README"] # Dependencies - s.add_dependency("rack", ["> 0.4.0"]) - s.add_dependency("markaby", ["> 0.5"]) + s.add_dependency("rack", [">= 0.4.0"]) + s.add_dependency("markaby", [">= 0.5"]) end \ No newline at end of file invisible.gemspec @@ -1,4 +1,4 @@ -%w(rubygems time rack markaby invisible/core_ext).each { |f| require f } +%w(rubygems time rack markaby invisible/core_ext invisible/helpers).each { |f| require f } # = The Invisible Framework # Invisible is like a giant robot combining the awesomeness of Rails, # Merb, Camping and Sinatra. Except, it's tiny (100 sloc). @@ -95,8 +95,8 @@ class Invisible @response.status = options.delete(:status) || 200 # Render inside the layout - @content = args.last.is_a?(String) ? args.last : Markaby::Builder.new({}, self, &(block || @views[args.last])).to_s - @content = Markaby::Builder.new({}, self, &layout).to_s if layout + @content = args.last.is_a?(String) ? args.last : mab(&(block || @views[args.last])) + @content = mab(&layout).to_s if layout # Set headers @response.headers.merge!(options) @@ -129,6 +129,11 @@ class Invisible @views[name] = block end + # Return HTML rendered by evaluating the block using Markaby. + def mab(&block) + Markaby::Builder.new({}, self, &block).to_s + end + # Return the current session. # Add `use Rack::Session::Cookie` to use. def session lib/invisible.rb @@ -16,6 +16,12 @@ describe "params" do help_me end end + + get "/link_to" do + render do + link_to "ohaie", "/" + end + end end end @@ -32,4 +38,8 @@ describe "params" do app = Invisible.new {} app.should_not respond_to(:help_me) end + + it "should use link_to helper in markaby" do + @app.mock.get("/link_to").body.should == '<a href="/">ohaie</a>' + end end \ No newline at end of file spec/helpers_spec.rb 685d55c3b1085c514e5130327415c1213febc835 macournoyer macournoyer@gmail.com http://github.com/macournoyer/invisible/commit/5062b70c117ab9e37c9c8514237193c5a28ba23c 5062b70c117ab9e37c9c8514237193c5a28ba23c

2008-11-09T20:17:27-08:00

Add link_to & mab helpers. 4d8a607ecf51838b8e66a7d31a1cb435c3f6078c macournoyer macournoyer@gmail.com