resque-bus 0.3.2 → 0.3.3

data/lib/resque-bus.rb

@@ -146,6 +146,17 @@ module ResqueBus
       I18n.locale = original_locale   unless original_locale   == false
       Time.zone   = original_timezone unless original_timezone == false
     end
+
+    def before_publish=(proc)
+      @before_publish_callback = proc
+    end
+
+    def before_publish_callback(attributes)
+      if @before_publish_callback
+        @before_publish_callback.call(attributes)
+      end
+    end
+
     
     def publish_metadata(event_type, attributes={})
       # TODO: "bus_app_key" => application.app_key ?
@@ -154,7 +165,9 @@ module ResqueBus
       bus_attr["bus_app_hostname"] = hostname
       bus_attr["bus_locale"]       = I18n.locale.to_s if defined?(I18n) && I18n.respond_to?(:locale) && I18n.locale
       bus_attr["bus_timezone"]     = Time.zone.name   if defined?(Time) && Time.respond_to?(:zone)   && Time.zone
-      bus_attr.merge(attributes || {})
+      out = bus_attr.merge(attributes || {})
+      ResqueBus.before_publish_callback(out)
+      out
     end
     
     def generate_uuid
@@ -224,6 +237,7 @@ module ResqueBus
       @dispatcher = nil
       @default_app_key = nil
       @default_queue = nil
+      @before_publish_callback = nil
     end
     
     def incoming_queue

data/lib/resque_bus/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Bus
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/spec/driver_spec.rb

@@ -80,20 +80,11 @@ module ResqueBus
         
         hash = JSON.parse(ResqueBus.redis.lpop("queue:default"))
         hash["class"].should == "::ResqueBus::Rider"
-        hash["args"][0].should == {"bus_rider_app_key"=>"app3", "x" => "y", "bus_event_type" => "event5", "bus_rider_sub_key"=>"event5", "bus_rider_queue" => "default"}.merge(bus_attrs)
-        first = hash["args"][0]["bus_rider_sub_key"]
-        
+        hash["args"][0].should == {"bus_rider_app_key"=>"app3", "x" => "y", "bus_event_type" => "event5", "bus_rider_sub_key"=>"event[45]", "bus_rider_queue" => "default"}.merge(bus_attrs)
+
         hash = JSON.parse(ResqueBus.redis.lpop("queue:default"))
         hash["class"].should == "::ResqueBus::Rider"
-        hash["args"][0].should == {"bus_rider_app_key"=>"app3", "x" => "y", "bus_event_type" => "event5", "bus_rider_sub_key"=>"event[45]", "bus_rider_queue" => "default"}.merge(bus_attrs)
-        second= hash["args"][0]["bus_rider_sub_key"]
-        
-        if first == "event[45]"
-          second.should == "event5"
-        else
-          first.should == "event5"
-          second.should == "event[45]"
-        end
+        hash["args"][0].should == {"bus_rider_app_key"=>"app3", "x" => "y", "bus_event_type" => "event5", "bus_rider_sub_key"=>"event5", "bus_rider_queue" => "default"}.merge(bus_attrs)
       end
     end
   end

data/spec/publish_spec.rb

@@ -44,16 +44,37 @@ describe "Publishing an event" do
     hash["args"].should == [ {"bus_event_type" => event_name, "two"=>"here", "one"=>1}.merge(bus_attrs).merge("bus_id" => 'app-given') ]
   end
   
+  it "should add metadata via callback" do
+    myval = 0
+    ResqueBus.before_publish = lambda { |att|
+      att["mine"] = 4
+      myval += 1
+    }
 
+    hash = {:one => 1, "two" => "here", "bus_id" => "app-given" }
+    event_name = "event_name"
+    
+    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+    val.should == nil
+    
+    ResqueBus.publish(event_name, hash)
+
+
+    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+    hash = JSON.parse(val)
+    att = hash["args"].first
+    att["mine"].should == 4
+    myval.should == 1
+  end
   
   it "should set the timezone and locale if available" do
     defined?(I18n).should be_nil
     Time.respond_to?(:zone).should be_false
     
     stub_const("I18n", Class.new)
-    I18n.should_receive(:locale).and_return("jp")
+    I18n.stub(:locale).and_return("jp")
     
-    Time.should_receive(:zone).and_return(double('zone', :name => "EST"))
+    Time.stub(:zone).and_return(double('zone', :name => "EST"))
     
     hash = {:one => 1, "two" => "here", "bus_id" => "app-given" }
     event_name = "event_name"

data/spec/subscriber_spec.rb

@@ -190,22 +190,22 @@ module ResqueBus
 
       hash = JSON.parse(ResqueBus.redis.lpop("queue:myqueue"))
       hash["class"].should == "SubscriberTest1"
-      hash["args"].should == [ {"bus_rider_app_key"=>"my_thing", "bus_rider_sub_key"=>"SubscriberTest1.event_sub", "bus_rider_queue" => "myqueue", "bus_rider_class_name"=>"SubscriberTest1",
+      hash["args"].should == [ {"bus_rider_app_key"=>"my_thing", "bus_rider_sub_key"=>"SubscriberTest1.thing_filter", "bus_rider_queue" => "myqueue", "bus_rider_class_name"=>"SubscriberTest1",
                                 "bus_event_type" => "event_sub", "x" => "y"}.merge(bus_attrs) ]
                                 
       Runner1.value.should == 0
       Runner2.value.should == 0
       Util.constantize(hash["class"]).perform(*hash["args"])
-      Runner1.value.should == 1
-      Runner2.value.should == 0
+      Runner1.value.should == 0
+      Runner2.value.should == 1
       
       hash = JSON.parse(ResqueBus.redis.lpop("queue:myqueue"))
       hash["class"].should == "SubscriberTest1"
-      hash["args"].should == [ {"bus_rider_app_key"=>"my_thing", "bus_rider_sub_key"=>"SubscriberTest1.thing_filter", "bus_rider_queue" => "myqueue", "bus_rider_class_name"=>"SubscriberTest1",
+      hash["args"].should == [ {"bus_rider_app_key"=>"my_thing", "bus_rider_sub_key"=>"SubscriberTest1.event_sub", "bus_rider_queue" => "myqueue", "bus_rider_class_name"=>"SubscriberTest1",
                                 "bus_event_type" => "event_sub", "x" => "y"}.merge(bus_attrs) ]
-                                
-      Runner1.value.should == 1
-      Runner2.value.should == 0
+         
+      Runner1.value.should == 0
+      Runner2.value.should == 1
       Util.constantize(hash["class"]).perform(*hash["args"])
       Runner1.value.should == 1
       Runner2.value.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-bus
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque