curlybars 1.3.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5f1fe84620e10957d38e663d3883158c00b6db25395c61e9628ddd3d19d110
-  data.tar.gz: 5eac82875ef4fca6a4c0aa728626615c643089ed6cc24de91232d793753f8f5b
+  metadata.gz: 2be6d03409f5c575fb33c7ba4ed74117420fd22ddca8272005c5f23e459a0d8e
+  data.tar.gz: ad11b01849c9d28a70b2ae2260615665cc2dc3ca3c380b9dfbc2ab9c91bf1de3
 SHA512:
-  metadata.gz: 3697082fceb22d1d868d4de0fcf1054d8facc0e8dee7da0e58704bf34bb303a0cd287b460baa5d40ffcbf17ed7d0e3235643b7d855e57f821ed63223f1d737e3
-  data.tar.gz: dfba149b55705dbc9567a763dbc12b3514296a43ec576a683642f83f727d6d7ec4c49ffc514a4c2a9a4d1ec91740365dd144d2a87bde96d59b2632b8c24ed4df
+  metadata.gz: ba6035a72fd5cf75120cc3adfc663192dae68d75132887b801bd29a53c4b655f6be09ed6b8e4a2ee497e708172c38db19258215b5f3b1a9b788371db20eeac3c
+  data.tar.gz: 83961d2f0ef03848c1ffb3feb9db859c866ff90e74d173f116b16c3af5ff4eac710e934cd7b3bb5039749f05169bd4f95e3f19fc208163f3333a6d66ba7261df

data/lib/curlybars.rb

@@ -118,7 +118,6 @@ require 'curlybars/rendering_support'
 require 'curlybars/parser'
 require 'curlybars/position'
 require 'curlybars/lexer'
-require 'curlybars/parser'
 require 'curlybars/processor/token_factory'
 require 'curlybars/processor/tilde'
 require 'curlybars/error/lex'

data/lib/curlybars/configuration.rb

@@ -16,15 +16,7 @@ module Curlybars
   end
 
   class Configuration
-    attr_accessor :presenters_namespace
-    attr_accessor :nesting_limit
-    attr_accessor :traversing_limit
-    attr_accessor :output_limit
-    attr_accessor :rendering_timeout
-    attr_accessor :custom_processors
-    attr_accessor :compiler_transformers
-    attr_accessor :global_helpers_provider_classes
-    attr_accessor :cache
+    attr_accessor :presenters_namespace, :nesting_limit, :traversing_limit, :output_limit, :rendering_timeout, :custom_processors, :compiler_transformers, :global_helpers_provider_classes, :cache
 
     def initialize
       @presenters_namespace = ''

data/lib/curlybars/error/base.rb

@@ -8,8 +8,10 @@ module Curlybars
         @id = id
         @position = position
         @metadata = metadata
+
         return if position.nil?
         return if position.file_name.nil?
+
         location = "%s:%d:%d" % [position.file_name, position.line_number, position.line_offset]
         set_backtrace([location])
       end

data/lib/curlybars/lexer.rb

@@ -32,6 +32,9 @@ module Curlybars
     r(/{{/) { push_state :curly; :START }
     r(/}}/, :curly) { pop_state; :END }
 
