erbse 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb5a744396c2f7901a545c6c2ae480eb6e7893e
-  data.tar.gz: 3738953bcabb49eb00ccd3db0a1feb99e39d63ac
+  metadata.gz: 77e9086b4307a32040e9853a10a23bef166a0a70
+  data.tar.gz: 584fb610b0bc9ada7d9a585be6c884b1556ba905
 SHA512:
-  metadata.gz: bdf4146a9703c7b3d1254fa3ad865bb3391a3a97b083c1a7424462c02fa470d469a743053b50ce43eccdd51525403ad5e539c0a0dbcb5bdb41486c3893a4ef5a
-  data.tar.gz: a4842875cae85c733a006931a84a55e5b7363a53ca62aade95c35c470c2eb07bf1356dcb3b4dd035c8b4a124cf1ee7272b0e7749cbce2b6b9d7c4beb5f0d7728
+  metadata.gz: 7da9ee8cc19f748691923be30243eaed954fa701be099e95d8c70648c4d94b810cbebde572f32fb5520d125529711342b6efc62afda130d5bbbea7bf0d27194a
+  data.tar.gz: c40f64e244d4236e4c221ef5748a714d9096c5e8e3953fced3e434ed3c0a55065b025d1f025fd839d8e93e6d49791bc617f287324424db8def34a707dac400b3

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.1.2
+
+* Postfix conditionals are now parsed properly: code such as `<% puts if true %>` now works, thanks to @aiomaster's work.
+* `<%@ code %>` now requires an explicit whitespace after the `@` for backward-compatibility.
+
 # 0.1.1
 
 * Introduce the `<%@ %>` tag. This is a built-in capture mechanism. It will assign all block content to a local variable but *not* output it.

data/lib/erbse/parser.rb

@@ -1,9 +1,10 @@
 module Erbse
   class Parser
     # ERB_EXPR = /<%(=|\#)?(.*?)%>(\n)*/m # this is the desired pattern.
-    ERB_EXPR = /<%(=+|-|\#|@|%)?(.*?)[-=]?%>(\n)*/m # this is for backward-compatibility.
+    ERB_EXPR = /<%(=+|-|\#|@\s|%)?(.*?)[-=]?%>(\n)*/m # this is for backward-compatibility.
     # BLOCK_EXPR     = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
-    BLOCK_EXPR = /\b(if|unless)\b|\sdo\s*$|\sdo\s+\|/
+    BLOCK_EXPR = /\sdo\s*\z|\sdo\s+\|[^|]*\|\s*\z/
+    BLOCK_EXEC = /\A\s*(if|unless)\b|#{BLOCK_EXPR}/
 
     # Parsing patterns
     #
@@ -48,7 +49,7 @@ module Erbse
           buffers.last << [:capture, :block, code, block = [:multi]] # picked up by our own BlockFilter. # TODO: merge with %= ?
           buffers << block
         else # <% %>
-          if code =~ BLOCK_EXPR
+          if code =~ BLOCK_EXEC
             buffers.last << [:block, code, block = [:multi]] # picked up by Temple's ControlFlow filter.
             buffers << block
           else

data/lib/erbse/version.rb

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

data/test/erbse_test.rb

@@ -125,6 +125,37 @@ blubb</b>} }
     it { eval(Erbse::Engine.new.(str)).must_equal "1" }
   end
 
+  describe "postfix conditional in expression tag" do
+    let (:str) { %{<p><%= 'test' if true %></p>} }
+    it { eval(Erbse::Engine.new.(str)).must_equal "<p>test</p>" }
+  end
+
+  describe "postfix conditional in execution tag" do
+    let (:str) { %{<p><% foo = 'test' if true %><%= foo %></p>} }
+    it { eval(Erbse::Engine.new.(str)).must_equal "<p>test</p>" }
+  end
+
+  describe "condition in multiline expression tag" do
+    let (:str) { %{<p><%= if true
+                           'test'
+                          end %></p>} }
+    it { eval(Erbse::Engine.new.(str)).must_equal "<p>test</p>" }
+  end
+
+  describe "multiline do-end-block in expression tag" do
+    let (:str) { %{<%= [1,2].map do |i|
+                 i+1
+               end.join %>} }
+    it { eval(Erbse::Engine.new.(str)).must_equal "23" }
+  end
+
+  describe "multiline {}-block in expression tag" do
+    let (:str) { %(<%= [3,1].map { |i|
+                 i+1
+               }.join %>) }
+    it { eval(Erbse::Engine.new.(str)).must_equal "42" }
+  end
+
   describe "<% \"string with do\" %>" do
     it { Erbse::Parser.new.(%{<% var = "do 1" %><%= var %>}).must_equal [:multi, [:code, " var = \"do 1\" "], [:dynamic, " var "]] }
     it { Erbse::Parser.new.(%{<% var = " do 1" %><%= var %>}).must_equal [:multi, [:code, " var = \" do 1\" "], [:dynamic, " var "]] }
@@ -135,7 +166,7 @@ blubb</b>} }
     it { Erbse::Parser.new.(%{<% form do |i| %>1<% end %>}).must_equal [:multi, [:block, " form do |i| ", [:multi, [:static, "1"]]]] }
   end
 
-  describe "capture" do
+  describe "<%@ %>" do
     let (:str) { %{<%@ content = capture do %>
   Yo!
   <%= 1 %>
@@ -143,8 +174,12 @@ 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 << (\"  Yo!@@  \".freeze); _erbse_blockfilter1 << (( 1 ).to_s); @; _erbse_blockfilter1; end; _buf = _buf.join(\"\".freeze)}
       ruby.must_equal code
     end
+
+    it do
+      Erbse::Parser.new.(%{<%@content = capture do %><% end %>}).must_equal [:multi, [:block, "@content = capture do ", [:multi]]]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erbse
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2017-12-25 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.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Updated Erubis.