erubi 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '06927703ddb707650937af01e62308503844ea83'
-  data.tar.gz: a15b6bf8a5bcc28f16aa5ccc4e607946816c6fac
+SHA256:
+  metadata.gz: f90a1816343b873297c5d0f5cc2a4d5506c129b3f7613a63cdb34afa82cb28ee
+  data.tar.gz: ed8b6d7739ebae9db5818bebd6c42120a155da3d1eef8732f1d1e2b64bfdf417
 SHA512:
-  metadata.gz: 1319c023421b758f72d2a0c07d67fa1e1267879a3eb82999a523154b9b7bdd6fdd23b8767f4f058f72c5e75720670271df5f8e70a10e7d1101748962d0e4e386
-  data.tar.gz: 2a35f88d8c20279919fac6704fe0bc51ed4fcba6d56fb2e6ff7a1fde03c7ea44691a14da10588333daeeb4eb61b3cdae68700006424894fd1dd447eeb0b203ed
+  metadata.gz: 56b1f608a9f0f049ae3523afaf8ff1ab0970290f4adb703a1e3b949ee476ddb2347d550e20cef140ec7afa72d1d34bc35d9fd8404c5eb94f43b5fcf644d7d031
+  data.tar.gz: d8027fd9255e838d6c4df2064d37d5e2f2fa55c65bbd783b983438684a229706a8d35e3d2fbbaee79ffca0785a68804545acbb40c66ae9e1640322b501c17ff8

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.7.1 (2018-03-05)
+
+* Make whitespace handling for <%# %> tags more compatible with Erubis (jeremyevans) (#14)
+
 === 1.7.0 (2017-10-09)
 
 * Fix escaping in erubi/capture_end, the setting was previously inverted (jeremyevans) (#10)

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
-copyright(c) 2016-2017 Jeremy Evans
+copyright(c) 2016-2018 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

@@ -13,7 +13,6 @@ the same basic algorithm, with the following differences:
 * 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, <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)
 
 It is not designed with Erubis API compatibility in mind, though most Erubis
@@ -37,9 +36,8 @@ file:
   require 'erubi'
   eval(Erubi::Engine.new(File.read('filename.erb')).src)
 
-Most users are will probably use Erubi via Rails or Tilt.  Erubi is the default
-erb template handler in Tilt 2.0.6+ and will be the default template handler in
-Rails 5.1+.
+Most users will probably use Erubi via Rails or Tilt.  Erubi is the default
+erb template handler in Tilt 2.0.6+ and Rails 5.1+.
 
 == Capturing
 

data/lib/erubi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Erubi
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
   RANGE_ALL = 0..-1
 
   if RUBY_VERSION >= '1.9'
@@ -123,7 +123,7 @@ module Erubi
           end
         end
 
-        is_bol = rspace ? true : false
+        is_bol = rspace
         add_text(text) if text && !text.empty?
         case ch
         when '='
@@ -133,7 +133,7 @@ module Erubi
           add_text(rspace) if rspace
         when '#'
           n = code.count("\n") + (rspace ? 1 : 0)
-          if trim
+          if trim && lspace && rspace
             add_code("\n" * n)
           else
             add_text(lspace) if lspace

data/test/test.rb

@@ -119,6 +119,67 @@ END2
 END3
   end
 
+  it "should strip only whitespace for <%, <%- and <%# tags" do
+    check_output(<<END1, <<END2, <<END3){}
+  <% 1 %>  
+a
+  <%- 2 %>  
+b
+  <%# 3 %>  
+c
+ /<% 1 %>  
+a
+/ <%- 2 %>  
+b
+//<%# 3 %>  
+c
+  <% 1 %> /
+a
+  <%- 2 %>/ 
+b
+  <%# 3 %>//
+c
+END1
+_buf = String.new;   1   
+ _buf << 'a
+';   2   
+ _buf << 'b
+';
+ _buf << 'c
+ /'; 1 ; _buf << '  
+'; _buf << 'a
+/ '; 2 ; _buf << '  
+'; _buf << 'b
+//';
+ _buf << '  
+'; _buf << 'c
+'; _buf << '  '; 1 ; _buf << ' /
+a
+'; _buf << '  '; 2 ; _buf << '/ 
+b
+'; _buf << '  ';; _buf << '//
+c
+';
+_buf.to_s
+END2
+a
+b
+c
+ /  
+a
+/   
+b
+//  
+c
+   /
+a
+  / 
+b
+  //
+c
+END3
+  end
+
   it "should handle ensure option" do
     list = ['&\'<>"2']
     @options[:ensure] = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erubi
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Jeremy Evans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-03-05 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.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Small ERB Implementation