hanami-controller 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 546fec0f371e76fa6e8f494ed3b66fb75cc7250226ffdcdbe6e7c52cce953204
-  data.tar.gz: 82f4c7eca712806b6960f72eef8f62703008f45df342f6ad0ca83dffe232fe4b
+  metadata.gz: 3bc65546cbce3a2801eb75980f6f3d43a47c46bd98c3cd1128992d650da4b457
+  data.tar.gz: 1380fea8cc79b2a7506e872b27fc629b15c4dd43353ee83dc98fdd110d3e8cf4
 SHA512:
-  metadata.gz: c36ec8f8f6b8ffca2ecafe33e4ed5b748578e0469368b2af6ba6b833cc334892d3b73bf555d8afc3c8c63d956a24a1b6ab13133f528f73aee855a084fb4b58af
-  data.tar.gz: ac75c0c499f36ad8d44f334028f6081843ad829b486e6e5787521167d1b5b48e5f9e2723b00641baea769619e8a9844ef4f5231251cbc7db023b1b39ecf84094
+  metadata.gz: 075ebe574b4d001f463887d89823b2589682d772e92756be28d9e9a348b893902d620ac6a4716ea79c5c58167224539eff658544e23abdc8bdb1c1133166c50a
+  data.tar.gz: 94a22cb0e1b2c5920fdf2252405b5d2c7e7f9daa9457be96197f0552c5141972b0af98af1c6991175e156d0df3825fe5eba7d2dc28c1f4d547bf0797535deb6c

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v1.3.3 - 2020-01-14
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.7
+- [Luca Guidi] Support `rack` 2.1
+- [Luca Guidi] Support for both `hanami-validations` 1 and 2
+
 ## v1.3.2 - 2019-06-28
 ### Fixed
 - [Ian Ker-Seymer] Ensure `Etag` to work when `If-Modified-Since` is sent from browser and upstream proxy sets `Last-Modified` automatically.

data/README.md

@@ -5,7 +5,7 @@ Complete, fast and testable actions for Rack and [Hanami](http://hanamirb.org)
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-controller.svg)](https://badge.fury.io/rb/hanami-controller)
-[![TravisCI](https://travis-ci.org/hanami/controller.svg?branch=master)](https://travis-ci.org/hanami/controller)
+[![Build Status](https://ci.hanamirb.org/api/badges/hanami/controller/status.svg)](https://ci.hanamirb.org/hanami/controller)
 [![CircleCI](https://circleci.com/gh/hanami/controller/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/controller/tree/master)
 [![Test Coverage](https://codecov.io/gh/hanami/controller/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/controller)
 [![Depfu](https://badges.depfu.com/badges/7cd17419fba78b726be1353118fb01de/overview.svg)](https://depfu.com/github/hanami/controller?project=Bundler)

data/hanami-controller.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',   '>= 1.6', '< 3'
   spec.add_development_dependency 'rack-test', '~> 1.0'
-  spec.add_development_dependency 'rake',      '~> 12'
+  spec.add_development_dependency 'rake',      '~> 13'
   spec.add_development_dependency 'rspec',     '~> 3.7'
 end

data/lib/hanami/action/rack.rb

@@ -83,6 +83,14 @@ module Hanami
       # 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 1.3.3
+      # @api private
+      #
+      # @see #unsafe_send_file
+      FILE_SYSTEM_ROOT = Pathname.new("/").freeze
+
       # Override Ruby's hook for modules.
       # It includes basic Hanami::Action modules to the given class.
       #
@@ -353,7 +361,11 @@ module Hanami
       #     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)

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Action
+    module Rack
+      # This module provides method to set exceptions to Rack env:
+      #
+      #   * `rack.errors` - IO for errors, as requested by Rack SPEC
+      #   * `rack.exception` - De-facto standard for Ruby exception tracking SaaS
+      #
+      # @see http://www.rubydoc.info/github/rack/rack/file/SPEC#The_Error_Stream
+      # @see https://github.com/hanami/controller/issues/133
+      #
+      # @since 1.3.3
+      # @api private
+      module Errors
+        # @since 1.3.3
+        # @api private
+        RACK_ERRORS = "rack.errors"
+
+        # @since 1.3.3
+        # @api private
+        RACK_EXCEPTION = "rack.exception"
+
+        # Set exception in Rack env
+        #
+        # @param env [Hash] the Rack environment
+        # @param exception [Exception] the exception to set
+        #
+        # @since 1.3.3
+        # @api private
+        def self.set(env, exception)
+          env[RACK_EXCEPTION] = exception
+
+          return unless errors = env[RACK_ERRORS] # rubocop:disable Lint/AssignmentInCondition
+
+          errors.write(_dump_exception(exception))
+          errors.flush
+        end
+
+        # Format exception info with name and backtrace
+        #
+        # @param exception [Exception]
+        #
+        # @since 1.3.3
+        # @api private
+        def self._dump_exception(exception)
+          [[exception.class, exception.message].compact.join(": "), *exception.backtrace].join("\n\t")
+        end
+      end
+    end
+  end
+end

data/lib/hanami/action/throwable.rb

@@ -1,5 +1,6 @@
 require 'hanami/utils/class_attribute'
 require 'hanami/http/status'
+require 'hanami/action/rack/errors'
 
 module Hanami
   module Action
@@ -11,23 +12,6 @@ module Hanami
     # @see Hanami::Action::Throwable#halt
     # @see Hanami::Action::Throwable#status
     module Throwable
-      # @since 0.2.0
-      # @api private
-      RACK_ERRORS = 'rack.errors'.freeze
-
-      # This isn't part of Rack SPEC
-      #
-      # Exception notifiers use <tt>rack.exception</tt> instead of
-      # <tt>rack.errors</tt>, so we need to support it.
-      #
-      # @since 0.5.0
-      # @api private
-      #
-      # @see Hanami::Action::Throwable::RACK_ERRORS
-      # @see http://www.rubydoc.info/github/rack/rack/file/SPEC#The_Error_Stream
-      # @see https://github.com/hanami/controller/issues/133
-      RACK_EXCEPTION = 'rack.exception'.freeze
-
       # @since 0.1.0
       # @api private
       def self.included(base)
@@ -155,18 +139,7 @@ module Hanami
       def _reference_in_rack_errors(exception)
         return if configuration.handled_exception?(exception)
 
-        @_env[RACK_EXCEPTION] = exception
-
-        if errors = @_env[RACK_ERRORS]
-          errors.write(_dump_exception(exception))
-          errors.flush
-        end
-      end
-
-      # @since 0.2.0
-      # @api private
-      def _dump_exception(exception)
-        [[exception.class, exception.message].compact.join(": "), *exception.backtrace].join("\n\t")
+        Hanami::Action::Rack::Errors.set(@_env, exception)
       end
 
       # @since 0.1.0

data/lib/hanami/controller/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - lib/hanami/action/params.rb
 - lib/hanami/action/rack.rb
 - lib/hanami/action/rack/callable.rb
+- lib/hanami/action/rack/errors.rb
 - lib/hanami/action/rack/file.rb
 - lib/hanami/action/redirect.rb
 - lib/hanami/action/request.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami