roger 0.11.0 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E4YjE1MDI4YWZiNmMyMzAwYmQzMGFmN2JiMGZhYjQzYzFjNTIwZA==
+    YzYxZWRjNGYwZjA1NjRmNzQ4NDA1YjA5NTJlYjg2Y2VjNGE2ODQwMA==
   data.tar.gz: !binary |-
-    NjgxYjg4ZTU2NGJjNzE3MjlmNzc1NjBhNzU1ZDgxMGNmY2RhYjk3Mg==
+    NTA4Y2Y4MjIwMjA1OGYzNzgxM2Y1NmZiZTljMDgxOGQ2OGU0YTFlNw==
 SHA512:
   metadata.gz: !binary |-
-    MTJjNjM2ZTFiNzIwZTU3ODdmYjYyM2QwYzEyYWVhMTk0MGM0OTBlODU5MTBk
-    NDQyZWE5OGVmNzM1NmMyNWNkM2NmZDNiZGE2MjE0MGI3ZWMwN2VjY2JkZTU2
-    OWUxYzgyOGJlODE4ZmRkY2U5OWI1MzI1YjEyZGIwOGNjNDU2OWI=
+    ZjkxOTQ2MmY4MzYzYTcxMDVjNzY5MTAyYzU1NjA3MzgyYzE0OWFlODdlMjRk
+    ZjdlOGUzNDg1M2M1NjYwMjQ0OTg1NDRkOTA4YmZiM2ZhZjFmMjAxZmVhNTk4
+    MDg5ZjNiYjM3MjViMmRiZDYwNzQ3MzkyNWM2ZmY5OGM4ODFhNTE=
   data.tar.gz: !binary |-
-    OTBiYTliOWQxZDZjYjNkZDdkNTU2Mjg2YjkxOGU4ZmNjNjc2OTRiYTEwOGU4
-    YTEyMjVkZWMxZjBhMGQxYWI2MTNmODk2MTk5ZDE3NjliZTdiODE0MWMxNzQ1
-    YmU3NjE1YjYwYWUzNGZlOGQyZWIyMzdlNzM4MmQyODQ4Yzk4MDA=
+    ODhjNWUwNzI0ODMxN2E0YThkMzc2NmQ5MWI3MjM2MWY3YjRmNzEyOTczNzZi
+    YjZkMDlkMjM2NjdjNzBjZWU1OWNlOTJiNDZiZDUwZTM1OTI2OWRmZDU4OTEx
+    YWVhMjJjMmViYmFiMTI1YzJhZDFlZjE2NTRlZjMzOTYwNzQxY2Y=

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.12.0
+* Allow passing blocks to partials. Keep in mind that you'll need to use the `<% ... %>` form when using blocks.
+
 ## Version 0.11.0
 * You can now register release processors and finalizers with a name and use them by name (call `Roger::Release::Finalizers.register(:name, Finalizer)` or `Roger::Release::Processors.register(:name, Processor)`)
 * Generators now need to be registered on `Roger::Generators` instead of `Roger::Generators::Base`

data/lib/roger/template.rb

@@ -177,21 +177,35 @@ module Roger
     # ```
     #   <%= yield :name %>
     # ```
-    def content_for(block_name, &capture)
+    def content_for(block_name, &block)
+      @_content_for_blocks[block_name] = capture(&block)
+    end
+
+    def capture(&block)
       raise ArgumentError, "content_for works only with ERB Templates" if !self.template.template.kind_of?(Tilt::ERBTemplate)
-      eval "@_erbout_tmp = _erbout", capture.binding
-      eval "_erbout = \"\"", capture.binding
+      eval "@_erbout_tmp = _erbout", block.binding
+      eval "_erbout = \"\"", block.binding
       t = Tilt::ERBTemplate.new(){ "<%= yield %>" }
-      @_content_for_blocks[block_name] = t.render(&capture)
-      return nil
+      t.render(&block)      
     ensure
-      eval "_erbout = @_erbout_tmp", capture.binding
+      eval "_erbout = @_erbout_tmp", block.binding
     end
         
-    def partial(name, options = {})
+    def partial(name, options = {}, &block)
       if template_path = self.template.find_template(name, :partials_path)
         partial_template = Tilt.new(template_path.to_s)
-        partial_template.render(self, options[:locals] || {})
+        if block_given?
+          block_content = capture(&block)
+        else
+          block_content = ""
+        end
+        out = partial_template.render(self, options[:locals] || {}){ block_content }
+
+        if block_given?
+          eval "_erbout.concat(#{out.dump})", block.binding
+        else
+          out
+        end
       else
         raise ArgumentError, "No such partial #{name}, referenced from #{self.template.source_path}"
       end

data/roger.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "roger"
-  s.version = "0.11.0"
+  s.version = "0.12.0"
   
   s.authors = ["Flurin Egger", "Edwin van der Graaf", "Joran Kapteijns"]
   s.email = ["info@digitpaint.nl", "flurin@digitpaint.nl"]  

data/test/project/partials/test/yield.html.erb

@@ -0,0 +1 @@
+B-<%= yield %>-A

data/test/unit/template_test.rb

@@ -99,6 +99,19 @@ module Roger
 
     end
 
+    def test_partial_with_block
+      template = Template.new("<% partial 'test/yield' do %>CONTENT<% end %>", @config.update(:source_path => @base + "html/test.html.erb"))
+      assert_equal template.render, "B-CONTENT-A"
+
+      template = Template.new("<% partial 'test/yield' do %><%= 'CONTENT' %><% end %>", @config.update(:source_path => @base + "html/test.html.erb"))
+      assert_equal template.render, "B-CONTENT-A"
+    end
+
+    def test_partial_with_block_without_yield
+      template = Template.new("<% partial 'test/simple' do %>CONTENT<% end %>", @config.update(:source_path => @base + "html/test.html.erb"))
+      assert_equal template.render, "ERB"
+    end
+
     # Content for parts
 
     def test_content_for_not_returning_in_template

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -184,6 +184,7 @@ files:
 - test/project/partials/test/json.json.erb
 - test/project/partials/test/markdown.md
 - test/project/partials/test/simple.html.erb
+- test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
 - test/unit/cli_test.rb
 - test/unit/generators_test.rb
@@ -246,6 +247,7 @@ test_files:
 - test/project/partials/test/json.json.erb
 - test/project/partials/test/markdown.md
 - test/project/partials/test/simple.html.erb
+- test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
 - test/unit/cli_test.rb
 - test/unit/generators_test.rb