hanami-router 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393f316c6e21157b2ac3d3d7a9544c9311e55c41
-  data.tar.gz: 887ed0b0c22b13bf105a621b2cfb9f8ce7542ea7
+  metadata.gz: c416e1d26debdd38c991e1d26e4fa0f00db09fc6
+  data.tar.gz: ed52730ca7766727ec933d5b3c082b90fd3e1c26
 SHA512:
-  metadata.gz: 4fc20e2fe87c4fd3f2a7c088d26836dca184f7dfa4918930793442f7fabecd99de3eaec56c16d2e0fe85cca6f5b90b21607efaa297b27868dad5a0701e0de649
-  data.tar.gz: 722378463a90b9ea3ebcd5151a630a776655ce37d1025389b5dda41f4bd76e7345506a44188ad10c6ec8d2af8f35a741419665afc0704ce782d8596db3d0d5ac
+  metadata.gz: b9b254c39fb3e4d74e6acf2d3ed3fa12da839f2365c67743d7b5ba31c24892f79cf66a2913669064df3b419dd2c5df783c9b2341fd5d8283c6e7855dab3e1d82
+  data.tar.gz: 160dba7b24852b5540b1fbbad66567e3ea2ba16ae2a67d91e534a3778ffea16dcfb8c8f9f483fba863fb0c17355dc4883fe347befbdf8d6aaecd6e40929461f8

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Hanami::Router
 Rack compatible HTTP router for Ruby
 
+## v0.8.0 - 2016-11-15
+### Added
+- [Kyle Chong] Referenced params from body parses in Rack env via `router.parsed_body`
+
+### Fixed
+- [Luca Guidi & Lucas Hosseini] Ensure params from routes take precedence over params from body parsing
+- [Luca Guidi] Ensure inspector to respect path prefix of mouted apps
+
+### Changed
+- [Luca Guidi] Official support for Ruby: MRI 2.3+ and JRuby 9.1.5.0+
+
 ## v0.7.0 - 2016-07-22
 ### Added
 - [Sean Collins] Introduced `Hanami::Router#root`. Example: `root to: 'home#index'`, equivalent to `get '/', to: 'home#index', as: :root`.

data/README.md

@@ -22,7 +22,7 @@ Rack compatible, lightweight and fast HTTP Router for Ruby and [Hanami](http://h
 
 ## Rubies
 
-__Hanami::Router__ supports Ruby (MRI) 2.2+, JRuby 9k+
+__Hanami::Router__ supports Ruby (MRI) 2.3+, JRuby 9.1.5.0+
 
 
 ## Installation

data/hanami-router.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_dependency 'rack',         '~> 1.6'
   spec.add_dependency 'http_router',  '~> 0.11'
-  spec.add_dependency 'hanami-utils', '~> 0.8'
+  spec.add_dependency 'hanami-utils', '~> 0.9'
 
   spec.add_development_dependency 'bundler',   '~> 1.5'
   spec.add_development_dependency 'minitest',  '~> 5'

data/lib/hanami/router/version.rb

@@ -1,6 +1,6 @@
 module Hanami
   class Router
     # @since 0.1.0
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/lib/hanami/router.rb

@@ -499,6 +499,44 @@ module Hanami
       @router.trace(path, options, &blk)
     end
 
+    # Defines a route that accepts a LINK request for the given path.
+    #
+    # @param path [String] the relative URL to be matched
+    #
+    # @param options [Hash] the options to customize the route
+    # @option options [String,Proc,Class,Object#call] :to the endpoint
+    #
+    # @param blk [Proc] the anonymous proc to be used as endpoint for the route
+    #
+    # @return [Hanami::Routing::Route] this may vary according to the :route
+    #   option passed to the constructor
+    #
+    # @see Hanami::Router#get
+    #
+    # @since 0.8.0
+    def link(path, options = {}, &blk)
+      @router.link(path, options, &blk)
+    end
+
+    # Defines a route that accepts an UNLINK request for the given path.
+    #
+    # @param path [String] the relative URL to be matched
+    #
+    # @param options [Hash] the options to customize the route
+    # @option options [String,Proc,Class,Object#call] :to the endpoint
+    #
+    # @param blk [Proc] the anonymous proc to be used as endpoint for the route
+    #
+    # @return [Hanami::Routing::Route] this may vary according to the :route
+    #   option passed to the constructor
+    #
+    # @see Hanami::Router#get
+    #
+    # @since 0.8.0
+    def unlink(path, options = {}, &blk)
+      @router.unlink(path, options, &blk)
+    end
+
     # Defines a root route (a GET route for '/')
     #
     # @param options [Hash] the options to customize the route
@@ -1165,7 +1203,7 @@ module Hanami
     #          logout GET, HEAD  /logout                  Sessions::Destroy
     def inspector
       require 'hanami/routing/routes_inspector'
-      Routing::RoutesInspector.new(@router.routes)
+      Routing::RoutesInspector.new(@router.routes, @router.prefix)
     end
 
     protected

data/lib/hanami/routing/http_router.rb

@@ -1,6 +1,5 @@
 require 'uri'
 require 'http_router'
-require 'hanami/utils/io'
 require 'hanami/routing/endpoint_resolver'
 require 'hanami/routing/route'
 require 'hanami/routing/parsers'
@@ -8,10 +7,6 @@ require 'hanami/routing/force_ssl'
 require 'hanami/routing/error'
 require 'hanami/utils/path_prefix'
 
-Hanami::Utils::IO.silence_warnings do
-  HttpRouter::Route::VALID_HTTP_VERBS = %w{GET POST PUT PATCH DELETE HEAD OPTIONS TRACE}
-end
-
 module Hanami
   module Routing
     # Invalid route
@@ -60,6 +55,10 @@ module Hanami
       # @api private
       attr_reader :namespace
 
+      # @since 0.8.0
+      # @api private
+      attr_reader :prefix
+
       # Initialize the router.
       #
       # @see Hanami::Router#initialize

data/lib/hanami/routing/parsers.rb

@@ -1,4 +1,5 @@
 require 'hanami/routing/parsing/parser'
+require 'hanami/utils/hash'
 
 module Hanami
   module Routing
@@ -8,6 +9,7 @@ module Hanami
 
       RACK_INPUT    = 'rack.input'.freeze
       ROUTER_PARAMS = 'router.params'.freeze
+      ROUTER_PARSED_BODY = 'router.parsed_body'.freeze
       FALLBACK_KEY  = '_'.freeze
 
       def initialize(parsers)
@@ -47,25 +49,25 @@ module Hanami
           env[RACK_INPUT].rewind    # somebody might try to read this stream
 
           env[ROUTER_PARAMS] ||= {} # prepare params
-          env[ROUTER_PARAMS].merge!(
-            _parse(env, body)
-          )
+          env[ROUTER_PARSED_BODY] = _parse(env, body)
+          env[ROUTER_PARAMS]      = _symbolize(env[ROUTER_PARSED_BODY]).merge(env[ROUTER_PARAMS])
 
           env
         end
       end
 
+      def _symbolize(body)
+        if body.is_a?(Hash)
+          Utils::Hash.new(body).deep_dup.symbolize!.to_h
+        else
+          { FALLBACK_KEY => body }
+        end
+      end
+
       def _parse(env, body)
-        result = @parsers[
+        @parsers[
           media_type(env)
         ].parse(body)
-
-        case result
-        when Hash
-          result
-        else
-          {FALLBACK_KEY => result}
-        end
       end
 
       def media_type(env)

data/lib/hanami/routing/routes_inspector.rb

@@ -47,8 +47,9 @@ module Hanami
       #
       # @since 0.2.0
       # @api private
-      def initialize(routes)
+      def initialize(routes, prefix)
         @routes = routes
+        @prefix = prefix
       end
 
       # Return a formatted string that describes all the routes
@@ -133,7 +134,7 @@ module Hanami
       #          | GET, HEAD |      | /admin/home                | Home::Index     |
       #          | GET, HEAD |      | /api/posts                 | Posts::Index    |
       #          | GET, HEAD |      | /api/second_mount/comments | Comments::Index |
-      def to_s(formatter = FORMATTER, base_path = nil)
+      def to_s(formatter = FORMATTER, base_path = prefix)
         base_path = Utils::PathPrefix.new(base_path)
 
         inspect_routes(formatter, base_path)
@@ -171,6 +172,10 @@ module Hanami
 
       private
 
+      # @since 0.8.0
+      # @api private
+      attr_reader :prefix
+
       # Returns a string representation of the given route
       #
       # @param formatter [String] the template for the output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="