erbse 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77e9086b4307a32040e9853a10a23bef166a0a70
-  data.tar.gz: 584fb610b0bc9ada7d9a585be6c884b1556ba905
+SHA256:
+  metadata.gz: a7fbd1dec8733c0729e2deca42168eb95696704b85c0b0d9c37a1d14e64587ba
+  data.tar.gz: 0fbe06409ad39912f9b4e81183426c54a7f05be522ccc16f395640f304611280
 SHA512:
-  metadata.gz: 7da9ee8cc19f748691923be30243eaed954fa701be099e95d8c70648c4d94b810cbebde572f32fb5520d125529711342b6efc62afda130d5bbbea7bf0d27194a
-  data.tar.gz: c40f64e244d4236e4c221ef5748a714d9096c5e8e3953fced3e434ed3c0a55065b025d1f025fd839d8e93e6d49791bc617f287324424db8def34a707dac400b3
+  metadata.gz: 512cfadfb79da8590ed0f19cd1f0f69eaf157cbef7004b6e0b6053c14df5cb95cd3980157e2cc98b4d51a60e47452fc838330da997eaa1c7e3308ba65f8aec0e
+  data.tar.gz: f8bfa636d35d4cbff380b7c9926a8b2ae520ac6441f61b156379c90dc29904e993d97738b113ab5dde68aa5652723e482935e2c66d9d898c9a98dd4ed8df1bc0

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.3
+
+* Do not trim whitespace between ERB tags.
+
 # 0.1.2
 
 * Postfix conditionals are now parsed properly: code such as `<% puts if true %>` now works, thanks to @aiomaster's work.

data/lib/erbse/parser.rb

@@ -29,7 +29,7 @@ module Erbse
         pos  = match.end(0)
         ch   = indicator ? indicator[0] : nil
 
-        if text and !text.strip.empty? # text
+        if text and !text.empty? # text
           buffers.last << [:static, text]
         end
 

data/lib/erbse/version.rb

@@ -1,3 +1,3 @@
 module Erbse
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/erbse_test.rb

@@ -16,19 +16,22 @@ Text
 
   it "what" do
     Erbse::Parser.new.(str).must_equal [:multi,
+      [:static, "\n"],
       [:dynamic, " true "], [:newline],
       [:static, "Text\n"],
       [:erb, :block, " form_for do ", [:multi,
         [:dynamic, " 1 "],
         [:code, " 2 "], [:newline],
+        [:static, "  "],
         [:erb, :block, " nested do ", [:multi, [:newline],
+          [:static, "    "],
           [:dynamic, " this "], [:newline],
           [:static, "    <a/>\n  "],
           ]], [:newline]]]]
   end
 
   it "generates ruby" do
-      code = %{_buf = []; _buf << ( true ); @; _buf << ("Text@@".freeze); _erbse_blockfilter1 =  form_for do ; _erbse_blockfilter2 = ''; _erbse_blockfilter2 << (( 1 ).to_s);  2 ; @; _erbse_blockfilter3 =  nested do ; _erbse_blockfilter4 = ''; @; _erbse_blockfilter4 << (( this ).to_s); @; _erbse_blockfilter4 << ("    <a/>@@  ".freeze); _erbse_blockfilter4; end; _erbse_blockfilter2 << ((_erbse_blockfilter3).to_s); @; _erbse_blockfilter2; end; _buf << (_erbse_blockfilter1); _buf = _buf.join("".freeze)}
+      code = %{_buf = []; _buf << ("@@".freeze); _buf << ( true ); @; _buf << ("Text@@".freeze); _erbse_blockfilter1 =  form_for do ; _erbse_blockfilter2 = ''; _erbse_blockfilter2 << (( 1 ).to_s);  2 ; @; _erbse_blockfilter2 << ("  ".freeze); _erbse_blockfilter3 =  nested do ; _erbse_blockfilter4 = ''; @; _erbse_blockfilter4 << ("    ".freeze); _erbse_blockfilter4 << (( this ).to_s); @; _erbse_blockfilter4 << ("    <a/>@@  ".freeze); _erbse_blockfilter4; end; _erbse_blockfilter2 << ((_erbse_blockfilter3).to_s); @; _erbse_blockfilter2; end; _buf << (_erbse_blockfilter1); _buf = _buf.join("".freeze)}
     ruby = Erbse::Engine.new.(str).gsub("\n", "@").gsub('\n', "@@")
     # puts ruby
     ruby.must_equal code
@@ -36,39 +39,38 @@ Text
 
   describe "<% %>" do
     let (:str) { %{
-<% self %>
 <% 2.times do |i| %>
   <%= i+1 %>
   <% puts %>
 <% end %>
 
-<% if 1 %>
+<% if 1 == 1 %>
   Hello
 <% end %>
 }
     }
     it "what" do
       Erbse::Parser.new.(str).must_equal [:multi,
-        [:code, " self "], [:newline],
-        [:block, " 2.times do |i| ", [:multi, [:newline],
-          [:dynamic, " i+1 "], [:newline],
+        [:static, "\n"],
+        [:block, " 2.times do |i| ", [:multi,
+          [:newline],
+          [:static, "  "],
+          [:dynamic, " i+1 "], [:newline], [:static, "  "],
           [:code, " puts "], [:newline]]], [:newline],
-        [:block, " if 1 ", [:multi, [:newline],
-          [:static, "  Hello
-"]]], [:newline]]
+        [:block, " if 1 == 1 ", [:multi, [:newline],
+          [:static, "  Hello\n"]]], [:newline]]
     end
 
     it do
       ruby = Erbse::Engine.new.(str)
       ruby = ruby.gsub("\n", "@")
-
       # ruby.must_equal %{_buf = [];  self ;  2.times do |i| ; _buf << ( i+1 );  puts ; end; _buf = _buf.join(\"\".freeze)}
-      ruby.must_equal '_buf = [];  self ; @;  2.times do |i| ; @; _buf << ( i+1 ); @;  puts ; @; end; @;  if 1 ; @; _buf << ("  Hello\n".freeze); end; @; _buf = _buf.join("".freeze)'
+      ruby.must_equal '_buf = []; _buf << ("\n".freeze);  2.times do |i| ; @; _buf << ("  ".freeze); _buf << ( i+1 ); @; _buf << ("  ".freeze);  puts ; @; end; @;  if 1 == 1 ; @; _buf << ("  Hello\n".freeze); end; @; _buf = _buf.join("".freeze)'
     end
 
     it do
       ruby = Erbse::Engine.new.(str)
-      eval(ruby).must_equal "12  Hello\n"
+      eval(ruby).must_equal "\n  1    2    Hello\n"
     end
   end
 
@@ -166,6 +168,26 @@ blubb</b>} }
     it { Erbse::Parser.new.(%{<% form do |i| %>1<% end %>}).must_equal [:multi, [:block, " form do |i| ", [:multi, [:static, "1"]]]] }
   end
 
+  describe "quoted conditional" do
+    let (:str2) { %{
+  <%= form_for do %>
+    <%= link_to "string", path, "v-if" => "trigger" %>
+  <% end %>}
+    }
+
+    it "parses quoted conditionals correctly" do
+      Erbse::Parser.new.(str2).must_equal [:multi,
+        [:static, "\n  "],
+        [:erb, :block, " form_for do ", [:multi,
+          [:newline],
+          [:static, "    "],
+          [:dynamic, " link_to \"string\", path, \"v-if\" => \"trigger\" "],
+          [:newline],
+          [:static, "  "]
+        ]]]
+    end
+  end
+
   describe "<%@ %>" do
     let (:str) { %{<%@ content = capture do %>
   Yo!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erbse
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Updated Erubis.