curly-templates 2.5.0 → 2.6.0

data/lib/curly.rb

@@ -25,7 +25,6 @@
 #
 # See Curly::Presenter for more information on presenters.
 module Curly
-  VERSION = "2.5.0"
 
   # Compiles a Curly template to Ruby code.
   #
@@ -52,3 +51,4 @@ require 'curly/compiler'
 require 'curly/presenter'
 require 'curly/template_handler'
 require 'curly/railtie' if defined?(Rails)
+require 'curly/version'

data/lib/curly/compiler.rb

@@ -94,12 +94,7 @@ module Curly
       name = component.name.singularize
       counter = "#{name}_counter"
 
-      begin
-        item_presenter_class = presenter_class.presenter_for_name(name)
-      rescue NameError
-        raise Curly::Error,
-          "cannot enumerate `#{name}`, could not find matching presenter class"
-      end
+      item_presenter_class = presenter_class.presenter_for_name(name)
 
       output <<-RUBY
         presenters << presenter
@@ -146,12 +141,7 @@ module Curly
 
       name = component.name
 
-      begin
-        item_presenter_class = presenter_class.presenter_for_name(name)
-      rescue NameError
-        raise Curly::Error,
-          "cannot use context `#{name}`, could not find matching presenter class"
-      end
+      item_presenter_class = presenter_class.presenter_for_name(name)
 
       output <<-RUBY
         options_stack << options

data/lib/curly/component_compiler.rb

@@ -64,8 +64,7 @@ module Curly
     end
 
     def invalid_signature?
-      positional_params = param_types.select {|type| [:req, :opt].include?(type) }
-      positional_params.size > 1
+      param_types.count { |type| [:req, :opt].include?(type) } > 1
     end
 
     def required_identifier?
@@ -89,7 +88,7 @@ module Curly
     end
 
     def validate_attributes!
-      attributes.keys.each do |key|
+      attributes_collected? || attributes.keys.each do |key|
         unless attribute_names.include?(key)
           raise Curly::Error, "`#{method}` does not allow attribute `#{key}`"
         end
@@ -116,6 +115,10 @@ module Curly
         map {|type, name| name.to_s }
     end
 
+    def attributes_collected?
+      param_types.include?(:keyrest)
+    end
+
     def required_attribute_names
       @required_attribute_names ||= params.
         select {|type, name| type == :keyreq }.

data/lib/curly/presenter.rb

@@ -1,3 +1,5 @@
+require 'curly/presenter_name_error'
+
 module Curly
 
   # A base class that can be subclassed by concrete presenters.
@@ -154,28 +156,25 @@ module Curly
       #
       # Returns the Class or nil if the constant cannot be found.
       def presenter_for_path(path)
-        name = presenter_name_for_path(path)
-
         begin
-          name.constantize
-        rescue NameError => e
-          missing_name = e.name.to_s
-
-          # Since we only want to return nil when the constant matching the
-          # path could not be found, we need to do same hacky matching. If
-          # the constant's name is Foo::BarPresenter and Foo does not exist,
-          # we consider that a match. If Foo exists but Foo::BarPresenter does
-          # not, NameError#name will return :BarPresenter, so we need to match
-          # that as well.
-          unless name.start_with?(missing_name) || name.end_with?(missing_name)
-            raise # The NameError was due to something else, re-raise.
-          end
+          # Assume that the path can be derived without a prefix; In other words
+          # from the given path we can look up objects by namespace.
+          presenter_for_name(path.camelize, [])
+        rescue Curly::PresenterNameError
+          nil
         end
       end
 
-      def presenter_for_name(name)
-        namespace = to_s.split("::")
-        class_name = name.camelcase << "Presenter"
+      # Retrieve the named presenter with consideration for object scope.
+      # The namespace_prefixes are to acknowledge that sometimes we will have
+      # a subclass of Curly::Presenter receiving the .presenter_for_name
+      # and other times we will not (when we are receiving this message by
+      # way of the .presenter_for_path method).
+      def presenter_for_name(name, namespace_prefixes = to_s.split('::'))
+        full_class_name = name.camelcase << "Presenter"
+        relative_namespace = full_class_name.split("::")
+        class_name = relative_namespace.pop
+        namespace = namespace_prefixes + relative_namespace
 
         # Because Rails' autoloading mechanism doesn't work properly with
         # namespace we need to loop through the namespace ourselves. Ideally,
@@ -185,8 +184,21 @@ module Curly
         begin
           full_name = namespace.join("::") << "::" << class_name
           const_get(full_name)
-        rescue NameError
-          raise if namespace.empty?
+        rescue NameError => e
+          # Due to the way the exception hirearchy works, we need to check
+          # that this exception is actually a `NameError` - since other
+          # classes can inherit `NameError`, rescue will actually rescue
+          # those classes as being under `NameError`, causing this block to
+          # be executed for classes that aren't `NameError`s (but are rather
+          # subclasses of it), which isn't the desired behavior.  This
+          # prevents anything but `NameError`s from triggering the resulting
+          # code.  `NoMethodError` is actually a subclass of `NameError`,
+          # so a typo in a file (e.g. `present` instead of `presents`) can
+          # cause the library to act as if the class was never defined.
+          raise unless e.class == NameError
+          if namespace.empty?
+            raise Curly::PresenterNameError.new(e, name)
+          end
           namespace.pop
           retry
         end

data/lib/curly/presenter_name_error.rb

@@ -0,0 +1,16 @@
+require 'curly/error'
+
+module Curly
+  class PresenterNameError < Error
+    attr_reader :original_exception, :name
+
+    def initialize(original_exception, name)
+      @name = name
+      @original_exception = original_exception
+    end
+
+    def message
+      "cannot use context `#{name}`, could not find matching presenter class"
+    end
+  end
+end

data/lib/curly/rspec.rb

@@ -0,0 +1,16 @@
+require 'rspec/rails'
+
+module Curly
+  module RSpec
+    module PresenterExampleGroup
+      extend ActiveSupport::Concern
+      include ::RSpec::Rails::ViewExampleGroup
+
+      included do
+        let(:presenter) { described_class.new(view, view_assigns) }
+      end
+    end
+
+    ::RSpec.configuration.include PresenterExampleGroup, type: :presenter
+  end
+end

data/lib/curly/version.rb

@@ -0,0 +1,3 @@
+module Curly
+  VERSION = "2.6.0"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Daniel Schierbeck
@@ -19,7 +19,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -118,61 +122,18 @@ files:
 - lib/curly/invalid_component.rb
 - lib/curly/parser.rb
 - lib/curly/presenter.rb
+- lib/curly/presenter_name_error.rb
 - lib/curly/presenter_not_found.rb
 - lib/curly/railtie.rb
+- lib/curly/rspec.rb
 - lib/curly/scanner.rb
 - lib/curly/syntax_error.rb
 - lib/curly/template_handler.rb
+- lib/curly/version.rb
 - lib/generators/curly/controller/controller_generator.rb
 - lib/generators/curly/controller/templates/presenter.rb.erb
 - lib/generators/curly/controller/templates/view.html.curly.erb
 - lib/rails/projections.json
-- perf/compile_benchmark.rb
-- perf/compile_profile.rb
-- perf/component_benchmark.rb
-- spec/attribute_scanner_spec.rb
-- spec/collection_blocks_spec.rb
-- spec/compiler/collections_spec.rb
-- spec/compiler/context_blocks_spec.rb
-- spec/compiler_spec.rb
-- spec/component_compiler_spec.rb
-- spec/component_scanner_spec.rb
-- spec/components_spec.rb
-- spec/conditional_blocks_spec.rb
-- spec/dummy/.gitignore
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/dashboards_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/presenters/dashboards/collection_presenter.rb
-- spec/dummy/app/presenters/dashboards/item_presenter.rb
-- spec/dummy/app/presenters/dashboards/new_presenter.rb
-- spec/dummy/app/presenters/dashboards/partials_presenter.rb
-- spec/dummy/app/presenters/dashboards/show_presenter.rb
-- spec/dummy/app/presenters/layouts/application_presenter.rb
-- spec/dummy/app/views/dashboards/_item.html.curly
-- spec/dummy/app/views/dashboards/collection.html.curly
-- spec/dummy/app/views/dashboards/new.html.curly
-- spec/dummy/app/views/dashboards/partials.html.curly
-- spec/dummy/app/views/dashboards/show.html.curly
-- spec/dummy/app/views/layouts/application.html.curly
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/routes.rb
-- spec/generators/controller_generator_spec.rb
-- spec/integration/application_layout_spec.rb
-- spec/integration/collection_blocks_spec.rb
-- spec/integration/context_blocks_spec.rb
-- spec/integration/partials_spec.rb
-- spec/matchers/have_structure.rb
-- spec/parser_spec.rb
-- spec/presenter_spec.rb
-- spec/scanner_spec.rb
-- spec/spec_helper.rb
-- spec/syntax_error_spec.rb
-- spec/template_handler_spec.rb
 homepage: https://github.com/zendesk/curly
 licenses:
 - apache2
