resque-bus 0.3.7 → 0.5.7

data/spec/matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module ResqueBus
+module QueueBus
   describe Matcher do
     it "should already return false on empty filters" do
       matcher = Matcher.new({})
@@ -8,19 +8,19 @@ module ResqueBus
       matcher.matches?(nil).should  == false
       matcher.matches?("name" => "val").should == false
     end
-    
+
     it "should not crash if nil inputs" do
       matcher = Matcher.new("name" => "val")
       matcher.matches?(nil).should == false
     end
-    
+
     it "string filter to/from redis" do
       matcher = Matcher.new("name" => "val")
       matcher.matches?("name" => "val").should   == true
       matcher.matches?("name" => " val").should  == false
       matcher.matches?("name" => "zval").should  == false
     end
-    
+
     it "regex filter" do
       matcher = Matcher.new("name" => /^[cb]a+t/)
       matcher.matches?("name" => "cat").should == true
@@ -29,7 +29,7 @@ module ResqueBus
       matcher.matches?("name" => "ct").should == false
       matcher.matches?("name" => "bcat").should == false
     end
-    
+
     it "present filter" do
       matcher = Matcher.new("name" => :present)
       matcher.matches?("name" => "").should == false
@@ -37,7 +37,7 @@ module ResqueBus
       matcher.matches?("name" => "bear").should == true
       matcher.matches?("other" => "bear").should == false
     end
-    
+
     it "blank filter" do
       matcher = Matcher.new("name" => :blank)
       matcher.matches?("name" => nil).should == true
@@ -47,7 +47,7 @@ module ResqueBus
       matcher.matches?("name" => "bear").should == false
       matcher.matches?("name" => "   s ").should == false
     end
-    
+
     it "nil filter" do
       matcher = Matcher.new("name" => :nil)
       matcher.matches?("name" => nil).should == true
@@ -56,7 +56,7 @@ module ResqueBus
       matcher.matches?("name" => "  ").should == false
       matcher.matches?("name" => "bear").should == false
     end
-    
+
     it "key filter" do
       matcher = Matcher.new("name" => :key)
       matcher.matches?("name" => nil).should == true
@@ -65,7 +65,7 @@ module ResqueBus
       matcher.matches?("name" => "  ").should == true
       matcher.matches?("name" => "bear").should == true
     end
-    
+
     it "empty filter" do
       matcher = Matcher.new("name" => :empty)
       matcher.matches?("name" => nil).should == false
@@ -75,7 +75,7 @@ module ResqueBus
       matcher.matches?("name" => "bear").should == false
       matcher.matches?("name" => "   s ").should == false
     end
-    
+
     it "value filter" do
       matcher = Matcher.new("name" => :value)
       matcher.matches?("name" => nil).should == false
@@ -85,7 +85,7 @@ module ResqueBus
       matcher.matches?("name" => "bear").should == true
       matcher.matches?("name" => "   s ").should == true
     end
-    
+
     it "multiple filters" do
       matcher = Matcher.new("name" => /^[cb]a+t/, "state" => "sleeping")
       matcher.matches?("state" => "sleeping", "name" => "cat").should  == true
@@ -94,7 +94,7 @@ module ResqueBus
       matcher.matches?("state" => "sleeping", "name" => "bear").should == false
       matcher.matches?("state" => "awake", "name" => "bear").should    == false
     end
-    
+
     it "regex should go back and forth into redis" do
       matcher = Matcher.new("name" => /^[cb]a+t/)
       matcher.matches?("name" => "cat").should == true
@@ -102,40 +102,40 @@ module ResqueBus
       matcher.matches?("name" => "caaaaat").should == true
       matcher.matches?("name" => "ct").should == false
       matcher.matches?("name" => "bcat").should == false
-      
-      ResqueBus.redis.set("temp1", Resque.encode(matcher.to_redis))
-      redis = ResqueBus.redis.get("temp1")
-      matcher = Matcher.new(Resque.decode(redis))
+
+      QueueBus.redis { |redis| redis.set("temp1", QueueBus::Util.encode(matcher.to_redis) ) }
+      redis = QueueBus.redis { |redis| redis.get("temp1") }
+      matcher = Matcher.new(QueueBus::Util.decode(redis))
       matcher.matches?("name" => "cat").should == true
       matcher.matches?("name" => "bat").should == true
       matcher.matches?("name" => "caaaaat").should == true
       matcher.matches?("name" => "ct").should == false
       matcher.matches?("name" => "bcat").should == false
-      
-      ResqueBus.redis.set("temp2", Resque.encode(matcher.to_redis))
-      redis = ResqueBus.redis.get("temp2")
-      matcher = Matcher.new(Resque.decode(redis))
+
+      QueueBus.redis { |redis| redis.set("temp2", QueueBus::Util.encode(matcher.to_redis) ) }
+      redis = QueueBus.redis { |redis| redis.get("temp2") }
+      matcher = Matcher.new(QueueBus::Util.decode(redis))
       matcher.matches?("name" => "cat").should == true
       matcher.matches?("name" => "bat").should == true
       matcher.matches?("name" => "caaaaat").should == true
       matcher.matches?("name" => "ct").should == false
       matcher.matches?("name" => "bcat").should == false
     end
-    
+
     it "special value should go back and forth into redis" do
       matcher = Matcher.new("name" => :blank)
       matcher.matches?("name" => "cat").should == false
       matcher.matches?("name" => "").should    == true
-      
-      ResqueBus.redis.set("temp1", Resque.encode(matcher.to_redis))
-      redis = ResqueBus.redis.get("temp1")
-      matcher = Matcher.new(Resque.decode(redis))
+
+      QueueBus.redis { |redis| redis.set("temp1", QueueBus::Util.encode(matcher.to_redis) ) }
+      redis= QueueBus.redis { |redis| redis.get("temp1") }
+      matcher = Matcher.new(QueueBus::Util.decode(redis))
       matcher.matches?("name" => "cat").should == false
       matcher.matches?("name" => "").should    == true
-      
-      ResqueBus.redis.set("temp2", Resque.encode(matcher.to_redis))
-      redis = ResqueBus.redis.get("temp2")
-      matcher = Matcher.new(Resque.decode(redis))
+
+      QueueBus.redis { |redis| redis.set("temp2", QueueBus::Util.encode(matcher.to_redis) ) }
+      redis= QueueBus.redis { |redis| redis.get("temp2") }
+      matcher = Matcher.new(QueueBus::Util.decode(redis))
       matcher.matches?("name" => "cat").should == false
       matcher.matches?("name" => "").should    == true
     end

data/spec/publish_spec.rb

@@ -1,93 +1,96 @@
 require 'spec_helper'
 
 describe "Publishing an event" do
-  
+
   before(:each) do
     Timecop.freeze
-    ResqueBus.stub(:generate_uuid).and_return("idfhlkj")
+    QueueBus.stub(:generate_uuid).and_return("idfhlkj")
   end
   after(:each) do
     Timecop.return
   end
-  let(:bus_attrs) { {"bus_published_at" => Time.now.to_i,
+  let(:bus_attrs) { {"bus_class_proxy"=>"QueueBus::Driver",
+                     "bus_published_at" => Time.now.to_i,
                      "bus_id"=>"#{Time.now.to_i}-idfhlkj",
                      "bus_app_hostname" =>  `hostname 2>&1`.strip.sub(/.local/,'')} }
-  
+
   it "should add it to Redis" do
     hash = {:one => 1, "two" => "here", "id" => 12 }
     event_name = "event_name"
-    
-    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+
+    val = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     val.should == nil
-    
-    ResqueBus.publish(event_name, hash)
-    
-    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+
+    QueueBus.publish(event_name, hash)
+
+    val = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     hash = JSON.parse(val)
-    hash["class"].should == "ResqueBus::Driver"
-    hash["args"].should == [ {"bus_event_type" => event_name, "two"=>"here", "one"=>1, "id" => 12}.merge(bus_attrs) ]
-    
+    hash["class"].should == "QueueBus::Worker"
+    hash["args"].size.should == 1
+    JSON.parse(hash["args"].first).should == {"bus_event_type" => event_name, "two"=>"here", "one"=>1, "id" => 12}.merge(bus_attrs)
+
   end
-  
+
   it "should use the id if given" do
     hash = {:one => 1, "two" => "here", "bus_id" => "app-given" }
     event_name = "event_name"
-    
-    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+
+    val = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     val.should == nil
-    
-    ResqueBus.publish(event_name, hash)
-    
-    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+
+    QueueBus.publish(event_name, hash)
+
+    val = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     hash = JSON.parse(val)
-    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') ]
+    hash["class"].should == "QueueBus::Worker"
+    hash["args"].size.should == 1
+    JSON.parse(hash["args"].first).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|
+    QueueBus.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 = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     val.should == nil
-    
-    ResqueBus.publish(event_name, hash)
+
+    QueueBus.publish(event_name, hash)
 
 
-    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+    val = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     hash = JSON.parse(val)
-    att = hash["args"].first
+    att = JSON.parse(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
-    
+    Time.respond_to?(:zone).should eq(false)
+
     stub_const("I18n", Class.new)
     I18n.stub(:locale).and_return("jp")
-    
+
     Time.stub(: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 = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     val.should == nil
-    
-    ResqueBus.publish(event_name, hash)
-    
-    val = ResqueBus.redis.lpop("queue:resquebus_incoming")
+
+    QueueBus.publish(event_name, hash)
+
+    val = QueueBus.redis { |redis| redis.lpop("queue:bus_incoming") }
     hash = JSON.parse(val)
-    hash["class"].should == "ResqueBus::Driver"
-    att = hash["args"].first
+    hash["class"].should == "QueueBus::Worker"
+    att = JSON.parse(hash["args"].first)
     att["bus_locale"].should == "jp"
     att["bus_timezone"].should == "EST"
   end

data/spec/publisher_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module QueueBus
+  describe Publisher do
+    it "should call publish as expected"
+  end
+end

data/spec/rider_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-module ResqueBus
+module QueueBus
   describe Rider do
     it "should call execute" do
-      ResqueBus.should_receive(:dispatcher_execute)
+      QueueBus.should_receive(:dispatcher_execute)
       Rider.perform("bus_rider_app_key" => "app", "bus_rider_sub_key" => "sub", "ok" => true, "bus_event_type" => "event_name")
     end
-    
+
     it "should change the value" do
-      ResqueBus.dispatch("r1") do
+      QueueBus.dispatch("r1") do
         subscribe "event_name" do |attributes|
           Runner1.run(attributes)
         end
@@ -18,74 +18,22 @@ module ResqueBus
       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
+      QueueBus.dispatch("r1") do
+        subscribe "event_name" do |attributes|
+          Runner1.run(attributes)
+        end
+      end
+
       defined?(I18n).should be_nil
-      Time.respond_to?(:zone).should be_false
+      Time.respond_to?(:zone).should eq(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
-        Resque.redis = "example.com/bad"
-        ResqueBus.original_redis =  Resque.redis
-        ResqueBus.redis = "localhost:6379"
-        
-        
-        ResqueBus.enqueue_to("testing", "::ResqueBus::Rider", { "bus_rider_app_key" => "r2", "bus_rider_sub_key" => "event_name", "bus_event_type" => "event_name", "ok" => true, "bus_rider_queue" => "testing" })
-        
-        # like the job does
-        Resque.redis = ResqueBus.redis
-        
-        @worker = Resque::Worker.new(:testing)
-        @worker.register_worker
-      end
-      
-      it "should use the app's redis within the rider" do
-        host = Resque.redis.instance_variable_get("@redis").instance_variable_get("@client").host
-        host.should == "localhost"
-        
-        ResqueBus.dispatch("r2") do
-          subscribe "event_name" do |attributes|
-            host = Resque.redis.instance_variable_get("@redis").instance_variable_get("@client").host
-            if host == "example.com"
-              Runner1.run(attributes)
-            end
-          end
-        end
-        
-        host = Resque.redis.instance_variable_get("@redis").instance_variable_get("@client").host
-        host.should == "localhost"
-        
-        
-        Runner1.value.should == 0
-        perform_next_job @worker
-        Runner1.value.should == 1
-      end
-      
-      it "should put it in the failed jobs" do
- 
-        ResqueBus.dispatch("r2") do
-          subscribe "event_name" do |attributes|
-            raise "boo!"
-          end
-        end
-        
-        perform_next_job @worker
-        Resque.info[:processed].should == 1
-        Resque.info[:failed].should == 1
-        Resque.info[:pending].should == 1 # requeued
-
-        perform_next_job @worker
-        Resque.info[:processed].should == 2
-        Resque.info[:failed].should == 2
-        Resque.info[:pending].should == 0
-      end
-    end    
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,49 +1,45 @@
 require 'timecop'
-require 'resque-bus'
-require 'resque/scheduler'
+require 'queue-bus'
+require 'adapter/support'
 
-module ResqueBus
+reset_test_adapter
+
+module QueueBus
   class Runner
     def self.value
       @value ||= 0
     end
-    
+
     def self.attributes
       @attributes
     end
-    
+
     def self.run(attrs)
       @value ||= 0
       @value += 1
       @attributes = attrs
     end
-    
+
     def self.reset
       @value = nil
       @attributes = nil
     end
   end
-  
+
   class Runner1 < Runner
   end
-  
+
   class Runner2 < Runner
   end
 end
 
-def perform_next_job(worker, &block)
-  return unless job = worker.reserve
-  worker.perform(job, &block)
-  worker.done_working
-end
-
 def test_sub(event_name, queue="default")
   matcher = {"bus_event_type" => event_name}
-  ResqueBus::Subscription.new(queue, event_name, "::ResqueBus::Rider", matcher, nil)
+  QueueBus::Subscription.new(queue, event_name, "::QueueBus::Rider", matcher, nil)
 end
 
 def test_list(*args)
-  out = ResqueBus::SubscriptionList.new
+  out = QueueBus::SubscriptionList.new
   args.each do |sub|
     out.add(sub)
   end
@@ -51,20 +47,24 @@ def test_list(*args)
 end
 
 RSpec.configure do |config|
-  config.mock_framework = :rspec
-  
+  config.mock_with :rspec do |c|
+    c.syntax = :should
+  end
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+
   config.before(:each) do
-    ResqueBus.send(:reset)
+    reset_test_adapter
+    ResqueBus.show_deprecations = true
   end
   config.after(:each) do
     begin
-      ResqueBus.redis.flushall
+      QueueBus.redis { |redis| redis.flushall }
     rescue
     end
-    ResqueBus.send(:reset)
-    ResqueBus::Runner1.reset
-    ResqueBus::Runner2.reset
+    QueueBus.send(:reset)
+    QueueBus::Runner1.reset
+    QueueBus::Runner2.reset
   end
 end
-
-ResqueBus.redis.namespace = "resquebus_test"