roger 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc5df3b7198a5c8ae6dca70a00e6a35416fa4056
-  data.tar.gz: 850c235b8f2426af1772cb02182e749d91557a95
+  metadata.gz: 08b47d99903f3d3eead1bac65ee0b5f12d87be52
+  data.tar.gz: ac530d446306f7891cae517fe062cef21b4af25a
 SHA512:
-  metadata.gz: d4aabffaf1c231cdda88a03a4df296324abf857a9be70ad18273f7a2709ef9e33480e0aa0096bf18b0a377b695eceb629b8d4e1f18c18c57a592981121d95b89
-  data.tar.gz: 3151091868343c3aaeffa12903b5b331e78b2f7bf941e021c98b6110fa1ff5dd280a0253f0beacc9c15ab468e212907209ffa0cbe48b3fa7f5283f3e5b49c550
+  metadata.gz: 25315c6c7e964d202919de443d9d8045379d817737a5cf81b2dcf104ffaffafc128c1b4a183a6d21a03990e1ca7c0ec10586b4c86830ee258c40a381fd151ba3
+  data.tar.gz: b40b87fe2d800010d15d23fe2104909f3d3998df83a3c17749faa6cba5f2aa8fd77df16ba154da9bdee38c5671b25d64bd9ce4076012b4a5f56a00b4d264d22e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 1.6.3
+* Fix issue with `render_file` screwing up the current_template nesting stack.
+
 ## Version 1.6.2
 * Allow for tempalte recursion for up to 10 levels.
 * Fix issue with missing partials that would screw up the current_template nesting stack.

data/lib/roger/renderer.rb

@@ -154,6 +154,10 @@ module Roger
       template_nesting.push(template)
 
       template.render(options[:locals] || {})
+    ensure
+      # Only pop the template from the nesting if we actually
+      # put it on the nesting stack.
+      template_nesting.pop if template
     end
 
     # The current template being rendered

data/lib/roger/version.rb

@@ -1,4 +1,4 @@
 # Roger main namespace
 module Roger
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

data/test/unit/renderer/renderer_base_test.rb

@@ -42,6 +42,12 @@ module Roger
       end
     end
 
+    def test_render_file_pop_nesting
+      assert_equal nil, @renderer.current_template
+      @renderer.render_file(@base + "html/renderer/file.html.erb")
+      assert_equal nil, @renderer.current_template
+    end
+
     # Formats
 
     def test_render_md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor