soar_sc-rack-router 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06db72006f7280dbcdfd881a108d084e9fb67b79
-  data.tar.gz: 4ffcd46d095e341fce59740dad5a6faaa3ed8552
+  metadata.gz: 7c3e14ae23f2f9217563a57239e82ec930382ec1
+  data.tar.gz: 6ab1b6bf12582996334481f2aa06a90cb0447c55
 SHA512:
-  metadata.gz: 1962096dc371cc19ce1d25bde13a0724f9d934006bcf0a0c36036f7bc3b762a2154025effb39aa52aa8f90c2b5a024ddf502e22d8683c3f27376e5bfb38122f2
-  data.tar.gz: c7b0b28b6ec325022474b76bff8194de423beb484b185eba8516d7c9549eaaea0a60c16bbbda5a20793ad883663ca2201af1d38116313a3d877426dd30f7bc50
+  metadata.gz: 1593840d3ea7254eb74ce64dd95bf8d3ea2a984821117bd3a802da50a81ef8b5cdc71a66c3d1aca4b4b57d517498456d2753f7ed53ce696c0ee33fbeb7aecc17
+  data.tar.gz: c0572f514f065db5b65dd22a841459323899a49f186ccf0f3f7242c739ccf7ba475dd7de13ced12dcb257d84c6feba783c51ed86790155b66ba0a9b8f49262db

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/soar_sc-rack-router.svg)](http://badge.fury.io/rb/soar_sc-rack-router) [![Build Status](https://travis-ci.org/hetznerZA/soar_sc-rack-router.svg?branch=master)](https://travis-ci.org/hetznerZA/soar_sc-rack-router)
+
 # SoarSc::Rack::Router
 
 SoarSc::Rack::Router is a middleware-centric rack router. It has three key features:

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

@@ -18,24 +18,11 @@ module SoarSc
         def initialize(method, path, action)
           validate_path(path)
           @method, @path, @action = method, path, action
-          @static = components(path).none? { |c| c.start_with?(PARAMETER_PREFIX) }
+          @static = components(@path).none? { |c| c.start_with?(PARAMETER_PREFIX) }
         end
 
         def matches?(env)
-          return false unless method == env[REQUEST_METHOD] or method == HttpMethod::ANY
-
-          return request_path(env) == path if @static
-
-          route_components = components(path)
-          req_components = components(request_path(env))
-
-          return false unless route_components.size == req_components.size
-
-          route_components.each_with_index do |c, i|
-            return false unless c.start_with?(PARAMETER_PREFIX) or c == req_components[i]
-          end
-
-          return true
+          method_matches?(env[REQUEST_METHOD]) and path_matches?(request_path(env))
         end
 
         def extract_path_parameters(env)
@@ -43,7 +30,7 @@ module SoarSc
 
           req_components = components(request_path(env))
           parameters = {}
-          components(path).each_with_index do |c, i|
+          components(@path).each_with_index do |c, i|
             parameters[c[1..-1]] = req_components[i] if c.start_with?(PARAMETER_PREFIX)
           end
           parameters
@@ -51,6 +38,35 @@ module SoarSc
 
         private
 
+        def method_matches?(method)
+          @method == method or @method == HttpMethod::ANY
+        end
+
+        def path_matches?(path)
+          if @static
+            static_path_matches?(path)
+          else
+            parameterized_path_matches?(path)
+          end
+        end
+
+        def static_path_matches?(path)
+          path == @path
+        end
+
+        def parameterized_path_matches?(path)
+          route_components = components(@path)
+          req_components = components(path)
+
+          return false unless route_components.size == req_components.size
+
+          route_components.each_with_index do |c, i|
+            return false unless c.start_with?(PARAMETER_PREFIX) or c == req_components[i]
+          end
+
+          return true
+        end
+
         def request_path(env)
           env[SCRIPT_NAME] + env[PATH_INFO]
         end

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

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

data/lib/soar_sc/rack/router.rb

@@ -14,10 +14,12 @@ module SoarSc
 
       EMPTY_STRING = ""
 
-      def initialize(app, routes = {}, &block)
+      def initialize(app, routes = nil, &block)
         @app = app
         @routes = []
-        routes.each { |(p, a)| add_route(Route.new(HttpMethod::ANY, p, a)) }
+        if !routes.nil?
+          raise NotImplementedError, "Route map syntax obsoleted (use builder syntax)"
+        end
         instance_eval(&block) if block_given?
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_sc-rack-router
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sheldon Hearn