hanami-view 1.3.0.beta1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f100d8a194322c23df67578b55d851460fcca93fb7c4302f5a73478829ca079
-  data.tar.gz: f6952d1e8d562ad3de2bdf281a906bf5db7e152f9725769cf92a487ef6ccb44a
+  metadata.gz: 4ed81e3efb1ae0ba5ecac568b5be54a37756d25196703320340a2117cd9f80d8
+  data.tar.gz: 8938dfb849c7c5acb62810a8f92c6ca91b453466e0f8183b044a7d2e35ea6f42
 SHA512:
-  metadata.gz: 2e47e684ee507d0ee4977fc03f8d2808876b0b0d77b954152eafe8900b369ea0a4d3be7ba52e9342791ef14bb3a575ade092e8c65126b0e54ae235693d4abf62
-  data.tar.gz: ad9e79bf19fe03863ee01ff57e652116b7d218bfa64b5aa25d8b439d9ff87047de19d419a7317c43e7512ffdae89cbf6fe4f0bd7e59996d603cfb2034bece1c9
+  metadata.gz: 18693737891ce62ff4d4f7c862ad0fd3096373d630d9b6ca60435ff8e4bbd35b3f565ddf69dc3732255232d991c5a95fe35e2a454a04522d16c0d9bae033a66d
+  data.tar.gz: 49a3bfa0efe3b98fff11db2c7af4fcbd65c2dc14e4abc07f7ca843a8eb6524ea1eca493d1cd1dc91fef91f53068258839b380d379edc3efc1a7ea7b9749f1519

data/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Hanami::View
 View layer for Hanami
 
+## v1.3.0 - 2018-10-24
+
 ## v1.3.0.beta1 - 2018-08-08
 ### Fixed
 - [Ferdinand Niedermann] Ensure to set `:disable_escape` option only for Slim and don't let Tilt to emit a warning for other template engines.
 - [glaszig] Ensure partial rendering to respect `format` overriding
 
+## 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/hanami-view.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency 'tilt',         '~> 2.0', '>= 2.0.1'
-  spec.add_runtime_dependency 'hanami-utils', '~> 1.3.beta'
+  spec.add_runtime_dependency 'hanami-utils', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rspec',   '~> 3.7'

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta1
+  version: 1.3.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -143,9 +144,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7