ribbon-event_bus 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0e255bfceecf580acb711845bdf8402d212593
-  data.tar.gz: 107d32e1e5dd6c66597aaefae1d3dfa6a2cc13ab
+  metadata.gz: 07d4601534a5d201e75d5c81367616d82e278c2e
+  data.tar.gz: de763f8aeb39610d210860de8050f6dd6a78327d
 SHA512:
-  metadata.gz: 29404aa9a31933c838acd94e60d9c0f22bd8d9ea2e46739fcca65cc83dc6778527df8ac2ecc4f801c23daff2067f61465b642eb39d65da2d801f5bc256eb7900
-  data.tar.gz: 830ded2e0e09da4db4403dbdc228565302895f711edb5b2c117d612747f576f3797f2343ae1815b3ad5de00e166e65d81e587037ed780a04e8a2de2b6ae57c14
+  metadata.gz: 0d1adb38016cc6bb5c59b9d345d147f2dc224d69de9bf166bc13a1a0e4c32869a84a3f3e362a163473551f54a88b1d90d1679838e5d0fcf99488b728063d7a36
+  data.tar.gz: 76a811606c9e92f8c87f6c9131ad7e20e8a011648729c8b86f2da4b053d2a34e5dfd1e8a347cbe50a01820837a15401c4e440d777e3b8098c3a54ce244e4eb29

data/config/defaults.yml

@@ -1,10 +1,11 @@
 subscriptions:
   default_priority: medium
+  max_priority: 5
 
 publishers:
   resque:
     publisher_queue: publisher
-    subscription_queue_format: 'subscriptions_p%{priority}'
+    subscription_queue_formatter: null
 
   remote_resque:
     queue: publisher

data/lib/ribbon/event_bus/instance.rb

@@ -72,6 +72,15 @@ module Ribbon
         _subscriptions_by_locators[locator]
       end
 
+      def find_publisher(publisher)
+        klass = Publishers.load(publisher)
+        publishers && publishers.find { |pub| pub.is_a?(klass) }
+      end
+
+      def has_publisher?(publisher)
+        !!find_publisher(publisher)
+      end
+
       def _register_subscription(subscription)
         if _subscriptions_by_locators[subscription.locator]
           # This is not expected to occur

data/lib/ribbon/event_bus/publishers/remote_resque_publisher.rb

@@ -21,7 +21,6 @@ module Ribbon::EventBus
         # These should be the same as the args passed to Resque.enqueue in
         # ResquePublisher#publish(event).
         args = [
-          config.subscription_queue_format.to_s,
           event.serialize
         ]
 

data/lib/ribbon/event_bus/publishers/resque_publisher.rb

@@ -5,13 +5,33 @@ module Ribbon::EventBus
     class ResquePublisher < Publisher
       config_key :resque
 
+      def initialize(instance=nil, params={})
+        super
+        _disallow_multiple_per_instance
+      end
+
       def publish(event)
         super
 
         unless event.subscriptions.empty?
           PublisherJob.set_queue(config.publisher_queue.to_sym)
-          sub_queue_format = config.subscription_queue_format.to_s
-          Resque.enqueue(PublisherJob, sub_queue_format, event.serialize)
+          Resque.enqueue(PublisherJob, event.serialize)
+        end
+      end
+
+      def subscription_queue_formatter
+        if config.subscription_queue_formatter?
+          formatter = config.subscription_queue_formatter
+          case formatter
+          when Array
+            formatter.last
+          when Proc
+            formatter
+          else
+            raise Errors::PublisherError, "Invalid subscription_queue_formatter: #{formatter.inspect}"
+          end
+        else
+          lambda { |subscription| "subscriptions_p#{subscription.priority}" }
         end
       end
 
@@ -20,24 +40,22 @@ module Ribbon::EventBus
           @queue = queue
         end
 
-        def self.perform(sub_queue_format, serialized_event)
+        def self.perform(serialized_event)
           event = Event.deserialize(serialized_event)
           instance = event.instance
 
+          publisher = instance.find_publisher(:resque)
+          raise Errors::PublisherError, 'No ResquePublisher found' unless publisher
+          queue_formatter = publisher.subscription_queue_formatter
+
           instance.plugins.perform(:resque_publish, event) do |event|
             event.subscriptions.each { |s|
-              SubscriptionJob.set_queue(
-                (sub_queue_format % {
-                  event: event.name,
-                  priority: s.priority
-                }).to_sym
-              )
-
+              SubscriptionJob.set_queue(queue_formatter.call(s).to_sym)
               Resque.enqueue(SubscriptionJob, s.serialize, event.serialize)
             }
           end
         end
-      end
+      end # PublisherJob
 
       module SubscriptionJob
         def self.set_queue(queue)
@@ -49,6 +67,14 @@ module Ribbon::EventBus
           event = Event.deserialize(serialized_event)
           subscription.handle(event)
         end
+      end # SubscriptionJob
+
+      private
+      def _disallow_multiple_per_instance
+        if instance.has_publisher?(:resque)
+          raise Errors::PublisherError,
+            "cannot have multiple ResquePublishers in an EventBus instance"
+        end
       end
     end
   end

data/lib/ribbon/event_bus/subscription.rb

@@ -14,14 +14,6 @@ module Ribbon::EventBus
     attr_reader :priority
     attr_reader :locator
 
-    PRIORITY_SYMBOL_TO_INTEGER_MAP = {
-      highest: 1,
-      high: 3,
-      medium: 5,
-      low: 7,
-      lowest: 10
-    }.freeze
-
     def initialize(event_name, params={}, &block)
       @event_name = event_name.to_sym
       @_block = block
@@ -73,6 +65,19 @@ module Ribbon::EventBus
       Digest::MD5.hexdigest(_path).to_sym
     end
 
+    def _symbol_to_priority(sym)
+      (@__symbol_to_priority_map ||= _generate_priority_shortcut_map)[sym]
+    end
+
+    def _generate_priority_shortcut_map(max_priority=config.max_priority)
+      {}.tap { |map|
+        map.merge!(highest: 1, lowest: max_priority)
+        map[:medium] = (map[:lowest] / 2.0).ceil
+        map[:high] = (map[:medium] / 2.0).ceil
+        map[:low] = ((map[:lowest] + map[:medium]) / 2.0).ceil
+      }.freeze
+    end
+
     ############################################################################
     # Parameter Evaluation Logic
     #
@@ -106,13 +111,13 @@ module Ribbon::EventBus
 
     # Evaluate an integer as a priority.
     def _evaluate_priority_int(int)
-      raise Errors::InvalidPriorityError, int unless int > 0 && int <= 10
+      raise Errors::InvalidPriorityError, int unless int > 0 && int <= config.max_priority
       int
     end
 
     # Evaluate a symbol as a priority.
     def _evaluate_priority_symbol(sym)
-      if (priority = PRIORITY_SYMBOL_TO_INTEGER_MAP[sym])
+      if (priority = _symbol_to_priority(sym))
         _evaluate_priority(priority)
       else
         raise Errors::InvalidPriorityError, sym.inspect

data/lib/ribbon/event_bus/version.rb

@@ -1,5 +1,5 @@
 module Ribbon
   module EventBus
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ribbon-event_bus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Honer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ribbon-plugins