erubi 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33a3418c5b03e4cbef20234176d4b4d92308fa2a
-  data.tar.gz: eba2a09e387237585fb664206eb917b6b19838a3
+  metadata.gz: 20b3fb23c6df5c201822001090290ca746da0c46
+  data.tar.gz: 1792657866eff6b28e95be1ab5a3463445be3a2b
 SHA512:
-  metadata.gz: 2cb262e67db9196ce7a1b894dd611fdd62e9662d327ad6e68e95eb7226ca225c0dae98afa5d7edbda0ebb51d4711b8c0871d502876d3865e976965c0f853b1a2
-  data.tar.gz: f85eda1b8942c038a4261dbad958cba7aeb7c72423fa7cf06101dd5b15a6420e4301e4a3cb84168b429f177f853f3775b146d815c5e87478f6f89c9cc6b98049
+  metadata.gz: e8e2c2e1e8bd7cbe522a1570f81fbd12a691c84a2332df3e1be760193b59b9ab73b6bf05f1d1944f64b902295d980229e63fe6098f1bebfa851f5816da81b1bb
+  data.tar.gz: 0b515eb522628f20f1843070c216ad1fc01a76a64235f87bc6ecec09116f20f6f97e77de85ba0518aeaa0fbe816c50e41096a197637f41b4edd24ba98791a614

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.4.0 (2017-01-20)
+
+* Allow postambles to depend on internal state of engine (jeremyevans)
+
+* Allow overriding of behavior for <%= and <%== tags to depend on which indicator was used (jeremyevans)
+
+* Make whitespace handling for <% %> tags more compatible with Erubis for subclasses overriding add_text (jeremyevans)
+
 === 1.3.0 (2016-12-29)
 
 * Support :capture=>:explicit option in tilt support to use Erubi::CaptureEndEngine (jeremyevans)

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
-copyright(c) 2016 Jeremy Evans
+copyright(c) 2016-2017 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -8,11 +8,11 @@ the following differences:
 * Works with ruby's --enable-frozen-string-literal option
 * Automatically freezes strings for template text when ruby optimizes it (on ruby 2.1+)
 * Escapes ' (apostrophe) when escaping for better XSS protection 
-* Has 90% smaller memory footprint for base engine
+* Has 88% smaller memory footprint for base engine
 * Has 75% smaller memory footprint for tilt support
 * Does no monkey patching (Erubis adds a method to Kernel)
 * Uses an immutable design (all options passed to the constructor, which returns a frozen object)
-* Has simpler internals (1 file, <100 lines of code)
+* Has simpler internals (1 file, <150 lines of code)
 * Has an open development model (Erubis doesn't have a public source control repository or bug tracker)
 * Is not dead (Erubis hasn't been updated since 2011)
 
@@ -49,12 +49,12 @@ source:
 == Capturing
 
 Erubi does not support capturing block output into the template by default.
-However, it comes with an +erubi/capture+ file that supports capturing
-via <tt><%|=</tt> and <tt><%|==</tt> tags:
+However, it comes with an +erubi/capture_end+ file that supports capturing
+via <tt><%|=</tt>, <tt><%|==</tt>, <tt><%|</tt> tags:
 
   <%|= form do %>
     <input>
-  <% end %>
+  <%| end %>
 
 This offers similar functionality to that offered by Rails' <tt><%=</tt>
 tags, but without the corner cases with that approach (which are due to

data/lib/erubi.rb

@@ -52,7 +52,7 @@ module Erubi
     # :src :: The initial value to use for the source code
     # :trim :: Whether to trim leading and trailing whitespace, true by default.
     def initialize(input, properties={})
-      escape     = properties.fetch(:escape){properties.fetch(:escape_html, false)}
+      @escape = escape = properties.fetch(:escape){properties.fetch(:escape_html, false)}
       trim       = properties[:trim] != false
       @filename  = properties[:filename]
       @bufvar = bufvar = properties[:bufvar] || properties[:outvar] || "_buf"
@@ -116,11 +116,7 @@ module Erubi
         when '='
           rspace = nil if tailch && !tailch.empty?
           add_text(lspace) if lspace
-          if ((indicator == '=') ^ escape)
-            add_expression_result(code)
-          else
-            add_expression_result_escaped(code)
-          end
+          add_expression(indicator, code)
           add_text(rspace) if rspace
         when '#'
           n = code.count("\n") + (rspace ? 1 : 0)
@@ -134,7 +130,7 @@ module Erubi
         when '%'
           add_text("#{lspace}#{prefix||='<%'}#{code}#{tailch}#{postfix||='%>'}#{rspace}")
         when nil, '-'
-          if trim
+          if trim && lspace && rspace
             add_code("#{lspace}#{code}#{rspace}")
           else
             add_text(lspace) if lspace
@@ -149,7 +145,7 @@ module Erubi
       add_text(rest)
 
       src << "\n" unless src[RANGE_LAST] == "\n"
-      src << postamble
+      add_postamble(postamble)
       src << "; ensure\n  #{bufvar} = __original_outvar\nend\n" if properties[:ensure]
       src.freeze
       freeze
@@ -168,6 +164,16 @@ module Erubi
       @src << ';' unless code[RANGE_LAST] == "\n"
     end
 
+    # Add the given ruby expression result to the template,
+    # escaping it based on the indicator given and escape flag.
+    def add_expression(indicator, code)
+      if ((indicator == '=') ^ @escape)
+        add_expression_result(code)
+      else
+        add_expression_result_escaped(code)
+      end
+    end
+
     # Add the result of Ruby expression to the template
     def add_expression_result(code)
       @src << " #{@bufvar} << (" << code << ').to_s;'
@@ -178,6 +184,12 @@ module Erubi
       @src << " #{@bufvar} << #{@escapefunc}((" << code << '));'
     end
 
+    # Add the given postamble to the src.  Can be overridden in subclasses
+    # to make additional changes to src that depend on the current state.
+    def add_postamble(postamble)
+      src << postamble
+    end
+
     # Raise an exception, as the base engine class does not support handling other indicators.
     def handle(indicator, code, tailch, rspace, lspace)
       raise ArgumentError, "Invalid indicator: #{indicator}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erubi
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt