resque-remote-namespace 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,25 +1,37 @@
 PATH
   remote: .
   specs:
-    resque-remote-namespace (0.1.0)
+    resque-remote-namespace (0.2.0)
       resque (~> 1.0)
+      resque-scheduler
 
 GEM
   remote: http://rubygems.org/
   specs:
+    columnize (0.3.6)
+    debugger (1.5.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
     diff-lcs (1.1.3)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rack-protection (1.3.2)
+    multi_json (1.7.0)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    redis (3.0.2)
+    redis (3.0.3)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
-    resque (1.23.0)
+    resque (1.23.1)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
+    resque-scheduler (2.0.0)
+      redis (>= 2.0.1)
+      resque (>= 1.20.0)
+      rufus-scheduler
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -28,11 +40,14 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
+    rufus-scheduler (2.0.18)
+      tzinfo (>= 0.3.23)
+    sinatra (1.4.1)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.3.6)
+    tzinfo (0.3.37)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -41,5 +56,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
+  debugger
   resque-remote-namespace!
   rspec (~> 2.8)

data/lib/resque-remote-namespace.rb

@@ -1,2 +1,4 @@
 require 'resque'
-require 'resque-remote-namespace/remote_namespace'
+require 'resque_scheduler'
+require 'resque-remote-namespace/remote_namespace'
+require 'resque-remote-namespace/support/shared_helpers'

data/lib/resque-remote-namespace/remote_namespace.rb

@@ -1,41 +1,52 @@
 module Resque
-	module Plugins
-		module RemoteNamespace
-			
-			# Remote enqueue of a job by temporarily changing the Resque redis 
+  module Plugins
+    module RemoteNamespace
+
+      # Remote enqueue of a job by temporarily changing the Resque redis
       #   namespace.
       #
       # @param [ String ] queue The queue to enqueue the job to.
       # @param [ String ] namespace The namespace to enqueue the job to.
       # @param [ String ] klass The class name of the job to enqueue.
       # @param [ Array ] args The arguments to the job being remotely enqueued.
-			def remote_enqueue_to(queue, namespace, klass, *args)
-				original_namespace 		 = Resque.redis.namespace
-				Resque.redis.namespace = namespace
+      def remote_enqueue_to(queue, namespace, klass, *args)
+        from_namespace(namespace) do
+          Resque::Job.create(queue.to_sym, klass, *args)
+        end
+      end
+
+      # Remote enqueue of a job in the future by temporarily changing the 
+      #   Resque redis namespace.
+      #
+      # @param [ String ] number_of_seconds_from_now The number of seconds from
+      #   now to enqueue the job at.
+      # @param [ String ] queue The queue to enqueue the job to.
+      # @param [ String ] namespace The namespace to enqueue the job to.
+      # @param [ String ] klass The class name of the job to enqueue.
+      # @param [ Array ] args The arguments to the job being remotely enqueued.
+      def remote_enqueue_to_in(number_of_seconds_from_now, queue, namespace, klass, *args)
+        time_to_enqueue = Time.now + number_of_seconds_from_now
 
-				Resque::Job.create(queue.to_sym, klass, *args)
-			ensure
-				Resque.redis.namespace = original_namespace
-			end
+        from_namespace(namespace) do
+          Resque.enqueue_at_with_queue(queue, time_to_enqueue, klass, *args)
+        end
+      end
 
-			# Remote dequeue of a job by temporarily changin gthe Resque redis
-			# 	namespace.
-			#
-			# @param [ String ] queue The queue to dequeue the job from.
-			# @param [ String ] namespace The namespace to dequeue the job from.
-			# @param [ String ] klass The class name of the job to enqueue.
-			# @param [ Array ] args The arguments to the job being remotely dequeued.
-			def remote_dequeue_from(queue, namespace, klass, *args)
-				original_namespace 		 = Resque.redis.namespace
-				Resque.redis.namespace = namespace
+      # Remote dequeue of a job by temporarily changin gthe Resque redis
+      #   namespace.
+      #
+      # @param [ String ] queue The queue to dequeue the job from.
+      # @param [ String ] namespace The namespace to dequeue the job from.
+      # @param [ String ] klass The class name of the job to enqueue.
+      # @param [ Array ] args The arguments to the job being remotely dequeued.
+      def remote_dequeue_from(queue, namespace, klass, *args)
+        from_namespace(namespace) do
+          Resque::Job.destroy(queue.to_sym, klass, *args)
+        end
+      end
+    end
+  end
 
-				Resque::Job.destroy(queue.to_sym, klass, *args)
-			ensure
-				Resque.redis.namespace = original_namespace
-			end
-		end
-	end
-	
-	# Pull the remote methods into the Resque module
-	extend Plugins::RemoteNamespace
-end
+  # Pull the remote methods into the Resque module
+  extend Plugins::RemoteNamespace
+end

data/lib/resque-remote-namespace/support/shared_helpers.rb

@@ -0,0 +1,13 @@
+# Run a block of code from a different namespace.
+#
+# @param [ String ] namespace The namespace to execute the block of code from.
+# @param [ Proc ] block The block of code to execute from a different
+#   namespace.
+def from_namespace(namespace, &block)
+  original_namespace     = Resque.redis.namespace
+  Resque.redis.namespace = namespace
+
+  yield if block_given?
+ensure
+  Resque.redis.namespace = original_namespace
+end

data/lib/resque-remote-namespace/version.rb

@@ -1,7 +1,7 @@
 module Resque
 	module Plugins
 	  module RemoteNamespace
-	    VERSION = "0.1.0"
+	    VERSION = "0.2.0"
 	  end
 	end
 end

data/resque-remote-namespace.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = 'resque-remote-namespace'
 
   s.add_dependency 'resque', '~> 1.0'
+  s.add_dependency 'resque-scheduler'
 
   s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'debugger'
   s.add_development_dependency 'rspec', '~> 2.8'
 
   s.files        = `git ls-files`.split("\n")

data/spec/remote_spec.rb

@@ -50,6 +50,32 @@ describe Resque::Plugins::RemoteNamespace do
     end
 	end
 
+  describe '#remote_enqueue_to_in' do
+    subject       { Resque.remote_enqueue_to_in 5, queue, remote_namespace, 'TestJob', 'foo' }
+
+    it 'temporarily changes the Resque.redis.namespace' do
+      Resque.redis.should_receive(:namespace=)
+        .with('resque:foo')
+        .once
+
+      Resque.redis.should_receive(:namespace=)
+        .with('resque:bar')
+        .once
+
+      subject
+    end
+
+    it 'enqueues a job' do
+      expect {
+        subject
+      }.to change {
+        from_namespace remote_namespace do
+          Resque.delayed_queue_schedule_size
+        end
+      }.by(1)
+    end
+  end
+
 	describe '#remote_dequeue_from' do
 		subject { Resque.remote_dequeue_from queue, remote_namespace, 'TestJob', 'foo' }
 

data/spec/spec_helper.rb

@@ -7,17 +7,3 @@ $: << File.expand_path('../lib', File.dirname(__FILE__))
 require 'resque-remote-namespace'
 
 Resque.redis.namespace = 'resque:foo'
-
-# Run a block of code from a different namespace.
-#
-# @param [ String ] namespace The namespace to execute the block of code from.
-# @param [ Proc ] block The block of code to execute from a different
-#   namespace.
-def from_namespace(namespace, &block)
-  original_namespace     = Resque.redis.namespace
-  Resque.redis.namespace = namespace
-
-  yield if block_given?
-ensure
-  Resque.redis.namespace = original_namespace
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-remote-namespace
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -28,6 +28,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: resque-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +60,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +111,7 @@ files:
 - Rakefile
 - lib/resque-remote-namespace.rb
 - lib/resque-remote-namespace/remote_namespace.rb
+- lib/resque-remote-namespace/support/shared_helpers.rb
 - lib/resque-remote-namespace/version.rb
 - resque-remote-namespace.gemspec
 - spec/remote_spec.rb