dry-view 0.7.0 → 0.7.1

data/lib/dry/view/context.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require_relative "decorated_attributes"
 
 module Dry
@@ -43,7 +43,7 @@ module Dry
 
       # @api private
       def for_render_env(render_env)
-        return self if render_env == self._render_env
+        return self if render_env == _render_env
 
         self.class.new(**_options.merge(render_env: render_env))
       end
@@ -72,7 +72,7 @@ module Dry
       def with(**new_options)
         self.class.new(
           render_env: _render_env,
-          **_options.merge(new_options),
+          **_options.merge(new_options)
         )
       end
     end

data/lib/dry/view/decorated_attributes.rb

@@ -27,7 +27,8 @@ module Dry
         #
         # @param names [Array<Symbol>] the attribute names
         # @param options [Hash] the options to pass to the Part Builder
-        # @option options [Symbol, Class] :as an alternative name or class to use when finding a matching Part
+        # @option options [Symbol, Class] :as an alternative name or class to use when finding a
+        #   matching Part
         #
         # @api public
         def decorate(*names, **options)

data/lib/dry/view/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class View
     # Error raised when critical settings are not configured
@@ -17,7 +19,7 @@ module Dry
       def initialize(template_name, lookup_paths)
         msg = [
           "Template +#{template_name}+ could not be found in paths:",
-          lookup_paths.map { |path| " - #{path}"}
+          lookup_paths.map { |path| " - #{path}" }
         ].join("\n\n")
 
         super(msg)

data/lib/dry/view/exposure.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry-equalizer"
+require "dry/core/equalizer"
 
 module Dry
   class View
@@ -10,8 +10,8 @@ module Dry
     class Exposure
       include Dry::Equalizer(:name, :proc, :object, :options)
 
-      EXPOSURE_DEPENDENCY_PARAMETER_TYPES = [:req, :opt].freeze
-      INPUT_PARAMETER_TYPES = [:key, :keyreq, :keyrest].freeze
+      EXPOSURE_DEPENDENCY_PARAMETER_TYPES = %i[req opt].freeze
+      INPUT_PARAMETER_TYPES = %i[key keyreq keyrest].freeze
 
       attr_reader :name
       attr_reader :proc
@@ -26,7 +26,7 @@ module Dry
       end
 
       def bind(obj)
-        self.class.new(name, proc, obj, options)
+        self.class.new(name, proc, obj, **options)
       end
 
       def dependency_names
@@ -76,23 +76,31 @@ module Dry
       private
 
       def call_proc(input, locals)
-        args = proc_args(input, locals)
-
-        if proc.is_a?(Method)
-          proc.(*args)
+        args, keywords = proc_args(input, locals)
+
+        if keywords.empty?
+          if proc.is_a?(Method)
+            proc.(*args)
+          else
+            object.instance_exec(*args, &proc)
+          end
         else
-          object.instance_exec(*args, &proc)
+          if proc.is_a?(Method)
+            proc.(*args, **keywords)
+          else
+            object.instance_exec(*args, **keywords, &proc)
+          end
         end
       end
 
       def proc_args(input, locals)
         dependency_args = proc_dependency_args(locals)
-        input_args = proc_input_args(input)
+        keywords = proc_input_args(input)
 
-        if input_args.any?
-          dependency_args << input_args
+        if keywords.empty?
+          [dependency_args, {}]
         else
-          dependency_args
+          [dependency_args, keywords]
         end
       end
 

data/lib/dry/view/exposures.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "tsort"
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/view/exposure"
 
 module Dry
@@ -30,7 +30,7 @@ module Dry
       end
 
       def add(name, proc = nil, **options)
-        exposures[name] = Exposure.new(name, proc, options)
+        exposures[name] = Exposure.new(name, proc, **options)
       end
 
       def import(name, exposure)
@@ -46,8 +46,9 @@ module Dry
       end
 
       def call(input)
+        # rubocop:disable Style/MultilineBlockChain
         tsort.each_with_object({}) { |name, memo|
-          next unless exposure = self[name]
+          next unless (exposure = self[name])
 
           value = exposure.(input, memo)
           value = yield(value, exposure) if block_given?
@@ -56,6 +57,7 @@ module Dry
         }.each_with_object({}) { |(name, value), memo|
           memo[name] = value unless self[name].private?
         }
+        # rubocop:enable Style/MultilineBlockChain
       end
 
       private

data/lib/dry/view/part.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require_relative "decorated_attributes"
 require_relative "render_environment_missing"
 
@@ -70,7 +70,11 @@ module Dry
       # @param render_env [RenderEnvironment] render environment
       #
       # @api public
-      def initialize(render_env: RenderEnvironmentMissing.new, name: self.class.part_name(render_env.inflector), value:)
+      def initialize(
+        render_env: RenderEnvironmentMissing.new,
+        name: self.class.part_name(render_env.inflector),
+        value:
+      )
         @_name = name
         @_value = value
         @_render_env = render_env
@@ -115,15 +119,18 @@ module Dry
       #   itself responds to `#render`.
       #
       # @param partial_name [Symbol, String] partial name
-      # @param as [Symbol] the name for the Part to assume in the partial's locals. Default's to the Part's `_name`.
+      # @param as [Symbol] the name for the Part to assume in the partial's locals. Defaults to
+      #   the Part's `_name`.
       # @param locals [Hash<Symbol, Object>] other locals to provide the partial
       #
       # @return [String] rendered partial
       #
       # @api public
+      # rubocop:disable Naming/UncommunicativeMethodParamName
       def _render(partial_name, as: _name, **locals, &block)
         _render_env.partial(partial_name, _render_env.scope({as => self}.merge(locals)), &block)
       end
+      # rubocop:enable Naming/UncommunicativeMethodParamName
 
       # Builds a new scope with the part included in its locals.
       #
@@ -133,7 +140,8 @@ module Dry
       #   A convenience alias for `#_scope`. Is available unless the value
       #   itself responds to `#scope`.
       #
-      # @param scope_name [Symbol, nil] scope name, used by the scope builder to determine the scope class
+      # @param scope_name [Symbol, nil] scope name, used by the scope builder to determine the
+      #   scope class
       # @param locals [Hash<Symbol, Object>] other locals to provide the partial
       #
       # @return [Dry::View::Scope] scope
@@ -168,12 +176,12 @@ module Dry
       # @param options[Hash<Symbol, Object>] other options to provide when initializing the new part
       #
       # @api public
-      def new(klass = (self.class), name: (_name), value: (_value), **options)
+      def new(klass = self.class, name: _name, value: _value, **options)
         klass.new(
           name: name,
           value: value,
           render_env: _render_env,
-          **options,
+          **options
         )
       end
 
@@ -199,6 +207,7 @@ module Dry
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
       def respond_to_missing?(name, include_private = false)
         CONVENIENCE_METHODS.include?(name) || _value.respond_to?(name, include_private) || super

data/lib/dry/view/part_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/core/cache"
-require "dry/equalizer"
+require "dry/core/equalizer"
 require_relative "part"
 
 module Dry
@@ -54,7 +54,7 @@ module Dry
         klass.new(
           name: name,
           value: value,
-          render_env: render_env,
+          render_env: render_env
         )
       end
 
@@ -69,11 +69,13 @@ module Dry
         build_part(name, arr, **options.merge(as: collection_as))
       end
 
+      # rubocop:disable Lint/UnusedMethodArgument
       def collection_options(name:, **options)
         collection_as = options[:as].is_a?(Array) ? options[:as].first : nil
 
         options.merge(as: collection_as)
       end
+      # rubocop:enable Lint/UnusedMethodArgument
 
       def collection_item_options(name:, **options)
         singular_name = inflector.singularize(name).to_sym
@@ -90,7 +92,7 @@ module Dry
 
         options.merge(
           name: singular_name,
-          as: singular_as,
+          as: singular_as
         )
       end
 
@@ -106,6 +108,7 @@ module Dry
         end
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity
       def resolve_part_class(name:, fallback_class:)
         return fallback_class unless namespace
 
@@ -114,7 +117,7 @@ module Dry
         # Give autoloaders a chance to act
         begin
           klass = namespace.const_get(name)
-        rescue NameError
+        rescue NameError # rubocop:disable Lint/HandleExceptions
         end
 
         if !klass && namespace.const_defined?(name, false)
@@ -127,6 +130,7 @@ module Dry
           fallback_class
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def inflector
         render_env.inflector

data/lib/dry/view/path.rb

@@ -38,7 +38,7 @@ module Dry
       end
 
       def to_s
-        dir
+        dir.to_s
       end
 
       private

data/lib/dry/view/render_environment.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 module Dry
   class View
@@ -12,7 +12,7 @@ module Dry
           inflector: config.inflector,
           context: context,
           scope_builder: config.scope_builder.new(namespace: config.scope_namespace),
-          part_builder: config.part_builder.new(namespace: config.part_namespace),
+          part_builder: config.part_builder.new(namespace: config.part_namespace)
         )
       end
 
@@ -36,7 +36,7 @@ module Dry
         part_builder.(name, value, **options)
       end
 
-      def scope(name = nil, locals)
+      def scope(name = nil, locals) # rubocop:disable Style/OptionalArguments
         scope_builder.(name, locals)
       end
 
@@ -54,7 +54,7 @@ module Dry
           inflector: inflector,
           context: context,
           scope_builder: scope_builder,
-          part_builder: part_builder,
+          part_builder: part_builder
         )
       end
     end

data/lib/dry/view/render_environment_missing.rb

@@ -20,19 +20,19 @@ module Dry
         raise MissingEnvironmentError
       end
 
-      def part(name, value, **options)
+      def part(_name, _value, **_options)
         raise MissingEnvironmentError
       end
 
-      def scope(name = nil, locals)
+      def scope(_name = nil, _locals) # rubocop:disable Style/OptionalArguments
         raise MissingEnvironmentError
       end
 
-      def template(name, scope, &block)
+      def template(_name, _scope)
         raise MissingEnvironmentError
       end
 
-      def partial(name, scope, &block)
+      def partial(_name, _scope)
         raise MissingEnvironmentError
       end
 

data/lib/dry/view/rendered.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 module Dry
   class View

data/lib/dry/view/renderer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/core/cache"
-require "dry/equalizer"
+require "dry/core/equalizer"
 require_relative "errors"
 require_relative "tilt"
 

data/lib/dry/view/scope.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/core/constants"
 require_relative "render_environment_missing"
 
@@ -59,7 +59,11 @@ module Dry
       # @return [Scope]
       #
       # @api public
-      def initialize(name: nil, locals: Dry::Core::Constants::EMPTY_HASH, render_env: RenderEnvironmentMissing.new)
+      def initialize(
+        name: nil,
+        locals: Dry::Core::Constants::EMPTY_HASH,
+        render_env: RenderEnvironmentMissing.new
+      )
         @_name = name
         @_locals = locals
         @_render_env = render_env
@@ -83,10 +87,16 @@ module Dry
       # @api public
       def render(partial_name = nil, **locals, &block)
         partial_name ||= _name
-        raise ArgumentError, "+partial_name+ must be provided for unnamed scopes" unless partial_name
-        partial_name = _inflector.underscore(_inflector.demodulize(partial_name.to_s)) if partial_name.is_a?(Class)
 
-        _render_env.partial(partial_name, _render_scope(locals), &block)
+        unless partial_name
+          raise ArgumentError, "+partial_name+ must be provided for unnamed scopes"
+        end
+
+        if partial_name.is_a?(Class)
+          partial_name = _inflector.underscore(_inflector.demodulize(partial_name.to_s))
+        end
+
+        _render_env.partial(partial_name, _render_scope(**locals), &block)
       end
 
       # Build a new scope using a scope class matching the provided name
@@ -150,9 +160,13 @@ module Dry
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
       def respond_to_missing?(name, include_private = false)
-        _locals.key?(name) || _render_env.context.respond_to?(name) || CONVENIENCE_METHODS.include?(name) || super
+        _locals.key?(name) ||
+          _render_env.context.respond_to?(name) ||
+          CONVENIENCE_METHODS.include?(name) ||
+          super
       end
 
       def _render_scope(**locals)
@@ -162,7 +176,7 @@ module Dry
           self.class.new(
             # FIXME: what about `name`?
             locals: locals,
-            render_env: _render_env,
+            render_env: _render_env
           )
         end
       end

data/lib/dry/view/scope_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/core/cache"
-require "dry/equalizer"
+require "dry/core/equalizer"
 require_relative "scope"
 
 module Dry
@@ -46,11 +46,11 @@ module Dry
       # @return [Dry::View::Scope]
       #
       # @api private
-      def call(name = nil, locals)
+      def call(name = nil, locals) # rubocop:disable Style/OptionalArguments
         scope_class(name).new(
           name: name,
           locals: locals,
-          render_env: render_env,
+          render_env: render_env
         )
       end
 
@@ -76,7 +76,7 @@ module Dry
         # Give autoloaders a chance to act
         begin
           klass = namespace.const_get(name)
-        rescue NameError
+        rescue NameError # rubocop:disable Lint/HandleExceptions
         end
 
         if !klass && namespace.const_defined?(name, false)