resque-bus 0.2.7 → 0.2.8

data/lib/resque-bus.rb

@@ -117,11 +117,26 @@ module ResqueBus
       @original_redis
     end
     
+    def with_global_attributes(attributes)
+      original_timezone = false
+      original_locale   = false
+      
+      I18n.locale = attributes["bus_locale"]   if defined?(I18n) && I18n.respond_to?(:locale=)
+      Time.zone   = attributes["bus_timezone"] if defined?(Time) && Time.respond_to?(:zone=)
+      
+      yield
+    ensure
+      I18n.locale = original_locale   unless original_locale   == false
+      Time.zone   = original_timezone unless original_timezone == false
+    end
+    
     def publish_metadata(event_type, attributes={})
       # TODO: "bus_app_key" => application.app_key ?
       bus_attr = {"bus_published_at" => Time.now.to_i, "created_at" => Time.now.to_i, "bus_event_type" => event_type}
-      bus_attr["bus_id"] ||= "#{Time.now.to_i}-#{generate_uuid}"
+      bus_attr["bus_id"]           = "#{Time.now.to_i}-#{generate_uuid}"
       bus_attr["bus_app_hostname"] = hostname
+      bus_attr["bus_locale"]       = I18n.locale    if defined?(I18n) && I18n.respond_to?(:locale)
+      bus_attr["bus_timezone"]     = Time.zone.name if defined?(Time) && Time.respond_to?(:zone)
       bus_attr.merge(attributes || {})
     end
     

data/lib/resque_bus/subscriber.rb

@@ -38,10 +38,13 @@ module ResqueBus
       def transform(method_name)
         @transform = method_name
       end
+      
       def perform(attributes)
-        sub_key = attributes["bus_rider_sub_key"]
-        meth_key = sub_key.split(".").last
-        resque_bus_execute(meth_key, attributes)
+        ResqueBus.with_global_attributes(attributes) do
+          sub_key = attributes["bus_rider_sub_key"]
+          meth_key = sub_key.split(".").last
+          resque_bus_execute(meth_key, attributes)
+        end
       end
       
       def resque_bus_execute(key, attributes)

data/lib/resque_bus/subscription.rb

@@ -33,7 +33,9 @@ module ResqueBus
     
     def execute!(attributes)
       attributes = attributes.with_indifferent_access if attributes.respond_to?(:with_indifferent_access)
-      executor.call(attributes)
+      ResqueBus.with_global_attributes(attributes) do
+        executor.call(attributes)
+      end
     end
     
     def matches?(attributes)

data/lib/resque_bus/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Bus
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/spec/publish_spec.rb

@@ -44,5 +44,32 @@ describe "Publishing an event" do
     hash["class"].should == "ResqueBus::Driver"
     hash["args"].should == [ {"bus_event_type" => event_name, "two"=>"here", "one"=>1}.merge(bus_attrs).merge("bus_id" => 'app-given') ]
   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")
+    
+    Time.should_receive(:zone).and_return(double('zone', :name => "EST"))
+    
+    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)
+    hash["class"].should == "ResqueBus::Driver"
+    att = hash["args"].first
+    att["bus_locale"].should == "jp"
+    att["bus_timezone"].should == "EST"
+  end
 
 end

data/spec/rider_spec.rb

@@ -14,11 +14,21 @@ module ResqueBus
         end
       end
       Runner1.value.should == 0
-      Rider.perform("bus_rider_app_key" => "r1", "bus_rider_sub_key" => "event_name", "ok" => true, "bus_event_type" => "event_name")
+      Rider.perform("bus_locale" => "en", "bus_timezone" => "PST", "bus_rider_app_key" => "r1", "bus_rider_sub_key" => "event_name", "ok" => true, "bus_event_type" => "event_name")
       Rider.perform("bus_rider_app_key" => "other", "bus_rider_sub_key" => "event_name", "ok" => true, "bus_event_type" => "event_name")
       Runner1.value.should == 1
     end
     
+    it "should set the timezone and locale if present" do
+      defined?(I18n).should be_nil
+      Time.respond_to?(:zone).should be_false
+
+      stub_const("I18n", Class.new)
+      I18n.should_receive(:locale=).with("en")
+      Time.should_receive(:zone=).with("PST")
+      
+      Rider.perform("bus_locale" => "en", "bus_timezone" => "PST", "bus_rider_app_key" => "r1", "bus_rider_sub_key" => "event_name", "ok" => true, "bus_event_type" => "event_name")
+    end
     
     context "Integration Test" do
       before(:each) do
@@ -76,8 +86,6 @@ module ResqueBus
         Resque.info[:failed].should == 2
         Resque.info[:pending].should == 0
       end
-    end
-   
-    
+    end    
   end
 end

data/spec/subscriber_spec.rb

@@ -229,5 +229,24 @@ module ResqueBus
       
       ResqueBus.redis.lpop("queue:myqueue").should be_nil
     end
+    
+    describe ".perform" do
+      let(:attributes) { {"bus_rider_sub_key"=>"SubscriberTest1.event_sub", "bus_locale" => "en", "bus_timezone" => "PST"} }
+      it "should call the method based on key" do
+        SubscriberTest1.any_instance.should_receive(:event_sub)
+        SubscriberTest1.perform(attributes)
+      end
+      it "should set the timezone and locale if present" do
+        defined?(I18n).should be_nil
+        Time.respond_to?(:zone).should be_false
+
+        stub_const("I18n", Class.new)
+        I18n.should_receive(:locale=).with("en")
+        Time.should_receive(:zone=).with("PST")
+        
+        SubscriberTest1.any_instance.should_receive(:event_sub)
+        SubscriberTest1.perform(attributes)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-bus
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque