handlebars-engine 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93107a1a86ac4a02cadbbfd8221cba9515ff839e948e39dc37c61a3de1d15400
-  data.tar.gz: '0091362554954a3f86ab24b7c0bc701595818b9b72af4b8780bccd3d6e4193ec'
+  metadata.gz: c0b3a91d4ae32afb2ef716bb86c5991620a7a5671b0e687a3064b3dcfedac590
+  data.tar.gz: f0067ebf10b733bdc4859a67f36b3d5094376459377e91e452e8c3fb78d6b831
 SHA512:
-  metadata.gz: 7cd86ebb6fbeb64acd29dc3c4cb0f6853a7193983c53e05d32e42490a38b70f37c8d99ae7b214e3f76923c7931b46c1d3dcda1326339dfcdfa00ec29be745ae9
-  data.tar.gz: 6f5fd77a08e73e9f2b9f40c1c769f2eca5a0359a35e9aa02ca9fd7d430e83e8f61d6c26541f0b2bbaf5caf3ff990663962cdedfc5dd61e8892c842a8b6404fec
+  metadata.gz: '083916774bcf8207e3ea40cb5957e9cf633956c07769997ba21d7302b9479f2ec2c1a3e8011702adfc708178a3ce1dcb5d02fc4ef70b93b950958d59ab94eff3'
+  data.tar.gz: b2047c755344c0157730878a2dcedae9bb5624c7c06a080fa32306032e4ba816031736739498f583b2c03a0b61196d15da9fb86d572b9f1575131cc94b0a349d

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.4] - 2025-08-12
+
+### Changed
+- `engine`: fixed issue with serialization of functions ([#26](https://github.com/gi/handlebars-ruby/pull/26))
+- `engine`: include optional logging ([#24](https://github.com/gi/handlebars-ruby/pull/24))
+- `ci`: test against macOS 14, Ubuntu 22.04, and ruby 3.1-3.4 ([#27](https://github.com/gi/handlebars-ruby/pull/27))
+
+## [0.3.3] - 2022-02-17
+
+### Changed
+- `engine/function`: remove object finalizer (fixes [#14](https://github.com/gi/handlebars-ruby/issues/14))
+
 ## [0.3.2] - 2022-02-17
 
 ### Changed

data/lib/handlebars/engine/function.rb

@@ -4,24 +4,16 @@ module Handlebars
   class Engine
     # A proxy for a JavaScript function defined in the context.
     class Function
-      def initialize(context, name)
+      def initialize(context, name, logger: nil)
         @context = context
+        @logger = logger
         @name = name
-        ObjectSpace.define_finalizer(self, self.class.finalizer(context, name))
       end
 
       def call(*args)
+        @logger&.debug { "[handlebars] calling #{@name} with args #{args}" }
         @context.call(@name, *args)
       end
-
-      def self.finalizer(context, name)
-        proc {
-          begin
-            context.eval("delete #{name}")
-          rescue ThreadError # rubocop:disable Lint/SuppressedException
-          end
-        }
-      end
     end
   end
 end

data/lib/handlebars/engine/init.js

@@ -16,14 +16,23 @@ var template = (spec) => {
 var registerPartial = Handlebars.registerPartial.bind(Handlebars);
 var unregisterPartial = Handlebars.unregisterPartial.bind(Handlebars);
 
-var registerHelper = (...args) => {
-  const fn = args[args.length - 1];
+var registerJsHelper = Handlebars.registerHelper.bind(Handlebars);
+
+var registerRbHelper = (name, fn) => {
   function wrapper(...args) {
+    // Ruby cannot access the `this` context, so pass it as the first argument.
     args.unshift(this);
+    const { ...options } = args[args.length-1];
+    Object.entries(options).forEach(([key, value]) => {
+      if (typeof value === "function") {
+        // functions are cannot be passed back to Ruby
+        options[key] = "function";
+      }
+    });
+    args[args.length-1] = options
     return fn(...args);
   }
-  args[args.length - 1] = wrapper;
-  return Handlebars.registerHelper(...args);
+  return registerJsHelper(name, wrapper);
 };
 
 var unregisterHelper = Handlebars.unregisterHelper.bind(Handlebars);

data/lib/handlebars/engine/version.rb

@@ -2,6 +2,6 @@
 
 module Handlebars
   class Engine
-    VERSION = "0.3.2"
+    VERSION = "0.3.4"
   end
 end

data/lib/handlebars/engine.rb

@@ -21,7 +21,8 @@ module Handlebars
     #   environment.
     # @param path [String, nil] the path to the version of Handlebars to load.
     #   If `nil`, the contents of `Handlebars::Source.bundled_path` is loaded.
-    def initialize(lazy: false, path: nil)
+    def initialize(lazy: false, logger: nil, path: nil)
+      @logger = logger
       @path = path
       init! unless lazy
     end
@@ -84,9 +85,9 @@ module Handlebars
         case f
         when Proc
           attach(n, &f)
-          evaluate("registerHelper('#{n}', #{n})")
+          evaluate("registerRbHelper('#{n}', #{n})")
         when String, Symbol
-          evaluate("Handlebars.registerHelper('#{n}', #{f})")
+          evaluate("registerJsHelper('#{n}', #{f})")
         end
       end
     end
@@ -175,6 +176,7 @@ module Handlebars
 
     def attach(name, &block)
       init!
+      @logger&.debug { "[handlebars] attaching #{name}" }
       @context.attach(name.to_s, block)
     end
 
@@ -182,6 +184,8 @@ module Handlebars
       init!
       name = name.to_s
 
+      @logger&.debug { "[handlebars] calling #{name} with args #{args}" }
+
       if assign || eval
         call_via_eval(name, args, assign: assign)
       else
@@ -207,6 +211,7 @@ module Handlebars
     end
 
     def evaluate(code)
+      @logger&.debug { "[handlebars] evaluating #{code}" }
       @context.eval(code)
     end
 
@@ -222,10 +227,18 @@ module Handlebars
     def init!
       return if @init
 
+      @logger&.debug { "[handlebars] initializing" }
+
       @context = MiniRacer::Context.new
+      @context.attach(
+        "console.log",
+        ->(*args) { @logger&.debug { "[handlebars] #{args.join(" ")}" } },
+      )
       @context.load(@path || ::Handlebars::Source.bundled_path)
       @context.load(File.absolute_path("engine/init.js", __dir__))
 
+      @logger&.debug { "[handlebars] initialized" }
+
       @init = true
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: handlebars-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Zach Gianos
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars-source
@@ -72,7 +71,6 @@ metadata:
   github_repo: https://github.com/gi/handlebars-ruby
   homepage_uri: https://github.com/gi/handlebars-ruby
   source_code_uri: https://github.com/gi/handlebars-ruby
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -80,15 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A complete interface to Handlebars.js for Ruby.
 test_files: []