hanami-view 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c5c33349b33efe1572d221dfd54d860ae04ce1b873a47e5fdfe9612af46387
-  data.tar.gz: d60517a35dca1f695b63de1a046f0e15b2af822111cf2b5d33c07ac5c0370781
+  metadata.gz: 5bd8111fc0f2c00a03f7a4020932a2f35f672e8fd93a7db28865fb8c4116053b
+  data.tar.gz: 4b3b34acf3bc9dd63f58866d5c023063c94826add5d8ad54baa522030ee5185b
 SHA512:
-  metadata.gz: b2cfcf0fe4ea4c177f5b6ecb9e2d4915af6643d6604e4365894e36e70f829105b87cdc09a3eb1bc0730f7b3af6e3fde38fdb94ae196a80cb9f41563acf4e5ce8
-  data.tar.gz: c2e700dba8c01b4529d2993ebfa9a3587190f7d2f600400de0ba5209e9dc7490d12cfbea2cd03892d28af8448489f4064c18e4a4bc093b3c6411ba5b9a5a3ed9
+  metadata.gz: a66c97948ce7e2838e5a9772157ac9850c81f382caf278dc62a1e2123ca186d802111ee6699199a0d659433caeed868379be4a63626fd9bf3ed1c8c6a74264de
+  data.tar.gz: 774d9cb89c4300314420042be8873cfc463e9fc2858ae2d7fcc2676ac6e5176d6fc53883b77ddd565bbc5c17a880982b76af6820e5aecfa254fa43c4a379da7d

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::View
 View layer for Hanami
 
+## v1.2.1 - 2018-10-16
+### Added
+- [Luca Guidi] Introduced new, backward compatible, signature to render a layout for testing purposes (eg. `ApplicationLayout.new({ format: :html }, "contents").render`)
+
+### Fixed
+- [Luca Guidi] Ensure layout to be rendered when using HAML 5
+- [Luca Guidi] Ensure to raise `NoMethodError` when an unknown method is invoked by a view/template
+
 ## v1.2.0 - 2018-04-06
 
 ## v1.2.0.rc2 - 2018-04-06

data/README.md

@@ -16,12 +16,12 @@ Like all the other Hanami components, it can be used as a standalone framework o
 
 ## Status
 
-[![Gem Version](http://img.shields.io/gem/v/hanami-view.svg)](https://badge.fury.io/rb/hanami-view)
-[![Build Status](http://img.shields.io/travis/hanami/view/master.svg)](https://travis-ci.org/hanami/view?branch=master)
-[![Coverage](http://img.shields.io/coveralls/hanami/view/master.svg)](https://coveralls.io/r/hanami/view)
-[![Code Climate](http://img.shields.io/codeclimate/github/hanami/view.svg)](https://codeclimate.com/github/hanami/view)
-[![Dependencies](http://img.shields.io/gemnasium/hanami/view.svg)](https://gemnasium.com/hanami/view)
-[![Inline docs](http://inch-ci.org/github/hanami/view.svg?branch=master)](http://inch-ci.org/github/hanami/view)
+[![Gem Version](https://badge.fury.io/rb/hanami-view.svg)](https://badge.fury.io/rb/hanami-view)
+[![TravisCI](https://travis-ci.org/hanami/view.svg?branch=master)](https://travis-ci.org/hanami/view)
+[![CircleCI](https://circleci.com/gh/hanami/view/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/view/tree/master)
+[![Test Coverage](https://codecov.io/gh/hanami/view/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/view)
+[![Depfu](https://badges.depfu.com/badges/4f5c8868d047d206f33893bc9194812d/overview.svg)](https://depfu.com/github/hanami/view?project=Bundler)
+[![Inline Docs](http://inch-ci.org/github/hanami/view.svg)](http://inch-ci.org/github/hanami/view)
 
 ## Contact
 

data/lib/hanami/layout.rb

@@ -2,6 +2,7 @@ require 'hanami/utils/class_attribute'
 require 'hanami/view/rendering/layout_registry'
 require 'hanami/view/rendering/layout_scope'
 require 'hanami/view/rendering/null_layout'
+require 'hanami/view/rendering/null_view'
 
 module Hanami
   # Layout
@@ -116,7 +117,12 @@ module Hanami
 
     # Initialize a layout
     #
-    # @param scope [Hanami::View::Rendering::Scope] view rendering scope
+    # @param scope [Hanami::View::Rendering::Scope,::Hash] view rendering scope.
+    #   Optionally a scope can be expressed as a Ruby `::Hash`, but it MUST contain
+    #   the `:format` key, to specify which template to render.
+    # @option scope [Symbol] :format the format to render (e.g. `:html`, `:xml`, `:json`)
+    #   This is mandatory only if a `:Hash` is passed as `scope`.
+    #
     # @param rendered [String] the output of the view rendering process
     #
     # @api private
@@ -124,7 +130,19 @@ module Hanami
     #
     # @see Hanami::View::Rendering#render
     def initialize(scope, rendered)
-      @scope, @rendered = View::Rendering::LayoutScope.new(self, scope), rendered
+      # NOTE: This complex data transformation is due to a combination of a bug and the intent of maintaing backward compat (SemVer).
+      # See https://github.com/hanami/view/pull/156
+      s, r = *case scope
+              when ::Hash
+                [Hanami::View::Rendering::Scope.new(Hanami::View::Rendering::NullView, scope), rendered]
+              when Hanami::View::Template
+                [Hanami::View::Rendering::Scope.new(Hanami::View::Rendering::NullView, rendered.merge(format: scope.format)), ""]
+              else
+                [scope, rendered]
+              end
+
+      @scope = View::Rendering::LayoutScope.new(self, s)
+      @rendered = r
     end
 
     # Render the layout

data/lib/hanami/view/rendering.rb

@@ -196,7 +196,7 @@ module Hanami
         #   view     = IndexView.new(template, {article: article})
         #
         #   view.article # => #<Article:0x007fb0bbd3b6e8>
-        def method_missing(m)
+        def method_missing(m, *)
           @scope.__send__ m
         end
       end

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

@@ -0,0 +1,26 @@
+module Hanami
+  module View
+    module Rendering
+      # Null Object pattern for view
+      #
+      # It's used when a layout is rendered direcly for testing purposes
+      #
+      # @api private
+      # @since 1.2.1
+      class NullView
+        # Render the layout template
+        #
+        # @return [String] an empty string
+        #
+        # @api private
+        # @since 1.2.1
+        #
+        # @see Hanami::Layout#render
+        # @see Hanami::View::Rendering#render
+        def render
+          ""
+        end
+      end
+    end
+  end
+end

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

@@ -12,9 +12,10 @@ module Hanami
         # @api private
         def self.build(options, locals, format)
           options.dup.tap do |opts|
-            opts[:format] = format
+            opts[:format] ||= format
             opts[:locals] = locals
-            opts[:locals].merge!(options.fetch(:locals) { ::Hash.new }).merge!(format: format)
+            opts[:locals].merge!(options.fetch(:locals) { ::Hash.new })
+            opts[:locals].merge!(format: opts.fetch(:format, format))
           end
         end
       end

data/lib/hanami/view/template.rb

@@ -7,9 +7,15 @@ module Hanami
     # @since 0.1.0
     class Template
       def initialize(template, encoding = Encoding::UTF_8)
-        # NOTE disable_escape: true is for Slim compatibility
-        # See https://github.com/hanami/assets/issues/36
-        @_template = Tilt.new(template, nil, default_encoding: encoding, disable_escape: true)
+        options = { default_encoding: encoding }
+
+        if slim?(template)
+          # NOTE disable_escape: true is for Slim compatibility
+          # See https://github.com/hanami/assets/issues/36
+          options[:disable_escape] = true
+        end
+
+        @_template = Tilt.new(template, nil, options)
       end
 
       # Returns the format that the template handles.
@@ -40,6 +46,12 @@ module Hanami
       def render(scope, &blk)
         @_template.render(scope, {}, &blk)
       end
+
+      private
+
+      def slim?(template)
+        File.extname(template) == ".slim".freeze
+      end
     end
   end
 end

data/lib/hanami/view/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -113,6 +113,7 @@ 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/null_view.rb
 - lib/hanami/view/rendering/options.rb
 - lib/hanami/view/rendering/partial.rb
 - lib/hanami/view/rendering/partial_file.rb
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: View layer for Hanami, with a separation between views and templates