Rack 2.1 (#305)

lib/hanami/action/rack.rb

@@ -83,6 +83,12 @@ module Rack
       # The key that returns router parsed body from the Rack env
       ROUTER_PARSED_BODY = 'router.parsed_body'.freeze
 
+      # This is the root directory for `#unsafe_send_file`
+      #
+      # @since x.x.x
+      # @api private
+      FILE_SYSTEM_ROOT = Pathname.new("/").freeze
+
       # Override Ruby's hook for modules.
       # It includes basic Hanami::Action modules to the given class.
       #
@@ -353,7 +359,11 @@ def send_file(path)
       #     end
       #   end
       def unsafe_send_file(path)
-        directory = self.class.configuration.root_directory if Pathname.new(path).relative?
+        directory = if Pathname.new(path).relative?
+                      self.class.configuration.root_directory
+                    else
+                      FILE_SYSTEM_ROOT
+                    end
 
         _send_file(
           File.new(path, directory).call(@_env)

spec/integration/hanami/controller/mime_type_spec.rb

@@ -21,7 +21,7 @@ class Default
     include Hanami::Action
 
     def call(_params)
-      self.body = format
+      self.body = format.to_s
     end
   end
 
@@ -32,7 +32,7 @@ class Configuration
     configuration.default_charset 'ISO-8859-1'
 
     def call(_params)
-      self.body = format
+      self.body = format.to_s
     end
   end
 
@@ -41,7 +41,7 @@ class Custom
 
     def call(_params)
       self.format = :xml
-      self.body   = format
+      self.body   = format.to_s
     end
   end
 
@@ -51,7 +51,7 @@ class Latin
     def call(_params)
       self.charset = 'latin1'
       self.format  = :html
-      self.body    = format
+      self.body    = format.to_s
     end
   end
 
@@ -64,7 +64,7 @@ def call(_params)
       headers['X-AcceptXml']     = accept?('application/xml').to_s
       headers['X-AcceptJson']    = accept?('text/json').to_s
 
-      self.body = format
+      self.body = format.to_s
     end
   end
 
@@ -75,7 +75,7 @@ class CustomFromAccept
     accept :json, :custom
 
     def call(_params)
-      self.body = format
+      self.body = format.to_s
     end
   end
 
@@ -105,7 +105,7 @@ class DefaultResponse
     configuration.default_response_format :json
 
     def call(_params)
-      self.body = configuration.default_request_format
+      self.body = configuration.default_request_format.to_s
     end
   end
 
@@ -135,7 +135,7 @@ class ContentType
 
     def call(_params)
       self.format = :json
-      self.body   = format
+      self.body   = format.to_s
     end
   end
 
@@ -146,7 +146,7 @@ class DefaultAndContentType
 
     def call(_params)
       self.format = :json
-      self.body   = format
+      self.body   = format.to_s
     end
   end
 end

spec/unit/hanami/action/cookies_spec.rb

@@ -31,14 +31,14 @@
       action   = SetCookiesWithOptionsAction.new(expires: tomorrow)
       _, headers, = action.call({})
 
-      expect(headers).to eq("Content-Type" => "application/octet-stream; charset=utf-8", "Set-Cookie" => "kukki=yum%21; domain=hanamirb.org; path=/controller; expires=#{tomorrow.gmtime.rfc2822}; secure; HttpOnly")
+      expect(headers).to eq("Content-Type" => "application/octet-stream; charset=utf-8", "Set-Cookie" => "kukki=yum%21; domain=hanamirb.org; path=/controller; expires=#{tomorrow.httpdate}; secure; HttpOnly")
     end
 
     it "removes cookies" do
       action = RemoveCookiesAction.new
       _, headers, = action.call("HTTP_COOKIE" => "foo=bar;rm=me")
 
-      expect(headers).to eq("Content-Type" => "application/octet-stream; charset=utf-8", "Set-Cookie" => "rm=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000")
+      expect(headers).to eq("Content-Type" => "application/octet-stream; charset=utf-8", "Set-Cookie" => "rm=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 GMT")
     end
 
     it "iterates cookies" do
@@ -75,7 +75,7 @@
         _, headers, = action.call({})
         max_age = 120
         expect(headers["Set-Cookie"]).to include("max-age=#{max_age}")
-        expect(headers["Set-Cookie"]).to include("expires=#{(Time.now + max_age).gmtime.rfc2822}")
+        expect(headers["Set-Cookie"]).to include("expires=#{(Time.now + max_age).httpdate}")
       end
     end
   end