@@ -194,28 +155,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 2
 summary: Free your views!
-test_files:
-- spec/attribute_scanner_spec.rb
-- spec/collection_blocks_spec.rb
-- spec/compiler/collections_spec.rb
-- spec/compiler/context_blocks_spec.rb
-- spec/compiler_spec.rb
-- spec/component_compiler_spec.rb
-- spec/component_scanner_spec.rb
-- spec/components_spec.rb
-- spec/conditional_blocks_spec.rb
-- spec/generators/controller_generator_spec.rb
-- spec/integration/application_layout_spec.rb
-- spec/integration/collection_blocks_spec.rb
-- spec/integration/context_blocks_spec.rb
-- spec/integration/partials_spec.rb
-- spec/parser_spec.rb
-- spec/presenter_spec.rb
-- spec/scanner_spec.rb
-- spec/syntax_error_spec.rb
-- spec/template_handler_spec.rb
+test_files: []
 has_rdoc: 

data/perf/compile_benchmark.rb

@@ -1,71 +0,0 @@
-require 'bundler/setup'
-require 'benchmark/ips'
-
-ENV["RAILS_ENV"] = "test"
-
-require_relative '../spec/dummy/config/environment'
-
-class TestPresenter < Curly::Presenter
-  def foo
-  end
-
-  def bar
-  end
-
-  def form(&block)
-    xcontent_tag :form, block.call
-  end
-
-  class FormPresenter < Curly::Presenter
-    def fields
-      %w[]
-    end
-
-    class FieldPresenter < Curly::Presenter
-      presents :field
-
-      def field_name
-        @field
-      end
-    end
-  end
-end
-
-# Build a huge template.
-TEMPLATE = <<-CURLY
-<h1>{{foo}}</h1>
-<h2>{{bar}}</h2>
-
-{{@form}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-{{/form}}
-CURLY
-
-Benchmark.ips do |x|
-  x.report "compiling a huge template" do
-    Curly::Compiler.compile(TEMPLATE * 100, TestPresenter)
-  end
-
-  x.report "compiling a normal template" do
-    Curly::Compiler.compile(TEMPLATE, TestPresenter)
-  end
-
-  x.compare!
-end

data/perf/compile_profile.rb

@@ -1,64 +0,0 @@
-require 'bundler/setup'
-require 'benchmark/ips'
-require 'stackprof'
-
-ENV["RAILS_ENV"] = "test"
-
-require_relative '../spec/dummy/config/environment'
-
-class TestPresenter < Curly::Presenter
-  def foo
-  end
-
-  def bar
-  end
-
-  def form(&block)
-    xcontent_tag :form, block.call
-  end
-
-  class FormPresenter < Curly::Presenter
-    def fields
-      %w[]
-    end
-
-    class FieldPresenter < Curly::Presenter
-      presents :field
-
-      def field_name
-        @field
-      end
-    end
-  end
-end
-
-# Build a huge template.
-TEMPLATE = <<-CURLY
-<h1>{{foo}}</h1>
-<h2>{{bar}}</h2>
-
-{{@form}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-  {{*fields}}
-    <input name={{field_name}}><br>
-  {{/fields}}
-{{/form}}
-CURLY
-
-StackProf.run(mode: :cpu, out: "tmp/stackprof-cpu-compile.dump") do
-  Curly::Compiler.compile(TEMPLATE * 100, TestPresenter)
-end