hanami 2.1.0.rc3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f126bd2f756323d71dfe0eedd34a45f998882fd1ef2e0afcc8d05c27de224e3a
-  data.tar.gz: c9b360c13dbb7ce88e935df753a4d9ec4234f02bc625c403664fb44617ff6261
+  metadata.gz: 3f9161e98415778e746f9140d2ee9e23b7d8388eca678e7ddeb696c2bb8cdfee
+  data.tar.gz: 7deffed8c1081258db7182306bf95bf484fa9e08dbd37193ca36659a06d45040
 SHA512:
-  metadata.gz: ef015d93dfbd94b0f0617cc0966f1d081e06859b2559de39c3b180dc9afc9d0e9034d53dc66117ea7305e80afd8f643a4204246dcba202da8f3c49b59c108426
-  data.tar.gz: bced4c311fbcf6ee66e3036cb70fd9f9edc7cb897f6ff26eca660b30a94629297ec5abc3dfb5c849d04f682f66d45e0c2aa55b46829b9ce7b5edeef80a3e9247
+  metadata.gz: 1acff67204a42604558bce5455d36454cc8c176a741906750a536ae72f3048a006c798db7192918d64f06cc4b1fce7ce5c4f46726d0a27b309c82a1263b3d72b
+  data.tar.gz: aadb05898198c750f485f5a78f6d35f1e82c6b95ee052f749cfb0241b11f6706c367f7cfc01c31205664ff508853a3415884b7b729097e689d2f9f72c6bdf0fc

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 The web, with simplicity.
 
+## v2.1.0 - 2024-02-27
+
+### Changed
+
+- [Pat Allan] Pass keyword arguments through to configured middleware
+- [Tim Riley] Expect underscored slice names in `public/assets/` to avoid naming conflicts with nested asset entry points. In this arrangement, an "admin" slice will have its assets compiled into `public/assets/_admin/`.
+
 ## v2.1.0.rc3 - 2024-02-16
 
 ### Changed