+    r(/\(/, :curly) { push_state :curly; :LPAREN }
+    r(/\)/, :curly) { pop_state; :RPAREN }
+
     r(/#/, :curly) { :HASH }
     r(/\//, :curly) { :SLASH }
     r(/>/, :curly) { :GT }

data/lib/curlybars/method_whitelist.rb

@@ -1,5 +1,6 @@
 module Curlybars
   module MethodWhitelist
+    # rubocop:disable Style/SoleNestedConditional
     def allow_methods(*methods_without_type, **methods_with_type, &contextual_block)
       methods_with_type_validator = lambda do |methods_to_validate|
         methods_to_validate.each do |(method_name, type)|
@@ -14,19 +15,21 @@ module Curlybars
       methods_with_type_validator.call(methods_with_type)
 
       define_method(:allowed_methods) do
-        methods_list = methods_without_type + methods_with_type.keys
+        @method_whitelist_allowed_methods ||= begin
+          methods_list = methods_without_type + methods_with_type.keys
 
-        # Adds methods to the list of allowed methods
-        method_adder = lambda do |*more_methods, **more_methods_with_type|
-          methods_with_type_validator.call(more_methods_with_type)
+          # Adds methods to the list of allowed methods
+          method_adder = lambda do |*more_methods, **more_methods_with_type|
+            methods_with_type_validator.call(more_methods_with_type)
 
-          methods_list += more_methods
-          methods_list += more_methods_with_type.keys
-        end
+            methods_list += more_methods
+            methods_list += more_methods_with_type.keys
+          end
 
-        contextual_block&.call(self, method_adder)
+          contextual_block&.call(self, method_adder)
 
-        defined?(super) ? super() + methods_list : methods_list
+          defined?(super) ? super() + methods_list : methods_list
+        end
       end
 
       define_singleton_method(:methods_schema) do |context = nil|
@@ -47,8 +50,8 @@ module Curlybars
           memo[method] = nil
         end
 
-        methods_with_type_resolved = all_methods_with_type.each_with_object({}) do |(method_name, type), memo|
-          memo[method_name] = if type.respond_to?(:call)
+        methods_with_type_resolved = all_methods_with_type.transform_values do |type|
+          if type.respond_to?(:call)
             type.call(context)
           else
             type
@@ -63,6 +66,7 @@ module Curlybars
         # Included modules
         included_modules.each do |mod|
           next unless mod.respond_to?(:methods_schema)
+
           schema.merge!(mod.methods_schema(context))
         end
 
@@ -88,6 +92,7 @@ module Curlybars
         allowed_methods.include?(method)
       end
     end
+    # rubocop:enable Style/SoleNestedConditional
 
     def self.extended(base)
       # define a default of no method allowed

data/lib/curlybars/node/block_helper_else.rb

@@ -100,6 +100,7 @@ module Curlybars
 
       def check_open_and_close_elements(helper, helperclose, error_class)
         return unless helper.path != helperclose.path
+
         message = "block `#{helper.path}` cannot be closed by `#{helperclose.path}`"
         raise error_class.new('closing_tag_mismatch', message, helperclose.position)
       end

data/lib/curlybars/node/if_else.rb

@@ -15,7 +15,7 @@ module Curlybars
 
       def validate(branches)
         [
-          expression.validate(branches, check_type: :not_helper),
+          expression.validate(branches),
           if_template.validate(branches),
           else_template.validate(branches)
         ]

data/lib/curlybars/node/path.rb

@@ -109,26 +109,32 @@ module Curlybars
         case check_type
         when :presenter
           return if presenter?(branches)
+
           message = "`#{path}` must resolve to a presenter"
           raise Curlybars::Error::Validate.new('not_a_presenter', message, position)
         when :presenter_collection
           return if presenter_collection?(branches)
+
           message = "`#{path}` must resolve to a collection of presenters"
           raise Curlybars::Error::Validate.new('not_a_presenter_collection', message, position)
         when :leaf
           return if leaf?(branches)
+
           message = "`#{path}` cannot resolve to a component"
           raise Curlybars::Error::Validate.new('not_a_leaf', message, position)
         when :partial
           return if partial?(branches)
+
           message = "`#{path}` cannot resolve to a partial"
           raise Curlybars::Error::Validate.new('not_a_partial', message, position)
         when :helper
           return if helper?(branches)
+
           message = "`#{path}` cannot resolve to a helper"
           raise Curlybars::Error::Validate.new('not_a_helper', message, position)
         when :not_helper
           return unless helper?(branches)
+
           message = "`#{path}` resolves to a helper"
           raise Curlybars::Error::Validate.new('is_a_helper', message, position)
         when :anything

data/lib/curlybars/node/sub_expression.rb

@@ -0,0 +1,62 @@
+module Curlybars
+  module Node
+    SubExpression = Struct.new(:helper, :arguments, :options, :position) do
+      def compile
+        compiled_arguments = arguments.map do |argument|
+          "arguments.push(rendering.cached_call(#{argument.compile}))"
+        end.join("\n")
+
+        compiled_options = options.map do |option|
+          "options.merge!(#{option.compile})"
+        end.join("\n")
+
+        # NOTE: the following is a heredoc string, representing the ruby code fragment
+        # outputted by this node.
+        <<-RUBY
+          ::Module.new do
+            def self.exec(contexts, rendering)
+              rendering.check_timeout!
+
+              -> {
+                options = ::ActiveSupport::HashWithIndifferentAccess.new
+                #{compiled_options}
+
+                arguments = []
+                #{compiled_arguments}
+
+                helper = #{helper.compile}
+                helper_position = rendering.position(#{helper.position.line_number},
+                  #{helper.position.line_offset})
+
+                options[:this] = contexts.last
+
+                rendering.call(helper, #{helper.path.inspect}, helper_position,
+                  arguments, options)
+              }
+            end
+          end.exec(contexts, rendering)
+        RUBY
+      end
+
+      def validate_as_value(branches, check_type: :anything)
+        validate(branches, check_type: check_type)
+      end
+
+      def validate(branches, check_type: :anything)
+        [
+          helper.validate(branches, check_type: :helper),
+          arguments.map { |argument| argument.validate_as_value(branches) },
+          options.map { |option| option.validate(branches) }
+        ]
+      end
+
+      def cache_key
+        [
+          helper,
+          arguments,
+          options
+        ].flatten.map(&:cache_key).push(self.class.name).join("/")
+      end
+    end
+  end
+end

data/lib/curlybars/node/unless_else.rb

@@ -15,7 +15,7 @@ module Curlybars
 
       def validate(branches)
         [
-          expression.validate(branches, check_type: :not_helper),
+          expression.validate(branches),
           unless_template.validate(branches),
           else_template.validate(branches)
         ]

data/lib/curlybars/parser.rb

@@ -15,6 +15,7 @@ require 'curlybars/node/block_helper_else'
 require 'curlybars/node/option'
 require 'curlybars/node/partial'
 require 'curlybars/node/output'
+require 'curlybars/node/sub_expression'
 
 module Curlybars
   class Parser < RLTK::Parser
@@ -155,6 +156,7 @@ module Curlybars
     production(:expression) do
       clause('value') { |value| value }
       clause('path') { |path| path }
+      clause('subexpression') { |subexpression| subexpression }
     end
 
     production(:value) do
@@ -164,6 +166,15 @@ module Curlybars
 
     production(:path, 'PATH') { |path| Node::Path.new(path, pos(0)) }
 
+    production(:subexpression, 'LPAREN .path .expressions? .options? RPAREN') do |helper, arguments, options|
+      Node::SubExpression.new(
+        helper,
+        arguments || [],
+        options || [],
+        pos(0)
+      )
+    end
+
     finalize
 
     VOID = Class.new do

data/lib/curlybars/processor/tilde.rb

@@ -10,10 +10,12 @@ module Curlybars
             when :TILDE_START
               tokens[index] = create_token(:START, token.value, token.position)
               next if index == 0
+
               strip_token_if_text(tokens, index - 1, :rstrip)
             when :TILDE_END
               tokens[index] = create_token(:END, token.value, token.position)
               next if index == (tokens.length - 1)
+
               strip_token_if_text(tokens, index + 1, :lstrip)
             end
           end
@@ -22,6 +24,7 @@ module Curlybars
         def strip_token_if_text(tokens, index, strip_method)
           token = tokens[index]
           return if token.type != :TEXT
+
           stripped_value = token.value.public_send(strip_method)
           tokens[index] = create_token(token.type, stripped_value, token.position)
         end

data/lib/curlybars/rendering_support.rb

@@ -23,12 +23,14 @@ module Curlybars
     def check_timeout!
       return unless timeout.present?
       return unless (Time.now - start_time) > timeout
+
       message = "Rendering took too long (> #{timeout} seconds)"
       raise ::Curlybars::Error::Render.new('timeout', message, nil)
     end
 
     def check_context_is_presenter(context, path, position)
       return if presenter?(context)
+
       message = "`#{path}` is not a context type object"
       raise Curlybars::Error::Render.new('context_is_not_a_presenter', message, position)
     end
@@ -83,9 +85,11 @@ module Curlybars
       resolved = chain.inject(base_context) do |context, meth|
         next context if meth == 'this'
         next context.count if meth == 'length' && presenter_collection?(context)
+
         raise_if_not_traversable(context, meth, position)
         outcome = instrument(context.method(meth)) { context.public_send(meth) }
         return -> {} if outcome.nil?
+
         outcome
       end
 
@@ -101,7 +105,8 @@ module Curlybars
 
     def cached_call(meth)
       return cached_calls[meth] if cached_calls.key? meth
-      instrument(meth) { cached_calls[meth] = meth.call }
+
+      instrument(meth) { cached_calls[meth] = meth.call(*arguments_for_signature(meth, [], {})) }
     end
 
     def call(helper, helper_path, helper_position, arguments, options, &block)
@@ -202,6 +207,7 @@ module Curlybars
 
     def check_context_allows_method(context, meth, position)
       return if context.allows_method?(meth.to_sym)
+
       message = "`#{meth}` is not available - "
       message += "add `allow_methods :#{meth}` to #{context.class} to allow this path"
       raise Curlybars::Error::Render.new('unallowed_path', message, position, meth: meth.to_sym)
@@ -209,12 +215,14 @@ module Curlybars
 
     def check_context_has_method(context, meth, position)
       return if context.respond_to?(meth.to_sym)
+
       message = "`#{meth}` is not available in #{context.class}"
       raise Curlybars::Error::Render.new('unallowed_path', message, position)
     end
 
     def check_traverse_not_too_deep(traverse, position)
       return unless traverse.count('.') > Curlybars.configuration.traversing_limit
+
       message = "`#{traverse}` too deep"
       raise Curlybars::Error::Render.new('traverse_too_deep', message, position)
     end

data/lib/curlybars/template_handler.rb

@@ -13,9 +13,17 @@ module Curlybars
       # template - The ActionView::Template template that should be compiled.
       #
       # Returns a String containing the Ruby code representing the template.
-      def call(template)
-        instrument(template) do
-          compile(template)
+      if ActionView::VERSION::MAJOR < 6
+        def call(template)
+          instrument(template) do
+            compile_for_actionview5(template)
+          end
+        end
+      else
+        def call(template, source)
+          instrument(template) do
+            compile(template, source)
+          end
         end
       end
 
@@ -43,9 +51,13 @@ module Curlybars
 
       private
 
-      def compile(template)
+      def compile_for_actionview5(template)
+        compile(template, template.source)
+      end
+
+      def compile(template, source)
         # Template is empty, so there's no need to initialize a presenter.
-        return %("") if template.source.empty?
+        return %("") if source.empty?
 
         path = template.virtual_path
         presenter_class = Curlybars::Presenter.presenter_for_path(path)
@@ -55,7 +67,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 = template.source.gsub(/\A#{ActionView::ENCODING_FLAG}/, '')
+        safe_source = source.gsub(/\A#{ActionView::ENCODING_FLAG}/, '')
 
         source = Curlybars.compile(safe_source, template.identifier)
 

data/lib/curlybars/version.rb

@@ -1,3 +1,3 @@
 module Curlybars
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/lib/curlybars/visitor.rb

@@ -75,6 +75,12 @@ module Curlybars
     def visit_string(_node)
     end
 
+    def visit_sub_expression(node)
+      visit(node.helper)
+      node.arguments.each { |argument| visit(argument) }
+      node.options.each { |option| visit(option) }
+    end
+
     def visit_template(node)
       node.items.each { |item| visit(item) }
     end

data/spec/acceptance/application_layout_spec.rb

@@ -2,7 +2,7 @@ describe "Using Curlybars for the application layout", type: :request do
   example "A simple layout view in Curlybars" do
     get '/'
 
-    expect(body).to eq(<<-HTML.strip_heredoc)
+    expect(body).to eq(<<~HTML)
       <html>
       <head>
         <title>Dummy app</title>
@@ -31,7 +31,7 @@ describe "Using Curlybars for the application layout", type: :request do
     example "A simple layout view in Curlybars with html safe logic" do
       get '/articles/1'
 
-      expect(body).to eq(<<-HTML.strip_heredoc)
+      expect(body).to eq(<<~HTML)
         <html>
         <head>
           <title>Dummy app</title>

data/spec/acceptance/collection_blocks_spec.rb

@@ -8,7 +8,7 @@ describe "Collection blocks", type: :request do
   example "Rendering collections" do
     get '/categories'
 
-    expect(body).to eq(<<-HTML.strip_heredoc)
+    expect(body).to eq(<<~HTML)
       <html>
       <head>
         <title>Dummy app</title>