hanami-controller 2.1.0.beta2 → 2.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fc2d8c6c6c5d8427e000d3a9644ca79ebb06528052d9d85796aad26f12c00dd
-  data.tar.gz: 689ba6ba0655450344f3e87f9a7723760a4673df0b3beb6e7b21fca8a18f7fcd
+  metadata.gz: a9d4981a4c7901ff4be64ae0a339886817da04a071e7490f440f745d971e4212
+  data.tar.gz: ffc574ca14b030a7e23b2b035f3df04f83c4b20aaca203c76dea61971cbb86e2
 SHA512:
-  metadata.gz: 1e8bf47095abf0da69058e26e0d627cbb664c9b861a35de3b84173836f8cb76773bdf78ff233aedf8e09819de8f4ca5cc53f5116f73dd7d63fb54b1ae9c90656
-  data.tar.gz: b09e1c0506ef1e309e6c53bc37ad503dd8821b159d4a60bd1142be3b105cb24ff67abd57871005eddc807451712dbf507e24c95e0c2ff0f38b8e53d9160329b8
+  metadata.gz: 9a579c0418d491bf872afddd9143043702d0f6f96b7b3bc47f5f56c6600f74da9da0cb8370b6cd103ad0c616285e2035b4cddd7cb94c0fcc0e78e4b7ae61311d
+  data.tar.gz: e4acfb84cd8610a9b81139e12730880484a5e6a7ec96fe518942256579bcaa6cd6fffe62221032633e26574e46d9bfaa38c1bd1fd46bec7e672e44d9490b4cdd

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Complete, fast and testable actions for Rack
 
+## v2.1.0.rc2 - 2023-11-08
+
+## v2.1.0.rc1 - 2023-11-01
+
+### Fixed
+
+- [Luca Guidi] Ensure Rack compatibility of `Hanami::Action::Response#send_file` (#431)
+
 ## v2.1.0.beta2 - 2023-10-04
 
 ### Fixed

data/hanami-controller.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.0"
 
   spec.add_dependency "rack", "~> 2.0"
-  spec.add_dependency "hanami-utils", "~> 2.0"
+  spec.add_dependency "hanami-utils", "~> 2.1.rc"
   spec.add_dependency "dry-configurable", "~> 1.0", "< 2"
   spec.add_dependency "dry-core", "~> 1.0"
   spec.add_dependency "zeitwerk", "~> 2.6"

data/lib/hanami/action/response.rb

@@ -73,15 +73,14 @@ module Hanami
         @length = 0
         @body   = EMPTY_BODY.dup
 
-        # FIXME: there could be a bug that prevents Content-Length to be sent for files
-        if str.is_a?(::Rack::File::Iterator)
+        if str.is_a?(::Rack::Files::BaseIterator)
           @body = str
         else
           write(str) unless str.nil? || str == EMPTY_BODY
         end
       end
 
-      # Set the response status
+      # Sets the response status.
       #
       # @param code [Integer, Symbol] the status code
       #
@@ -102,11 +101,21 @@ module Hanami
         super(Http::Status.lookup(code))
       end
 
-      # This is NOT RELEASED with 2.0.0
+      # Sets the response body from the rendered view.
       #
-      # @api private
-      def render(view, **options)
-        self.body = view.(**view_options.(request, self), **exposures.merge(options)).to_str
+      # @param view [Hanami::View] the view to render
+      # @param input [Hash] keyword arguments to pass to the view's `#call` method
+      #
+      # @api public
+      # @since 2.1.0
+      def render(view, **input)
+        view_input = {
+          **view_options.call(request, self),
+          **exposures,
+          **input
+        }
+
+        self.body = view.call(**view_input).to_str
       end
 
       # Returns the format for the response.
@@ -275,24 +284,26 @@ module Hanami
       #
       # @return [void]
       #
-      # @see Config#public_directory
+      # @see Hanami::Action::Config#public_directory
+      # @see Hanami::Action::Rack::File
       #
       # @since 2.0.0
       # @api public
       def send_file(path)
         _send_file(
-          Rack::File.new(path, @config.public_directory).call(env)
+          Action::Rack::File.new(path, @config.public_directory).call(env)
         )
       end
 
       # Send the file at the given path as the response, for a file anywhere in the file system.
       #
-      # @see #send_file
-      #
       # @param path [String, Pathname] path to the file to be sent
       #
       # @return [void]
       #
+      # @see #send_file
+      # @see Hanami::Action::Rack::File
+      #
       # @since 2.0.0
       # @api public
       def unsafe_send_file(path)
@@ -303,7 +314,7 @@ module Hanami
                     end
 
         _send_file(
-          Rack::File.new(path, directory).call(env)
+          Action::Rack::File.new(path, directory).call(env)
         )
       end
 

data/lib/hanami/controller/version.rb

@@ -8,6 +8,6 @@ module Hanami
     #
     # @since 0.1.0
     # @api public
-    VERSION = "2.1.0.beta2"
+    VERSION = "2.1.0.rc2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.rc2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.rc
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami