tomogram_routing 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abd7983bdf67aa0314618cc9690576dc4daf407
-  data.tar.gz: cbad40f31afad50c16bc533affbe3f44bca63edd
+  metadata.gz: bcb98ad3fe017db262e35ca34c30ca89931bb531
+  data.tar.gz: 9b21414348bbd8649102e23018f3f320bc6edd0a
 SHA512:
-  metadata.gz: 896bfa61bb0a81b93796d1333494e0456852691a59715c11f2d14ec5e77624095387b08e46c6c44e8d8d9798ea344c919988fb6f793b2b30873fddbb983e29f6
-  data.tar.gz: dc2f4a2805945ac1218181edceb70d29a1030459cac975572124800b3aa963f7af132bda9f6399eb218fd21182472906a132ff68875d4ed8553cbd160fd8f5ae
+  metadata.gz: 7929357cc86a34a0a9844990ffbe2cccbc66d92270ebfdded6e979bfce42b6d2b0c969d4062d989b0542b8c4d32a648221d8bb14b400401ea591bbc0f5482f70
+  data.tar.gz: d2bdf5d2624d84bc501d80210b27874716979a1f2ab94cac3b06eed8448c9af87758e4cdb6ce2f0e0228ad1a1a17b193e672285504b942193cd17845779b7a80

data/lib/tomogram_routing/tomogram.rb

@@ -17,6 +17,27 @@ module TomogramRouting
 
     private
 
+    def initialize(array)
+      super
+      compile_path_patterns
+    end
+
+    def compile_path_patterns
+      each do |action|
+        next unless (path = action['path'])
+
+        regexp = compile_path_pattern(path)
+        action['path_regexp'] = regexp
+      end
+    end
+
+    def compile_path_pattern(path)
+      str = Regexp.escape(path)
+      str = str.gsub(/\\{\w+\\}/, '[^&=\/]+')
+      str = "\\A#{ str }\\z"
+      Regexp.new(str)
+    end
+
     def find_request_path(method:, path:)
       return '' unless path && path.size > 0
 
@@ -26,7 +47,7 @@ module TomogramRouting
       return action['path'] if action
 
       action = search_with_parameter(method, path, self)
-      return action['path'] if action && action.first
+      return action['path'] if action
 
       ''
     end
@@ -53,13 +74,10 @@ module TomogramRouting
 
     def search_with_parameter(method, path, documentation)
       documentation = actions_with_same_method(documentation, method)
-      sought_for_path = path.split('/')
 
-      documentation.map do |action|
-        current_path = action['path'].split('/')
-        next unless sought_for_path.size == current_path.size
-        next unless match(sought_for_path, current_path)
-        return action
+      documentation.find do |action|
+        next unless regexp = action['path_regexp']
+        regexp =~ path
       end
     end
 
@@ -68,11 +86,5 @@ module TomogramRouting
         doc['method'] == method
       end
     end
-
-    def match(sought_for_path, current_path)
-      sought_for_path.zip(current_path).all? do |p|
-        p[0] == p[1] || (p[1][0] == '{' && p[1][-1] == '}')
-      end
-    end
   end
 end

data/lib/tomogram_routing/version.rb

@@ -1,3 +1,3 @@
 module TomogramRouting
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomogram_routing
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json