erubi 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7f083e903297ea1af2aa0f9fffb787a7fcd8cdd
-  data.tar.gz: 5f2ee10913c29dde0cd731781e8c696872f71733
+  metadata.gz: '06927703ddb707650937af01e62308503844ea83'
+  data.tar.gz: a15b6bf8a5bcc28f16aa5ccc4e607946816c6fac
 SHA512:
-  metadata.gz: 78b7ecae18bdc2e524cf2f778ef3552419a0df2b61e63f1f027ee1083375e9395306c3444bcc5ceb69ba7fe2a9e0da7aaf1535267b3db59d6ff8c634cf42a955
-  data.tar.gz: 58f2d7eb1f3930061415f010815d9e097fa3939d52491d60038ccf58283f4cf04d77ddabf808582cdae1a5fd6d9e3b0d9c8918c27cf2e02dc3a73c9ba367a05a
+  metadata.gz: 1319c023421b758f72d2a0c07d67fa1e1267879a3eb82999a523154b9b7bdd6fdd23b8767f4f058f72c5e75720670271df5f8e70a10e7d1101748962d0e4e386
+  data.tar.gz: 2a35f88d8c20279919fac6704fe0bc51ed4fcba6d56fb2e6ff7a1fde03c7ea44691a14da10588333daeeb4eb61b3cdae68700006424894fd1dd447eeb0b203ed

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.7.0 (2017-10-09)
+
+* Fix escaping in erubi/capture_end, the setting was previously inverted (jeremyevans) (#10)
+
 === 1.6.1 (2017-06-27)
 
 * Fix usage on newer versions of JRuby 9.1 (jeremyevans)

data/README.rdoc

@@ -45,7 +45,8 @@ Rails 5.1+.
 
 Erubi does not support capturing block output into the template by default.
 However, it comes with an +erubi/capture_end+ file that supports capturing
-via <tt><%|=</tt>, <tt><%|==</tt>, <tt><%|</tt> tags:
+via <tt><%|=</tt> and <tt><%|==</tt> tags which are closed with a
+<tt><%|</tt> tag:
 
   <%|= form do %>
     <input>

data/lib/erubi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Erubi
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
   RANGE_ALL = 0..-1
 
   if RUBY_VERSION >= '1.9'

data/lib/erubi/capture_end.rb

@@ -28,7 +28,7 @@ module Erubi
       when '|=', '|=='
         rspace = nil if tailch && !tailch.empty?
         add_text(lspace) if lspace
-        escape_capture = ((indicator == '|=') ^ @escape_capture)
+        escape_capture = !((indicator == '|=') ^ @escape_capture)
         src << "begin; (#{@bufstack} ||= []) << #{@bufvar}; #{@bufvar} = #{@bufval}; #{@bufstack}.last << #{@escapefunc if escape_capture}((" << code
         add_text(rspace) if rspace
       when '|'

data/test/test.rb

@@ -64,6 +64,16 @@ describe Erubi::Engine do
       @a << 'd'
       @a * 2
     end
+    def self.quux
+      @a << "a"
+      3.times do |i|
+        @a << "c#{i}"
+        yield i
+        @a << "d#{i}"
+      end
+      @a << "b"
+      @a.upcase
+    end
   end
 
   it "should handle no options" do
@@ -159,6 +169,22 @@ END3
     @a.must_equal 'bar'
   end
 
+  it "should have <%|= with CaptureEndEngine not escape by default" do
+    eval(::Erubi::CaptureEndEngine.new('<%|= "&" %><%| %>').src).must_equal '&'
+    eval(::Erubi::CaptureEndEngine.new('<%|= "&" %><%| %>', :escape=>false).src).must_equal '&'
+    eval(::Erubi::CaptureEndEngine.new('<%|= "&" %><%| %>', :escape_capture=>false).src).must_equal '&'
+    eval(::Erubi::CaptureEndEngine.new('<%|= "&" %><%| %>', :escape=>true).src).must_equal '&amp;'
+    eval(::Erubi::CaptureEndEngine.new('<%|= "&" %><%| %>', :escape_capture=>true).src).must_equal '&amp;'
+  end
+
+  it "should have <%|== with CaptureEndEngine escape by default" do
+    eval(::Erubi::CaptureEndEngine.new('<%|== "&" %><%| %>').src).must_equal '&amp;'
+    eval(::Erubi::CaptureEndEngine.new('<%|== "&" %><%| %>', :escape=>true).src).must_equal '&'
+    eval(::Erubi::CaptureEndEngine.new('<%|== "&" %><%| %>', :escape_capture=>true).src).must_equal '&'
+    eval(::Erubi::CaptureEndEngine.new('<%|== "&" %><%| %>', :escape=>false).src).must_equal '&amp;'
+    eval(::Erubi::CaptureEndEngine.new('<%|== "&" %><%| %>', :escape_capture=>false).src).must_equal '&amp;'
+  end
+
   [['', false], ['=', true]].each do |ind, escape|
     it "should allow <%|=#{ind} and <%| for capturing with CaptureEndEngine with :escape_capture => #{escape} and :escape => #{!escape}" do
       @options[:bufvar] = '@a'
@@ -178,7 +204,7 @@ END3
 END1
 #{'__erubi = ::Erubi;' unless escape}@a = String.new; @a << '<table>
  <tbody>
-'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << #{!escape ? '__erubi' : '::Erubi'}.h(( bar do  @a << '
+'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << (( bar do  @a << '
 '; @a << '   <b>'; @a << #{!escape ? '__erubi' : '::Erubi'}.h(( '&' )); @a << '</b>
 '; @a << ' '; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
 '; @a << ' </tbody>
@@ -189,7 +215,7 @@ END2
 <table>
  <tbody>
   A
-   &lt;B&gt;&amp;AMP;&lt;/B&gt;
+   <B>&AMP;</B>
  B
  </tbody>
 </table>
@@ -214,7 +240,7 @@ END3
 END1
 #{'__erubi = ::Erubi;' if escape}@a = String.new; @a << '<table>
  <tbody>
-'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << (( bar do  @a << '
+'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << #{escape ? '__erubi' : '::Erubi'}.h(( bar do  @a << '
 '; @a << '   <b>'; @a << #{escape ? '__erubi' : '::Erubi'}.h(( '&' )); @a << '</b>
 '; @a << ' '; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
 '; @a << ' </tbody>
@@ -225,13 +251,51 @@ END2
 <table>
  <tbody>
   A
-   <B>&AMP;</B>
+   &lt;B&gt;&amp;AMP;&lt;/B&gt;
  B
  </tbody>
 </table>
 END3
     end
 
+    it "should handle loops in <%|=#{ind} and <%| for capturing with CaptureEndEngine when with :escape => #{escape}" do
+      @options[:bufvar] = '@a'
+      @options[:escape] = escape
+      @options[:engine] = ::Erubi::CaptureEndEngine
+      setup_bar
+      check_output(<<END1, <<END2, <<END3){}
+<table>
+ <tbody>
+  <%|=#{ind} quux do |i| %>
+   <b><%=#{ind} "\#{i}&" %></b>
+ <%| end %>
+ </tbody>
+</table>
+END1
+#{'__erubi = ::Erubi;' if escape}@a = String.new; @a << '<table>
+ <tbody>
+'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << #{escape ? '__erubi' : '::Erubi'}.h(( quux do |i|  @a << '
+'; @a << '   <b>'; @a << #{escape ? '__erubi' : '::Erubi'}.h(( "\#{i}&" )); @a << '</b>
+'; @a << ' '; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
+'; @a << ' </tbody>
+</table>
+';
+@a.to_s
+END2
+<table>
+ <tbody>
+  AC0
+   &lt;B&gt;0&amp;AMP;&lt;/B&gt;
+ D0C1
+   &lt;B&gt;1&amp;AMP;&lt;/B&gt;
+ D1C2
+   &lt;B&gt;2&amp;AMP;&lt;/B&gt;
+ D2B
+ </tbody>
+</table>
+END3
+    end
+
     it "should allow <%|=#{ind} and <%| for nested capturing with CaptureEndEngine when with :escape => #{escape}" do
       @options[:bufvar] = '@a'
       @options[:escape] = escape
@@ -249,9 +313,9 @@ END3
 END1
 #{'__erubi = ::Erubi;' if escape}@a = String.new; @a << '<table>
  <tbody>
-'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << (( bar do  @a << '
+'; @a << '  ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << #{escape ? '__erubi' : '::Erubi'}.h(( bar do  @a << '
 '; @a << '   <b>'; @a << #{escape ? '__erubi' : '::Erubi'}.h(( '&' )); @a << '</b>
-'; @a << '   ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << (( baz do  @a << 'e'; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
+'; @a << '   ';begin; (__erubi_stack ||= []) << @a; @a = String.new; __erubi_stack.last << #{escape ? '__erubi' : '::Erubi'}.h(( baz do  @a << 'e'; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
 '; @a << ' '; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
 '; @a << ' </tbody>
 </table>
@@ -261,7 +325,7 @@ END2
 <table>
  <tbody>
   A
-   <B>&AMP;</B>
+   &lt;B&gt;&amp;AMP;&lt;/B&gt;
    CEDCED
  B
  </tbody>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erubi
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Small ERB Implementation