spine-routing 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55bafb8fe57baaf3d499c9c416693680ec738af1
-  data.tar.gz: c0ea9a169de6630a47f48760df23f427c7d0d800
+  metadata.gz: 4becea9a7a3f05d9ce9bb4e701ef75f5619b0d26
+  data.tar.gz: 0a97bd8d1c089ffff56be59b8b2d15d059b54b73
 SHA512:
-  metadata.gz: 18ec32f8f0c9e5c78c40726f4cd84cefa2eadc7bd88b889ed73be94de850ee257faae50534df357ae63e75a0ac5791c9a2c62afe182b793d6e4a717d5106e7ee
-  data.tar.gz: b1a9d6f595967e07d3d3eb973f554e786d669c83c71dfd0a69eab3b162ae6c34c0b1096ce324dc182e3755f2b463c07174a3bba69b1a4bae88972a68b154c924
+  metadata.gz: f093bec4d1ba84766c98451cfb92b34aee7a1e488ff3ab01f73cb17c265bf1f89e8e830e14751e442702ed001401b8794015910635f03b4680b0f3408c1d072f
+  data.tar.gz: 6fa34127dc338c4026b071e2d9335da0172935712162caff35efb521be9ee38c4189c870946200958a15f6a126992fe4f889b125d62d768049b7e55ce66a7dcf

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.3.0
+-----
+-   Merges all parameters to Rack environment
+
 0.2.0
 -----
 -   Adds Spine::Engines extension

data/README.md

@@ -34,3 +34,6 @@ end
 
 router.call(env)
 ```
+
+For getting parameters use `env['router.parameters']` or include
+`Spine::Routing::Parameters` to your controller/action.

data/lib/spine/routing.rb

@@ -10,6 +10,7 @@ module Spine
       autoload :Namespacing, 'spine/routing/syntax/namespacing'
     end
 
+    autoload :Parameters, 'spine/routing/parameters'
     autoload :Engine, 'spine/routing/engine'
   end
 end

data/lib/spine/routing/parameters.rb

@@ -0,0 +1,9 @@
+module Spine
+  module Routing
+    module Parameters
+      def params
+        env[Router::PARAMETERS]
+      end
+    end
+  end
+end

data/lib/spine/routing/route.rb

@@ -22,7 +22,7 @@ module Spine
         matches = path.match(regex)
         return nil unless matches
 
-        Match.new(self, Hash[matches.names.map(&:to_sym).zip(matches.captures)])
+        Match.new(self, Hash[matches.names.zip(matches.captures)])
       end
 
       private

data/lib/spine/routing/router.rb

@@ -7,7 +7,7 @@ module Spine
 
       VERB = 'REQUEST_METHOD'.freeze
       PATH = 'PATH_INFO'.freeze
-      PATH_PARAMETERS = 'router.parameters'.freeze
+      PARAMETERS = 'router.parameters'.freeze
       NOT_FOUND_RESPONSE = [404, {}, ['']].freeze
 
 
@@ -44,7 +44,8 @@ module Spine
         verb = env[VERB].downcase.gsub('head', 'get').to_sym
         route = recognise(verb, env[PATH])
         if route
-          env[PATH_PARAMETERS] = route.parameters
+          env[PARAMETERS] = Rack::Request.new(env).params
+          env[PARAMETERS].merge!(route.parameters)
           run(route.app, env)
         else
           NOT_FOUND_RESPONSE # TODO: set default app

data/lib/spine/routing/version.rb

@@ -1,5 +1,5 @@
 module Spine
   module Routing
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spine-routing
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - TOGGL LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -100,6 +100,7 @@ files:
 - lib/spine/routing/engine/configuration.rb
 - lib/spine/routing/engine/loader.rb
 - lib/spine/routing/nested_router.rb
+- lib/spine/routing/parameters.rb
 - lib/spine/routing/route.rb
 - lib/spine/routing/router.rb
 - lib/spine/routing/syntax/match.rb