roda 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49da3db12f5573c87c6be816d293503ff794ea2f
-  data.tar.gz: 443753193002f7e346437cd50ed50eab168e8f25
+  metadata.gz: db1595b9c872a259412f3038f5a0fb2840eeb3cf
+  data.tar.gz: f2b1ccafbdbbe5555ba7267aaa51711be0ea0f4e
 SHA512:
-  metadata.gz: c0be145864376662bc858c903c9d4a1865b184b782b2b3f0494c0e85f168de74f44fe8c58f7398e6c1236cbbf9f280a22c3658bdf8a83f0018c6a9af45a1dc62
-  data.tar.gz: 79911454fded94aaf16e48ed958c0ebfaf7d0bb5e3be9e22e0740b71eb21f5acabf949eff65eba5314a0b67dfeca13b84e4037484efff44fbc7d6d382061115b
+  metadata.gz: 584b93e1c7fad7764b37835c5a902ae0fa6549eadd180792db2cdb8bcd6ddcccf6e1c0292e3962e0960e5f491dae6807308f76534a9e51f66698b62e3d794def
+  data.tar.gz: 47869cb66d33806d615dae3046dd0b372532811c00456c839e781d5e57912dcec6c09161f8802a66a37d401fa4dd685dc00327ce1389555ce20dee84419d406b

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 2.9.0 (2015-12-15)
+
+* Support passing the content as a string argument instead of a block in the content_for plugin (badosu) (#52)
+
 = 2.8.0 (2015-11-16)
 
 * Add multi_view plugin for easily setting up routing for rendering multiple views (jeremyevans)

data/README.rdoc

@@ -759,7 +759,7 @@ application level using using the +default_headers+ plugin:
 
 Content-Security-Policy/X-Content-Security-Policy :: Defines policy for how javascript and other
                                                      types of content can be used on the page.
-Frame-Options/X-Frame-Options :: Provides click-jacking projection by not allowing usage inside
+Frame-Options/X-Frame-Options :: Provides click-jacking protection by not allowing usage inside
                                  a frame.
 Strict-Transport-Security :: Enforces SSL/TLS Connections to the application.
 X-Content-Type-Options :: Forces some browsers to respect a declared Content-Type header.

data/doc/release_notes/2.9.0.txt

@@ -0,0 +1,6 @@
+= New Features
+
+* The content_for plugin now supports passing the content as a
+  string argument instead of a block:
+
+    <% content_for :foo, "Some content" %>

data/lib/roda/plugins/content_for.rb

@@ -14,6 +14,11 @@ class Roda
     #     Some content here.
     #   <% end %>
     #
+    # You can also set the raw content as the second argument,
+    # instead of passing a block:
+    #
+    #   <% content_for :foo, "Some content" %>
+    #
     # In the template in which you want to retrieve content,
     # call content_for without the block:
     #
@@ -30,7 +35,7 @@ class Roda
         # under the given key.  If called without a block, retrieve
         # stored content with the given key, or return nil if there
         # is no content stored with that key.
-        def content_for(key, &block)
+        def content_for(key, value=nil, &block)
           if block
             outvar = render_opts[:template_opts][:outvar]
             buf_was = instance_variable_get(outvar)
@@ -41,6 +46,9 @@ class Roda
             @_content_for[key] = Tilt[render_opts[:engine]].new(&block).render
 
             instance_variable_set(outvar, buf_was)
+          elsif value
+            @_content_for ||= {}
+            @_content_for[key] = value
           elsif @_content_for
             @_content_for[key]
           end

data/lib/roda/plugins/not_allowed.rb

@@ -60,9 +60,7 @@ class Roda
     # In all cases where it uses a 405 response, it also sets the +Allow+
     # header in the response to contain the request methods supported.
     #
-    # This plugin depends on the all_verbs plugin.  It works by overriding
-    # the verb methods, so it wouldn't work if loaded after the all_verbs
-    # plugin.
+    # This plugin depends on the all_verbs plugin.
     module NotAllowed
       # Depend on the all_verbs plugin, as this plugin overrides methods
       # defined by it and calls super.

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 2
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 8
+  RodaMinorVersion = 9
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/spec/plugin/content_for_spec.rb

@@ -19,6 +19,9 @@ describe "content_for plugin with erb" do
         r.get 'a' do
           view(:inline => "bar", :layout => { :inline => '<%= content_for(:foo) %> <%= yield %>' })
         end
+        r.get 'b' do
+          view(:inline => '<% content_for(:foo, "foo") %>bar', :layout => { :inline => '<%= yield %> <%= content_for(:foo) %>' })
+        end
       end
     end
   end
@@ -30,6 +33,10 @@ describe "content_for plugin with erb" do
   it "should work if content is not set by the template" do
     body('/a').strip.must_equal "bar"
   end
+
+  it "should work if a raw string is set" do
+    body('/b').strip.must_equal "bar foo"
+  end
 end
 
 describe "content_for plugin with haml" do
@@ -42,12 +49,16 @@ describe "content_for plugin with haml" do
         r.root do
           view(:inline => "- content_for :foo do\n  - capture_haml do\n    foo\nbar", :layout => { :inline => "= yield\n=content_for :foo" })
         end
+        r.get 'a' do
+          view(:inline => "- content_for :foo, 'foo'\nbar", :layout => { :inline => "= yield\n=content_for :foo" })
+        end
       end
     end
   end
 
   it "should work with alternate rendering engines" do
     body.strip.must_equal "bar\nfoo"
+    body('/a').strip.must_equal "bar\nfoo"
   end
 end
 
@@ -61,12 +72,16 @@ describe "content_for plugin with mixed template engines" do
         r.root do
           view(:inline => "<% content_for :foo do %>foo<% end %>bar")
         end
+        r.get 'a' do
+          view(:inline => "<% content_for :foo, 'foo' %>bar")
+        end
       end
     end
   end
 
   it "should work with alternate rendering engines" do
     body.strip.must_equal "bar\nfoo"
+    body('/a').strip.must_equal "bar\nfoo"
   end
 end
 
@@ -80,12 +95,16 @@ describe "content_for plugin when overriding :engine" do
         r.root do
           view(:inline => "<% content_for :foo do %>foo<% end %>bar", :engine=>:erb)
         end
+        r.get 'a' do
+          view(:inline => "<% content_for :foo, 'foo' %>bar", :engine=>:erb)
+        end
       end
     end
   end
 
   it "should work with alternate rendering engines" do
     body.strip.must_equal "bar\nfoo"
+    body('/a').strip.must_equal "bar\nfoo"
   end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -174,6 +174,7 @@ extra_rdoc_files:
 - doc/release_notes/2.6.0.txt
 - doc/release_notes/2.7.0.txt
 - doc/release_notes/2.8.0.txt
+- doc/release_notes/2.9.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -194,6 +195,7 @@ files:
 - doc/release_notes/2.6.0.txt
 - doc/release_notes/2.7.0.txt
 - doc/release_notes/2.8.0.txt
+- doc/release_notes/2.9.0.txt
 - lib/roda.rb
 - lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/all_verbs.rb