hanami-view 2.0.0.alpha6 → 2.0.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 728dfbae92fb7d572546e53f1825fcdaf62e65516cc37239adedc6ee4cb53180
-  data.tar.gz: 7141aecb976e943a354edf1e737dc89fa1f9909789963e04a80fe6bcfd6b90a0
+  metadata.gz: 5f1426ce046073c71aeffe9a171b0b0343704686bb92b75046526858ca82f9e8
+  data.tar.gz: 14a7f4078a42e3abd63e5411da1a2fa4b19fdfeaf405184c9c1f11bda7e78210
 SHA512:
-  metadata.gz: be9ca9902d8e234749fab079f9a6c67593d8e0c657534729530e1b189a0096cb4592c3a7834ca5a817a23a91b2a0c1b1ea9a4d0fb0fe02f203bf762f4b94d704
-  data.tar.gz: 191de385de5777d639263270d8dfb6c5539766d28e1b545b62008d50c0ff7e6ac671b6287346b5c91288ffbbcaae79e717f5543c2eabcc95be03cd665a1780ff
+  metadata.gz: 1a0f2cca15e556ee2c93396f730c6b68d3a7799ec0c2cbebc574b5c73c0315d2192c89ad8d85ad1b273d03b80132b3acf2348befab3c7f22fff28b1ef7e82667
+  data.tar.gz: 5032a5b1c0891a369bf518cf12d0baad00dcfb688ac41625dd61818b635b8ef6dea498a574c9558249a0beb2cd905553b253bb5a0a8b82245030664d0f7bd629

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Hanami::View
 View layer for Hanami
 
+## v2.0.0.alpha7 - 2022-03-08
+
+### Added
+- [Luca Guidi] Automatically inject the app's `settings` and `assets` components (if present) into instances of `Hanami::View::ApplicationContext`
+- [Luca Guidi] Temporarily added to `Hanami::View::ApplicationContext` the `#content_for`, `#current_path` `#csrf_token` helpers, ported from the hanami-2-application-template. Some of those helpers will be moved to `hanami-helpers` gem in a later release.
+
+### Changed
+- [Sean Collins] For views within an Hanami application, changed default location for templates from "web/templates" to "templates"
+- [Luca Guidi] For views within an Hanami application, the default `part_namespace` is now `"view/parts"` (previously `"views/parts"`)
+
+## Fixed
+- [Luca Guidi] Application-level configuration is now applied to `Hanami::View` subclasses, no matter how deep their inheritance chain (e.g. app base view -> slice base view -> slice view)
+
 ## v2.0.0.alpha6 - 2022-02-10
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 3.0 and 3.1

data/lib/hanami/view/application_configuration.rb

@@ -8,7 +8,7 @@ module Hanami
     class ApplicationConfiguration
       include Dry::Configurable
 
-      setting :parts_path, default: "views/parts"
+      setting :parts_path, default: "view/parts"
 
       def initialize(*)
         super
@@ -41,7 +41,7 @@ module Hanami
       attr_reader :base_config
 
       def configure_defaults
-        self.paths = ["web/templates"]
+        self.paths = ["templates"]
         self.template_inference_base = "views"
         self.layout = "application"
       end

data/lib/hanami/view/application_context.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "hanami/view/errors"
+
 module Hanami
   class View
     class ApplicationContext < Module
@@ -20,11 +22,15 @@ module Hanami
 
       def define_initialize
         inflector = application.inflector
+        settings = application[:settings] if application.key?(:settings)
         routes = application[:routes_helper] if application.key?(:routes_helper)
+        assets = application[:assets] if application.key?(:assets)
 
         define_method :initialize do |**options|
           @inflector = options[:inflector] || inflector
+          @settings = options[:settings] || settings
           @routes = options[:routes] || routes
+          @assets = options[:assets] || assets
           super(**options)
         end
       end
@@ -32,6 +38,36 @@ module Hanami
       module InstanceMethods
         attr_reader :inflector
         attr_reader :routes
+        attr_reader :settings
+
+        def initialize(**args)
+          defaults = {content: {}}
+
+          super(**defaults.merge(args))
+        end
+
+        def content_for(key, value = nil, &block)
+          content = _options[:content]
+          output = nil
+
+          if block
+            content[key] = yield
+          elsif value
+            content[key] = value
+          else
+            output = content[key]
+          end
+
+          output
+        end
+
+        def current_path
+          request.fullpath
+        end
+
+        def csrf_token
+          request.session[Hanami::Action::CSRFProtection::CSRF_TOKEN]
+        end
 
         def request
           _options.fetch(:request)
@@ -45,6 +81,11 @@ module Hanami
           response.flash
         end
 
+        def assets
+          @assets or
+            raise Hanami::View::MissingProviderError.new("hanami-assets")
+        end
+
         private
 
         # TODO: create `Request#flash` so we no longer need the `response`

data/lib/hanami/view/errors.rb

@@ -2,6 +2,11 @@
 
 module Hanami
   class View
+    # @since 2.0.0
+    # @api public
+    class Error < StandardError
+    end
+
     # Error raised when critical settings are not configured
     #
     # @api private
@@ -40,5 +45,13 @@ module Hanami
         super(msg)
       end
     end
+
+    # @since 2.0.0
+    # @api public
+    class MissingProviderError < Error
+      def initialize(provider)
+        super("#{provider.inspect} is missing")
+      end
+    end
   end
 end

data/lib/hanami/view/version.rb

@@ -3,6 +3,6 @@
 module Hanami
   class View
     # @api private
-    VERSION = "2.0.0.alpha6"
+    VERSION = "2.0.0.alpha7"
   end
 end

data/lib/hanami/view.rb

@@ -235,9 +235,10 @@ module Hanami
     def self.inherited(subclass)
       super
 
-      # If inheriting directly from Hanami::View within an Hanami app, configure
-      # the view for the application
-      if subclass.superclass == View && (provider = application_provider(subclass))
+      # When inheriting within an Hanami app, and the application provider has
+      # changed from the superclass, (re-)configure the action for the provider,
+      # i.e. for the slice and/or the application itself
+      if (provider = application_provider(subclass)) && provider != application_provider(subclass.superclass)
         subclass.include ApplicationView.new(provider)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha6
+  version: 2.0.0.alpha7
 platform: ruby
 authors:
 - Tim Riley
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby