rack-routing 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c39e9a75ddf65ae69be35a7168d6b233d993c5d
-  data.tar.gz: 391e0ebacf9c3494660ea1be48a7d9eaac70b460
+  metadata.gz: 775f85f9f806f2508607c2eca0643ca70f686f0f
+  data.tar.gz: 43cf5f06c4af528e01e9dc328391a5f06c96098c
 SHA512:
-  metadata.gz: 1c8446a2b59eb3a2c69e861b51e466d311eb6b5d166b8af1b75424a9efb6ecbeca5894fa6a301825fbda2ad295c87b7e88f932a3d828db21fa5be8ee59514044
-  data.tar.gz: 58c414a7c5318180f90c2b06fb113bc032b70af490960efdceac6fad49f31a6a4457b1bff67c24207d1ecaf69485476e59aac0ac0088623de797877dd5ae0d0e
+  metadata.gz: 0a945d9c2d6a49038513510ef617012a118d09be013ccf78963bd3a45c3623328313a41f0d2ab9514a81e20cc3643dadf176572686fb6a911950bed7f89d7b94
+  data.tar.gz: 67a56c5e40f2cac7e2da709d724d75d4ed7ae2dc8471780682feab9c293b8e4912bf79cda513a06678ee02d1ab763f1239ca1543e82371e4d5149146c8c20fc6

data/lib/rack/route.rb

@@ -1,36 +1,40 @@
-class Route
-  def initialize path
-    @my_parts = path.split( '/' ).reject{| p | blank?( p )}.map( &:strip )
-  end
-
-  def match? parts
-    return false unless parts.count == @my_parts.count
-    
-    indexes = ( 0..@my_parts.count - 1 ).to_a
-    indexes.delete param_index
-
-    indexes.all? do |i|
-      parts[ i ].to_s == @my_parts[ i ]
+module Rack
+  module Routing
+    class Route
+      def initialize path
+        @my_parts = path.split( '/' ).reject{| p | String.blank?( p )}.map( &:strip )
+      end
+
+      def match? parts
+        return false unless parts.count == @my_parts.count
+        
+        indexes = ( 0..@my_parts.count - 1 ).to_a
+        indexes.delete param_index
+
+        indexes.all? do |i|
+          parts[ i ].to_s == @my_parts[ i ]
+        end
+      end
+
+      def params_for parts
+        return {} unless param_index
+
+        { @my_parts[ param_index ].sub( /\A:/, '' ).to_sym => parts[ param_index ]}
+      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
+      end
+
+      def param_index
+        @my_parts.index{ |p| p[ 0 ] == ':' }
+      end
+
+      def to_s
+        "#{ self.class } @my_parts:#{ @my_parts } count:#{ @my_parts.count }"
+      end
     end
   end
-
-  def params_for parts
-    return {} unless param_index
-
-    { @my_parts[ param_index ].sub( /\A:/, '' ).to_sym => parts[ param_index ]}
-  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
-  end
-
-  def param_index
-    @my_parts.index{ |p| p[ 0 ] == ':' }
-  end
-
-  def to_s
-    "#{ self.class } @my_parts:#{ @my_parts } count:#{ @my_parts.count }"
-  end
-end
+end

data/lib/rack/router.rb

@@ -1,33 +1,37 @@
-class Router
-  VALID_HTTP_METHODS = [ :GET, :POST, :PUT, :DELETE ]
+module Rack
+  module Routing
+    class Router
+      VALID_HTTP_METHODS = [ :GET, :POST, :PUT, :DELETE ]
 
-  class << self
-    def for env
-      http_method = env[ 'REQUEST_METHOD' ].to_sym
+      class << self
+        def for env
+          http_method = env[ 'REQUEST_METHOD' ].to_sym
 
-      raise 'Invalid HTTP method' unless VALID_HTTP_METHODS.include?( http_method )
+          raise 'Invalid HTTP method' unless VALID_HTTP_METHODS.include?( http_method )
 
-      parts = [ http_method ] + env[ 'PATH_INFO' ].split( '/' ).reject{| p | blank?( p )}
+          parts = [ http_method ] + env[ 'PATH_INFO' ].split( '/' ).reject{| p | String.blank?( p )}
 
-      matched_route = ROUTES.find do |route|
-        route.match?( parts )
-      end
-  
-      return { method: :not_found, params:{} } unless matched_route
+          matched_route = ROUTES.find do |route|
+            route.match?( parts )
+          end
+      
+          return { method: :not_found, params:{} } unless matched_route
 
-      params = matched_route.params_for( parts )
-  
-      { method: matched_route.routing_method,
-        params:params  }
-    end
+          params = matched_route.params_for( parts )
+      
+          { method: matched_route.routing_method,
+            params:params  }
+        end
 
-    def load_routes
-      lines = File.read( ROUTES_FILE )
-                  .split( "\n"      )
-                  .reject{| l | blank?( l )}
+        def load_routes
+          lines = ::File.read( ROUTES_FILE )
+                      .split( "\n"      )
+                      .reject{| l | String.blank?( l )}
 
-      lines.map do |line|
-        Route.new( line )
+          lines.map do |line|
+            Route.new( line )
+          end
+        end
       end
     end
   end

data/lib/rack/shared.rb

@@ -1,3 +1,9 @@
-def blank? str
-  str.nil? || str == ''
+module Rack
+  module Routing
+    class String
+      def self.blank? str
+        str.nil? || str == ''
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-routing
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - George Ulmer