curlybars 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e0f6f2934a512ad3ba98455f3eab1492ddd131489322d4082a19cf9568b1cc
-  data.tar.gz: 9e36b98d7c878e4083ca27f34a7daccc2eee4f39bb6e4e5040c186a806321f87
+  metadata.gz: 2ef985c46340022e337318774e4fcf8f36a1f0f7fc6d87788d70ffa3b214f16f
+  data.tar.gz: 1bd1f9195be76418bc0b416f6466aa73809f39037d93ccdde901d90ffca14baa
 SHA512:
-  metadata.gz: 6aeb6a8ace0d10637dcc0a9be64fc23e150d1971afb01d4ce8c735d9740e6a1f1644c33cd662dbd3fbbaa9e2b8b34a2c76aa735d064eb08118dd54435c3eb5c9
-  data.tar.gz: fd1289f763c7870e921120b849a1f1fa8de334c9998e8ca34fc4758384a83fc62ac86070b382b934f47961a4f0b7073c49ade00ebb77572b0d419d7e8a5d8677
+  metadata.gz: 443143ccfb796e5cc14f4cb4bf2f5c1958b8de9b271c95f8fdfccc07caa169d520e4563e70b5111109f6d914388d18c8c6bd519f837524371f235cb375b10389
+  data.tar.gz: fc72c19b12e2084f7e9dab5a01c51d6c6f7ab1614dde449f635356f40fc0841ef3305fd2fb6169763c6333e66324e3486d38f396516325794597b8184801e84a

data/lib/curlybars/error/lex.rb

@@ -9,7 +9,7 @@ module Curlybars
 
         error_line = source.split("\n")[line_number - 1]
         before_error = error_line.first(line_offset).last(10)
-        after_error = error_line[line_offset + 1..].first(10)
+        after_error = error_line[(line_offset + 1)..].first(10)
         error = error_line[line_offset]
 
         details = [before_error, error, after_error]

data/lib/curlybars/error/parse.rb

@@ -16,7 +16,7 @@ module Curlybars
 
           error_line = source.split("\n")[line_number - 1]
           before_error = error_line.first(line_offset).last(10)
-          after_error = error_line[line_offset + length..].first(10)
+          after_error = error_line[(line_offset + length)..].first(10)
           error = error_line.slice(line_offset, length)
 
           details = [before_error, error, after_error]

data/lib/curlybars/lexer.rb

@@ -51,10 +51,10 @@ module Curlybars
     r(/'(.*?)'/, :curly) { [:LITERAL, match[1].inspect] }
     r(/"(.*?)"/, :curly) { [:LITERAL, match[1].inspect] }
 
