curlybars 1.7.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4b2799fad2886edfd0bc1c4873d8da9ed80d8885a1868f4b0fa5797fb9e49c
-  data.tar.gz: ee1bfc5d500f2ceee63675c5188d915227f507de7895c6ed2f08e89ddcae122e
+  metadata.gz: 1b3420bf9b68dbab653e2ead7d7802ffc7abf4312630a0fb328f79aaddca1a2d
+  data.tar.gz: b0e91d8dc8ccc8069d3543c204c907a2681f06a22ce586f162ef891ae3d70904
 SHA512:
-  metadata.gz: 4233c4cd5ed833892d17603776a6db2abae2061cf72dfebe1add84bb7464e99b563cacee499fbcd447f59dd54a1ea3bf3b4aa18010526249aba2ed39a2310b96
-  data.tar.gz: f78754a1adc25de66302116338dd2abf9b4e9f8c2ae3439d1f74beda9065bb634c8fae64c19f65767be4d7389f1362559c0537f36bb438969e151bb93a47612f
+  metadata.gz: bda5835f6f4cca77b09cf12ccca3b0c74ec30758743a45ae2ca76e703bfa8603e742c6c21b296ebf30fa849b13bc56b8187b6676272e9ba25bde218e7700b287
+  data.tar.gz: ff2a4169575055da7591aa9b0be580695f8776f2532f8c2308d49169e9892486eea7dd7688bff108f8b325966c921854875b8ac28f64dd3821253d2ae2373255

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..-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..-1].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/node/path.rb

@@ -109,20 +109,18 @@ module Curlybars
 
           offset_adjustment = 0
           dotted_path_side.split(/\./).map(&:to_sym).inject(base_tree) do |sub_tree, step|
-            begin
-              if step == :this
-                next sub_tree
-              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}`"
-                raise Curlybars::Error::Validate.new('unallowed_path', message, position, offset_adjustment, path: path, step: step)
-              end
-
-              sub_tree[step]
-            ensure
-              offset_adjustment += step.length + 1 # '1' is the length of the dot
+            if step == :this
+              next sub_tree
+            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}`"
+              raise Curlybars::Error::Validate.new('unallowed_path', message, position, offset_adjustment, path: path, step: step)
             end
+
+            sub_tree[step]
+          ensure
+            offset_adjustment += step.length + 1 # '1' is the length of the dot
           end
         end
       end

data/lib/curlybars/presenter.rb

@@ -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, &block)
-      @_context.public_send(method, *args, &block)
+    def method_missing(method, *args, **kwargs, &block)
+      @_context.public_send(method, *args, **kwargs, &block)
     end
 
     # Tells ruby (and developers) what methods we can accept.

data/lib/curlybars/template_handler.rb

@@ -13,17 +13,9 @@ module Curlybars
       # template - The ActionView::Template template that should be compiled.
       #
       # Returns a String containing the Ruby code representing the 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
+      def call(template, source)
+        instrument(template) do
+          compile(template, source)
         end
       end
 

data/lib/curlybars/version.rb

@@ -1,3 +1,3 @@
 module Curlybars
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.9.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curlybars
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Libo Cannici
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -23,40 +23,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -119,20 +119,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -267,44 +267,6 @@ files:
 - lib/curlybars/template_handler.rb
 - lib/curlybars/version.rb
 - lib/curlybars/visitor.rb
-- spec/acceptance/application_layout_spec.rb
-- spec/acceptance/collection_blocks_spec.rb
-- spec/acceptance/global_helper_spec.rb
-- spec/curlybars/configuration_spec.rb
-- spec/curlybars/error/base_spec.rb
-- spec/curlybars/error/compile_spec.rb
-- spec/curlybars/error/lex_spec.rb
-- spec/curlybars/error/parse_spec.rb
-- spec/curlybars/error/render_spec.rb
-- spec/curlybars/error/validate_spec.rb
-- spec/curlybars/lexer_spec.rb
-- spec/curlybars/method_whitelist_spec.rb
-- spec/curlybars/processor/tilde_spec.rb
-- spec/curlybars/rendering_support_spec.rb
-- spec/curlybars/safe_buffer_spec.rb
-- spec/curlybars/template_handler_spec.rb
-- spec/integration/cache_spec.rb
-- spec/integration/comment_spec.rb
-- spec/integration/exception_spec.rb
-- spec/integration/node/block_helper_else_spec.rb
-- spec/integration/node/each_else_spec.rb
-- spec/integration/node/each_spec.rb
-- spec/integration/node/escape_spec.rb
-- spec/integration/node/helper_spec.rb
-- spec/integration/node/if_else_spec.rb
-- spec/integration/node/if_spec.rb
-- spec/integration/node/output_spec.rb
-- spec/integration/node/partial_spec.rb
-- spec/integration/node/path_spec.rb
-- spec/integration/node/root_spec.rb
-- spec/integration/node/sub_expression_spec.rb
-- spec/integration/node/template_spec.rb
-- spec/integration/node/unless_else_spec.rb
-- spec/integration/node/unless_spec.rb
-- spec/integration/node/with_spec.rb
-- spec/integration/processor/tilde_spec.rb
-- spec/integration/processors_spec.rb
-- spec/integration/visitor_spec.rb
 homepage: https://github.com/zendesk/curlybars
 licenses:
 - Apache-2.0
