hanami-view 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f2330d18d5d01dad4e71e60e5e0d2994f0c9d1
-  data.tar.gz: b196bfb91c3dc4ec9cfa8c9aef685aec2d2d6573
+  metadata.gz: f3f3b5a91fabf790905218d179350b9ca5b09ea5
+  data.tar.gz: 90708fec73255ef891fa0210527ea32bf49c82a5
 SHA512:
-  metadata.gz: 95798a89b29c1e0b5fb5d5def1d21f5af74f33f3e0794af05aae36215d54f4211f61c820ded675223cfe23c1c0eb5d91840c85af343de3c885f762a8db7600fa
-  data.tar.gz: 107858f14f6918b489c1dee2e2e0f3c5e8d9e368fcf4d46678356a1c05a9dd14dc9e0759549eea8656b37041357351b6ea3324f9229e7748ff4247be2db95b99
+  metadata.gz: e414c7c8df49dfa4e33ff5e694baa9408ac8336aff315f631044ed8f86300dfbad8fdf066bed6e8227ba96d77c2e6e46cf20600d0cc7480e56ed83e55429f1f3
+  data.tar.gz: b21512ad851b40cd8dca788ff9c93ae98f40eec8a1087ee855e2c8858324543f45d3c403872b061f1c772f1a42d10332830f66f43607c3a2da7fec83b111f0b9

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::View
 View layer for Hanami
 
+## v1.0.1 - 2017-08-04
+### Added
+- [Luca Guidi] Compatibility with `haml` 5.0
+
 ## v1.0.0 - 2017-04-06
 
 ## v1.0.0.rc1 - 2017-03-31

data/hanami-view.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tilt',         '~> 2.0', '>= 2.0.1'
   spec.add_runtime_dependency 'hanami-utils', '~> 1.0'
 
-  spec.add_development_dependency 'bundler',  '~> 1.5'
-  spec.add_development_dependency 'minitest', '~> 5'
-  spec.add_development_dependency 'rake',     '~> 11'
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rspec',   '~> 3.5'
+  spec.add_development_dependency 'rake',    '~> 11'
 end

data/lib/hanami/view/errors.rb

@@ -26,7 +26,7 @@ module Hanami
 
     # Missing format error
     #
-    # This is raised at the runtime when rendering context lacks of the :format
+    # This is raised at the runtime when rendering context lacks the :format
     # key.
     #
     # @since 0.1.0
@@ -37,7 +37,7 @@ module Hanami
 
     # Missing template layout error
     #
-    # This is raised at the runtime when Hanami::Layout cannot find it's template.
+    # This is raised at the runtime when Hanami::Layout cannot find its template.
     #
     # @since 0.5.0
     class MissingTemplateLayoutError < Error
@@ -47,5 +47,20 @@ module Hanami
         super("Can't find layout template '#{ template }'")
       end
     end
+
+    # Unknown or missing render type
+    #
+    # This is raised at the runtime when Hanami::Layout doesn't recognize the render type.
+    #
+    # @since X.X.X
+    class UnknownOrMissingRenderTypeLayoutError < Error
+      # @since X.X.X
+      # @api private
+      def initialize(known_types, supplied_options)
+        known_types_list = known_types.map{|t| "':#{t}'"}.join(', ')
+        supplied_options_list = supplied_options.keys.map{|t| "':#{t}'"}.join(', ')
+        super("Calls to `render` in a layout must include one of #{known_types_list}. Found #{supplied_options_list}.")
+      end
+    end
   end
 end

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

@@ -4,6 +4,14 @@ require 'hanami/utils/escape'
 module Hanami
   module View
     module Rendering
+        
+      # List of render types that exactly one of must be included when calling `#render`. 
+      # For example, when calling `<%= render something: 'my_thing', locals: {} %>`,
+      # 'something' must be one of the values listed here.
+      # 
+      # @since X.X.X
+      KNOWN_RENDER_TYPES = [:partial, :template]
+
       # Scope for layout rendering
       #
       # @since 0.1.0
@@ -87,6 +95,9 @@ module Hanami
         #   #
         #   # `user` will be available in the scope of the sidebar rendering
         def render(options)
+          if !KNOWN_RENDER_TYPES.any?{|render_type| options[render_type]}
+            ::Kernel.raise UnknownOrMissingRenderTypeLayoutError.new(KNOWN_RENDER_TYPES, options)
+          end
           renderer(options).render
         end
 
@@ -213,7 +224,11 @@ module Hanami
         #   # `article` will be looked up in the view scope first.
         #   # If not found, it will be searched within the layout.
         def method_missing(m, *args, &blk)
-          if @scope.respond_to?(m)
+          # 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 @scope.respond_to?(m, true)
             @scope.__send__(m, *args, &blk)
           elsif layout.respond_to?(m)
             layout.__send__(m, *args, &blk)

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

@@ -57,7 +57,11 @@ module Hanami
         #
         # @see http://ruby-doc.org/core/Object.html#method-i-respond_to_missing-3F
         def respond_to_missing?(m, include_all)
-          @view.respond_to?(m) ||
+          # 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
+          @view.respond_to?(m, include_all) ||
             @locals.key?(m)
         end
 
@@ -65,7 +69,11 @@ module Hanami
         # @api private
         def method_missing(m, *args, &block)
           ::Hanami::View::Escape.html(
-            if @view.respond_to?(m)
+            # 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 @view.respond_to?(m, true)
               @view.__send__ m, *args, &block
             elsif @locals.key?(m)
               @locals[m]

data/lib/hanami/view/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -59,19 +59,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement