hanami 2.1.0.rc2 → 2.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6835d72654251d1461ea2ad61c9fe56ad9b37b0ff333d23dc444e205b32ab1
-  data.tar.gz: 3daf6e28931aa6abf0c3579d95c8e403c1ba12bbcb5879549825e03ae8e81556
+  metadata.gz: f126bd2f756323d71dfe0eedd34a45f998882fd1ef2e0afcc8d05c27de224e3a
+  data.tar.gz: c9b360c13dbb7ce88e935df753a4d9ec4234f02bc625c403664fb44617ff6261
 SHA512:
-  metadata.gz: 4b79171920231066598260223766e9abaee75806c751bcf83ca9ddaa93ef2eabef1fabc3077674cb81f25e435fa8659a04f9c272200a4ed27fa02c271ac03531
-  data.tar.gz: 04072a74f320abda02874ace16c616db0f3db9bb63de4d3b00746f3c1898c1dc58a143abd47915c9ef0a32b0a5eda860bd9264bccd375779d87bb101e4686dc1
+  metadata.gz: ef015d93dfbd94b0f0617cc0966f1d081e06859b2559de39c3b180dc9afc9d0e9034d53dc66117ea7305e80afd8f643a4204246dcba202da8f3c49b59c108426
+  data.tar.gz: bced4c311fbcf6ee66e3036cb70fd9f9edc7cb897f6ff26eca660b30a94629297ec5abc3dfb5c849d04f682f66d45e0c2aa55b46829b9ce7b5edeef80a3e9247

data/CHANGELOG.md

@@ -2,7 +2,21 @@
 
 The web, with simplicity.
 
-## Changed
+## v2.1.0.rc3 - 2024-02-16
+
+### Changed
+
+- [Tim Riley] Return `nil` when setting content via `#content_for` on the app's view context. This
+  allows it to be used with tempalte output tags (such as ERB's `<%=`) that capture a block for the
+  given content. (#1369)
+
+## Fixed
+
+- [Tim Riley] Ensure assets Rake task for Heroku works (#1368)
+
+## v2.1.0.rc2 - 2023-11-08
+
+### Changed
 
 - [Tim Riley] Enable `config.render_detailed_errors` in development mode only by default. (#1365)
 - [Tim Riley] Remove current_path from context (#1362)

data/hanami.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-monitor",      "~> 1.0", ">= 1.0.1", "< 2"
   spec.add_dependency "dry-system",       "~> 1.0", "< 2"
   spec.add_dependency "dry-logger",       "~> 1.0", "< 2"
-  spec.add_dependency "hanami-cli",       "~> 2.1.rc"
+  spec.add_dependency "hanami-cli",       "= 2.1.0.rc3"
   spec.add_dependency "hanami-utils",     "~> 2.1.rc"
   spec.add_dependency "zeitwerk",         "~> 2.6"
 

data/lib/hanami/app.rb

@@ -161,11 +161,6 @@ 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.rb

@@ -99,7 +99,6 @@ module Hanami
       rack.monitor
       routes
       settings
-      assets
     ]
 
     # @!attribute [rw] no_auto_register_paths
@@ -309,10 +308,7 @@ module Hanami
 
       @assets = load_dependent_config("hanami-assets") {
         require_relative "config/assets"
-
-        Hanami::Config::Assets.new(
-          manifest_path: root.join("public", "assets.json")
-        )
+        Hanami::Config::Assets.new
       }
 
       yield self if block_given?

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

@@ -143,7 +143,14 @@ module Hanami
             # @since 2.1.0
             def assets
               unless @assets
-                raise Hanami::ComponentLoadError, "the hanami-assets gem is required to access assets"
+                msg =
+                  if Hanami.bundled?("hanami-assets")
+                    "Have you put files into your assets directory?"
+                  else
+                    "The hanami-assets gem is required to access assets."
+                  end
+
+                raise Hanami::ComponentLoadError, "Assets not available. #{msg}"
               end
 
               @assets
@@ -159,7 +166,7 @@ module Hanami
             # @since 2.1.0
             def request
               unless @request
-                raise Hanami::ComponentLoadError, "only views rendered from Hanami::Action instances have a request"
+                raise Hanami::ComponentLoadError, "Request not available. Only views rendered from Hanami::Action instances have a request."
               end
 
               @request
@@ -194,7 +201,7 @@ module Hanami
             #     content_for(:page_title, "Hello world")
             #
             #   @example In a template
-            #     <% content_for :page_title do %>
+            #     <%= content_for :page_title do %>
             #       <h1>Hello world</h1>
             #     <% end %>
             #
@@ -211,8 +218,10 @@ module Hanami
             def content_for(key, value = nil)
               if block_given?
                 @content_for[key] = yield
+                nil
               elsif value
                 @content_for[key] = value
+                nil
               else
                 @content_for[key]
               end

data/lib/hanami/helpers/assets_helper.rb

@@ -11,47 +11,47 @@ module Hanami
     #
     # Inject these helpers in a view
     #
-    # @since 0.1.0
+    # @since 2.1.0
     #
     # @see http://www.rubydoc.info/gems/hanami-helpers/Hanami/Helpers/HtmlHelper
     module AssetsHelper
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       NEW_LINE_SEPARATOR = "\n"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       WILDCARD_EXT = ".*"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       JAVASCRIPT_EXT = ".js"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       STYLESHEET_EXT = ".css"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       JAVASCRIPT_MIME_TYPE = "text/javascript"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       STYLESHEET_MIME_TYPE = "text/css"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       FAVICON_MIME_TYPE = "image/x-icon"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       STYLESHEET_REL = "stylesheet"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       FAVICON_REL = "shortcut icon"
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       DEFAULT_FAVICON = "favicon.ico"
 
@@ -85,7 +85,7 @@ module Hanami
       # name of the algorithm, then a hyphen, then the hash value of the file.
       # If more than one algorithm is used, they"ll be separated by a space.
       #
-      # @param sources [Array<String>] one or more assets by name or absolute URL
+      # @param source_paths [Array<String, #url>] one or more assets by name or absolute URL
       #
       # @return [Hanami::View::HTML::SafeString] the markup
       #
@@ -93,7 +93,7 @@ module Hanami
       # `subresource_integrity` modes are on and the javascript file is missing
       # from the manifest
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @see Hanami::Assets::Helpers#path
       #
@@ -189,7 +189,7 @@ module Hanami
       # name of the algorithm, then a hyphen, then the hashed value of the file.
       # If more than one algorithm is used, they"ll be separated by a space.
       #
-      # @param sources [Array<String>] one or more assets by name or absolute URL
+      # @param source_paths [Array<String, #url>] one or more assets by name or absolute URL
       #
       # @return [Hanami::View::HTML::SafeString] the markup
       #
@@ -197,7 +197,7 @@ module Hanami
       # `subresource_integrity` modes are on and the stylesheet file is missing
       # from the manifest
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @see Hanami::Assets::Helpers#path
       #
@@ -282,7 +282,7 @@ module Hanami
       # If the "CDN mode" is on, the `src` is an absolute URL of the
       # application CDN.
       #
-      # @param source [String] asset name or absolute URL
+      # @param source [String, #url] asset name, absolute URL, or asset object
       # @param options [Hash] HTML 5 attributes
       #
       # @return [Hanami::View::HTML::SafeString] the markup
@@ -291,7 +291,7 @@ module Hanami
       # `subresource_integrity` modes are on and the image file is missing
       # from the manifest
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @see Hanami::Assets::Helpers#path
       #
@@ -353,7 +353,7 @@ module Hanami
       # If the "CDN mode" is on, the `href` is an absolute URL of the
       # application CDN.
       #
-      # @param source [String] asset name
+      # @param source [String, #url] asset name or asset object
       # @param options [Hash] HTML 5 attributes
       #
       # @return [Hanami::View::HTML::SafeString] the markup
@@ -362,7 +362,7 @@ module Hanami
       # `subresource_integrity` modes are on and the favicon is file missing
       # from the manifest
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @see Hanami::Assets::Helpers#path
       #
@@ -424,7 +424,7 @@ module Hanami
       # If the "CDN mode" is on, the `src` is an absolute URL of the
       # application CDN.
       #
-      # @param source [String] asset name or absolute URL
+      # @param source [String, #url] asset name, absolute URL or asset object
       # @param options [Hash] HTML 5 attributes
       #
       # @return [Hanami::View::HTML::SafeString] the markup
@@ -436,7 +436,7 @@ module Hanami
       # @raise [ArgumentError] if source isn"t specified both as argument or
       #   tag inside the given block
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @see Hanami::Assets::Helpers#path
       #
@@ -526,7 +526,7 @@ module Hanami
       # If the "CDN mode" is on, the `src` is an absolute URL of the
       # application CDN.
       #
-      # @param source [String] asset name or absolute URL
+      # @param source [String, #url] asset name, absolute URL or asset object
       # @param options [Hash] HTML 5 attributes
       #
       # @return [Hanami::View::HTML::SafeString] the markup
@@ -538,7 +538,7 @@ module Hanami
       # @raise [ArgumentError] if source isn"t specified both as argument or
       #   tag inside the given block
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @see Hanami::Assets::Helpers#path
       #
@@ -626,7 +626,7 @@ module Hanami
       #
       # If CDN mode is on, it returns the absolute URL of the asset.
       #
-      # @param source [String] the asset name
+      # @param source_path [String, #url] the asset name or asset object
       #
       # @return [String] the asset path
       #
@@ -634,7 +634,7 @@ module Hanami
       # `subresource_integrity` modes are on and the asset is missing
       # from the manifest
       #
-      # @since 0.1.0
+      # @since 2.1.0
       #
       # @example Basic Usage
       #
@@ -666,6 +666,7 @@ module Hanami
       #
       #   # "https://assets.bookshelf.org/assets/application-28a6b886de2372ee3922fcaf3f78f2d8.js"
       def asset_url(source_path)
+        return source_path.url if source_path.respond_to?(:url)
         return source_path if _absolute_url?(source_path)
 
         _context.assets[source_path].url
@@ -673,7 +674,7 @@ module Hanami
 
       private
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       def _safe_tags(*source_paths, &blk)
         ::Hanami::View::HTML::SafeString.new(
@@ -684,7 +685,7 @@ module Hanami
       # @since 2.1.0
       # @api private
       def _typed_path(source, ext)
-        source = "#{source}#{ext}" if _append_extension?(source, ext)
+        source = "#{source}#{ext}" if source.is_a?(String) && _append_extension?(source, ext)
         asset_url(source)
       end
 
@@ -696,7 +697,7 @@ module Hanami
         _context.assets[source_path].sri
       end
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       def _absolute_url?(source)
         ABSOLUTE_URL_MATCHER.match(source)
@@ -710,7 +711,7 @@ module Hanami
         _context.assets.crossorigin?(source)
       end
 
-      # @since 0.1.0
+      # @since 2.1.0
       # @api private
       def _source_options(src, options, &blk)
         options ||= {}