hanami-view 1.2.1 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bd8111fc0f2c00a03f7a4020932a2f35f672e8fd93a7db28865fb8c4116053b
-  data.tar.gz: 4b3b34acf3bc9dd63f58866d5c023063c94826add5d8ad54baa522030ee5185b
+  metadata.gz: 9f100d8a194322c23df67578b55d851460fcca93fb7c4302f5a73478829ca079
+  data.tar.gz: f6952d1e8d562ad3de2bdf281a906bf5db7e152f9725769cf92a487ef6ccb44a
 SHA512:
-  metadata.gz: a66c97948ce7e2838e5a9772157ac9850c81f382caf278dc62a1e2123ca186d802111ee6699199a0d659433caeed868379be4a63626fd9bf3ed1c8c6a74264de
-  data.tar.gz: 774d9cb89c4300314420042be8873cfc463e9fc2858ae2d7fcc2676ac6e5176d6fc53883b77ddd565bbc5c17a880982b76af6820e5aecfa254fa43c4a379da7d
+  metadata.gz: 2e47e684ee507d0ee4977fc03f8d2808876b0b0d77b954152eafe8900b369ea0a4d3be7ba52e9342791ef14bb3a575ade092e8c65126b0e54ae235693d4abf62
+  data.tar.gz: ad9e79bf19fe03863ee01ff57e652116b7d218bfa64b5aa25d8b439d9ff87047de19d419a7317c43e7512ffdae89cbf6fe4f0bd7e59996d603cfb2034bece1c9

data/CHANGELOG.md

@@ -1,13 +1,10 @@
 # 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`)
-
+## v1.3.0.beta1 - 2018-08-08
 ### 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
+- [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.0 - 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.2'
+  spec.add_runtime_dependency 'hanami-utils', '~> 1.3.beta'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rspec',   '~> 3.7'

data/lib/hanami/layout.rb

@@ -2,7 +2,6 @@ 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
@@ -117,12 +116,7 @@ module Hanami
 
     # Initialize a layout
     #
-    # @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 scope [Hanami::View::Rendering::Scope] view rendering scope
     # @param rendered [String] the output of the view rendering process
     #
     # @api private
@@ -130,19 +124,7 @@ module Hanami
     #
     # @see Hanami::View::Rendering#render
     def initialize(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
+      @scope, @rendered = View::Rendering::LayoutScope.new(self, scope), rendered
     end
 
     # Render the layout

data/lib/hanami/view/configuration.rb

@@ -92,7 +92,7 @@ module Hanami
       def self.for(base)
         # TODO this implementation is similar to Hanami::Controller::Configuration consider to extract it into Hanami::Utils
         namespace = Utils::String.namespace(base)
-        framework = Utils::Class.load_from_pattern!("(#{namespace}|Hanami)::View")
+        framework = Utils::Class.load("#{namespace}::View") || Utils::Class.load!('Hanami::View')
         framework.configuration
       end
 

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

@@ -66,7 +66,7 @@ module Hanami
           when Symbol, String
             # TODO Move this low level logic into a Hanami::Utils solution
             class_name = "#{ Utils::String.classify(layout) }#{ SUFFIX }"
-            namespace  = Utils::Class.load_from_pattern!(namespace)
+            namespace  = Utils::Class.load!(namespace)
             namespace.const_get(class_name)
           when Class
             layout

data/lib/hanami/view/version.rb

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

metadata

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

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

@@ -1,26 +0,0 @@
-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