rack-routing 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775f85f9f806f2508607c2eca0643ca70f686f0f
-  data.tar.gz: 43cf5f06c4af528e01e9dc328391a5f06c96098c
+  metadata.gz: f352eb6310074da661fbb565e2c5336e75fea97c
+  data.tar.gz: 869f02f03f796e54246e5bd0a41440efeb67e50f
 SHA512:
-  metadata.gz: 0a945d9c2d6a49038513510ef617012a118d09be013ccf78963bd3a45c3623328313a41f0d2ab9514a81e20cc3643dadf176572686fb6a911950bed7f89d7b94
-  data.tar.gz: 67a56c5e40f2cac7e2da709d724d75d4ed7ae2dc8471780682feab9c293b8e4912bf79cda513a06678ee02d1ab763f1239ca1543e82371e4d5149146c8c20fc6
+  metadata.gz: 3eee6d1a4f3c4e69e1390b3629a686f985408411d005312bfdf2662a8df1cb22a84063d13ad57e7ed089650754e91c3bc743fecce5ff73a2778a08a880206d27
+  data.tar.gz: 8e4106a660b275a966ca1348dcd951154829f6c905b36ca3b8751723baa3f4518ddab4a82d8563579918b35a0b5151f5b806fd84e9fcbc87d53bd83b1ef474de

data/lib/rack/route.rb

@@ -9,7 +9,8 @@ module Rack
         return false unless parts.count == @my_parts.count
         
         indexes = ( 0..@my_parts.count - 1 ).to_a
-        indexes.delete param_index
+
+        param_indexes.each{| i | indexes.delete i }
 
         indexes.all? do |i|
           parts[ i ].to_s == @my_parts[ i ]
@@ -17,19 +18,25 @@ module Rack
       end
 
       def params_for parts
-        return {} unless param_index
+        return {} unless param_indexes
 
-        { @my_parts[ param_index ].sub( /\A:/, '' ).to_sym => parts[ param_index ]}
+        arr = param_indexes.map{| i | [ @my_parts[ i ].sub( /\A:/, '' ).to_sym, parts[ i ]]}
+        
+        arr.to_h
       end
 
       def routing_method
         return "#{ @my_parts[ 0 ].downcase }_root".to_sym if @my_parts.count == 1
 
-        @my_parts.reject{ |p| p[ 0 ] == ':' }.map( &:downcase ).join( '_' ).to_sym
+        @my_parts.reject{ |p| p[ 0 ] == ':' }
+                 .map( &:downcase )
+                 .map{| p | p.gsub( '-', '_' )}
+                 .join( '_' )
+                 .to_sym
       end
 
-      def param_index
-        @my_parts.index{ |p| p[ 0 ] == ':' }
+      def param_indexes
+        @my_parts.map.with_index{ | p,i | i if p[ 0 ] == ':' }.compact
       end
 
       def to_s

data/lib/rack/router.rb

@@ -27,6 +27,7 @@ module Rack
           lines = ::File.read( ROUTES_FILE )
                       .split( "\n"      )
                       .reject{| l | String.blank?( l )}
+                      .reject{| l | l.match /\A\s*#/ }
 
           lines.map do |line|
             Route.new( line )

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rack-routing
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - George Ulmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement