curlybars 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 662148aedd0a8a6fdb84727cbe92b66fe66abf3fc11fa3e7720d70337fd9c1ff
-  data.tar.gz: 9b599e7c0232ee1442e6f9e410a7e19f10405ea0dbb150bc309121a18be6afef
+  metadata.gz: 307c759c2acc1c33ab91a236aeb5042e6ecfee67581eef05f468c241a722e1f6
+  data.tar.gz: 68b0a401f830e5985d0d6b657974f84c2afdda2d49e70c696e97641845d31a16
 SHA512:
-  metadata.gz: 35b139b2d8c393a2a5a0f413edb687dfae425d315ef22b6cf9652a34a2367737dab922417c52494983f32e10b4f86dbc85ff62a12ac30cf178b7953af3dae3f1
-  data.tar.gz: 271f1f72a18ec374eadead76df6eda66e982ee5863d0be690903d581fbf6387cd83af6e9dbeed2b1351bfd2206c99a7b74ef4619fe2166c2b8a446033a164eac
+  metadata.gz: 7db835baca28f2c15af2fb1a582059bb8346d1de41f8d9ed72262ea7ef1e2ff2e8130091b4e1494858b366f050e1b2fe2cf1753afbd1a403c66058c37f8fa9ff
+  data.tar.gz: 9a54e30bba2976a6c6f0ff4e6fef5f00075dc6186a9eb07c70a63ead7a96629a17897ce9ea9e09fad00049262a891eb88b1389873b629ca22f12c7b712686166

data/lib/curlybars/version.rb

@@ -1,3 +1,3 @@
 module Curlybars
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

data/lib/curlybars/visitor.rb

@@ -75,6 +75,12 @@ module Curlybars
     def visit_string(_node)
     end
 
+    def visit_sub_expression(node)
+      visit(node.helper)
+      node.arguments.each { |argument| visit(argument) }
+      node.options.each { |option| visit(option) }
+    end
+
     def visit_template(node)
       node.items.each { |item| visit(item) }
     end

data/spec/integration/visitor_spec.rb

@@ -4,6 +4,8 @@ describe "visitor" do
       {{#print_args_and_options 'first' 'second' key='value'}}
       {{/print_args_and_options}}
 
+      {{calc (calc 1 "+" 2) "*" 3}}
+
       {{#render_inverse}}
         fn
       {{else}}
@@ -53,7 +55,7 @@ describe "visitor" do
     it "visits BlockHelperElse nodes" do
       visitor = counting_visitor_for(Curlybars::Node::BlockHelperElse)
       output = Curlybars.visit(visitor, source)
-      expect(output).to eq(4)
+      expect(output).to eq(5)
     end
 
     it "visits EachElse nodes" do
@@ -71,13 +73,13 @@ describe "visitor" do
     it "visits Item nodes" do
       visitor = counting_visitor_for(Curlybars::Node::Item)
       output = Curlybars.visit(visitor, source)
-      expect(output).to eq(42)
+      expect(output).to eq(44)
     end
 
     it "visits Literal nodes" do
       visitor = counting_visitor_for(Curlybars::Node::Literal)
       output = Curlybars.visit(visitor, source)
-      expect(output).to eq(3)
+      expect(output).to eq(8)
     end
 
     it "visits Option nodes" do
@@ -95,7 +97,7 @@ describe "visitor" do
     it "visits Path nodes" do
       visitor = counting_visitor_for(Curlybars::Node::Path)
       output = Curlybars.visit(visitor, source)
-      expect(output).to eq(13)
+      expect(output).to eq(15)
     end
 
     it "visits Root nodes" do
@@ -104,6 +106,12 @@ describe "visitor" do
       expect(output).to eq(1)
     end
 
+    it "visits SubExpression nodes" do
+      visitor = counting_visitor_for(Curlybars::Node::SubExpression)
+      output = Curlybars.visit(visitor, source)
+      expect(output).to eq(1)
+    end
+
     it "visits Template nodes" do
       visitor = counting_visitor_for(Curlybars::Node::Template)
       output = Curlybars.visit(visitor, source)
@@ -113,7 +121,7 @@ describe "visitor" do
     it "visits Text nodes" do
       visitor = counting_visitor_for(Curlybars::Node::Text)
       output = Curlybars.visit(visitor, source)
-      expect(output).to eq(28)
+      expect(output).to eq(29)
     end
 
     it "visits UnlessElse nodes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curlybars
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Libo Cannici
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack