curlybars 1.3.1 → 1.7.0

data/spec/integration/node/template_spec.rb

@@ -53,8 +53,6 @@ describe "template" do
   end
 
   describe "#validate" do
-    let(:presenter_class) { double(:presenter_class) }
-
     it "without errors" do
       dependency_tree = { presenter: { field: nil } }
 

data/spec/integration/node/unless_else_spec.rb

@@ -82,8 +82,6 @@ describe "{{#unless}}...{{else}}...{{/unless}}" do
   end
 
   describe "#validate" do
-    let(:presenter_class) { double(:presenter_class) }
-
     it "validates with errors the condition" do
       dependency_tree = {}
 
@@ -96,7 +94,7 @@ describe "{{#unless}}...{{else}}...{{/unless}}" do
       expect(errors).not_to be_empty
     end
 
-    it "validates with errors the helper as condition" do
+    it "validates without errors when using a helper in the condition" do
       dependency_tree = { helper: :helper }
 
       source = <<-HBS
@@ -105,7 +103,7 @@ describe "{{#unless}}...{{else}}...{{/unless}}" do
 
       errors = Curlybars.validate(dependency_tree, source)
 
-      expect(errors).not_to be_empty
+      expect(errors).to be_empty
     end
 
     it "validates with errors the nested unless_template" do

data/spec/integration/node/unless_spec.rb

@@ -99,8 +99,6 @@ describe "{{#unless}}...{{/unless}}" do
   end
 
   describe "#validate" do
-    let(:presenter_class) { double(:presenter_class) }
-
     it "validates with errors the condition" do
       dependency_tree = {}
 

data/spec/integration/node/with_spec.rb

@@ -1,5 +1,5 @@
 describe "{{#with presenter}}...{{/with}}" do
-  let(:global_helpers_providers) { [] }
+  let(:global_helpers_providers) { [IntegrationTest::GlobalHelperProvider.new] }
 
   describe "#compile" do
     let(:post) { double("post") }
@@ -31,6 +31,18 @@ describe "{{#with presenter}}...{{/with}}" do
       HTML
     end
 
