mvz-ruby-handlebars 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c677856bd3e74f5198f64f3b10b9348530b95024889ff1cf6db380c1165c771f
-  data.tar.gz: 1ff2e3bba711f257d9412ef9aa074fad8ca87429ab5b2ad0033187b289c586e0
+  metadata.gz: 2ee7a7f7964d4f0ea1f63848d114c4877fab021a61bce513e485cb6f13444a55
+  data.tar.gz: f671688ece97795863fed6e673206967469e61529a8c5c6e9b46f5ebb50edfac
 SHA512:
-  metadata.gz: 00be980edd23a6f537a5c7e6354f592826651a795f4a4b7055f26db4d31778c90c7e8a9367e9450578bf0b8c74d690409c52137c337017074edd6163c8148ff2
-  data.tar.gz: 2d89f9b244cad437e7ee33b75562197071dac7d0ccb66be0b83d183f86b9774b16c79178f467fa8f72201b9ef563bbc8b7bc7c2288b81462718f0a7aff5b1b07
+  metadata.gz: 29845db860dcd376e53ac0b64ca9fe8c0e3691e3355bc38401432edadbce83d2c237850faf16d04346e1f94ee48cd4c8f5e9e5401b49e0db280b9d782c2b9685
+  data.tar.gz: 531d60ce02ad77d3b8a58e9dc71147400fa169499f9c26c494f3b2a8f9810775970461c63e48249f3741109fbc5cc1d229547145164a3ffc770a1fc90de63d25

data/CHANGELOG.md

@@ -1,10 +1,25 @@
-mvz-ruby-handlebars changelog
-=============================
+# Changelog
 
-0.0.9 (2021-01-04)
-------------------
+## 0.0.10 (2021-08-31)
 
- - Pull in upstream master. See
-   https://github.com/SmartBear/ruby-handlebars/blob/master/CHANGELOG.md for
-   included changes.
- - Prefer variable over helper when processing a replacement if the helper has the wrong arity
+* Pull in upstream master. See
+  https://github.com/SmartBear/ruby-handlebars/blob/2a8ce9ef584f2c34cd5714a4ed36711c2dd9d58a/CHANGELOG.md
+  for included changes
+* Make helpers with only optional arguments work in replacement form
+
+## 0.0.9 (2021-01-04)
+
+* Pull in upstream master. See
+  https://github.com/SmartBear/ruby-handlebars/blob/44dc6800dd5006865fc2dc1c26a9d4e5c1411bce/CHANGELOG.md
+  for included changes
+* Prefer variable over helper when processing a replacement if the helper has
+  the wrong arity
+
+## 0.0.8
+
+* Update dependencies
+
+## 0.0.7
+
+* Set up forked gem mvz-ruby-handlebars
+* Several improvements

data/lib/ruby-handlebars/context.rb

@@ -2,7 +2,6 @@ module Handlebars
   class Context
     def initialize(hbs, data)
       @hbs = hbs
-      @locals = {}
       @data = data
     end
 

data/lib/ruby-handlebars/escapers/html_escaper.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Handlebars
   module Escapers
     class HTMLEscaper
@@ -6,4 +8,4 @@ module Handlebars
       end
     end
   end
-end
+end

data/lib/ruby-handlebars/helpers/register_default_helpers.rb

@@ -2,6 +2,7 @@ require_relative 'each_helper'
 require_relative 'helper_missing_helper'
 require_relative 'if_helper'
 require_relative 'unless_helper'
+require_relative 'with_helper'
 
 module Handlebars
   module Helpers
@@ -10,6 +11,7 @@ module Handlebars
       HelperMissingHelper.register(hbs)
       IfHelper.register(hbs)
       UnlessHelper.register(hbs)
+      WithHelper.register(hbs)
     end
   end
 end

data/lib/ruby-handlebars/helpers/with_helper.rb

@@ -0,0 +1,25 @@
+require_relative 'default_helper'
+
+module Handlebars
+  module Helpers
+    class WithHelper < DefaultHelper
+      def self.registry_name
+        'with'
+      end
+
+      def self.apply(context, data, block, else_block)
+        if data
+          context.with_temporary_context(data) do
+            block.fn(context)
+          end
+        else
+          else_block.fn(context)
+        end
+      end
+
+      def self.apply_as(context, data, name, block, else_block)
+        self.apply(context, { name.to_sym => data }, block, else_block)
+      end
+    end
+  end
+end

data/lib/ruby-handlebars/tree.rb

@@ -17,7 +17,7 @@ module Handlebars
     class Replacement < TreeItem.new(:item)
       def _eval(context)
         helper = context.get_helper(item.to_s)
