cotton-tail 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790abb66e618fd55310f4acbca7b7d0498f158af153c454c696ee084e13257c4
-  data.tar.gz: f12d3be7f5fbda32a435e161f95e672878e6a1a5b357880c23ee37defbd96a9f
+  metadata.gz: ea50d4559d3b22547293d0efb07f7841837e272b877a96646c948a2d125313a8
+  data.tar.gz: 640b18d1aefc48686535b9f1f3685c38c5fc1724492192bb766dfdd39573d0ca
 SHA512:
-  metadata.gz: b07dfcbe78301c9e688b3b6616a5f054961d8d77c63f4ef8e3e6c0d604bb07f7382f39986ada745e451d216e3d3ac08d12565eded41de62259d0258facbc3405
-  data.tar.gz: 0c09960c9c4733c3d9894db627e7d46edc431ba6c1c467236ee60dd52b0285ff6180ff76af80dc357e267503e3b3f6b4ec4f732879c5f34466cbd2e4b7676d4e
+  metadata.gz: 433de64af1c506e5f997e7cd24c70453110822662b6ba5139673b443bff235100a15d6dad2f1e3e23f0e429cab08dd927c0c47b614094b3f0160893ee6644541
+  data.tar.gz: 18a12763f6a88ab0940c20850e1110b0a4305f69451f5ef2ef2c7a5f82ec1f59bf48e41dccc8e9740da3854314c3c82c4c84a50d0878ae94c662617c2fa434bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cotton-tail (0.4.1)
+    cotton-tail (0.5.0)
       bunny (~> 2.12)
       ibsciss-middleware (~> 0.4.2)
 

data/lib/cotton_tail.rb

@@ -9,6 +9,7 @@ module CottonTail
   autoload :DSL, 'cotton_tail/dsl'
   autoload :Middleware, 'cotton_tail/middleware'
   autoload :Queue, 'cotton_tail/queue'
+  autoload :Route, 'cotton_tail/route'
   autoload :Router, 'cotton_tail/router'
   autoload :Version, 'cotton_tail/version'
 
@@ -28,6 +29,9 @@ module CottonTail
 
   Response = Struct.new(:body)
 
+  class RouteConflictError < StandardError
+  end
+
   class UndefinedRouteError < StandardError
   end
 end

data/lib/cotton_tail/dsl/routes.rb

@@ -43,7 +43,7 @@ module CottonTail
 
       def handle(key, handler = nil, &block)
         handler ||= block
-        handlers[key] = handler
+        handlers[Route.new(key)] = handler
       end
 
       def handlers

data/lib/cotton_tail/middleware.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'middleware'
-require 'logger'
 
 module CottonTail
   # Top level namespace for Middleware

data/lib/cotton_tail/middleware/router.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module CottonTail
   module Middleware
     # Router Middleware
@@ -18,13 +20,26 @@ module CottonTail
 
       private
 
-      def handler(route)
-        handlers.fetch(route) { raise UndefinedRouteError }
+      def route(routing_key)
+        CottonTail::Route.new(routing_key)
       end
 
       def response(routing_key, message)
         CottonTail::Response.new handler(routing_key).call(message)
       end
+
+      def routes(routing_key)
+        handlers.keys.select { |route| route.match? routing_key }
+      end
+
+      def handler(routing_key)
+        route, *conflicts = routes(routing_key)
+        raise UndefinedRouteError if route.nil?
+
+        raise RouteConflictError unless conflicts.empty?
+
+        handlers[route]
+      end
     end
   end
 end

data/lib/cotton_tail/route.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module CottonTail
+  # Route value object
+  class Route
+    attr_reader :pattern
+
+    def initialize(pattern)
+      @pattern = pattern
+    end
+
+    def match?(routing_key)
+      return true if @pattern == routing_key
+
+      regex.match? routing_key
+    end
+
+    def to_s
+      @pattern
+    end
+
+    private
+
+    def regex
+      @regex ||= Regexp.new build_regex(@pattern)
+    end
+
+    def build_regex(pattern)
+      [
+        '^',
+        pattern.gsub('*', '([^.]+)').gsub(/\.?#\.?/, '([^.]{0,}\.?)+'),
+        '$'
+      ].join
+    end
+  end
+end

data/lib/cotton_tail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CottonTail
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cotton-tail
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Brennan
@@ -30,7 +30,7 @@ cert_chain:
   fXe/xr/Sc+2wCjHPVE2J+auN5hk3KCp1I4s2fKqyLIwyhTEF3shuYfCpC8rt/YdN
   cy9/lg5LCI3OvakzxL4Xt1Sq4h/xJZ06ydTVJ1wxfk6BXHrg
   -----END CERTIFICATE-----
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -219,6 +219,7 @@ files:
 - lib/cotton_tail/queue/memory.rb
 - lib/cotton_tail/queue/reader.rb
 - lib/cotton_tail/queue/supervisor.rb
+- lib/cotton_tail/route.rb
 - lib/cotton_tail/version.rb
 homepage: https://github.com/jamesBrennan/cotton-tail
 licenses: