hanami-controller 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f0fb43da2ad920ba9c799b41f4ccfc87eb5b438
-  data.tar.gz: 294e4ed9ebf6e18c13c52d560efb181f69ded99b
+  metadata.gz: a55f1d51fe4e8c7f3d631f070eab1233fadc0c3e
+  data.tar.gz: c9eb6f944227efb95943885e866adf40be3614dd
 SHA512:
-  metadata.gz: 6b7ce52381b3e383caf8a169f9c40af67e8a8a546503c89d0b3b7642fe8e36321ab3bf5bee8d844d9e26ace64d5c1c49f894f642b469dcac63c712d5025246b0
-  data.tar.gz: f6e6cfe2e117ce0d3946b308b2684dfd53ae31783510ec143f10cd9959e671338abe613bc70ef2070a2c5ecdd1383fbcffad76070cfd76e457ebf218be22759e
+  metadata.gz: 01cbf64f7661609247d8eeb2ed3b73168a0e21dbcd69f48f60bd79d828db788099bdd70f4192a47090e8babd007faa75ac50d6d480dc9235d5aa39a1fe141961
+  data.tar.gz: f24e1ee54fe5b990d4261c92889d602dd9e6fd9dfaef31dc975a6ff122a32ffc69c5c806b07cc24931919dac68d2a7ad152b841c9a1c61f61c6a3627fadc99cb

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
-## v1.0.0beta1 - 2017-02-14
+## v1.0.0.beta2 - 2017-03-02
+### Added
+- [Marcello Rocha] Add `Action#unsafe_send_file` to send files outside of the public directory of a project
+
+### Fixed
+- [Anton Davydov] Ensure HTTP Cache to not crash when `HTTP_IF_MODIFIED_SINCE` and `HTTP_IF_NONE_MATCH` have blank values
+- [Luca Guidi] Keep flash values after a redirect
+- [Craig M. Wellington & Luca Guidi] Ensure to return 404 when `Action#send_file` cannot find a file with a globbed route
+- [Luca Guidi] Don't mutate Rack env when sending files
+
+## v1.0.0.beta1 - 2017-02-14
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 2.4
 

data/lib/hanami/action/cache/conditional_get.rb

@@ -56,7 +56,7 @@ module Hanami
         end
 
         def fresh?
-          modified_since && Time.httpdate(modified_since).to_i >= @value.to_i
+          !Hanami::Utils::Blank.blank?(modified_since) && Time.httpdate(modified_since).to_i >= @value.to_i
         end
 
         def header

data/lib/hanami/action/flash.rb

@@ -31,6 +31,7 @@ module Hanami
         @session         = session
         @request_id      = request_id
         @last_request_id = session[LAST_REQUEST_KEY]
+        @merged          = {}
 
         session[SESSION_KEY]             ||= {}
         session[SESSION_KEY][request_id] ||= {}
@@ -54,7 +55,7 @@ module Hanami
       # @since 0.3.0
       # @api private
       def [](key)
-        last_request_flash.merge(data).fetch(key) do
+        @merged.fetch(key) do
           _values.find {|data| !data[key].nil? }
         end
       end
@@ -73,8 +74,9 @@ module Hanami
         # It may happen that `#flash` is nil, and those two methods will fail
         unless flash.nil?
           expire_stale!
-          set_last_request_id!
           remove!
+          merge!
+          set_last_request_id!
         end
       end
 
@@ -89,6 +91,13 @@ module Hanami
         _values.all?(&:empty?)
       end
 
+      # @return [String]
+      #
+      # @since 1.0.0.beta2
+      def inspect
+        "#<#{self.class}:#{'0x%x' % (__id__ << 1)} #{@merged.inspect}>"
+      end
+
       private
 
       # The flash registry that holds the data for **all** the recent requests
@@ -135,6 +144,14 @@ module Hanami
         @session.delete(SESSION_KEY) if empty?
       end
 
+      # @since 1.0.0.beta2
+      # @api private
+      #
+      # @see Hanami::Action::Flash#[]
+      def merge!
+        @merged = last_request_flash.merge(data)
+      end
+
       # Values from all the stored requests
       #
       # @return [Array]

data/lib/hanami/action/rack.rb

@@ -10,12 +10,36 @@ module Hanami
     #
     # @since 0.1.0
     module Rack
+      # Rack SPEC response code
+      #
+      # @since 1.0.0.beta2
+      # @api private
+      RESPONSE_CODE = 0
+
+      # Rack SPEC response headers
+      #
+      # @since 1.0.0.beta2
+      # @api private
+      RESPONSE_HEADERS = 1
+
+      # Rack SPEC response body
+      #
+      # @since 1.0.0.beta2
+      # @api private
+      RESPONSE_BODY = 2
+
       # The default HTTP response code
       #
       # @since 0.1.0
       # @api private
       DEFAULT_RESPONSE_CODE = 200
 
+      # Not Found
+      #
+      # @since 1.0.0.beta2
+      # @api private
+      NOT_FOUND = 404
+
       # The default Rack response body
       #
       # @since 0.1.0
@@ -36,6 +60,19 @@ module Hanami
       # @api private
       REQUEST_METHOD = 'REQUEST_METHOD'.freeze
 
+      # The Content-Length HTTP header
+      #
+      # @since 1.0.0.beta2
+      # @api private
+      CONTENT_LENGTH = 'Content-Length'.freeze
+
+      # The non-standard HTTP header to pass the control over when a resource
+      # cannot be found by the current endpoint
+      #
+      # @since 1.0.0.beta2
+      # @api private
+      X_CASCADE = 'X-Cascade'.freeze
+
       # HEAD request
       #
       # @since 0.3.2
@@ -257,6 +294,7 @@ module Hanami
       end
 
       # Send a file as response.
+      #  <tt>This method only sends files from the public directory</tt>
       #
       # It automatically handle the following cases:
       #
@@ -282,9 +320,37 @@ module Hanami
       #     end
       #   end
       def send_file(path)
-        result = File.new(path, self.class.configuration.public_directory).call(@_env)
-        headers.merge!(result[1])
-        halt result[0], result[2]
+        _send_file(
+          File.new(path, self.class.configuration.public_directory).call(@_env)
+        )
+      end
+
+      # Send a file as response from anywhere in the file system.
+      #
+      # @see Hanami::Action::Rack#send_file
+      #
+      # @param path [String, Pathname] path to the file to be sent
+      # @return [void]
+      #
+      # @since 1.0.0.beta2
+      #
+      # @example
+      #   require 'hanami/controller'
+      #
+      #   class Show
+      #     include Hanami::Action
+      #
+      #     def call(params)
+      #       # ...
+      #       unsafe_send_file Pathname.new('/tmp/path/to/file')
+      #     end
+      #   end
+      def unsafe_send_file(path)
+        directory = self.class.configuration.root_directory if Pathname.new(path).relative?
+
+        _send_file(
+          File.new(path, directory).call(@_env)
+        )
       end
 
       # Check if the current request is a HEAD
@@ -303,6 +369,20 @@ module Hanami
       def request_method
         @_env[REQUEST_METHOD]
       end
+
+      # @since 1.0.0.beta2
+      # @api private
+      def _send_file(response)
+        headers.merge!(response[RESPONSE_HEADERS])
+
+        if response[RESPONSE_CODE] == NOT_FOUND
+          headers.delete(X_CASCADE)
+          headers.delete(CONTENT_LENGTH)
+          halt NOT_FOUND
+        else
+          halt response[RESPONSE_CODE], response[RESPONSE_BODY]
+        end
+      end
     end
   end
 end

data/lib/hanami/action/rack/file.rb

@@ -10,7 +10,6 @@ module Hanami
       #
       # @see Hanami::Action::Rack#send_file
       class File
-
         # The key that returns path info from the Rack env
         #
         # @since 1.0.0.beta1
@@ -22,14 +21,16 @@ module Hanami
         # @since 0.4.3
         # @api private
         def initialize(path, root)
-          @file = ::Rack::File.new(root)
-          @path = path
+          @file = ::Rack::File.new(root.to_s)
+          @path = path.to_s
         end
 
         # @since 0.4.3
         # @api private
         def call(env)
+          env = env.dup
           env[PATH_INFO] = @path
+
           @file.get(env)
         rescue Errno::ENOENT
           [404, {}, nil]

data/lib/hanami/controller/configuration.rb

@@ -651,11 +651,15 @@ module Hanami
         @formats.key(format)
       end
 
+      # @api private
+      # @since 1.0.0.beta2
+      attr_reader :root_directory
+
       def public_directory(value = nil)
         if value.nil?
           @public_directory
         else
-          @public_directory = Pathname.new(Dir.pwd).join(value).to_s
+          @public_directory = root_directory.join(value).to_s
         end
       end
 
@@ -706,7 +710,8 @@ module Hanami
         @default_charset         = nil
         @default_headers         = {}
         @cookies                 = {}
-        @public_directory        = ::File.join(Dir.pwd, "public")
+        @root_directory          = ::Pathname.new(Dir.pwd).realpath
+        @public_directory        = root_directory.join(DEFAULT_PUBLIC_DIRECTORY).to_s
         @action_module           = ::Hanami::Action
       end
 

data/lib/hanami/controller/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.0.0.beta1'.freeze
+    VERSION = '1.0.0.beta2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack