roger 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b47d99903f3d3eead1bac65ee0b5f12d87be52
-  data.tar.gz: ac530d446306f7891cae517fe062cef21b4af25a
+  metadata.gz: 92478f7482bcbb5fa9dfe14d0a96d092a46e5d78
+  data.tar.gz: b6f75c7d2deb4c7d3d5afb2fd5c5ea3bd2e9c22d
 SHA512:
-  metadata.gz: 25315c6c7e964d202919de443d9d8045379d817737a5cf81b2dcf104ffaffafc128c1b4a183a6d21a03990e1ca7c0ec10586b4c86830ee258c40a381fd151ba3
-  data.tar.gz: b40b87fe2d800010d15d23fe2104909f3d3998df83a3c17749faa6cba5f2aa8fd77df16ba154da9bdee38c5671b25d64bd9ce4076012b4a5f56a00b4d264d22e
+  metadata.gz: 2a7ca884f0897b455af8b81c1eff91fe0066ac71b3d3f89bd302b533fdf2b7dc7ba1ba8f69a1472727327fc9434b328f11ad92b6fb98d7ef8a0d7f836469ad43
+  data.tar.gz: 560301778c4892fbbeb5040a7c1e00162f1012af0395202e4f0c92c52c2401bb7e920f9df40e9bdda9b9af4c212bebd4fd02c0339256fbf1c94000b57a08bb1c

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 1.6.4
+* Fix bug with block partials in layouts by correctly determine the current Tilt template we're rendering.
+
 ## Version 1.6.3
 * Fix issue with `render_file` screwing up the current_template nesting stack.
 

data/Gemfile

@@ -3,5 +3,6 @@ source "https://rubygems.org"
 gemspec name: "roger"
 
 gem "rake"
+gem "pry"
 # Only coverage support in CI, CODECLIMATE TOKEN is part of travis.yml
 gem "codeclimate-test-reporter", group: :test, require: nil if ENV["CODECLIMATE_REPO_TOKEN"]

data/lib/roger/template/helpers/capture.rb

@@ -36,7 +36,7 @@ module Roger
 
         # rubocop:disable Lint/Eval
         def capture(&block)
-          unless template.current_tilt_template == Tilt::ERBTemplate
+          unless Thread.current[:tilt_current_template].is_a?(Tilt::ERBTemplate)
             err  = "content_for works only with ERB Templates"
             err += "(was: #{template.current_tilt_template.inspect})"
             fail ArgumentError, err

data/lib/roger/version.rb

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

data/test/project/layouts/partial.html.erb

@@ -0,0 +1 @@
+<%= yield %><%= partial "test/simple" %>

data/test/project/layouts/partial_with_block.html.erb

@@ -0,0 +1 @@
+<%= yield %><% partial "test/yield" do %>PARTIAL<% end %>

data/test/unit/renderer/renderer_layout_test.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+# Generators register themself on the CLI module
+require "test_helper"
+require "./lib/roger/renderer.rb"
+
+module Roger
+  # Roger template tests
+  class RendererBaseTest < ::Test::Unit::TestCase
+    def setup
+      @base = Pathname.new(File.dirname(__FILE__) + "/../../project")
+      @config = {
+        partials_path: @base + "partials",
+        layouts_path: @base + "layouts",
+        source_path: @base + "html/test.html.erb"
+      }
+      @template_path = @base + "html"
+
+      @renderer = Renderer.new({}, @config)
+    end
+
+    def test_basic_layout
+      template = "---\nlayout: \"yield\"\n---\nTEMPLATE"
+      assert_equal "TEMPLATE", render_erb_template(template)
+    end
+
+    def test_layout_with_partial
+      template = "---\nlayout: \"partial\"\n---\nTEMPLATE"
+      assert_equal "TEMPLATEERB", render_erb_template(template)
+    end
+
+    def test_layout_with_block_partial
+      template = "---\nlayout: \"partial_with_block\"\n---\nTEMPLATE"
+      assert_equal "TEMPLATEB-PARTIAL-A", render_erb_template(template)
+    end
+
+    def render_erb_template(template)
+      @renderer.render(@base + "html/layouts/test.html.erb", source: template)
+    end
+  end
+end

data/test/unit/template/template_base_test.rb

@@ -25,5 +25,25 @@ module Roger
       template = Template.new("<%= yield %>", {}, source_path: "test.erb")
       assert_equal "inner", template.render { "inner" }
     end
+
+    def test_data
+      template = Template.new("---\nkey: value\n---\ndata", {}, source_path: "test.erb")
+      assert_equal "value", template.data[:key]
+    end
+
+    def test_faulty_data
+      template = Template.new("---\nkey value\n---\ndata", {}, source_path: "test.erb")
+      assert_equal({}, template.data)
+    end
+
+    def test_strip_data_block
+      template = Template.new("---\nkey: value\n---\ndata", {}, source_path: "test.erb")
+      assert_equal "data", template.render
+    end
+
+    def test_strip_faulty_data_block
+      template = Template.new("---\nkey value\n---\ndata", {}, source_path: "test.erb")
+      assert_equal "data", template.render
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -286,6 +286,8 @@ files:
 - test/project/html/renderer/recursive.html.erb
 - test/project/html/static/non-relative.html.erb
 - test/project/html/static/relative.html.erb
+- test/project/layouts/partial.html.erb
+- test/project/layouts/partial_with_block.html.erb
 - test/project/layouts/test.html.erb
 - test/project/layouts/yield.html.erb
 - test/project/lib/generators/test.rb
@@ -333,6 +335,7 @@ files:
 - test/unit/renderer/renderer_base_test.rb
 - test/unit/renderer/renderer_content_for_test.rb
 - test/unit/renderer/renderer_helper_test.rb
+- test/unit/renderer/renderer_layout_test.rb
 - test/unit/renderer/renderer_partial_test.rb
 - test/unit/resolver_test.rb
 - test/unit/server_test.rb
@@ -392,6 +395,8 @@ test_files:
 - test/project/html/renderer/recursive.html.erb
 - test/project/html/static/non-relative.html.erb
 - test/project/html/static/relative.html.erb
+- test/project/layouts/partial.html.erb
+- test/project/layouts/partial_with_block.html.erb
 - test/project/layouts/test.html.erb
 - test/project/layouts/yield.html.erb
 - test/project/lib/generators/test.rb
@@ -439,6 +444,7 @@ test_files:
 - test/unit/renderer/renderer_base_test.rb
 - test/unit/renderer/renderer_content_for_test.rb
 - test/unit/renderer/renderer_helper_test.rb
+- test/unit/renderer/renderer_layout_test.rb
 - test/unit/renderer/renderer_partial_test.rb
 - test/unit/resolver_test.rb
 - test/unit/server_test.rb