@@ -10,7 +17,7 @@ The web, with simplicity.
   allows it to be used with tempalte output tags (such as ERB's `<%=`) that capture a block for the
   given content. (#1369)
 
-## Fixed
+### Fixed
 
 - [Tim Riley] Ensure assets Rake task for Heroku works (#1368)
 

data/hanami.gemspec

@@ -38,8 +38,8 @@ 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.0.rc3"
-  spec.add_dependency "hanami-utils",     "~> 2.1.rc"
+  spec.add_dependency "hanami-cli",       "~> 2.1"
+  spec.add_dependency "hanami-utils",     "~> 2.1"
   spec.add_dependency "zeitwerk",         "~> 2.6"
 
   spec.add_development_dependency "rspec",     "~> 3.8"

data/lib/hanami/helpers/assets_helper.rb

@@ -382,7 +382,7 @@ module Hanami
       #
       #   <%= favicon_tag "favicon.ico", id: "fav" %>
       #
-      #   # <link id: "fav" href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">
+      #   # <link id="fav" href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">
       #
       # @example Fingerprint Mode
       #

data/lib/hanami/providers/assets.rb

@@ -29,8 +29,7 @@ module Hanami
 
       # @api private
       def start
-        assets_dir = slice.slice_name.to_s unless slice.app.eql?(slice)
-        root = slice.app.root.join("public", "assets", assets_dir.to_s)
+        root = slice.app.root.join("public", "assets", Hanami::Assets.public_assets_dir(slice).to_s)
 
         assets = Hanami::Assets.new(config: slice.config.assets, root: root)
 

data/lib/hanami/slice/routing/middleware/stack.rb

@@ -91,16 +91,16 @@ module Hanami
           #
           # @api public
           # @since 2.0.0
-          def use(spec, *args, path_prefix: ::Hanami::Router::DEFAULT_PREFIX, before: nil, after: nil, &blk)
+          def use(spec, *args, path_prefix: ::Hanami::Router::DEFAULT_PREFIX, before: nil, after: nil, **kwargs, &blk)
             middleware = resolve_middleware_class(spec)
-            item = [middleware, args, blk]
+            item = [middleware, args, kwargs, blk]
 
             if before
               @stack[path_prefix].insert((idx = index_of(before, path_prefix)).zero? ? 0 : idx - 1, item)
             elsif after
               @stack[path_prefix].insert(index_of(after, path_prefix) + 1, item)
             else
-              @stack[path_prefix].push([middleware, args, blk])
+              @stack[path_prefix].push(item)
             end
 
             self

data/lib/hanami/version.rb

@@ -7,7 +7,7 @@ module Hanami
   # @api private
   module Version
     # @api public
-    VERSION = "2.1.0.rc3"
+    VERSION = "2.1.0"
 
     # @since 0.9.0
     # @api private

data/lib/hanami/web/welcome.html.erb

@@ -7,7 +7,7 @@
   <title>Hanami</title>
   <style>
     :root {
-      --max-width: 1024px;
+      --max-width: 768px;
       --foreground-rgb: 0, 0, 0;
       --background-rgb: 255, 255, 255;
       --card-border-rgb: 200, 200, 200;
@@ -84,7 +84,7 @@
 
     .grid {
       display: grid;
-      grid-template-columns: repeat(4, 1fr);
+      grid-template-columns: repeat(3, 1fr);
       column-gap: 20px;
       max-width: 100%;
       margin-bottom: 8vh;
@@ -182,10 +182,6 @@
         <h2>Guides</h2>
         <p>Get started with the Hanami guides</p>
       </a>
-      <a href="https://docs.hanamirb.org/" class="card">
-        <h2>API docs</h2>
-        <p>Learn more through the API docs</p>
-      </a>
       <a href="http://github.com/hanami" class="card">
         <h2>Code</h2>
         <p>Contribute to the source code</p>

data/spec/integration/assets/assets_spec.rb

@@ -133,13 +133,13 @@ RSpec.describe "Assets", :app_integration do
 
       output = Main::Slice["views.posts.show"].call.to_s
 
-      expect(output).to match(%r{<link href="/assets/main/app-[A-Z0-9]{8}.css" type="text/css" rel="stylesheet">})
-      expect(output).to match(%r{<script src="/assets/main/app-[A-Z0-9]{8}.js" type="text/javascript"></script>})
+      expect(output).to match(%r{<link href="/assets/_main/app-[A-Z0-9]{8}.css" type="text/css" rel="stylesheet">})
+      expect(output).to match(%r{<script src="/assets/_main/app-[A-Z0-9]{8}.js" type="text/javascript"></script>})
 
       assets = Main::Slice["assets"]
 
-      expect(assets["app.css"].to_s).to match(%r{/assets/main/app-[A-Z0-9]{8}.css})
-      expect(assets["app.js"].to_s).to match(%r{/assets/main/app-[A-Z0-9]{8}.js})
+      expect(assets["app.css"].to_s).to match(%r{/assets/_main/app-[A-Z0-9]{8}.css})
+      expect(assets["app.js"].to_s).to match(%r{/assets/_main/app-[A-Z0-9]{8}.js})
     end
   end
 

data/spec/integration/rack_app/middleware_spec.rb

@@ -147,6 +147,72 @@ RSpec.describe "Hanami web app", :app_integration do
     expect(last_response.body).to eql("one.two")
   end
 
+  specify "Setting a middleware that requires keyword arguments" do
+    write "config/app.rb", <<~RUBY
+      require "hanami"
+
+      module TestApp
+        class TestMiddleware
+          def initialize(app, key:, value:)
+            @app = app
+            @key = key
+            @value = value
+          end
+
+          def call(env)
+            env[@key] = @value
+            @app.call(env)
+          end
+        end
+
+        class App < Hanami::App
+          config.logger.stream = StringIO.new
+
+          # Test middleware with keywords inside config
+          config.middleware.use(TestApp::TestMiddleware, key: "from_config", value: "config")
+        end
+      end
+    RUBY
+
+    write "config/routes.rb", <<~RUBY
+      require "hanami/router"
+
+      module TestApp
+        class Routes < Hanami::Routes
+          slice :main, at: "/" do
+            # Also test middleware with keywords inside routes
+            use TestApp::TestMiddleware, key: "from_routes", value: "routes"
+
+            root to: "home.index"
+          end
+        end
+      end
+    RUBY
+
+    write "slices/main/actions/home/index.rb", <<~RUBY
+      require "hanami/action"
+
+      module Main
+        module Actions
+          module Home
+            class Index < Hanami::Action
+              def handle(request, response)
+                response.body = [request.env["from_config"], request.env["from_routes"]].join(", ")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+
+    get "/"
+
+    expect(last_response).to be_successful
+    expect(last_response.body).to eq "config, routes"
+  end
+
   specify "Setting a middleware that requires a block" do
     write "config/app.rb", <<~RUBY
       require "hanami"

data/spec/support/app_integration.rb

@@ -37,7 +37,7 @@ module RSpec
 
         write "public/assets/assets.json", JSON.generate(manifest_hash)
 
-        # An assets dir isrequired to load the assets provider
+        # An assets dir is required to load the assets provider
         write "app/assets/.keep", ""
       end
 

data/spec/unit/hanami/version_spec.rb

@@ -2,6 +2,6 @@
 
 RSpec.describe "Hanami::VERSION" do
   it "returns current version" do
-    expect(Hanami::VERSION).to eq("2.1.0.rc3")
+    expect(Hanami::VERSION).to eq("2.1.0")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc3
+  version: 2.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,30 +160,30 @@ dependencies:
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc3
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc3
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.rc
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.rc
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement