hanami 2.1.0.beta1 → 2.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7770e05814c2c09affa6bb627a563f56f64601e2587c474f5139c42a17d25c
-  data.tar.gz: 67e7f5b426b6e50023f5c3baad3b91d422b1c82dcc25213f4d6fe4efab0ff681
+  metadata.gz: 06d7766d5bdb4f510945a2065cc15457acbf00f43970d691afda74219f0aeb02
+  data.tar.gz: 58935ca7f23c3d3612a91b277827ed941c30839d04c9bf577e35a095fa667f6f
 SHA512:
-  metadata.gz: eeb3695b89718d12ca4d6376b997af52a21fe39e39e8b8e2e932422d291314a9b8bc1f11ade96279737847283234a783039e8e7e0364fc488def2ab18f8efaf5
-  data.tar.gz: 63cf7e291a0b6789eb16430ce0c1945ce945787fab250c8e804869276428045404d0f98205fdf481c9a80e48cf89b38a243bff00b52a900349fcffef5cc62254
+  metadata.gz: 50a785250f4cf249c5721dd37a5e5a7a240282e5d3820fe848a53c133b1727ea57e5beb351429e636bb4a7d89812bfc53794b5357865b134598a5d54e60666db
+  data.tar.gz: 677f40136e0477c57e493e41ed9a25666d9b53d6dd4ae4c23ee6e61d062f9537c39d86eb16d264f194eda4209e5eb0e38fa0554fd3efaf2d39ea23afa1ead27b

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 The web, with simplicity.
 
+## v2.1.0.beta2 - 2023-10-04
+
+### Added
+
+- [Luca Guidi, Tim Riley] Reimplement assets integration (#1319, #1332, #1333, #1336)
+- [Tim Riley] Introduce `Hanami::Helpers::AssetsHelper`, automatically included in view templates, scopes and parts when hanami-assets is bundled (#1319)
+- [Tim Riley] Renamed assets helpers (#1319):
+  - Removed `#asset_path` in favour of `#asset_url` only
+  - Renamed `#javascript` to `#javascript_tag`, retaining `#js` alias
+  - Renamed `#stylesheet` to `#stylesheet_link_tag`, retaining `#css` alias
+  - Renamed `#image` to `#image_tag`
+  - Renamed `#favicon` to `#favicon_link_tag`, with `#favicon` retained as an alias
+  - Renamed `#video` to `#video_tag`
+  - Renamed `#audio` to `#audio_tag`
+
+
+### Fixed
+
+- [Tim Riley] Return appropriate response statuses based on error type (#1330)
+
 ## v2.1.0.beta1 - 2023-06-29
 
 ### Added
@@ -23,10 +43,6 @@ The web, with simplicity.
 
 ## v2.0.3 - 2023-02-01
 
-### Added
-
-- [Luca Guidi] Official support for Ruby 3.2
-
 ### Fixed
 
 - [Adam Lassek] Ensure to setup a logger in a non-default Hanami env

data/README.md

@@ -62,7 +62,7 @@ You can give back to Open Source, by supporting Hanami development via [GitHub S
 * Guides: https://guides.hanamirb.org
 * Snippets: https://snippets.hanamirb.org
 * Mailing List: http://hanamirb.org/mailing-list
-* API Doc: http://rdoc.info/gems/hanami
+* API Doc: https://gemdocs.org/gems/hanami/latest
 * Bugs/Issues: https://github.com/hanami/hanami/issues
 * Stack Overflow: http://stackoverflow.com/questions/tagged/hanami
 * Forum: https://discourse.hanamirb.org

data/lib/hanami/app.rb

@@ -161,6 +161,11 @@ module Hanami
           require_relative "providers/rack"
           register_provider(:rack, source: Hanami::Providers::Rack, namespace: true)
         end
+
+        if Hanami.bundled?("hanami-assets")
+          require_relative "providers/assets"
+          register_provider(:assets, source: Providers::Assets.for_slice(self))
+        end
       end
 
       def prepare_autoloader

data/lib/hanami/config/actions.rb

@@ -99,12 +99,7 @@ module Hanami
         super()
 
         @base_config = Hanami::Action.config.dup
-        @content_security_policy = ContentSecurityPolicy.new do |csp|
-          if assets_server_url = options[:assets_server_url]
-            csp[:script_src] += " #{assets_server_url}"
-            csp[:style_src] += " #{assets_server_url}"
-          end
-        end
+        @content_security_policy = ContentSecurityPolicy.new
 
         configure_defaults
       end
@@ -118,7 +113,9 @@ module Hanami
       private :initialize_copy
 
       # @api private
-      def finalize!
+      def finalize!(app_config)
+        @base_config.root_directory = app_config.root
+
         # A nil value for `csrf_protection` means it has not been explicitly configured
         # (neither true nor false), so we can default it to whether sessions are enabled
         self.csrf_protection = sessions.enabled? if csrf_protection.nil?

data/lib/hanami/config/assets.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "dry/configurable"
+require "hanami/assets"
+
+module Hanami
+  class Config
+    # Hanami assets config
+    #
+    # This exposes all the settings from the standalone `Hanami::Assets` class, pre-configured with
+    # sensible defaults for actions within a full Hanami app. It also provides additional settings
+    # for further integration of actions with other full stack app components.
+    #
+    # @since 2.1.0
+    # @api public
+    class Assets
+      include Dry::Configurable
+
+      # @!attribute [rw] serve
+      #   Serve static assets.
+      #
+      #   When this is `true`, the app will serve static assets.
+      #
+      #   If not set, this will:
+      #
+      #     * Check if the `HANAMI_SERVE_ASSETS` environment variable is set to `"true"`.
+      #     * If not, it will check if the app is running in the `development` or `test` environment.
+      #
+      #   @example
+      #     config.assets.serve = true
+      #
+      #   @return [Hanami::Config::Actions::Cookies]
+      #
+      #   @api public
+      #   @since 2.1.0
+      setting :serve
+
+      # @api private
+      attr_reader :base_config
+      protected :base_config
+
+      # @api private
+      def initialize(*, **options)
+        super()
+
+        @base_config = Hanami::Assets::Config.new(**options)
+
+        configure_defaults
+      end
+
+      # @api private
+      def initialize_copy(source)
+        super
+        @base_config = source.base_config.dup
+      end
+      private :initialize_copy
+
+      private
+
+      def configure_defaults
+        self.serve =
+          if ENV.key?("HANAMI_SERVE_ASSETS")
+            ENV["HANAMI_SERVE_ASSETS"] == "true"
+          else
+            Hanami.env?(:development, :test)
+          end
+      end
+
+      def method_missing(name, *args, &block)
+        if config.respond_to?(name)
+          config.public_send(name, *args, &block)
+        elsif base_config.respond_to?(name)
+          base_config.public_send(name, *args, &block)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(name, _incude_all = false)
+        config.respond_to?(name) || base_config.respond_to?(name) || super
+      end
+    end
+  end
+end

data/lib/hanami/config/null_config.rb

@@ -9,6 +9,9 @@ module Hanami
     # loaded)
     class NullConfig
       include Dry::Configurable
+
+      def finalize!(*)
+      end
     end
   end
 end

data/lib/hanami/config.rb

@@ -99,6 +99,7 @@ module Hanami
       rack.monitor
       routes
       settings
+      assets
     ]
 
     # @!attribute [rw] no_auto_register_paths
@@ -263,6 +264,7 @@ module Hanami
     attr_reader :assets
 
     # @api private
+    # rubocop:disable Metrics/AbcSize
     def initialize(app_name:, env:)
       @app_name = app_name
       @env = env
@@ -275,10 +277,6 @@ module Hanami
 
       @logger = Config::Logger.new(env: env, app_name: app_name)
 
-      # TODO: Make assets config dependent
-      require "hanami/assets/app_config"
-      @assets = Hanami::Assets::AppConfig.new
-
       @actions = load_dependent_config("hanami-controller") {
         require_relative "config/actions"
         Actions.new
@@ -295,8 +293,22 @@ module Hanami
         Views.new
       }
 
+      @assets = load_dependent_config("hanami-assets") {
+        require_relative "config/assets"
+
+        public_dir = root.join("public")
+
+        Hanami::Config::Assets.new(
+          # TODO: check if `sources` are still needed
+          sources: root.join("app", "assets"),
+          destination: public_dir.join("assets"),
+          manifest_path: public_dir.join("assets.json")
+        )
+      }
+
       yield self if block_given?
     end
+    # rubocop:enable Metrics/AbcSize
 
     # @api private
     def initialize_copy(source)
@@ -323,7 +335,7 @@ module Hanami
     def finalize!
       # Finalize nested configs
       assets.finalize!
-      actions.finalize!
+      actions.finalize!(self)
       views.finalize!
       logger.finalize!
       router.finalize!

data/lib/hanami/extensions/action.rb

@@ -94,10 +94,12 @@ module Hanami
         end
 
         # @api private
-        def _handle_exception(request, _response, exception)
+        def _handle_exception(request, _response, _exception)
+          super
+        rescue StandardError => exception
           rack_monitor&.instrument(:error, exception: exception, env: request.env)
 
-          super
+          raise
         end
 
         # @api private

data/lib/hanami/extensions/view/standard_helpers.rb

@@ -8,6 +8,10 @@ module Hanami
         include Hanami::View::Helpers::NumberFormattingHelper
         include Hanami::View::Helpers::TagHelper
         include Helpers::FormHelper
+
+        if Hanami.bundled?("hanami-assets")
+          include Helpers::AssetsHelper
+        end
       end
     end
   end