erbse 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7fbd1dec8733c0729e2deca42168eb95696704b85c0b0d9c37a1d14e64587ba
-  data.tar.gz: 0fbe06409ad39912f9b4e81183426c54a7f05be522ccc16f395640f304611280
+  metadata.gz: 40d1d10b1c63ad9100e2112b150ef69e0d3a08f44767a34ee47b5ffe5483b940
+  data.tar.gz: e06b5f57fa13d926932949213076c01f576f5aebafb6e99b10ad9a56b97c7237
 SHA512:
-  metadata.gz: 512cfadfb79da8590ed0f19cd1f0f69eaf157cbef7004b6e0b6053c14df5cb95cd3980157e2cc98b4d51a60e47452fc838330da997eaa1c7e3308ba65f8aec0e
-  data.tar.gz: f8bfa636d35d4cbff380b7c9926a8b2ae520ac6441f61b156379c90dc29904e993d97738b113ab5dde68aa5652723e482935e2c66d9d898c9a98dd4ed8df1bc0
+  metadata.gz: ec08209d87ebb3235f2f8fdc87d1299037af405454c62ce1165d0d2d132191247d32d82259f1c288a26105390db2f54099f7c1f7462782600d0f30850e0761c1
+  data.tar.gz: 55307e0004e6f6de876394840e0c23f07b077911e388789f0d1d433a63ce129b4b103e0663efaaf7cf979f9bdca3d1869788d3b1df2af98673e9517eff0ccb93

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.4
+
+* Newlines are now properly reflected in the compiled code.
+
 # 0.1.3
 
 * Do not trim whitespace between ERB tags.

data/lib/erbse/parser.rb

@@ -1,7 +1,7 @@
 module Erbse
   class Parser
-    # ERB_EXPR = /<%(=|\#)?(.*?)%>(\n)*/m # this is the desired pattern.
-    ERB_EXPR = /<%(=+|-|\#|@\s|%)?(.*?)[-=]?%>(\n)*/m # this is for backward-compatibility.
+    # ERB_EXPR = /(\n)|<%(=|\#)?(.*?)%>(\n)*/m # this is the desired pattern.
+    ERB_EXPR = /(\n)|<=|<%(=+|-|\#|@\s|%)?(.*?)[-=]?%>/m # this is for backward-compatibility.
     # BLOCK_EXPR     = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
     BLOCK_EXPR = /\sdo\s*\z|\sdo\s+\|[^|]*\|\s*\z/
     BLOCK_EXEC = /\A\s*(if|unless)\b|#{BLOCK_EXPR}/
@@ -21,7 +21,7 @@ module Erbse
       buffers << result
       match = nil
 
-      str.scan(ERB_EXPR) do |indicator, code, newlines|
+      str.scan(ERB_EXPR) do |newline, indicator, code|
         match = Regexp.last_match
         len  = match.begin(0) - pos
 
@@ -29,6 +29,11 @@ module Erbse
         pos  = match.end(0)
         ch   = indicator ? indicator[0] : nil
 
+        if newline
+          buffers.last << [:static, "#{text}\n"] << [:newline]
+          next
+        end
+
         if text and !text.empty? # text
           buffers.last << [:static, text]
         end
@@ -56,10 +61,6 @@ module Erbse
             buffers.last << [:code, code]
           end
         end
-
-        # FIXME: only adds one newline.
-        # TODO: does that influence speed?
-        buffers.last << [:newline] if newlines
       end
 
       # add text after last/none ERB tag.

data/lib/erbse/version.rb

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

data/test/erbse_test.rb

@@ -16,22 +16,28 @@ Text
 
   it "what" do
     Erbse::Parser.new.(str).must_equal [:multi,
-      [:static, "\n"],
-      [:dynamic, " true "], [:newline],
-      [:static, "Text\n"],
+      [:static, "\n"], [:newline],
+      [:dynamic, " true "],
+      [:static, "\n"], [:newline],
+      [:static, "Text\n"], [:newline],
       [:erb, :block, " form_for do ", [:multi,
         [:dynamic, " 1 "],
-        [:code, " 2 "], [:newline],
+        [:code, " 2 "], 
+        [:static, "\n"], [:newline],
         [:static, "  "],
-        [:erb, :block, " nested do ", [:multi, [:newline],
+        [:erb, :block, " nested do ", [:multi, 
+          [:static, "\n"], [:newline],
           [:static, "    "],
-          [:dynamic, " this "], [:newline],
-          [:static, "    <a/>\n  "],
-          ]], [:newline]]]]
+          [:dynamic, " this "],
+          [:static, "\n"], [:newline],
+          [:static, "    <a/>\n"], [:newline],
+          [:static, "  "],
+          ]], 
+        [:static, "\n"], [:newline]]]]
   end
 
   it "generates ruby" do
-      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)}
+      code = %{_buf = []; _buf << (\"@@\".freeze); @; _buf << ( true ); _buf << (\"@@\".freeze); @; _buf << (\"Text@@\".freeze); @; _erbse_blockfilter1 =  form_for do ; _erbse_blockfilter2 = ''; _erbse_blockfilter2 << (( 1 ).to_s);  2 ; _erbse_blockfilter2 << (\"@@\".freeze); @; _erbse_blockfilter2 << (\"  \".freeze); _erbse_blockfilter3 =  nested do ; _erbse_blockfilter4 = ''; _erbse_blockfilter4 << (\"@@\".freeze); @; _erbse_blockfilter4 << (\"    \".freeze); _erbse_blockfilter4 << (( this ).to_s); _erbse_blockfilter4 << (\"@@\".freeze); @; _erbse_blockfilter4 << (\"    <a/>@@\".freeze); @; _erbse_blockfilter4 << (\"  \".freeze); _erbse_blockfilter4; end; _erbse_blockfilter2 << ((_erbse_blockfilter3).to_s); _erbse_blockfilter2 << (\"@@\".freeze); @; _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
@@ -51,26 +57,33 @@ Text
     }
     it "what" do
       Erbse::Parser.new.(str).must_equal [:multi,
-        [:static, "\n"],
+        [:static, "\n"], [:newline],
         [:block, " 2.times do |i| ", [:multi,
-          [:newline],
+          [:static, "\n"], [:newline],
           [:static, "  "],
-          [:dynamic, " i+1 "], [:newline], [:static, "  "],
-          [:code, " puts "], [:newline]]], [:newline],
-        [:block, " if 1 == 1 ", [:multi, [:newline],
-          [:static, "  Hello\n"]]], [:newline]]
+          [:dynamic, " i+1 "], 
+          [:static, "\n"], [:newline], [:static, "  "],
+          [:code, " puts "], 
+          [:static, "\n"], [:newline]
+          ]],
+          [:static, "\n"], [:newline],
+          [:static, "\n"], [:newline],
+        [:block, " if 1 == 1 ", [:multi,
+          [:static, "\n"], [:newline],
+          [:static, "  Hello\n"], [:newline]]],
+          [:static, "\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 = []; _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)'
+      ruby.must_equal '_buf = []; _buf << ("\n".freeze); @;  2.times do |i| ; _buf << ("\n".freeze); @; _buf << ("  ".freeze); _buf << ( i+1 ); _buf << ("\n".freeze); @; _buf << ("  ".freeze);  puts ; _buf << ("\n".freeze); @; end; _buf << ("\n".freeze); @; _buf << ("\n".freeze); @;  if 1 == 1 ; _buf << ("\n".freeze); @; _buf << ("  Hello\n".freeze); @; end; _buf << ("\n".freeze); @; _buf = _buf.join("".freeze)'
     end
 
     it do
       ruby = Erbse::Engine.new.(str)
-      eval(ruby).must_equal "\n  1    2    Hello\n"
+      eval(ruby).must_equal "\n\n  1\n  \n\n  2\n  \n\n\n\n  Hello\n\n"
     end
   end
 
@@ -78,7 +91,7 @@ Text
     let (:str) { %{Holla
 Hi}
     }
-    it { Erbse::Parser.new.(str).must_equal [:multi, [:static, "Holla\nHi"]] }
+    it { Erbse::Parser.new.(str).must_equal [:multi, [:static, "Holla\n"], [:newline], [:static, "Hi"]] }
   end
 
   # comments
@@ -93,12 +106,12 @@ Hi
 } }
 
     it do
-      Erbse::Parser.new.(str).must_equal [:multi, [:static, "Hello\n"], [:newline], [:static, "Hola\n"], [:newline], [:newline], [:static, "Hi\n"], [:code, " # this "], [:newline]]
+      Erbse::Parser.new.(str).must_equal [:multi, [:static, "Hello\n"], [:newline], [:static, "\n"], [:newline], [:static, "Hola\n"], [:newline], [:newline], [:static, "\n"], [:newline], [:static, "Hi\n"], [:newline], [:code, " # this "], [:static, "\n"], [:newline]]
     end
 
     it do
       ruby = Erbse::Engine.new.(str).gsub("\n", "@").gsub('\n', "@@")
-      code = %{_buf = []; _buf << ("Hello@@".freeze); @; _buf << ("Hola@@".freeze); @; @; _buf << ("Hi@@".freeze);  # this ; @; _buf = _buf.join("".freeze)}
+      code = %{_buf = []; _buf << (\"Hello@@\".freeze); @; _buf << (\"@@\".freeze); @; _buf << (\"Hola@@\".freeze); @; @; _buf << (\"@@\".freeze); @; _buf << (\"Hi@@\".freeze); @;  # this ; _buf << (\"@@\".freeze); @; _buf = _buf.join(\"\".freeze)}
       ruby.must_equal code
     end
 
@@ -106,14 +119,14 @@ Hi
     it { Erbse::Parser.new.(%{Yo
 <%# bla do %>
 <%# end %>
-1}).must_equal [:multi, [:static, "Yo\n"], [:newline], [:newline], [:static, "1"]] }
+1}).must_equal [:multi, [:static, "Yo\n"], [:newline], [:static, "\n"], [:newline], [:static, "\n"], [:newline], [:static, "1"]] }
   end
 
   describe "content after last ERB tag" do
     let (:str) { %{<b><%= 1 %>bla
 blubb</b>} }
 
-    it { Erbse::Parser.new.(str).must_equal [:multi, [:static, "<b>"], [:dynamic, " 1 "], [:static, "bla\nblubb</b>"]] }
+    it { Erbse::Parser.new.(str).must_equal [:multi, [:static, "<b>"], [:dynamic, " 1 "], [:static, "bla\n"], [:newline], [:static, "blubb</b>"]] }
   end
 
   describe "<%* %>" do
@@ -177,16 +190,42 @@ blubb</b>} }
 
     it "parses quoted conditionals correctly" do
       Erbse::Parser.new.(str2).must_equal [:multi,
-        [:static, "\n  "],
+        [:static, "\n"],
+        [:newline],
+        [:static, "  "],
         [:erb, :block, " form_for do ", [:multi,
+          [:static, "\n"],
           [:newline],
           [:static, "    "],
           [:dynamic, " link_to \"string\", path, \"v-if\" => \"trigger\" "],
+          [:static, "\n"],
           [:newline],
           [:static, "  "]
         ]]]
     end
   end
+  
+  describe "newlines" do
+    let (:str2) { %{
+  abc
+  <%= 'foo' %>
+  def}
+    }
+
+    it "puts newlines after code" do
+      Erbse::Parser.new.(str2).must_equal [:multi,
+        [:static, "\n"],
+        [:newline],
+        [:static, "  abc\n"],
+        [:newline],
+        [:static, "  "],
+        [:dynamic, " 'foo' "],
+        [:static, "\n"],
+        [:newline],
+        [:static, '  def'],
+      ]
+    end
+  end
 
   describe "<%@ %>" do
     let (:str) { %{<%@ content = capture do %>
@@ -196,7 +235,7 @@ blubb</b>} }
 
     it do
       ruby = Erbse::Engine.new.(str).gsub("\n", "@").gsub('\n', "@@")
-      code = %{_buf = []; content = capture do ; _erbse_blockfilter1 = ''; @; _erbse_blockfilter1 << (\"  Yo!@@  \".freeze); _erbse_blockfilter1 << (( 1 ).to_s); @; _erbse_blockfilter1; end; _buf = _buf.join(\"\".freeze)}
+      code = %{_buf = []; content = capture do ; _erbse_blockfilter1 = ''; _erbse_blockfilter1 << (\"@@\".freeze); @; _erbse_blockfilter1 << (\"  Yo!@@\".freeze); @; _erbse_blockfilter1 << (\"  \".freeze); _erbse_blockfilter1 << (( 1 ).to_s); _erbse_blockfilter1 << (\"@@\".freeze); @; _erbse_blockfilter1; end; _buf = _buf.join(\"\".freeze)}
       ruby.must_equal code
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erbse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple