slim 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ec0b5a06448c8dd50ccf5b2113fce5b14c2ce2
-  data.tar.gz: 9b34f912436340d0e603eeb342ac5f3cd93c188c
+  metadata.gz: 3526425b78d5829bd231ac9a41146c6044b093d3
+  data.tar.gz: fe4ab15abda376d89008704a2956e2c5e7050f99
 SHA512:
-  metadata.gz: 5405f3254bfa3edba989203f191a8f8069fdf075ca4428ed173fbbdc40ca83061739c065e3a45c3fc765e1979015ad2969ac84eab93ba8075cf7aecf00fe4530
-  data.tar.gz: 66231d7ee04b5c03dae4f1497045d3345bbff266b5176f593f91f38fe83d8789fd956d93e9a3dea639d17e20dcd967ed8c661d754ad173173eaf9e880dfff287
+  metadata.gz: fa521d0745c0b0a404c512fc22a9dd69643efcfec0827e500ef6b5ad183ef9fdda8a163550ece9ae9d2d7ecbddd3ac32fa13a0edcfdaf824bd4076950c9eb6d4
+  data.tar.gz: caacf25c2529313fbf6aad2de36e6f5186de76b873819d214f39d982d3e91da7105f1d46ddf144e852f25a53f040ac20c3d8a45ea60c1abcba1967bfd3955b4a

data/CHANGES

@@ -1,3 +1,7 @@
+3.0.3
+
+  * Fix #392, capturing for splat attributes didn't work correctly under Rails
+
 3.0.2
 
   * slimrb: Add option --locals

data/README.jp.md

@@ -33,8 +33,8 @@ Slim は 不可解にならないように view の構文を本質的な部品
 * バグ:   <http://github.com/slim-template/slim/issues>
 * リスト:   <http://groups.google.com/group/slim-template>
 * API ドキュメント:
-    * 最新の Gem: <http://rubydoc.info/gems/slim/frames>
-    * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames>
+    * 最新の Gem: <http://rubydoc.info/gems/slim/frames> <https://www.omniref.com/ruby/gems/slim>
+    * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames> <https://www.omniref.com/github/slim-template/slim>
 
 ## イントロダクション
 

data/README.md

@@ -33,8 +33,8 @@ A short list of the features...
 * Bugs:   <http://github.com/slim-template/slim/issues>
 * List:   <http://groups.google.com/group/slim-template>
 * API documentation:
-    * Latest Gem: <http://rubydoc.info/gems/slim/frames>
-    * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames>
+    * Latest Gem: <http://rubydoc.info/gems/slim/frames> <https://www.omniref.com/ruby/gems/slim>
+    * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames> <https://www.omniref.com/github/slim-template/slim>
 
 ## Introduction
 

data/lib/slim/splat/builder.rb

@@ -36,11 +36,30 @@ module Slim
         end
       end
 
-      def build_tag
+      def build_tag(&block)
         tag = @attrs.delete('tag').to_s
         tag = @options[:default_tag] if tag.empty?
-        if block_given?
-          "<#{tag}#{build_attrs}>#{yield}</#{tag}>"
+        if block
+          # This is a bit of a hack to get a universal capturing.
+          #
+          # TODO: Add this as a helper somewhere to solve these capturing issues
+          # once and for all.
+          #
+          # If we have Slim capturing disabled and the scope defines the method `capture` (i.e. Rails)
+          # we use this method to capture the content.
+          #
+          # otherwise we just use normal Slim capturing (yield).
+          #
+          # See https://github.com/slim-template/slim/issues/591
+          #     https://github.com/slim-template/slim#helpers-capturing-and-includes
+          #
+          content =
+            if @options[:disable_capture] && (scope = block.binding.eval('self')).respond_to?(:capture)
+              scope.capture(&block)
+            else
+              yield
+            end
+          "<#{tag}#{build_attrs}>#{content}</#{tag}>"
         else
           "<#{tag}#{build_attrs} />"
         end

data/lib/slim/splat/filter.rb

@@ -2,7 +2,7 @@ module Slim
   module Splat
     # @api private
     class Filter < ::Slim::Filter
-      define_options :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :format,
+      define_options :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :format, :disable_capture,
                      hyphen_attrs: %w(data aria), use_html_safe: ''.respond_to?(:html_safe?)
 
       def call(exp)

data/lib/slim/version.rb

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/test/rails/app/views/slim/splat.html.slim

@@ -0,0 +1,2 @@
+#splat
+  *{tag: 'splat'} Hello

data/test/rails/test/test_slim.rb

@@ -82,4 +82,9 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_match %r{<label><b>Name</b></label>}, @response.body
     assert_xpath '//input[@id="entry_name" and @name="entry[name]" and @type="text"]'
   end
+
+  test "splat" do
+    get "/slim/splat"
+    assert_html "<div id=\"splat\"><splat>Hello</splat></div>"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -157,6 +157,7 @@ files:
 - test/rails/app/views/slim/no_layout.html.slim
 - test/rails/app/views/slim/normal.html.slim
 - test/rails/app/views/slim/partial.html.slim
+- test/rails/app/views/slim/splat.html.slim
 - test/rails/app/views/slim/thread_options.html.slim
 - test/rails/app/views/slim/variables.html.slim
 - test/rails/app/views/slim/xml.slim