@@ -318,53 +280,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Create your views using Handlebars templates!
-test_files:
-- spec/curlybars/rendering_support_spec.rb
-- spec/curlybars/method_whitelist_spec.rb
-- spec/curlybars/configuration_spec.rb
-- spec/curlybars/processor/tilde_spec.rb
-- spec/curlybars/template_handler_spec.rb
-- spec/curlybars/error/compile_spec.rb
-- spec/curlybars/error/render_spec.rb
-- spec/curlybars/error/parse_spec.rb
-- spec/curlybars/error/validate_spec.rb
-- spec/curlybars/error/lex_spec.rb
-- spec/curlybars/error/base_spec.rb
-- spec/curlybars/safe_buffer_spec.rb
-- spec/curlybars/lexer_spec.rb
-- spec/integration/processor/tilde_spec.rb
-- spec/integration/exception_spec.rb
-- spec/integration/processors_spec.rb
-- spec/integration/visitor_spec.rb
-- spec/integration/node/escape_spec.rb
-- spec/integration/node/unless_else_spec.rb
-- spec/integration/node/output_spec.rb
-- spec/integration/node/if_spec.rb
-- spec/integration/node/sub_expression_spec.rb
-- spec/integration/node/unless_spec.rb
-- spec/integration/node/with_spec.rb
-- spec/integration/node/partial_spec.rb
-- spec/integration/node/block_helper_else_spec.rb
-- spec/integration/node/root_spec.rb
-- spec/integration/node/template_spec.rb
-- spec/integration/node/each_spec.rb
-- spec/integration/node/each_else_spec.rb
-- spec/integration/node/helper_spec.rb
-- spec/integration/node/path_spec.rb
-- spec/integration/node/if_else_spec.rb
-- spec/integration/comment_spec.rb
-- spec/integration/cache_spec.rb
-- spec/acceptance/collection_blocks_spec.rb
-- spec/acceptance/global_helper_spec.rb
-- spec/acceptance/application_layout_spec.rb
+test_files: []

data/spec/acceptance/application_layout_spec.rb

@@ -1,60 +0,0 @@
-describe "Using Curlybars for the application layout", type: :request do
-  example "A simple layout view in Curlybars" do
-    get '/'
-
-    expect(body).to eq(<<~HTML)
-      <html>
-      <head>
-        <title>Dummy app</title>
-      </head>
-      <body>
-      <h1>Dashboard</h1>
-      <p>Hello, World!</p>
-      <p>Welcome!</p>
-
-      </body>
-      </html>
-    HTML
-  end
-
-  describe "Curlybars" do
-    before do
-      Curlybars.configure do |config|
-        config.presenters_namespace = 'curlybars_presenters'
-      end
-    end
-
-    after do
-      Curlybars.reset
-    end
-
-    example "A simple layout view in Curlybars with html safe logic" do
-      get '/articles/1'
-
-      expect(body).to eq(<<~HTML)
-        <html>
-        <head>
-          <title>Dummy app</title>
-        </head>
-        <body>
-        <p>Hi Admin</p>
-
-        <h1>Article: The Prince</h1>
-
-        <p>This is <strong>important</strong>!</p>
-
-        <p>&lt;script&gt;alert(&#39;bad&#39;)&lt;/script&gt;</p>
-
-
-        <p>
-          author Nicolò
-          <img src="http://example.com/foo.png" />
-        </p>
-
-
-        </body>
-        </html>
-      HTML
-    end
-  end
-end

data/spec/acceptance/collection_blocks_spec.rb

@@ -1,28 +0,0 @@
-describe "Collection blocks", type: :request do
-  before do
-    Curlybars.configure do |config|
-      config.presenters_namespace = 'curlybars_presenters'
-    end
-  end
-
-  example "Rendering collections" do
-    get '/categories'
-
-    expect(body).to eq(<<~HTML)
-      <html>
-      <head>
-        <title>Dummy app</title>
-      </head>
-      <body>
-
-      <h1>This are the categories</h1>
-
-      <p>One</p>
-      <p>Two</p>
-
-
-      </body>
-      </html>
-    HTML
-  end
-end

data/spec/acceptance/global_helper_spec.rb

@@ -1,25 +0,0 @@
-describe "Collection blocks", type: :request do
-  before do
-    Curlybars.configure do |config|
-      config.presenters_namespace = 'curlybars_presenters'
-      config.global_helpers_provider_classes = [GlobalHelpers]
-    end
-  end
-
-  example "Render a global helper" do
-    get '/welcome'
-
-    expect(body).to eq(<<~HTML)
-      <html>
-      <head>
-        <title>Dummy app</title>
-      </head>
-      <body>
-      Login as: Admin
-      Account: Testing
-
-      </body>
-      </html>
-    HTML
-  end
-end

data/spec/curlybars/configuration_spec.rb

@@ -1,57 +0,0 @@
-describe Curlybars::Configuration do
-  after do
-    Curlybars.reset
-  end
-
-  describe "#presenters_namespace" do
-    it "defaults to an empty string" do
-      presenters_namespace = Curlybars::Configuration.new.presenters_namespace
-
-      expect(presenters_namespace).to eq('')
-    end
-  end
-
-  describe "#presenters_namespace=" do
-    it "can set value" do
-      config = Curlybars::Configuration.new
-      config.presenters_namespace = 'foo'
-      expect(config.presenters_namespace).to eq('foo')
-    end
-  end
-
-  describe "#custom_processors" do
-    it "can set value" do
-      config = Curlybars::Configuration.new
-      config.custom_processors = ['test']
-      expect(config.custom_processors).to eq(['test'])
-    end
-  end
-
-  describe ".configure" do
-    before do
-      Curlybars.configure do |config|
-        config.presenters_namespace = 'bar'
-      end
-    end
-
-    it "returns correct value for presenters_namespace" do
-      presenters_namespace = Curlybars.configuration.presenters_namespace
-
-      expect(presenters_namespace).to eq('bar')
-    end
-  end
-
-  describe ".reset" do
-    it "resets the configuration to default value" do
-      Curlybars.configure do |config|
-        config.presenters_namespace = 'foobarbaz'
-      end
-
-      Curlybars.reset
-
-      presenters_namespace = Curlybars.configuration.presenters_namespace
-
-      expect(presenters_namespace).to eq('')
-    end
-  end
-end

data/spec/curlybars/error/base_spec.rb

@@ -1,41 +0,0 @@
-describe Curlybars::Error::Base do
-  let(:position) do
-    OpenStruct.new(line_number: 1, line_offset: 0)
-  end
-
-  it "creates an exception with the given message" do
-    message = "message"
-
-    exception = Curlybars::Error::Base.new('id', message, position)
-
-    expect(exception.message).to be message
-  end
-
-  it "doesn't change the backtrace for nil position.file_name" do
-    exception = Curlybars::Error::Base.new('id', 'message', position)
-
-    expect(exception.backtrace).to be nil
-  end
-
-  it "sets the right backtrace for non-nil position.file_name" do
-    position.file_name = 'template.hbs'
-
-    exception = Curlybars::Error::Base.new('id', 'message', position)
-
-    expect(exception.backtrace).not_to be nil
-  end
-
-  it "sets the position as an instance varaible" do
-    exception = Curlybars::Error::Base.new('id', 'message', position)
-
-    expect(exception.position).to be position
-  end
-
-  it "sets the id as an instance varaible" do
-    id = 'id'
-
-    exception = Curlybars::Error::Base.new(id, 'message', position)
-
-    expect(exception.id).to be id
-  end
-end

data/spec/curlybars/error/compile_spec.rb

@@ -1,19 +0,0 @@
-describe Curlybars::Error::Compile do
-  let(:position) do
-    OpenStruct.new(
-      line_number: 2,
-      line_offset: 3,
-      stream_offset: 14,
-      length: 3,
-      file_name: 'template.hbs'
-    )
-  end
-
-  it "prefixes the id with `compile.`" do
-    id = 'id'
-
-    exception = Curlybars::Error::Compile.new(id, 'message', position)
-
-    expect(exception.id).to eq 'compile.%s' % id
-  end
-end

data/spec/curlybars/error/lex_spec.rb

@@ -1,25 +0,0 @@
-describe Curlybars::Error::Lex do
-  let(:file_name) { 'template.hbs' }
-
-  let(:source) { "first_line\n0123456789\nthird_line" }
-
-  let(:exception) do
-    OpenStruct.new(line_number: 2, line_offset: 2)
-  end
-
-  it "creates an exception with a meaningful message" do
-    message = ".. 01 `2` 3456789 .. is not permitted symbol in this context"
-
-    lex_exception = Curlybars::Error::Lex.new(source, file_name, exception)
-
-    expect(lex_exception.message).to eq message
-  end
-
-  it "figures out a position from the exception" do
-    backtrace = "%s:%d:%d" % [file_name, exception.line_number, exception.line_offset]
-
-    lex_exception = Curlybars::Error::Lex.new(source, file_name, exception)
-
-    expect(lex_exception.backtrace).to eq [backtrace]
-  end
-end

data/spec/curlybars/error/parse_spec.rb

@@ -1,74 +0,0 @@
-describe Curlybars::Error::Parse do
-  let(:source) { "first_line\n0123456789\nthird_line" }
-
-  describe "with current token not being EOS" do
-    let(:position) do
-      OpenStruct.new(
-        line_number: 2,
-        line_offset: 3,
-        length: 3,
-        file_name: 'template.hbs'
-      )
-    end
-
-    let(:exception) do
-      current = double(:current, position: position, type: :type)
-      double(:exception, current: current)
-    end
-
-    it "creates an exception with a meaningful message" do
-      message = ".. 012 `345` 6789 .. is not permitted in this context"
-
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.message).to eq message
-    end
-
-    it "figures out a position from the exception" do
-      backtrace = "%s:%d:%d" % [position.file_name, position.line_number, position.line_offset]
-
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.backtrace).to eq [backtrace]
-    end
-  end
-
-  describe "with current token being EOS" do
-    let(:exception) do
-      current = double(:current, position: nil, type: :EOS)
-      double(:exception, current: current)
-    end
-
-    it "creates an exception with a meaningful message" do
-      message = "A block helper hasn't been closed properly"
-
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.message).to eq message
-    end
-
-    it "creates an exception whose position contains the right line_number" do
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.position.line_number).to be 3
-    end
-
-    it "creates an exception whose position contains the right line_offset" do
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.position.line_offset).to be_zero
-    end
-
-    it "creates an exception whose position contains the right length" do
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.position.length).to be 'third_line'.length
-    end
-
-    it "creates an exception whose position contains a nil file_name" do
-      lex_exception = Curlybars::Error::Parse.new(source, exception)
-
-      expect(lex_exception.position.file_name).to be_nil
-    end
-  end
-end

data/spec/curlybars/error/render_spec.rb

@@ -1,19 +0,0 @@
-describe Curlybars::Error::Render do
-  let(:position) do
-    OpenStruct.new(
-      line_number: 2,
-      line_offset: 3,
-      stream_offset: 14,
-      length: 3,
-      file_name: 'template.hbs'
-    )
-  end
-
-  it "prefixes the id with `render.`" do
-    id = 'id'
-
-    exception = Curlybars::Error::Render.new(id, 'message', position)
-
-    expect(exception.id).to eq 'render.%s' % id
-  end
-end

data/spec/curlybars/error/validate_spec.rb

@@ -1,19 +0,0 @@
-describe Curlybars::Error::Validate do
-  let(:position) do
-    OpenStruct.new(
-      line_number: 2,
-      line_offset: 3,
-      stream_offset: 14,
-      length: 3,
-      file_name: 'template.hbs'
-    )
-  end
-
-  it "prefixes the id with `validate.`" do
-    id = 'id'
-
-    exception = Curlybars::Error::Validate.new(id, 'message', position)
-
-    expect(exception.id).to eq 'validate.%s' % id
-  end
-end