mvz-ruby-handlebars 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d971e4df297aebaa8445decfe5756ffc6140318c8ad93d13ca90c3a2ed8d6601
-  data.tar.gz: 47de3f30733f85f377bfd5e3dc2b554940f406e96066de3fb38c1a53c8faf207
+  metadata.gz: 0fb29d1fe9fe4a053ef3772b90983af24a9b1e29c922e1222c87d2bdc39382de
+  data.tar.gz: 1c982006f0ffe74ded0271f864de390d5b54414428ac80820fedee8a22143832
 SHA512:
-  metadata.gz: 21bf66dedf5b10f50f46421ebfc632853b38cb3836f5fd4f4c1a798359b0cc3dba057fc8aa3f0b8dd329c5c862d8a78e27c92dcc8313d9873c5c5a506a383863
-  data.tar.gz: 3abb82f084a654f633f928535bb8f6331d066269ae14619a645b88fb50c7c0f395065201046600ca3fdc81a0a9e31f0b51da1909243d5719b4e964186b0bb376
+  metadata.gz: 6ca8bfb3a42446ac17a1711e57b6baae38b34180268289c59a4bb9069476b28f4c591b495ec3f8d5f7e7b69818f38dd80372a88a49749f08494f01830713928d
+  data.tar.gz: fe16a78829fdb5bf0e76939e794c73d0d14c4aa0872fbfb87be277611429b66aacd66544ace3ac7d7d596d256bc8190c9d9b4a13c8195291664e4b8cb667d3a3

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 This is the changelog for mvz-ruby-handlebars
 
+## 0.0.13 (2024-10-26)
+
+* Support Ruby 3.2 through 3.4, dropping support for Ruby 3.0 and 3.1
+  ([#40] and [#43] by [mvz])
+* Remove large dynamic object constants `Handlebars::Handlebars::PARSER` and
+  `Handlebars::Handlebars::TRANSFORM` ([#42] by [mvz])
+
+[#40]: https://github.com/mvz/ruby-handlebars/pull/40
+[#42]: https://github.com/mvz/ruby-handlebars/pull/42
+[#43]: https://github.com/mvz/ruby-handlebars/pull/43
+
 ## 0.0.12 (2024-05-18)
 
 * Support Ruby 3.0 through 3.3, dropping support for 2.6 and 2.7

data/lib/ruby-handlebars/transform.rb

@@ -0,0 +1,88 @@
+require "parslet"
+require_relative "tree"
+
+module Handlebars
+  class Transform < Parslet::Transform
+    rule(template_content: simple(:content)) { Tree::TemplateContent.new(content) }
+    rule(replaced_unsafe_item: simple(:item)) { Tree::EscapedReplacement.new(item) }
+    rule(replaced_safe_item: simple(:item)) { Tree::Replacement.new(item) }
+    rule(str_content: simple(:content)) { Tree::String.new(content) }
+    rule(parameter_name: simple(:name)) { Tree::Parameter.new(name) }
+
+    rule(
+      unsafe_helper_name: simple(:name),
+      parameters: subtree(:parameters)
+    ) do
+      Tree::EscapedHelper.new(name, parameters)
+    end
+
+    rule(
+      safe_helper_name: simple(:name),
+      parameters: subtree(:parameters)
+    ) do
+      Tree::Helper.new(name, parameters)
+    end
+
+    rule(
+      helper_name: simple(:name),
+      block_items: subtree(:block_items)
+    ) do
+      Tree::Helper.new(name, [], block_items)
+    end
+
+    rule(
+      helper_name: simple(:name),
+      block_items: subtree(:block_items),
+      else_block_items: subtree(:else_block_items)
+    ) do
+      Tree::Helper.new(name, [], block_items, else_block_items)
+    end
+
+    rule(
+      helper_name: simple(:name),
+      parameters: subtree(:parameters),
+      block_items: subtree(:block_items)
+    ) do
+      Tree::Helper.new(name, parameters, block_items)
+    end
+
+    rule(
+      helper_name: simple(:name),
+      parameters: subtree(:parameters),
+      block_items: subtree(:block_items),
+      else_block_items: subtree(:else_block_items)
+    ) do
+      Tree::Helper.new(name, parameters, block_items, else_block_items)
+    end
+
+    rule(
+      helper_name: simple(:name),
+      parameters: subtree(:parameters),
+      as_parameters: subtree(:as_parameters),
+      block_items: subtree(:block_items)
+    ) do
+      Tree::AsHelper.new(name, parameters, as_parameters, block_items)
+    end
+
+    rule(
+      helper_name: simple(:name),
+      parameters: subtree(:parameters),
+      as_parameters: subtree(:as_parameters),
+      block_items: subtree(:block_items),
+      else_block_items: subtree(:else_block_items)
+    ) do
+      Tree::AsHelper.new(name, parameters, as_parameters, block_items, else_block_items)
+    end
+
+    rule(
+      partial_name: simple(:partial_name),
+      arguments: subtree(:arguments)
+    ) do
+      Tree::PartialWithArgs.new(partial_name, arguments)
+    end
+
+    rule(partial_name: simple(:partial_name)) { Tree::Partial.new(partial_name) }
+    rule(block_items: subtree(:block_items)) { Tree::Block.new(block_items) }
+    rule(else_block_items: subtree(:else_block_items)) { Tree::Block.new(block_items) }
+  end
+end

data/lib/ruby-handlebars/tree.rb

@@ -17,17 +17,23 @@ module Handlebars
     class Replacement < TreeItem.new(:item)
       def _eval(context)
         helper = context.get_helper(item.to_s)
-        if helper && (helper.arity == 1 || helper.arity == -2)
+        if call_with_one_argument_possible?(helper)
           helper.apply(context)
         else
           context.get(item.to_s)
         end
       end
+
+      private
+
+      def call_with_one_argument_possible?(helper)
+        [1, -2].include? helper&.arity
+      end
     end
 
     class EscapedReplacement < Replacement
       def _eval(context)
-        context.escaper.escape(super(context).to_s)
+        context.escaper.escape(super.to_s)
       end
     end
 
@@ -71,7 +77,7 @@ module Handlebars
 
     class EscapedHelper < Helper
       def _eval(context)
-        context.escaper.escape(super(context).to_s)
+        context.escaper.escape(super.to_s)
       end
     end
 
@@ -102,88 +108,4 @@ module Handlebars
 
     end
   end
-
-  class Transform < Parslet::Transform
-    rule(template_content: simple(:content)) {Tree::TemplateContent.new(content)}
-    rule(replaced_unsafe_item: simple(:item)) {Tree::EscapedReplacement.new(item)}
-    rule(replaced_safe_item: simple(:item)) {Tree::Replacement.new(item)}
-    rule(str_content: simple(:content)) {Tree::String.new(content)}
-    rule(parameter_name: simple(:name)) {Tree::Parameter.new(name)}
-
-    rule(
-      unsafe_helper_name: simple(:name),
-      parameters: subtree(:parameters)
-    ) {
-      Tree::EscapedHelper.new(name, parameters)
-    }
-
-    rule(
-      safe_helper_name: simple(:name),
-      parameters: subtree(:parameters)
-    ) {
-      Tree::Helper.new(name, parameters)
-    }
-
-    rule(
-      helper_name: simple(:name),
-      block_items: subtree(:block_items),
-    ) {
-      Tree::Helper.new(name, [], block_items)
-    }
-
-    rule(
-      helper_name: simple(:name),
-      block_items: subtree(:block_items),
-      else_block_items: subtree(:else_block_items)
-    ) {
-      Tree::Helper.new(name, [], block_items, else_block_items)
-    }
-
-    rule(
-      helper_name: simple(:name),
-      parameters: subtree(:parameters),
-      block_items: subtree(:block_items),
-    ) {
-      Tree::Helper.new(name, parameters, block_items)
-    }
-
-    rule(
-      helper_name: simple(:name),
-      parameters: subtree(:parameters),
-      block_items: subtree(:block_items),
-      else_block_items: subtree(:else_block_items)
-    ) {
-      Tree::Helper.new(name, parameters, block_items, else_block_items)
-    }
-
-    rule(
-      helper_name: simple(:name),
-      parameters: subtree(:parameters),
-      as_parameters: subtree(:as_parameters),
-      block_items: subtree(:block_items),
-    ) {
-      Tree::AsHelper.new(name, parameters, as_parameters, block_items)
-    }
-
-    rule(
-      helper_name: simple(:name),
-      parameters: subtree(:parameters),
-      as_parameters: subtree(:as_parameters),
-      block_items: subtree(:block_items),
-      else_block_items: subtree(:else_block_items)
-    ) {
-      Tree::AsHelper.new(name, parameters, as_parameters, block_items, else_block_items)
-    }
-    
-    rule(
-      partial_name: simple(:partial_name),
-      arguments: subtree(:arguments)
-    ) {
-      Tree::PartialWithArgs.new(partial_name, arguments)
-    }
-
-    rule(partial_name: simple(:partial_name)) {Tree::Partial.new(partial_name)}
-    rule(block_items: subtree(:block_items)) {Tree::Block.new(block_items)}
-    rule(else_block_items: subtree(:else_block_items)) {Tree::Block.new(block_items)}
-  end
 end

data/lib/ruby-handlebars/version.rb

@@ -1,3 +1,3 @@
 module Handlebars
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/ruby-handlebars.rb

@@ -2,6 +2,7 @@ require_relative "ruby-handlebars/version"
 require_relative "ruby-handlebars/context"
 require_relative "ruby-handlebars/parser"
 require_relative "ruby-handlebars/tree"
+require_relative "ruby-handlebars/transform"
 require_relative "ruby-handlebars/template"
 require_relative "ruby-handlebars/helper"
 require_relative "ruby-handlebars/helpers/register_default_helpers"
@@ -15,6 +16,8 @@ module Handlebars
       @as_helpers = {}
       @helpers = {}
       @partials = {}
+      @parser = Parser.new
+      @transform = Transform.new
 
       register_default_helpers
       set_escaper
@@ -54,11 +57,10 @@ module Handlebars
 
     private
 
-    PARSER = Parser.new
-    TRANSFORM = Transform.new
+    attr_reader :parser, :transform
 
     def template_to_ast(content)
-      TRANSFORM.apply(PARSER.parse(content))
+      transform.apply(parser.parse(content))
     end
 
     def register_default_helpers

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require "simplecov"
 SimpleCov.start
 
-require "pry"
 RSpec::Mocks.configuration.allow_message_expectations_on_nil = true

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mvz-ruby-handlebars
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Vincent Pretre
 - Hiptest R&D
 - Matijs van Zuijlen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -26,40 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - matijs@matijs.net
 executables: []
@@ -158,6 +122,7 @@ files:
 - lib/ruby-handlebars/helpers/with_helper.rb
 - lib/ruby-handlebars/parser.rb
 - lib/ruby-handlebars/template.rb
+- lib/ruby-handlebars/transform.rb
 - lib/ruby-handlebars/tree.rb
 - lib/ruby-handlebars/version.rb
 - spec/handlebars_spec.rb
@@ -176,8 +141,8 @@ homepage: https://github.com/mvz/ruby-handlebars
 licenses:
 - MIT
 metadata:
+  homepage_uri: https://github.com/mvz/ruby-handlebars
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,15 +150,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Pure Ruby library for Handlebars templates
 test_files: []