hanami-view 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c2f65b1df90c3753ad9b1dc9832c1bbf560f920
-  data.tar.gz: bfea50f6d49c147ff741f6fe9f590c4965696a17
+SHA256:
+  metadata.gz: 975282c7d30e5a6826be9afccdebf3f8265f9407eb872849316141ffa6c1ef07
+  data.tar.gz: b8136cee7472c868d96ab6082a66410b53ef32b1f35bedcfd293c3fe1af12f3c
 SHA512:
-  metadata.gz: 7474ed87aca12b0e21b3d142dca41117c142763683eb65665d6a044cf848585668a21767a2c156475801e293866d68464a057eacffaa69336f2383cc0fde801d
-  data.tar.gz: c14ae0df06d44dd9163cfea9cfa79632044b200f03bbe85cabce5f6bd2aa0d400eb3ae4ee039137dcce94157aacc67e61ee5a98fdf4c8a974d0ca79c90ea3328
+  metadata.gz: b8cc401697f3e7cfcdb8f2b37d9ec8cdfdbb3413a274dd7e5e3eb471ebb2a1ca630bae7eab8fce3dd6c429fc922fff35983b6e158ff6069d279257de1c80eb39
+  data.tar.gz: 623f66b95073220a3a21d9569973cc749618345d4703917e3decae0b245ff8f8f232c4110cfc6bc6a4895bee63a964b282835cd7de0c8136f7bd4208b1983473

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Hanami::View
 View layer for Hanami
 
+## v1.1.1 - 2018-02-27
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.5
+
+### Fixed
+- [Alfonso Uceda] Ensure that `exposures` are properly overwritten for partials when `locals:` option is used
+
 ## v1.1.0 - 2017-10-25
 
 ## v1.1.0.rc1 - 2017-10-16

data/lib/hanami/view/rendering.rb

@@ -1,5 +1,6 @@
 require 'hanami/view/rendering/registry'
 require 'hanami/view/rendering/scope'
+require 'hanami/view/rendering/subscope'
 require 'hanami/view/rendering/null_local'
 
 module Hanami

data/lib/hanami/view/rendering/layout_scope.rb

@@ -1,4 +1,5 @@
 require 'hanami/view/rendering/null_local'
+require 'hanami/view/rendering/options'
 require 'hanami/utils/escape'
 
 module Hanami
@@ -125,7 +126,7 @@ module Hanami
         #
         # @since 0.1.0
         def locals
-          @locals || @scope.locals
+          Utils::Hash.deep_dup(@locals || @scope.locals)
         end
 
         # It tries to invoke a method for the view or a local for the given key.
@@ -206,6 +207,7 @@ module Hanami
         end
 
         protected
+
         # Forward all the missing methods to the view scope or to the layout.
         #
         # @api private
@@ -228,9 +230,11 @@ module Hanami
           # that we want to be frozen in the future
           #
           # See https://github.com/hanami/view/issues/130#issuecomment-319326236
-          if @scope.respond_to?(m, true)
+          if @scope.respond_to?(m, true) && @scope.locals.has_key?(m) && layout.respond_to?(m, true)
+            layout.__send__(m, *args, &blk)
+          elsif @scope.respond_to?(m, true)
             @scope.__send__(m, *args, &blk)
-          elsif layout.respond_to?(m)
+          elsif layout.respond_to?(m, true)
             layout.__send__(m, *args, &blk)
           else
             ::Hanami::View::Escape.html(super)
@@ -249,13 +253,14 @@ module Hanami
         end
 
         private
+
         # @api private
         def _options(options)
-          options.dup.tap do |opts|
-            opts.merge!(format: format)
-            opts[:locals] = locals
-            opts[:locals].merge!(options.fetch(:locals){ ::Hash.new })
+          current_locals = locals.reject do |key, _|
+            @scope.respond_to?(key, true) &&
+              (layout.respond_to?(key, true) || @scope.view.respond_to?(:name, true))
           end
+          Options.build(options, current_locals, format)
         end
 
         # @since 0.4.2

data/lib/hanami/view/rendering/null_template.rb

@@ -7,7 +7,7 @@ module Hanami
       #
       # A common scenario is for non-html requests.
       # Usually we have a template for the application layout
-      # (eg `templates/application.html.erb`), but we don't use to have the a
+      # (eg `templates/application.html.erb`), but we don't use to have the
       # template for JSON requests (eg `templates/application.json.erb`).
       # Because most of the times, we only return the output of the view.
       #