+    it "allows subexpressions" do
+      template = Curlybars.compile(<<-HBS)
+        {{#with (translate user "sk-SK")}}
+          {{avatar.url}}
+        {{/with}}
+      HBS
+
+      expect(eval(template)).to resemble(<<-HTML)
+        http://example.com/foo.png?locale=sk-SK
+      HTML
+    end
+
     it "allows empty with_template" do
       template = Curlybars.compile(<<-HBS)
         {{#with user}}{{/with}}
@@ -39,7 +51,7 @@ describe "{{#with presenter}}...{{/with}}" do
       expect(eval(template)).to resemble("")
     end
 
-    it "renders the else templte if the context is nil" do
+    it "renders the else template if the context is nil" do
       template = Curlybars.compile(<<-HBS)
         {{#with return_nil}}
           text
@@ -75,8 +87,6 @@ describe "{{#with presenter}}...{{/with}}" do
   end
 
   describe "#validate" do
-    let(:presenter_class) { double(:presenter_class) }
-
     it "without errors" do
       dependency_tree = { a_presenter: {} }
 
@@ -89,6 +99,34 @@ describe "{{#with presenter}}...{{/with}}" do
       expect(errors).to be_empty
     end
 
+    it "without errors when a presenter helper is used" do
+      dependency_tree = { translate_article: [:helper, { title: nil }] }
+
+      source = <<-HBS
+        {{#with (translate_article 12345 "en-US")}}
+          {{title}}
+        {{/with}}
+      HBS
+
+      errors = Curlybars.validate(dependency_tree, source)
+
+      expect(errors).to be_empty
+    end
+
+    it "without errors when a generic presenter helper is used" do
+      dependency_tree = { article: { title: nil }, translate: [:helper, {}] }
+
+      source = <<-HBS
+        {{#with (translate article "en-US")}}
+          {{title}}
+        {{/with}}
+      HBS
+
+      errors = Curlybars.validate(dependency_tree, source)
+
+      expect(errors).to be_empty
+    end
+
     it "with errors due to a leaf" do
       dependency_tree = { not_a_presenter: nil }
 
@@ -112,5 +150,29 @@ describe "{{#with presenter}}...{{/with}}" do
 
       expect(errors).not_to be_empty
     end
+
+    it "with errors due collection helpers" do
+      dependency_tree = { reverse_articles: [:helper, [{ title: nil }]] }
+
+      source = <<-HBS
+        {{#with (reverse_articles)}}{{/with}}
+      HBS
+
+      errors = Curlybars.validate(dependency_tree, source)
+
+      expect(errors).not_to be_empty
+    end
+
+    it "with errors due generic collection helpers" do
+      dependency_tree = { articles: [{ title: nil }], slice: [:helper, [{}]] }
+
+      source = <<-HBS
+        {{#with (slice articles 0 4)}}{{/with}}
+      HBS
+
+      errors = Curlybars.validate(dependency_tree, source)
+
+      expect(errors).not_to be_empty
+    end
   end
 end

data/spec/integration/processor/tilde_spec.rb

@@ -30,7 +30,7 @@ describe "tilde operator" do
     it "runs even when 'run_processors' flag is set to false" do
       allow(Curlybars::Processor::Tilde).to receive(:process!)
 
-      Curlybars.validate(presenter, "source", run_processors: false)
+      Curlybars.validate(presenter.dependency_tree, "source", run_processors: false)
 
       expect(Curlybars::Processor::Tilde).to have_received(:process!)
     end

data/spec/integration/processors_spec.rb

@@ -1,6 +1,5 @@
 describe "processors" do
   let(:presenter) { double(:presenter, dependency_tree: { curlybars: nil }) }
-  let(:global_helpers_providers) { [] }
   let(:processor) { double(:processor) }
 
   before do
@@ -10,19 +9,19 @@ describe "processors" do
 
   describe "validation" do
     it "are run by default" do
-      Curlybars.validate(presenter, "source")
+      Curlybars.validate(presenter.dependency_tree, "source")
 
       expect(processor).to have_received(:process!)
     end
 
-    it "are not run when run_processors is true" do
-      Curlybars.validate(presenter, "source", run_processors: true)
+    it "are run when run_processors is true" do
+      Curlybars.validate(presenter.dependency_tree, "source", run_processors: true)
 
       expect(processor).to have_received(:process!)
     end
 
     it "are not run when run_processors is false" do
-      Curlybars.validate(presenter, "source", run_processors: false)
+      Curlybars.validate(presenter.dependency_tree, "source", run_processors: false)
 
       expect(processor).not_to have_received(:process!)
     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.3.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Libo Cannici
@@ -10,10 +10,12 @@ authors:
 - Mauro Codella
 - Luís Almeida
 - Andreas Garnæs
+- Augusto Silva
+- Attila Večerek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -24,7 +26,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +36,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +46,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,7 +56,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +122,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +132,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,32 +167,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: 2.1.0
 description: |-
   A view layer for your Rails apps that separates structure and logic, using Handlebars templates.
   Strongly inspired by Curly Template gem by Daniel Schierbeck.
-email: libo@zendesk.com
+email: vikings@zendesk.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -205,6 +235,7 @@ files:
 - lib/curlybars/error/presenter/not_found.rb
 - lib/curlybars/error/render.rb
 - lib/curlybars/error/validate.rb
+- lib/curlybars/generic.rb
 - lib/curlybars/lexer.rb
 - lib/curlybars/method_whitelist.rb
 - lib/curlybars/node/block_helper_else.rb
@@ -219,6 +250,7 @@ files:
 - lib/curlybars/node/path.rb
 - lib/curlybars/node/root.rb
 - lib/curlybars/node/string.rb
+- lib/curlybars/node/sub_expression.rb
 - lib/curlybars/node/template.rb
 - lib/curlybars/node/text.rb
 - lib/curlybars/node/unless_else.rb
@@ -265,6 +297,7 @@ files:
 - spec/integration/node/partial_spec.rb
 - spec/integration/node/path_spec.rb
 - spec/integration/node/root_spec.rb
+- spec/integration/node/sub_expression_spec.rb
 - spec/integration/node/template_spec.rb
 - spec/integration/node/unless_else_spec.rb
 - spec/integration/node/unless_spec.rb
@@ -285,14 +318,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Create your views using Handlebars templates!
@@ -318,6 +351,7 @@ test_files:
 - spec/integration/node/unless_else_spec.rb
 - spec/integration/node/output_spec.rb
 - spec/integration/node/if_spec.rb
+- spec/integration/node/sub_expression_spec.rb
 - spec/integration/node/unless_spec.rb
 - spec/integration/node/with_spec.rb
 - spec/integration/node/partial_spec.rb