Merge pull request #6 from apartmentlist/upstream-prep

Ensure Resque Redis instance gets restored in all cases

README.mdown

@@ -110,13 +110,15 @@ Note: This subscribes when this class is loaded, so it needs to be in your load
 
 ### Dedicated Redis Instance
 
-By default, Resque-Bus uses the same instance of Redis as Resque.  If desired, Resque-Bus can be configured to use a different instance.  In your initializer:
+By default, Resque Bus uses the same instance of Redis as Resque.  If desired, Resque-Bus can be configured to use a different instance.  In your initializer:
 
 ```ruby
 QueueBus.adapter.redis = 'redis://my-other-redis-host:1234/4'
 ```
 
-Resque-Bus accepts the same types of Redis server descriptions as Resque.
+Resque Bus accepts the same types of Redis server descriptions as Resque.
+
+Once that instance variable is set, Resque Bus tasks will default to using it, including both the driver and the queuebus consumers.  All the commands described below will 'just work' as written, including subscribe, unsubscribe, driver, and worker.
 
 ### Commands
 

lib/resque_bus/adapter.rb

@@ -29,12 +29,15 @@ def queuebus_redis
 
             # Save the default Resque redis connection
             default_redis = ::Resque.redis
-            # Get Resque to generate the connection given the server definition
-            ::Resque.redis = @queuebus_redis_url
-            # Store the Redis namespace that Resque created...
-            @queuebus_redis = ::Resque.redis
-            # ...and restore the default.
-            ::Resque.redis = default_redis
+            begin
+              # Get Resque to generate the connection given the server definition
+              ::Resque.redis = @queuebus_redis_url
+              # Store the Redis namespace that Resque created...
+              @queuebus_redis = ::Resque.redis
+            ensure
+              # ...and restore the default.
+              ::Resque.redis = default_redis
+            end
             @queuebus_redis
           else
             ::Resque.redis

spec/adapter_spec.rb

@@ -32,20 +32,19 @@
   context 'with a custom QueueBus Redis configuration' do
     let(:resque_url) { 'redis://localhost:6379/0' }
     let(:queuebus_url) { 'redis://localhost:6379/1' }
-    let(:active_url) { ::Resque.redis.redis.client.options[:url] }
 
     before(:each) do
       Resque.redis = resque_url
       QueueBus.adapter.redis = queuebus_url
     end
 
     it 'still uses the default for Resque jobs' do
-      active_url.should eq(resque_url)
+      ::Resque.redis.redis.client.options[:url].should eq(resque_url)
     end
 
     it 'uses the custom Redis instance for QueueBus jobs' do
       QueueBus.adapter.redis do
-        active_url.should eq(queuebus_url)
+        ::Resque.redis.redis.client.options[:url].should eq(queuebus_url)
       end
     end