-    r(/@((?:\.\.\/)*#{IDENTIFIER})/, :curly) { |variable| [:VARIABLE, match[1]] }
+    r(/@((?:\.\.\/)*#{IDENTIFIER})/o, :curly) { |variable| [:VARIABLE, match[1]] }
 
-    r(/(#{IDENTIFIER})\s*=/, :curly) { [:KEY, match[1]] }
-    r(/(?:\.\.\/)*(?:#{IDENTIFIER}\.)*#{IDENTIFIER}/, :curly) { |name| [:PATH, name] }
+    r(/(#{IDENTIFIER})\s*=/o, :curly) { [:KEY, match[1]] }
+    r(/(?:\.\.\/)*(?:#{IDENTIFIER}\.)*#{IDENTIFIER}/o, :curly) { |name| [:PATH, name] }
 
     r(/\s/, :curly)
 

data/lib/curlybars/node/path.rb

@@ -87,15 +87,12 @@ module Curlybars
       end
 
       def resolve(branches)
-        @value ||= begin
-          if Curlybars.global_helpers_dependency_tree.key?(path.to_sym)
-            dep_node = Curlybars.global_helpers_dependency_tree[path.to_sym]
-
-            return :helper if dep_node.nil?
-
-            return [:helper, dep_node]
-          end
+        if !defined?(@value) && Curlybars.global_helpers_dependency_tree.key?(path.to_sym)
+          dep_node = Curlybars.global_helpers_dependency_tree[path.to_sym]
+          @value = dep_node.nil? ? :helper : [:helper, dep_node]
+        end
 
+        @value ||= begin
           path_split_by_slashes = path.split('/')
           backward_steps_on_branches = path_split_by_slashes.count - 1
           base_tree_position = branches.length - backward_steps_on_branches
@@ -108,10 +105,10 @@ module Curlybars
           dotted_path_side = path_split_by_slashes.last
 
           offset_adjustment = 0
-          dotted_path_side.split(/\./).map(&:to_sym).inject(base_tree) do |sub_tree, step|
+          dotted_path_side.split(".").map(&:to_sym).inject(base_tree) do |sub_tree, step|
             if step == :this
               next sub_tree
-            elsif step == :length && (sub_tree.is_a?(Array) && sub_tree.first.is_a?(Hash))
+            elsif step == :length && sub_tree.is_a?(Array) && sub_tree.first.is_a?(Hash)
               next nil # :length is synthesised leaf
             elsif !(sub_tree.is_a?(Hash) && sub_tree.key?(step))
               message = step.to_s == path ? "'#{path}' does not exist" : "not possible to access `#{step}` in `#{path}`"

data/lib/curlybars/path_finder.rb

@@ -0,0 +1,112 @@
+module Curlybars
+  class PathFinder
+    def initialize(ast)
+      @ast = ast
+      @matches = []
+    end
+
+    def find(target_path)
+      @matches = []
+      @target_segments = normalize_path(target_path)
+      traverse(@ast.template, [])
+      @matches
+    end
+
+    private
+
+    def normalize_path(path)
+      return path if path.is_a?(Array)
+
+      path.to_s.split('.')
+    end
+
+    def traverse(node, context_stack)
+      return unless node
+
+      case node
+      when Curlybars::Node::Template
+        node.items.each { |item| traverse(item, context_stack) }
+      when Curlybars::Node::Item
+        traverse(node.item, context_stack)
+      when Curlybars::Node::Path
+        check_path_match(node, context_stack)
+      when Curlybars::Node::Output
+        traverse(node.value, context_stack)
+      when Curlybars::Node::Partial
+        traverse(node.path, context_stack)
+      when Curlybars::Node::SubExpression
+        traverse(node.helper, context_stack)
+        node.arguments&.each { |arg| traverse(arg, context_stack) }
+        node.options&.each { |opt| traverse(opt.expression, context_stack) }
+      when Curlybars::Node::BlockHelperElse
+        handle_block_helper(node, context_stack)
+      when Curlybars::Node::IfElse, Curlybars::Node::UnlessElse
+        handle_conditional(node, context_stack)
+      when Curlybars::Node::EachElse
+        handle_each(node, context_stack)
+      when Curlybars::Node::WithElse
+        handle_with(node, context_stack)
+      end
+    end
+
+    def check_path_match(path_node, context_stack)
+      path_segments = path_node.path.split('.')
+      resolved_segments = resolve_path(path_segments, context_stack)
+
+      @matches << path_node if resolved_segments == @target_segments
+    end
+
+    def resolve_path(path_segments, context_stack)
+      full_path = path_segments.join('.')
+      stack = context_stack.dup
+
+      # Handle ../ parent navigation
+      while full_path.start_with?('../')
+        full_path = full_path[3..]
+        stack.pop unless stack.empty?
+      end
+
+      remaining_segments = full_path.empty? ? [] : full_path.split('.')
+      stack + remaining_segments
+    end
+
+    def handle_block_helper(node, context_stack)
+      traverse(node.helper, context_stack)
+      traverse(node.helper_template, context_stack)
+      traverse(node.else_template, context_stack) if node.else_template
+      node.arguments&.each { |arg| traverse(arg, context_stack) }
+      node.options&.each { |opt| traverse(opt.expression, context_stack) }
+    end
+
+    def handle_conditional(node, context_stack)
+      traverse(node.expression, context_stack)
+
+      if node.is_a?(Curlybars::Node::IfElse)
+        traverse(node.if_template, context_stack)
+      elsif node.is_a?(Curlybars::Node::UnlessElse)
+        traverse(node.unless_template, context_stack)
+      end
+      traverse(node.else_template, context_stack) if node.else_template
+    end
+
+    def handle_each(node, context_stack)
+      traverse(node.path, context_stack)
+
+      # EachElse changes context to the item being iterated
+      collection_path = node.path.respond_to?(:subexpression?) && node.path.subexpression? ? node.path.helper : node.path
+      new_context = context_stack + collection_path.path.split('.')
+      traverse(node.each_template, new_context)
+      traverse(node.else_template, context_stack) if node.else_template
+    end
+
+    def handle_with(node, context_stack)
+      traverse(node.path, context_stack)
+
+      # WithElse changes context to the specified path
+      presenter_path = node.path.respond_to?(:subexpression?) && node.path.subexpression? ? node.path.helper : node.path
+      new_context = context_stack + presenter_path.path.split('.')
+      traverse(node.with_template, new_context)
+      traverse(node.else_template, context_stack) if node.else_template
+    end
+  end
+end

data/lib/curlybars/presenter.rb

@@ -60,7 +60,7 @@ module Curlybars
           end
         end
 
-        instance_variable_set("@#{name}", value)
+        instance_variable_set(:"@#{name}", value)
       end
     end
 
@@ -276,8 +276,8 @@ module Curlybars
     # Delegates private method calls to the current view context.
     #
     # The view context, an instance of ActionView::Base, is set by Rails.
-    def method_missing(method, *args, **kwargs, &block)
-      @_context.public_send(method, *args, **kwargs, &block)
+    def method_missing(method, ...)
+      @_context.public_send(method, ...)
     end
 
     # Tells ruby (and developers) what methods we can accept.

data/lib/curlybars/rendering_support.rb

@@ -140,15 +140,15 @@ module Curlybars
       check_context_is_hash_or_enum_of_presenters(collection, path, position)
       if collection.is_a?(Hash)
         collection
-      elsif collection.respond_to? :each_with_index
-        collection.each_with_index.map { |value, index| [index, value] }.to_h
+      elsif collection.respond_to?(:each_with_index)
+        collection.each_with_index.to_h { |value, index| [index, value] }
       else
         raise "Collection is not coerceable to hash"
       end
     end
 
     def presenter?(context)
-      context.respond_to? :allows_method?
+      context.respond_to?(:allows_method?)
     end
 
     def presenter_collection?(collection)
@@ -180,12 +180,12 @@ module Curlybars
 
     attr_reader :contexts, :variables, :cached_calls, :file_name, :global_helpers, :start_time, :timeout, :cache
 
-    def instrument(meth, &block)
+    def instrument(meth, &)
       # Instruments only callables that give enough details (eg. methods)
       return yield unless meth.respond_to?(:name) && meth.respond_to?(:owner)
 
       payload = { presenter: meth.owner, method: meth.name }
-      ActiveSupport::Notifications.instrument("call_to_presenter.curlybars", payload, &block)
+      ActiveSupport::Notifications.instrument("call_to_presenter.curlybars", payload, &)
     end
 
     def arguments_for_signature(helper, arguments, options)

data/lib/curlybars/template_handler.rb

@@ -43,6 +43,9 @@ module Curlybars
 
       private
 
+      LEADING_ENCODING_REGEXP = /\A#{ActionView::ENCODING_FLAG}/
+      private_constant :LEADING_ENCODING_REGEXP
+
       def compile(template, source)
         # Template is empty, so there's no need to initialize a presenter.
         return %("") if source.empty?
@@ -55,7 +58,7 @@ module Curlybars
         # For security reason, we strip the encoding directive in order to avoid
         # potential issues when rendering the template in another character
         # encoding.
-        safe_source = source.gsub(/\A#{ActionView::ENCODING_FLAG}/, '')
+        safe_source = source.sub(LEADING_ENCODING_REGEXP, '')
 
         source = Curlybars.compile(safe_source, template.identifier)
 
@@ -84,9 +87,9 @@ module Curlybars
         RUBY
       end
 
-      def instrument(template, &block)
+      def instrument(template, &)
         payload = { path: template.virtual_path }
-        ActiveSupport::Notifications.instrument("compile.curlybars", payload, &block)
+        ActiveSupport::Notifications.instrument("compile.curlybars", payload, &)
       end
     end
   end

data/lib/curlybars/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Curlybars
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.13.0'
 end

data/lib/curlybars/visitor.rb

@@ -20,7 +20,7 @@ module Curlybars
       return unless class_name.start_with?('Curlybars::Node')
 
       method_name = class_name.demodulize.underscore
-      send("visit_#{method_name}", node)
+      send(:"visit_#{method_name}", node)
     end
 
     def visit_block_helper_else(node)

data/lib/curlybars.rb

@@ -63,8 +63,8 @@ module Curlybars
     # identifier - The the file name of the template being checked (defaults to `nil`).
     #
     # Returns true if the template is valid, false otherwise.
-    def valid?(presenter_class, source, identifier = nil, **options)
-      errors = validate(presenter_class, source, identifier, **options)
+    def valid?(presenter_class, source, identifier = nil, **)
+      errors = validate(presenter_class, source, identifier, **)
       errors.empty?
     end
 
@@ -78,6 +78,20 @@ module Curlybars
       visitor.accept(tree)
     end
 
+    # Find all path nodes in the AST that resolve to a given path.
+    # Takes into account contextual scope from block helpers like #with, #each, etc.
+    #
+    # target_path - The path String to search for (e.g., "user.name" or "user.organizations.id").
+    # source - The source HBS String used to generate an AST.
+    # identifier - The the file name of the template being checked (defaults to `nil`).
+    #
+    # Returns an Array of Curlybars::Node::Path instances that match the target path.
+    def find(target_path, source, identifier = nil)
+      tree = ast(transformed_source(source), identifier, run_processors: true)
+      finder = Curlybars::PathFinder.new(tree)
+      finder.find(target_path)
+    end
+
     def global_helpers_dependency_tree
       @global_helpers_dependency_tree ||= begin
         classes = Curlybars.configuration.global_helpers_provider_classes
@@ -139,3 +153,4 @@ require 'curlybars/railtie' if defined?(Rails)
 require 'curlybars/presenter'
 require 'curlybars/method_whitelist'
 require 'curlybars/visitor'
+require 'curlybars/path_finder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curlybars
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Libo Cannici
@@ -12,19 +12,15 @@ authors:
 - Andreas Garnæs
 - Augusto Silva
 - Attila Večerek
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
   type: :runtime
@@ -32,9 +28,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
 - !ruby/object:Gem::Dependency
@@ -42,9 +35,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
   type: :runtime
@@ -52,9 +42,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
 - !ruby/object:Gem::Dependency
@@ -85,138 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.57'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.57'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.19'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.19'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.25'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.25'
 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.
@@ -257,6 +112,7 @@ files:
 - lib/curlybars/node/variable.rb
 - lib/curlybars/node/with_else.rb
 - lib/curlybars/parser.rb
+- lib/curlybars/path_finder.rb
 - lib/curlybars/position.rb
 - lib/curlybars/presenter.rb
 - lib/curlybars/processor/tilde.rb
@@ -271,7 +127,6 @@ homepage: https://github.com/zendesk/curlybars
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -280,15 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Create your views using Handlebars templates!
 test_files: []