roger 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 843441f4532ad0dcd2c12697f3cc1a850468a14b
-  data.tar.gz: cdc778e25728a7f07752d57049187ab1335d375d
+  metadata.gz: b0e25d53fb264823bbd277555be283be84210460
+  data.tar.gz: a4618896d76651eb6002865640d2e5aa18b9442e
 SHA512:
-  metadata.gz: 9891bfcbc25ccefc84b2f165c4b2df93cca0c28fd4c87ff19ab56c52afdb97c36c0311f6b087d1b5f57719a474359a54695b834d99bdf8843d4c81dbba86c2da
-  data.tar.gz: cb4bcf7953ecf4250341c6fdfa868cffc578b5b9dca840ab73ffc501e006e6c478b7fb9d74a33946f21e7e2057ce59772a7fa19fda5ec5ef339f5ecf1bfc88bf
+  metadata.gz: 6e4c474bbe2fe95edf3aed26bcf060810764ea55c8e639ea009e27878740479c05f22e69a8c3d76e37afc9680177a597fb10ff1c2743910f9cc52f2851bf6423
+  data.tar.gz: 50131d49a34dd8b8bb7fa9568066975469c3c6b4d877d3670d68196e60bdc937a741a973e07e2fd9239b5a75bde589eb338e7f0ac82e5cfc27e7d3c2a4e7736d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 1.1.2
+
+* Fix issue where nested `content_for` statements or partials with blocks within a `content_for` block would yield multiple times.
+
 ## Version 1.1.1
 
 * Better compatiblity with the release as `build` is a relative path it will give sometimes weird issues. This has now been resolved.

data/lib/roger/template.rb

@@ -35,6 +35,7 @@ module Roger
     # @option options [String,Pathname] :partials_path The path to where all partials reside    
     def initialize(source, options = {})
       @options = options
+
       self.source_path = options[:source_path]
       self.data, self.source = extract_front_matter(source)
       self.template = Tilt.new(self.source_path.to_s){ self.source }
@@ -149,6 +150,9 @@ module Roger
     def initialize(template, env={})
       @_content_for_blocks = {}
       @_template, @_env = template, env
+
+      # Block counter to make sure erbtemp binding is always unique
+      @block_counter = 0
     end
     
     # The current Roger::Template in use
@@ -184,12 +188,16 @@ module Roger
 
     def capture(&block)
       raise ArgumentError, "content_for works only with ERB Templates" if !self.template.template.kind_of?(Tilt::ERBTemplate)
-      eval "@_erbout_tmp = _erbout", block.binding
+
+      @block_counter += 1
+      counter = @block_counter
+
+      eval "@_erbout_tmp#{counter} = _erbout", block.binding
       eval "_erbout = \"\"", block.binding
       t = Tilt::ERBTemplate.new(){ "<%= yield %>" }
-      t.render(&block)      
+      t.render(&block)
     ensure
-      eval "_erbout = @_erbout_tmp", block.binding
+      eval "_erbout = @_erbout_tmp#{counter}", block.binding
     end
         
     def partial(name, options = {}, &block)
@@ -214,4 +222,4 @@ module Roger
     
   end
   
-end
+end

data/roger.gemspec

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

data/test/unit/template_test.rb

@@ -135,6 +135,11 @@ module Roger
       assert_equal template.render, "BA"
     end    
 
+    def test_content_for_yield_with_partial_with_block
+      template = Template.new("---\nlayout: \"yield\"\n---\nB<% content_for :one do %><% partial 'test/yield' do %>CONTENT<% end %><% end %>A", @config.update(:source_path => @base + "html/test.html.erb"))
+      assert_equal template.render, "BAB-CONTENT-A"
+    end
+
     # Environment
 
     def test_template_env

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor