soar_sc-rack-router 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3e14ae23f2f9217563a57239e82ec930382ec1
-  data.tar.gz: 6ab1b6bf12582996334481f2aa06a90cb0447c55
+  metadata.gz: f58cbab68abf5cb5fae462ee5cbd3f684ec90825
+  data.tar.gz: 9db67f90583e5d57fc1eed5e20b2e9a2b015af64
 SHA512:
-  metadata.gz: 1593840d3ea7254eb74ce64dd95bf8d3ea2a984821117bd3a802da50a81ef8b5cdc71a66c3d1aca4b4b57d517498456d2753f7ed53ce696c0ee33fbeb7aecc17
-  data.tar.gz: c0572f514f065db5b65dd22a841459323899a49f186ccf0f3f7242c739ccf7ba475dd7de13ced12dcb257d84c6feba783c51ed86790155b66ba0a9b8f49262db
+  metadata.gz: 33186c63a75e6e5670113e83fa269d7b452b6060c4cb7fe2ba7b2b353a07057ad1541ba8a7bbfeab3c5e2c7693829263424c140ecb62f938669d94a008109ace
+  data.tar.gz: ef4aed9e7bb629ac050dd84843a3fdb139668498d41676b990add2e283ff89a6012685a87f5e56ca46708a7b82c2d8138e4afe165de49bcd275e1871a8fb442e

data/lib/soar_sc/rack/router/errors.rb

@@ -8,7 +8,15 @@ module SoarSc
         end
       end
 
-      class InvalidParameterError < RuntimeError; end
+      class InvalidRouteError < RuntimeError; end
+
+      class InvalidPathError < InvalidRouteError; end
+
+      class InvalidParameterError < InvalidPathError; end
+
+      class InvalidMethodError < InvalidRouteError; end
+
+      class InvalidActionError < InvalidRouteError; end
 
     end
   end

data/lib/soar_sc/rack/router/http_method.rb

@@ -4,14 +4,20 @@ module SoarSc
       module HttpMethod
 
         ANY = "*"
-        GET = "GET"
-        POST = "POST"
-        PUT = "PUT"
+        CONNECT = "CONNECT"
         DELETE = "DELETE"
+        GET = "GET"
         HEAD = "HEAD"
         OPTIONS = "OPTIONS"
+        POST = "POST"
+        PUT = "PUT"
         TRACE = "TRACE"
-        CONNECT = "CONNECT"
+
+        ALL_METHODS = [ ANY, CONNECT, DELETE, GET, HEAD, OPTIONS, POST, PUT, TRACE ]
+
+        def self.valid?(method)
+          ALL_METHODS.include?(method)
+        end
 
       end
     end

data/lib/soar_sc/rack/router/route.rb

@@ -1,4 +1,5 @@
 require 'soar_sc/rack/router/http_method'
+require 'soar_sc/rack/router/route_validation'
 
 # TODO Normalize paths (compress runs of slashes)
 module SoarSc
@@ -6,6 +7,9 @@ module SoarSc
     class Router
 
       class Route
+
+        include RouteValidation
+
         PARAMETER_PREFIX = ":"
         PARAMETER_VALID_REGEXP = /:[a-z_][a-z0-9_]*/
         REQUEST_METHOD = "REQUEST_METHOD"
@@ -16,8 +20,8 @@ module SoarSc
         attr_reader :method, :path, :action
 
         def initialize(method, path, action)
-          validate_path(path)
           @method, @path, @action = method, path, action
+          validate
           @static = components(@path).none? { |c| c.start_with?(PARAMETER_PREFIX) }
         end
 
@@ -36,6 +40,10 @@ module SoarSc
           parameters
         end
 
+        def to_s
+          "<#{@method.inspect} #{@path.inspect} #{@action.inspect}>"
+        end
+
         private
 
         def method_matches?(method)
@@ -75,14 +83,6 @@ module SoarSc
           path.split('/')
         end
 
-        def validate_path(path)
-          components(path).each do |c|
-            if c.start_with?(PARAMETER_PREFIX) and c !~ PARAMETER_VALID_REGEXP
-              raise InvalidParameterError, "Invalid parameter #{c} in path #{path}"
-            end
-          end
-        end
-
       end
 
     end

data/lib/soar_sc/rack/router/route_validation.rb

@@ -0,0 +1,40 @@
+module SoarSc
+  module Rack
+    class Router
+
+      module RouteValidation
+
+        def validate
+          validate_method
+          validate_path
+          validate_action
+        end
+
+        def validate_method
+          unless HttpMethod.valid?(@method)
+            raise InvalidMethodError, "Invalid method in route #{to_s}"
+          end
+        end
+
+        def validate_path
+          unless @path.is_a?(String)
+            raise InvalidPathError, "Invalid path in route #{to_s}"
+          end
+          components(@path).each do |c|
+            if c.start_with?(Route::PARAMETER_PREFIX) and c !~ Route::PARAMETER_VALID_REGEXP
+              raise InvalidParameterError, "Invalid path parameter in route #{to_s}"
+            end
+          end
+        end
+
+        def validate_action
+          unless (@action.respond_to?(:arity) and @action.arity == 1) or (@action.respond_to?(:call) and @action.method(:call).arity == 1)
+            raise InvalidActionError, "Invalid action in route #{to_s}"
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/soar_sc/rack/router/version.rb

@@ -1,7 +1,7 @@
 module SoarSc
   module Rack
     class Router
-      VERSION = "2.0.0"
+      VERSION = "2.0.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sc-rack-router
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -88,6 +88,7 @@ files:
 - lib/soar_sc/rack/router/errors.rb
 - lib/soar_sc/rack/router/http_method.rb
 - lib/soar_sc/rack/router/route.rb
+- lib/soar_sc/rack/router/route_validation.rb
 - lib/soar_sc/rack/router/version.rb
 - soar_sc-rack-router.gemspec
 homepage: https://github.com/hetznerZA/soar_sc-rack-router