hanami-router 0.8.1 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3700c021edbbd63744f0ccd14145fbf2f43bb74c
-  data.tar.gz: 181c99cb03d8b06a8b23afdb1a01c603a13e257d
+  metadata.gz: 459ea54d61819ab58f2fbaf0e0ee5dc14386ce58
+  data.tar.gz: 3507f38ff7540320daf7c086af56db3861d8108b
 SHA512:
-  metadata.gz: e3c88dffa47882138ed426e40430eca285dae96ef93d2dba5f423ef5280b317c829d740918fd324a2bf17f83b6ce6b6a5822e00f43728d3bd940f2141fb9bf2e
-  data.tar.gz: 1b6953416125bb0b1b2e7ec4e1beca690dc1629fd291056241fb70507210aee3a6d0c7c4fbea4e21c1f2b5f2ead2f890d0e6f2db264d0fea5999970cae2e2d59
+  metadata.gz: 6a5b0fa43e6dcaffa276be494bb3abec4be4cd58a0d8049ec78e7ca6d736e5f272b9e8743d4fef9629841c79f49c812468ec2f4d91a01f0bd3da26733501fa01
+  data.tar.gz: 8b9e93acf33e481ea75547c2c97c0f20c8b9bb52e9d3ed32243795bde569f087409b01ce6dc4731b977c2fed0a1a7ac0a79c030d88fbb99ef1ad5826a6cc4bdf

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::Router
 Rack compatible HTTP router for Ruby
 
+## v1.0.0.beta1 - 2017-02-14
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.4
+- [Jakub Pavlík] Added `:as` option for RESTful resources (eg. `resources :psi, controller: 'dogs', as: 'dogs'`)
+
+### Changed
+- [Pascal Betz] Make compatible with Rack 2.0 only
+
 ## v0.8.1 - 2016-11-18
 ### Fixed
 - [Luca Guidi] Ensure JSON body parser to not eval untrusted input

data/hanami-router.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   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.9', '>= 0.9.1'
+  spec.add_dependency 'rack',         '~> 2.0'
+  spec.add_dependency 'http_router',  '0.11.2'
+  spec.add_dependency 'hanami-utils', '~> 1.0.0.beta1'
 
   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.8.1'.freeze
+    VERSION = '1.0.0.beta1'.freeze
   end
 end

data/lib/hanami/routing/endpoint_resolver.rb

@@ -198,7 +198,7 @@ module Hanami
       end
 
       def classify(string)
-        Utils::String.new(string).classify
+        Utils::String.new(string).underscore.classify
       end
 
       private

data/lib/hanami/routing/http_router.rb

@@ -6,6 +6,7 @@ require 'hanami/routing/parsers'
 require 'hanami/routing/force_ssl'
 require 'hanami/routing/error'
 require 'hanami/utils/path_prefix'
+require 'hanami/routing/http_router_monkey_patch'
 
 module Hanami
   module Routing

data/lib/hanami/routing/http_router_monkey_patch.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+#
+# This monkey patches http_router to make it Rack 2.0 compatible.
+# Details see: https://github.com/hanami/router/issues/136
+#
+class HttpRouter
+  class Node
+    class Path < Node
+      def to_code
+        path_ivar = inject_root_ivar(self)
+        "#{"if !callback && request.path.size == 1 && request.path.first == '' && (request.rack_request.head? || request.rack_request.get?) && request.rack_request.path_info[-1] == ?/
+          response = ::Rack::Response.new
+          response.redirect(request.rack_request.path_info[0, request.rack_request.path_info.size - 1], 302)
+          return response.finish
+        end" if router.redirect_trailing_slash?}
+
+        #{"if request.#{router.ignore_trailing_slash? ? 'path_finished?' : 'path.empty?'}" unless route.match_partially}
+          if callback
+            request.called = true
+            callback.call(Response.new(request, #{path_ivar}))
+          else
+            env = request.rack_request.env
+            env['router.request'] = request
+            env['router.params'] ||= {}
+            #{"env['router.params'].merge!(Hash[#{param_names.inspect}.zip(request.params)])" if dynamic?}
+            @router.rewrite#{"_partial" if route.match_partially}_path_info(env, request)
+            response = @router.process_destination_path(#{path_ivar}, env)
+            return response unless router.pass_on_response(response)
+          end
+        #{"end" unless route.match_partially}"
+      end
+
+    end
+  end
+end

data/lib/hanami/routing/resource/action.rb

@@ -258,7 +258,8 @@ module Hanami
         # @api private
         # @since 0.4.0
         def _singularized_as
-          resource_name.split(NESTED_ROUTES_SEPARATOR).map do |name|
+          name = @options[:as] ? @options[:as].to_s : resource_name
+          name.split(NESTED_ROUTES_SEPARATOR).map do |name|
             Hanami::Utils::String.new(name).singularize
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -18,48 +18,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +131,7 @@ files:
 - lib/hanami/routing/error.rb
 - lib/hanami/routing/force_ssl.rb
 - lib/hanami/routing/http_router.rb
+- lib/hanami/routing/http_router_monkey_patch.rb
 - lib/hanami/routing/namespace.rb
 - lib/hanami/routing/parsers.rb
 - lib/hanami/routing/parsing/json_parser.rb
@@ -165,9 +160,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8