erubi 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b0f4d493253c58c5927887ba2193ef6a2e0d4e
-  data.tar.gz: 2946005fbabe579a5679f10758fa4d0bfae224f6
+  metadata.gz: 33a3418c5b03e4cbef20234176d4b4d92308fa2a
+  data.tar.gz: eba2a09e387237585fb664206eb917b6b19838a3
 SHA512:
-  metadata.gz: 29a9d08172af4320a6adb1c2c3645b57061da28d43b94621ee2fae921c213e99167a15b4e6b3f44a3eedcca5d2e87b809152fd9d9be1cd6e0e9f6e8b2afead45
-  data.tar.gz: 48ab8f3a18eb6e6257374d02b6db229ee03f48a459f5ea9ba66461c7e4d5eff8cec76515c675e709dc4410f954ef1487de09d58ccd1959fc7311a427238a4d50
+  metadata.gz: 2cb262e67db9196ce7a1b894dd611fdd62e9662d327ad6e68e95eb7226ca225c0dae98afa5d7edbda0ebb51d4711b8c0871d502876d3865e976965c0f853b1a2
+  data.tar.gz: f85eda1b8942c038a4261dbad958cba7aeb7c72423fa7cf06101dd5b15a6420e4301e4a3cb84168b429f177f853f3775b146d815c5e87478f6f89c9cc6b98049

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.3.0 (2016-12-29)
+
+* Support :capture=>:explicit option in tilt support to use Erubi::CaptureEndEngine (jeremyevans)
+
+* Add erubi/capture_end containing Erubi::CaptureEndEngine, allowing <%|= and <%|== for opening capture tags, and <%| for closing capture tags (jeremyevans)
+
 === 1.2.1 (2016-11-21)
 
 * Don't automatically freeze template text strings on ruby 1.9 or 2.0 (jeremyevans)

data/lib/erubi/capture_end.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'erubi'
+
+module Erubi
+  # An engine class that supports capturing blocks via the <%|= and <%|== tags,
+  # explicitly ending the captures using <%| end %> blocks.
+  class CaptureEndEngine < Engine
+    # Initializes the engine.  Accepts the same arguments as ::Erubi::Engine, and these
+    # additional options:
+    # :escape_capture :: Whether to make <%|= escape by default, and <%|== not escape by default,
+    #                    defaults to the same value as :escape.
+    def initialize(input, properties={})
+      properties = Hash[properties]
+      escape = properties.fetch(:escape){properties.fetch(:escape_html, false)}
+      @escape_capture = properties.fetch(:escape_capture, escape)
+      @bufval = properties[:bufval] ||= 'String.new'
+      @bufstack = '__erubi_stack'
+      properties[:regexp] ||= /<%(\|?={1,2}|-|\#|%|\|)?(.*?)([-=])?%>([ \t]*\r?\n)?/m
+      super
+    end
+
+    private
+
+    # Handle the <%|= and <%|== tags
+    def handle(indicator, code, tailch, rspace, lspace)
+      case indicator
+      when '|=', '|=='
+        rspace = nil if tailch && !tailch.empty?
+        add_text(lspace) if lspace
+        escape_capture = ((indicator == '|=') ^ @escape_capture)
+        src << "begin; (#{@bufstack} ||= []) << #{@bufvar}; #{@bufvar} = #{@bufval}; #{@bufstack}.last << #{@escapefunc if escape_capture}((" << code
+        add_text(rspace) if rspace
+      when '|'
+        rspace = nil if tailch && !tailch.empty?
+        add_text(lspace) if lspace
+        src << code << ")).to_s; ensure; #{@bufvar} = #{@bufstack}.pop; end;"
+        add_text(rspace) if rspace
+      else
+        super
+      end
+    end
+  end
+end

data/lib/tilt/erubi.rb

@@ -10,8 +10,12 @@ module Tilt
 
       engine_class = if @options[:engine_class]
         @options[:engine_class]
-      elsif @options[:capture]
-        Erubi::CaptureEngine
+      elsif capture = @options[:capture]
+        if capture == :explicit
+          Erubi::CaptureEndEngine
+        else
+          Erubi::CaptureEngine
+        end
       else
         Erubi::Engine
       end

data/test/test.rb

@@ -23,6 +23,7 @@ end
 
 require 'erubi'
 require 'erubi/capture'
+require 'erubi/capture_end'
 require 'tilt/erubi'
 require 'minitest/spec'
 require 'minitest/autorun'
@@ -34,8 +35,8 @@ describe Erubi::Engine do
 
   def check_output(input, src, result, &block)
     t = (@options[:engine] || Erubi::Engine).new(input, @options)
-    eval(t.src, block.binding).must_equal result
     tsrc = t.src
+    eval(tsrc, block.binding).must_equal result
     tsrc = tsrc.gsub("'.freeze;", "';") if RUBY_VERSION >= '2.1'
     tsrc.must_equal src
   end
@@ -52,6 +53,21 @@ describe Erubi::Engine do
     end
   end
 
+  def setup_bar
+    def self.bar
+      @a << "a"
+      yield
+      @a << 'b'
+      @a.upcase
+    end
+    def self.baz
+      @a << "c"
+      yield
+      @a << 'd'
+      @a * 2
+    end
+  end
+
   it "should handle no options" do
     list = ['&\'<>"2']
     check_output(<<END1, <<END2, <<END3){}
@@ -146,7 +162,7 @@ END3
   end
 
   [['', false], ['=', true]].each do |ind, escape|
-    it "should allow <%|=#{ind} for capturing without escaping when :escape_capture => #{escape}" do
+    it "should allow <%|=#{ind} for capturing with CaptureEngine with :escape_capture => #{escape} and :escape => #{escape}" do
       @options[:bufvar] = '@a'
       @options[:capture] = true
       @options[:escape_capture] = escape
@@ -192,7 +208,7 @@ END3
   end
 
   [['', true], ['=', false]].each do |ind, escape|
-    it "should allow <%|=#{ind} for capturing with escaping when :escape => #{escape}" do
+    it "should allow <%|=#{ind} for capturing with CaptureEngine with :escape => #{escape}" do
       @options[:bufvar] = '@a'
       @options[:capture] = true
       @options[:escape] = escape
@@ -227,6 +243,119 @@ END3
     end
   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'
+      @options[:capture] = true
+      @options[:escape_capture] = escape
+      @options[:escape] = !escape
+      @options[:engine] = ::Erubi::CaptureEndEngine
+      setup_bar
+      check_output(<<END1, <<END2, <<END3){}
+<table>
+ <tbody>
+  <%|=#{ind} bar do %>
+   <b><%=#{ind} '&' %></b>
+ <%| end %>
+ </tbody>
+</table>
+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 << '   <b>'; @a << #{!escape ? '__erubi' : '::Erubi'}.h(( '&' )); @a << '</b>
+'; @a << ' '; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
+'; @a << ' </tbody>
+</table>
+';
+@a.to_s
+END2
+<table>
+ <tbody>
+  A
+   &lt;B&gt;&amp;AMP;&lt;/B&gt;
+ B
+ </tbody>
+</table>
+END3
+    end
+  end
+
+  [['', true], ['=', false]].each do |ind, escape|
+    it "should allow <%|=#{ind} and <%| for capturing with CaptureEndEngine when with :escape => #{escape}" do
+      @options[:bufvar] = '@a'
+      @options[:capture] = true
+      @options[:escape] = escape
+      @options[:engine] = ::Erubi::CaptureEndEngine
+      setup_bar
+      check_output(<<END1, <<END2, <<END3){}
+<table>
+ <tbody>
+  <%|=#{ind} bar do %>
+   <b><%=#{ind} '&' %></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 << (( 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>
+</table>
+';
+@a.to_s
+END2
+<table>
+ <tbody>
+  A
+   <B>&AMP;</B>
+ B
+ </tbody>
+</table>
+END3
+    end
+
+    it "should allow <%|=#{ind} and <%| for nested capturing with CaptureEndEngine when with :escape => #{escape}" do
+      @options[:bufvar] = '@a'
+      @options[:capture] = true
+      @options[:escape] = escape
+      @options[:engine] = ::Erubi::CaptureEndEngine
+      setup_bar
+      check_output(<<END1, <<END2, <<END3){}
+<table>
+ <tbody>
+  <%|=#{ind} bar do %>
+   <b><%=#{ind} '&' %></b>
+   <%|=#{ind} baz do %>e<%| end %>
+ <%| 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 << (( 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 << ' '; end )).to_s; ensure; @a = __erubi_stack.pop; end; @a << '
+'; @a << ' </tbody>
+</table>
+';
+@a.to_s
+END2
+<table>
+ <tbody>
+  A
+   <B>&AMP;</B>
+   CEDCED
+ B
+ </tbody>
+</table>
+END3
+    end
+  end
+
   [:outvar, :bufvar].each do |var|
     it "should handle :#{var} and :freeze options" do
       @options[var] = "@_out_buf"
@@ -533,6 +662,15 @@ END1
 END2
   end
 
+  it "should have working tilt support for explicit capturing" do
+    setup_bar
+    Tilt::ErubiTemplate.new(:capture=>:explicit, :outvar=>'@a'){<<END1}.render(self).must_equal(<<END2)
+1<%|= bar do %>b<%|= baz do %>e<%| end %>ar<%| end %>2
+END1
+1ABCEDCEDARB2
+END2
+  end
+
   it "should have working tilt support for specifying engine class" do
     setup_foo
     @a = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erubi
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -54,6 +54,7 @@ files:
 - Rakefile
 - lib/erubi.rb
 - lib/erubi/capture.rb
+- lib/erubi/capture_end.rb
 - lib/tilt/erubi.rb
 - test/test.rb
 homepage: https://github.com/jeremyevans/erubi