queue-bus 0.5.2 → 0.5.3

data/lib/queue_bus/driver.rb

@@ -26,8 +26,7 @@ module QueueBus
                         "bus_rider_sub_key" => sub.key,
                         "bus_rider_class_name" => sub.class_name}
           bus_attr = bus_attr.merge(attributes || {})
-          bus_attr["bus_class_proxy"] = sub.class_name
-          ::QueueBus.enqueue_to(sub.queue_name, ::QueueBus::Worker, bus_attr)
+          ::QueueBus.enqueue_to(sub.queue_name, sub.class_name, bus_attr)
         end
       end
     end

data/lib/queue_bus/local.rb

@@ -3,7 +3,7 @@ module QueueBus
   class Local
 
     class << self
-      def perform(attributes = {})
+      def publish(attributes = {})
         if ::QueueBus.local_mode == :suppress
           ::QueueBus.log_worker("Suppressed: #{attributes.inspect}")
           return  # not doing anything
@@ -17,11 +17,10 @@ module QueueBus
                         "bus_rider_queue" => sub.queue_name,
                         "bus_rider_app_key" => sub.app_key,
                         "bus_rider_sub_key" => sub.key,
-                        "bus_rider_class_name" => sub.class_name,
-                        "bus_class_proxy" => sub.class_name}
+                        "bus_rider_class_name" => sub.class_name}
           to_publish = bus_attr.merge(attributes || {})
           if ::QueueBus.local_mode == :standalone
-            ::QueueBus.enqueue_to(sub.queue_name, ::QueueBus::Worker, bus_attr.merge(attributes || {}))
+            ::QueueBus.enqueue_to(sub.queue_name, sub.class_name, bus_attr.merge(attributes || {}))
           else  # defaults to inline mode
             sub.execute!(to_publish)
           end

data/lib/queue_bus/publisher.rb

@@ -3,16 +3,8 @@ module QueueBus
   class Publisher
 
     class << self
-      def perform(*args)
-        # TODO: move this to just resquebus for fallback
-        if args.size > 1
-          # handles older arguments
-          event_type = args.first
-          attributes = args.last
-        else
-          attributes = args.first
-          event_type = attributes["bus_event_type"]
-        end
+      def perform(attributes)
+        event_type = attributes["bus_event_type"]
         ::QueueBus.log_worker("Publisher running: #{event_type} - #{attributes.inspect}")
         ::QueueBus.publish(event_type, attributes)
       end

data/lib/queue_bus/publishing.rb

@@ -48,13 +48,12 @@ module QueueBus
 
     def publish(event_type, attributes = {})
       to_publish = publish_metadata(event_type, attributes)
-      to_publish["bus_class_proxy"] = ::QueueBus::Driver.name.to_s
 
       ::QueueBus.log_application("Event published: #{event_type} #{to_publish.inspect}")
       if local_mode
-        ::QueueBus::Local.perform(to_publish)
+        ::QueueBus::Local.publish(to_publish) # TODO: use different adapters
       else
-        enqueue_to(::QueueBus.incoming_queue, ::QueueBus::Worker, to_publish)
+        enqueue_to(::QueueBus.incoming_queue, ::QueueBus::Driver, to_publish)
       end
     end
 
@@ -68,8 +67,10 @@ module QueueBus
       delayed_enqueue_to(timestamp_or_epoch.to_i, incoming_queue, ::QueueBus::Worker, to_publish)
     end
 
-    def enqueue_to(queue_name, klass, hash)
-      ::QueueBus.adapter.enqueue(queue_name, klass, ::QueueBus::Util.encode(hash || {}))
+    def enqueue_to(queue_name, class_name, hash)
+      class_name = class_name.name if class_name.is_a?(Class)
+      hash = hash.merge("bus_class_proxy" => class_name.to_s)
+      ::QueueBus.adapter.enqueue(queue_name, ::QueueBus::Worker, ::QueueBus::Util.encode(hash || {}))
     end
 
     def delayed_enqueue_to(epoch_seconds, queue_name, klass, hash)

data/lib/queue_bus/version.rb

@@ -1,3 +1,3 @@
 module QueueBus
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/driver_spec.rb

@@ -95,7 +95,7 @@ module QueueBus
           hash1 = pop2
           hash2 = pop1
           args1 = pargs2
-          args2 = pargs2
+          args2 = pargs1
         end
 
         hash1["class"].should == "QueueBus::Worker"

data/spec/subscriber_spec.rb

@@ -199,7 +199,7 @@ require 'spec_helper'
       pop1 = JSON.parse(QueueBus.redis { |redis| redis.lpop("queue:myqueue") })
       pop2 = JSON.parse(QueueBus.redis { |redis| redis.lpop("queue:myqueue") })
 
-      if pop1["args"].first["bus_rider_sub_key"] == "SubscriberTest1.thing_filter"
+      if JSON.parse(pop1["args"].first)["bus_rider_sub_key"] == "SubscriberTest1.thing_filter"
         hash1 = pop1
         hash2 = pop2
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue-bus
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json