hanami-view 2.0.0.alpha3 → 2.0.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b6dc01adb32ad3baabc7a15012119e8814de8ec999c4b5da2009204c3b047c
-  data.tar.gz: 8ef681f6101b085dec6e03f6de0815dfa55d8cbd91e960bf0144e4a46da5cce9
+  metadata.gz: 5f1426ce046073c71aeffe9a171b0b0343704686bb92b75046526858ca82f9e8
+  data.tar.gz: 14a7f4078a42e3abd63e5411da1a2fa4b19fdfeaf405184c9c1f11bda7e78210
 SHA512:
-  metadata.gz: b5704c147558d2a0e3e86d59f3b665ee65265a9398584b1d3478970551d9a022551ea04420444622c2c4967ab3406d29ea9dab7c13462207364ea985aa4af723
-  data.tar.gz: 5909511de76e1daf91a375c5947103040c2ec40208ea52882771204249cc2d4aef23d2ceaa8dac24cc960dbba978f3e4c6c08fac52118673b9c22580571f10fb
+  metadata.gz: 1a0f2cca15e556ee2c93396f730c6b68d3a7799ec0c2cbebc574b5c73c0315d2192c89ad8d85ad1b273d03b80132b3acf2348befab3c7f22fff28b1ef7e82667
+  data.tar.gz: 5032a5b1c0891a369bf518cf12d0baad00dcfb688ac41625dd61818b635b8ef6dea498a574c9558249a0beb2cd905553b253bb5a0a8b82245030664d0f7bd629

data/CHANGELOG.md

@@ -1,6 +1,30 @@
 # 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
+
+### Changed
+- [Luca Guidi] Drop support for Ruby: MRI 2.3, 2.4, 2.5, 2.6, and 2.7.
+
+## v2.0.0.alpha5 - 2022-01-12
+### Added
+- [Marc Busqué] Automatically provide access to Hanami application routes helper as `routes` in default application view context (`Hanami::View::ApplicationContext`)
+
 ## v2.0.0.alpha3 - 2021-11-09
 ### Added
 - [Pablo Vicente] Raise `LayoutNotFoundError` exception with friendlier, more specific error message when layouts cannot be found

data/README.md

@@ -26,7 +26,7 @@ A view layer for [Hanami](http://hanamirb.org)
 
 ## Rubies
 
-__Hanami::view__ supports Ruby (MRI) 2.6+
+__Hanami::view__ supports Ruby (MRI) 3.0+
 
 ## Installation
 

data/hanami-view.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.executables   = []
   spec.require_paths = ['lib']
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   spec.metadata['changelog_uri']     = 'https://github.com/hanami/view/blob/main/CHANGELOG.md'
   spec.metadata['source_code_uri']   = 'https://github.com/hanami/view'
   spec.metadata['bug_tracker_uri']   = 'https://github.com/hanami/view/issues'
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-configurable", "~> 0.13", ">= 0.13.0"

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,34 +1,97 @@
 # frozen_string_literal: true
 
+require "hanami/view/errors"
+
 module Hanami
   class View
-    module ApplicationContext
-      def initialize(inflector: Hanami.application.inflector, **options)
-        @inflector = inflector
-        super
-      end
+    class ApplicationContext < Module
+      attr_reader :provider
+      attr_reader :application
 
-      def inflector
-        @inflector
+      def initialize(provider)
+        @provider = provider
+        @application = provider.respond_to?(:application) ? provider.application : Hanami.application
       end
 
-      def request
-        _options.fetch(:request)
+      def included(context_class)
+        define_initialize
+        context_class.include(InstanceMethods)
       end
 
-      def session
-        request.session
-      end
+      private
+
+      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)
 
-      def flash
-        response.flash
+        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
 
-      private
+      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)
+        end
+
+        def session
+          request.session
+        end
+
+        def flash
+          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`
-      def response
-        _options.fetch(:response)
+        # TODO: create `Request#flash` so we no longer need the `response`
+        def response
+          _options.fetch(:response)
+        end
       end
     end
   end

data/lib/hanami/view/context.rb

@@ -23,8 +23,9 @@ module Hanami
         super
 
         # When inheriting within an Hanami app, add application context behavior
-        if application_provider(subclass)
-          subclass.include ApplicationContext
+        provider = application_provider(subclass)
+        if provider
+          subclass.include ApplicationContext.new(provider)
         end
       end
 

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.alpha3"
+    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.alpha3
+  version: 2.0.0.alpha7
 platform: ruby
 authors:
 - Tim Riley
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -184,6 +184,7 @@ homepage: https://dry-rb.org/gems/hanami-view
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
   changelog_uri: https://github.com/hanami/view/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/hanami/view
@@ -196,14 +197,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A complete, standalone view rendering system that gives you everything you