data/lib/hanami/view/rendering/options.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "hanami/utils/hash"
+
+module Hanami
+  module View
+    module Rendering
+      # Rendering options
+      #
+      # @since 1.1.1
+      # @api private
+      class Options
+        # @since 1.1.1
+        # @api private
+        def self.build(options, locals, format)
+          Utils::Hash.deep_dup(options).tap do |opts|
+            opts[:format] = format
+            opts[:locals] = locals
+            opts[:locals].merge!(options.fetch(:locals) { ::Hash.new }).merge!(format: format)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanami/view/rendering/partial_finder.rb

@@ -47,12 +47,6 @@ module Hanami
           [view_template_dir, template_name].join(separator)
         end
 
-        # @since 0.4.3
-        # @api private
-        def partial_template_under_view_path
-          _find(view_template_dir).first
-        end
-
         # @since 0.4.3
         # @api private
         def view_template_dir

data/lib/hanami/view/rendering/scope.rb

@@ -6,7 +6,7 @@ require 'hanami/view/rendering/partial'
 module Hanami
   module View
     module Rendering
-      # Rendering scope
+      # Rendering view scope
       #
       # @since 0.1.0
       #
@@ -66,6 +66,7 @@ module Hanami
         end
 
         protected
+
         # @api private
         def method_missing(m, *args, &block)
           ::Hanami::View::Escape.html(
@@ -85,6 +86,13 @@ module Hanami
 
         private
 
+        # @since 1.1.1
+        # @api private
+        def _options(options)
+          current_locals = locals.reject { |key, _| @view.respond_to?(key) }
+          Options.build(options, current_locals, format)
+        end
+
         # @since 0.4.2
         # @api private
         def layout

data/lib/hanami/view/rendering/subscope.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "hanami/view/rendering/scope"
+require "hanami/view/rendering/options"
+
+module Hanami
+  module View
+    module Rendering
+      # Rendering subscope
+      #
+      # @since 1.1.1
+      # @api private
+      #
+      # @see Hanami::View::Rendering::Scope
+      class Subscope < Scope
+        # Implements "respond to" logic
+        #
+        # @return [TrueClass,FalseClass]
+        #
+        # @since 1.1.1
+        # @api private
+        #
+        # @see http://ruby-doc.org/core/Object.html#method-i-respond_to_missing-3F
+        def respond_to_missing?(m, _include_all)
+          @locals.key?(m)
+        end
+
+        protected
+
+        # @since 1.1.1
+        # @api private
+        def method_missing(m, *args, &block)
+          ::Hanami::View::Escape.html(
+            # FIXME: this isn't compatible with Hanami 2.0, as it extends a view
+            # that we want to be frozen in the future
+            #
+            # See https://github.com/hanami/view/issues/130#issuecomment-319326236
+            if @locals.key?(m)
+              @locals[m]
+            else
+              super
+            end
+          )
+        end
+
+        private
+
+        # @since 1.1.1
+        # @api private
+        def _options(options)
+          Options.build(options, locals, format)
+        end
+      end
+    end
+  end
+end

data/lib/hanami/view/rendering/template.rb

@@ -52,7 +52,7 @@ module Hanami
 
         # @api private
         def scope
-          Scope.new(@view, @options[:locals])
+          Subscope.new(@view, @options[:locals])
         end
 
         # @since 0.5.0

data/lib/hanami/view/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -113,12 +113,14 @@ files:
 - lib/hanami/view/rendering/null_layout.rb
 - lib/hanami/view/rendering/null_local.rb
 - lib/hanami/view/rendering/null_template.rb
+- lib/hanami/view/rendering/options.rb
 - lib/hanami/view/rendering/partial.rb
 - lib/hanami/view/rendering/partial_file.rb
 - lib/hanami/view/rendering/partial_finder.rb
 - lib/hanami/view/rendering/partial_templates_finder.rb
 - lib/hanami/view/rendering/registry.rb
 - lib/hanami/view/rendering/scope.rb
+- lib/hanami/view/rendering/subscope.rb
 - lib/hanami/view/rendering/template.rb
 - lib/hanami/view/rendering/template_finder.rb
 - lib/hanami/view/rendering/template_name.rb
@@ -146,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: View layer for Hanami, with a separation between views and templates