-        if helper && helper.arity == 1
+        if helper && (helper.arity == 1 || helper.arity == -2)
           helper.apply(context)
         else
           context.get(item.to_s)

data/lib/ruby-handlebars/version.rb

@@ -1,3 +1,3 @@
 module Handlebars
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/handlebars_spec.rb

@@ -117,6 +117,11 @@ describe Handlebars::Handlebars do
         expect(evaluate("{{{add left '&' right}}}", {left: 'Law', right: 'Order'})).to eq("Law & Order")
       end
 
+      it 'with optional arguments not specified' do
+        hbs.register_helper('rainbow') {|context, *opts| "-"}
+        expect(evaluate("{{rainbow}}")).to eq("-")
+      end
+
       it 'with an empty string argument' do
         hbs.register_helper('noah') {|context, value| value.to_s.gsub(/a/, '')}
 

data/spec/ruby-handlebars/helpers/with_helper_spec.rb

@@ -0,0 +1,80 @@
+require_relative '../../spec_helper'
+require_relative './shared'
+
+require_relative '../../../lib/ruby-handlebars'
+require_relative '../../../lib/ruby-handlebars/tree'
+require_relative '../../../lib/ruby-handlebars/helpers/with_helper'
+
+describe Handlebars::Helpers::WithHelper do
+  let(:subject) { Handlebars::Helpers::WithHelper }
+  let(:hbs) { Handlebars::Handlebars.new }
+
+  it_behaves_like "a registerable helper", "with"
+
+  context '.apply' do
+    include_context "shared apply helper"
+  end
+
+  context "integration" do
+    include_context "shared helpers integration tests"
+
+    let(:person_data) { { person: { firstname: "Yehuda", lastname: "Katz" }} }
+    let(:city_data) { {
+      city: {
+        name: "San Francisco",
+        summary: "San Francisco is the <b>cultural center</b> of <b>Northern California</b>",
+        location: {
+          north: "37.73,",
+          east: -122.44,
+        },
+        population: 883305,
+      },
+    } }
+
+    it "changes the evaluation context" do
+      template = <<~HANDLEBARS
+        {{#with person}}
+        {{firstname}} {{lastname}}
+        {{/with}}
+      HANDLEBARS
+
+      expect(evaluate(template, person_data).strip).to eq("Yehuda Katz")
+    end
+
+    it "supports block parameters" do
+      template = <<~HANDLEBARS
+        {{#with city as | city |}}
+          {{#with city.location as | loc |}}
+            {{city.name}}: {{loc.north}} {{loc.east}}
+          {{/with}}
+        {{/with}}
+      HANDLEBARS
+
+      expect(evaluate(template, city_data).strip).to eq("San Francisco: 37.73, -122.44")
+    end
+
+    it "supports else blocks" do
+      template = <<~HANDLEBARS
+        {{#with city}}
+        {{city.name}} (not shown because there is no city)
+        {{else}}
+        No city found
+        {{/with}}
+      HANDLEBARS
+
+      expect(evaluate(template, person_data).strip).to eq("No city found")
+    end
+
+    it "supports relative paths", skip: "Relative paths are not yet supported" do
+      template = <<~HANDLEBARS
+        {{#with city as | city |}}
+          {{#with city.location as | loc |}}
+            {{city.name}}: {{../population}}
+          {{/with}}
+        {{/with}}
+      HANDLEBARS
+
+      expect(evaluate(template, city_data).strip).to eq("San Francisco: 883305")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvz-ruby-handlebars
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Vincent Pretre
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,7 @@ files:
 - lib/ruby-handlebars/helpers/if_helper.rb
 - lib/ruby-handlebars/helpers/register_default_helpers.rb
 - lib/ruby-handlebars/helpers/unless_helper.rb
+- lib/ruby-handlebars/helpers/with_helper.rb
 - lib/ruby-handlebars/parser.rb
 - lib/ruby-handlebars/template.rb
 - lib/ruby-handlebars/tree.rb
@@ -153,6 +154,7 @@ files:
 - spec/ruby-handlebars/helpers/register_default_helpers_spec.rb
 - spec/ruby-handlebars/helpers/shared.rb
 - spec/ruby-handlebars/helpers/unless_helper_spec.rb
+- spec/ruby-handlebars/helpers/with_helper_spec.rb
 - spec/spec_helper.rb
 - spec/tree_spec.rb
 homepage: https://github.com/mvz/ruby-handlebars
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Pure Ruby library for Handlebars templates