resque-bus 0.3.5 → 0.3.6

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.mdown

@@ -221,7 +221,7 @@ That will use the default (resque) namespace which can be helpful for using the
 ```ruby
 # config
 Resque.redis = "192.168.1.0:6379"
-ResqusBus.redis.namespace = :get_on_the_bus
+ResqueBus.redis.namespace = :get_on_the_bus
 ```
 
 ### Local Mode

data/lib/resque-bus.rb

@@ -3,6 +3,10 @@ require "resque_bus/version"
 require 'redis/namespace'
 require 'resque'
 
+module QueueBus
+  autoload :Worker,          'resque_bus/compatibility'
+end
+
 module ResqueBus
   
   autoload :Application,      'resque_bus/application'

data/lib/resque_bus/compatibility.rb

@@ -0,0 +1,22 @@
+# these can be in the queue from the new queue-bus version
+module QueueBus
+  class Worker
+
+    def self.perform(json)
+      attributes = ::Resque.decode(json)
+      class_name = attributes["bus_class_proxy"]
+      
+      case class_name
+      when "::QueueBus::Driver", "QueueBus::Driver"
+        ResqueBus::Driver.perform(attributes)
+      when "::QueueBus::Rider", "QueueBus::Rider"
+        ResqueBus::Rider.perform(attributes)
+      when "::QueueBus::Publisher", "QueueBus::Publisher"
+        ResqueBus::Publisher.perform(attributes["bus_event_type"], attributes)
+      else
+        klass = ::ResqueBus::Util.constantize(class_name)
+        klass.perform(attributes)
+      end
+    end
+  end
+end

data/lib/resque_bus/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Bus
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/spec/compatibility_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe "migration compatibility" do
+  before(:each) do
+    ResqueBus.dispatch("r1") do
+      subscribe "event_name" do |attributes|
+        ResqueBus::Runner1.run(attributes)
+      end
+    end
+
+    ResqueBus::TaskManager.new(false).subscribe!
+    
+    @incoming = Resque::Worker.new(:resquebus_incoming)
+    @incoming.register_worker
+
+    @new_incoming = Resque::Worker.new(:bus_incoming)
+    @new_incoming.register_worker
+
+    @rider = Resque::Worker.new(:r1_default)
+    @rider.register_worker
+  end
+  
+  it "should still drive as expected" do
+    val = ResqueBus.redis.lpop("queue:bus_incoming")
+    val.should == nil
+    
+    args = [ JSON.generate({"bus_class_proxy"=>"QueueBus::Driver", "bus_event_type" => "event_name", "two"=>"here", "one"=>1, "id" => 12}) ]
+    item = {:class => "QueueBus::Worker", :args => args}
+
+    ResqueBus.redis.sadd(:queues, "bus_incoming")
+    ResqueBus.redis.rpush "queue:bus_incoming", Resque.encode(item)
+
+    ResqueBus::Runner1.value.should == 0
+
+    perform_next_job @new_incoming
+
+    ResqueBus::Runner1.value.should == 0
+
+    perform_next_job @rider
+
+    ResqueBus::Runner1.value.should == 1
+  end
+  
+  it "should still ride as expected" do
+    val = ResqueBus.redis.lpop("queue:r1_default")
+    val.should == nil
+
+    args = [ {"bus_rider_app_key"=>"r1", "x" => "y", "bus_event_type" => "event_name", 
+              "bus_rider_sub_key"=>"event_name", "bus_rider_queue" => "default", 
+              "bus_rider_class_name"=>"::ResqueBus::Rider"}]
+    item = {:class => "ResqueBus::Rider", :args => args}
+    
+    args = [ JSON.generate({"bus_class_proxy"=>"QueueBus::Rider","bus_rider_app_key"=>"r1", "x" => "y", 
+                            "bus_event_type" => "event_name", "bus_rider_sub_key"=>"event_name",
+                            "bus_rider_queue" => "default"}) ]
+    item = {:class => "QueueBus::Worker", :args => args}
+
+    ResqueBus.redis.sadd(:queues, "r1_default")
+    ResqueBus.redis.rpush "queue:r1_default", Resque.encode(item)
+
+    ResqueBus::Runner1.value.should == 0
+
+    perform_next_job @rider
+
+    ResqueBus::Runner1.value.should == 1
+  end
+  
+  it "should still publish as expected" do
+    val = ResqueBus.redis.lpop("queue:bus_incoming")
+    val.should == nil
+    
+    args = [ JSON.generate({"bus_class_proxy" => "QueueBus::Publisher", "bus_event_type"=>"event_name", "two"=>"here", "one"=>1, "id" => 12}) ]
+    item = {:class => "QueueBus::Worker", :args => args}
+
+    ResqueBus.redis.sadd(:queues, "bus_incoming")
+    ResqueBus.redis.rpush "queue:bus_incoming", Resque.encode(item)
+
+    ResqueBus::Runner1.value.should == 0
+
+    perform_next_job @new_incoming # publish
+
+    ResqueBus::Runner1.value.should == 0
+
+    perform_next_job @incoming # drive
+
+    ResqueBus::Runner1.value.should == 0
+
+    perform_next_job @rider # ride
+
+    ResqueBus::Runner1.value.should == 1
+    
+  end
+end

data/spec/driver_spec.rb

@@ -80,11 +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"=>"event[45]", "bus_rider_queue" => "default"}.merge(bus_attrs)
+        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)
 
         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)
+        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)
       end
     end
   end

data/spec/spec_helper.rb

@@ -32,9 +32,9 @@ module ResqueBus
 end
 
 def perform_next_job(worker, &block)
-  return unless job = @worker.reserve
-  @worker.perform(job, &block)
-  @worker.done_working
+  return unless job = worker.reserve
+  worker.perform(job, &block)
+  worker.done_working
 end
 
 def test_sub(event_name, queue="default")
@@ -50,9 +50,6 @@ def test_list(*args)
   out
 end
 
-
-Resque::Scheduler.mute = true
-
 RSpec.configure do |config|
   config.mock_framework = :rspec
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-bus
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -155,6 +155,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
+- .rspec
 - .rvmrc
 - Gemfile
 - MIT-LICENSE
@@ -162,6 +163,7 @@ files:
 - Rakefile
 - lib/resque-bus.rb
 - lib/resque_bus/application.rb
+- lib/resque_bus/compatibility.rb
 - lib/resque_bus/dispatch.rb
 - lib/resque_bus/driver.rb
 - lib/resque_bus/heartbeat.rb
@@ -181,6 +183,7 @@ files:
 - lib/tasks/resquebus.rake
 - resque-bus.gemspec
 - spec/application_spec.rb
+- spec/compatibility_spec.rb
 - spec/dispatch_spec.rb
 - spec/driver_spec.rb
 - spec/heartbeat_spec.rb
@@ -220,6 +223,7 @@ specification_version: 3
 summary: A simple event bus on top of Resque
 test_files:
 - spec/application_spec.rb
+- spec/compatibility_spec.rb
 - spec/dispatch_spec.rb
 - spec/driver_spec.rb
 - spec/heartbeat_spec.rb