hanami-router 2.0.0.alpha2 → 2.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078b6fde8c274fe1d60ae480f8b9aec21e3c765daf8ba58f10b1b30a2d0c2135'
-  data.tar.gz: 941ad1968db99f130f18ef37ba12798e882e80b84aeb9974780edeabd446dcfb
+  metadata.gz: fab23d35a0e2c1e71ec08a112f95f35a2c21eed5fb3ab45f231a2a7fc500cc31
+  data.tar.gz: 85c7e6ab36e321fb04235f088f3f479f542e98cf00e5ae7d642bb323bb42d969
 SHA512:
-  metadata.gz: 9091771edcea709bf395654175c7a4f8c1f961d85d66f553db6591d7e1c6675cea38cfdc393e5438e219edb75c75965d4a37727e2da69cdbe1d57ce6756523b7
-  data.tar.gz: 130e577dd27732b4b74acc147a9fbaa444b682546092acd6ed849347c94edcbd779193917b66f4444dd4faf1d7f35ae5dc6755eada2b783ba5d62aa0b7d9c004
+  metadata.gz: 2ce90e7659b29b0571742eb972442ea27a4d51d1ea5500f9d25f943fe7e6a5e9b04598a1289a4c50f107289ea7162708a78e4825564b4ef056ee30a5765a63d6
+  data.tar.gz: b953c5d251e8cfb6f698bb6cea77df0dec2ff194bf51fe091d7fb4464ffad135c0760d328f9e50ae49f6cd48c45171b6ef4c55dc42f64c924cfd6d631cde5250

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Hanami::Router
 Rack compatible HTTP router for Ruby
 
+## v2.0.0.alpha3 - 2020-05-20
+### Fixed
+- [Luca Guidi] `Hanami::Router#initialize` do not yield block if not given
+- [Luca Guidi] Ensure to not accidentally cache response headers for HTTP 404 and 405
+- [Luca Guidi] Ensure scoped root to not be added as trailing slash
+
 ## v2.0.0.alpha2 - 2020-02-19
 ### Added
 - [Luca Guidi] Block syntax. Routes definition accept a block which returning value is the body of the Rack response.

data/lib/hanami/router.rb

@@ -71,7 +71,7 @@ module Hanami
       @variable = {}
       @globbed = {}
       @mounted = {}
-      instance_eval(&blk)
+      instance_eval(&blk) if blk
     end
 
     # Resolve the given Rack env to a registered endpoint and invokes it.
@@ -631,13 +631,13 @@ module Hanami
     # @since 2.0.0
     # @api private
     def not_allowed(env)
-      (_not_allowed_fixed(env) || _not_allowed_variable(env)) and return NOT_ALLOWED
+      (_not_allowed_fixed(env) || _not_allowed_variable(env)) and return [405, { "Content-Length" => "11" }, ["Not Allowed"]]
     end
 
     # @since 2.0.0
     # @api private
     def not_found
-      NOT_FOUND
+      [404, { "Content-Length" => "9" }, ["Not Found"]]
     end
 
     protected
@@ -666,7 +666,7 @@ module Hanami
           url = path(env, params)
           return env_for(url, params, options) # rubocop:disable Style/RedundantReturn
         rescue Hanami::Router::InvalidRouteException
-          EMPTY_RACK_ENV.dup
+          {} # Empty Rack env
         end
       else
         env
@@ -691,31 +691,15 @@ module Hanami
     # @api private
     DEFAULT_REDIRECT_CODE = 301
 
-    # @since 2.0.0
-    # @api private
-    NOT_FOUND = [404, { "Content-Length" => "9" }, ["Not Found"]].freeze
-
-    # @since 2.0.0
-    # @api private
-    NOT_ALLOWED = [405, { "Content-Length" => "11" }, ["Not Allowed"]].freeze
-
     # @since 2.0.0
     # @api private
     PARAMS = "router.params"
 
-    # @since 2.0.0
-    # @api private
-    EMPTY_PARAMS = {}.freeze
-
-    # @since 2.0.0
-    # @api private
-    EMPTY_RACK_ENV = {}.freeze
-
     # @since 2.0.0
     # @api private
     def lookup(env)
       endpoint = fixed(env)
-      return [endpoint, EMPTY_PARAMS] if endpoint
+      return [endpoint, {}] if endpoint
 
       variable(env) || globbed(env) || mounted(env)
     end

data/lib/hanami/router/prefix.rb

@@ -57,6 +57,8 @@ module Hanami
       # @since 2.0.0
       # @api private
       def _join(path)
+        return @prefix if path == DEFAULT_SEPARATOR
+
         (@prefix + DEFAULT_SEPARATOR + path)
           .gsub(DOUBLE_DEFAULT_SEPARATOR_REGEXP, DEFAULT_SEPARATOR)
       end

data/lib/hanami/router/version.rb

@@ -4,6 +4,6 @@ module Hanami
   class Router
     # @since 0.1.0
     # @api public
-    VERSION = "2.0.0.alpha2"
+    VERSION = "2.0.0.alpha3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami