perform_later 1.1.0 → 1.1.1

data/lib/object_perform_later.rb

@@ -1,32 +1,32 @@
 module ObjectPerformLater
   def perform_later(queue, method, *args)
-    args = PerformLater::ArgsParser.args_to_resque(args)
+    return self.send(method, *args) unless PerformLater.config.enabled?
 
     worker = PerformLater::Workers::Objects::Worker
     perform_later_enqueue(worker, queue, method, args)
   end
 
   def perform_later!(queue, method, *args)
-    args = PerformLater::ArgsParser.args_to_resque(args)
-    
-    digest = PerformLater::PayloadHelper.get_digest(self.name, method, args)
-    return "EXISTS!" unless Resque.redis.get(digest).blank?
-    Resque.redis.set(digest, 'EXISTS')
+    return self.send(method, *args) unless PerformLater.config.enabled?
+
+    return "EXISTS!" if loner_exists(method, args)
 
     worker = PerformLater::Workers::Objects::LoneWorker
     perform_later_enqueue(worker, queue, method, args)
   end
 
   private 
-    def perform_later_enqueue(worker, queue, method, args)
-      if PerformLater.config.enabled?
-        Resque::Job.create(queue, worker, self.name, method, *args)
-      else
-        args = PerformLater::ArgsParser.args_from_resque(args)
-        self.send(method, *args)
-      end  
+    def loner_exists(method, args)
+      digest = PerformLater::PayloadHelper.get_digest(self.name, method, args)
+      return true unless Resque.redis.get(digest).blank?
+      Resque.redis.set(digest, 'EXISTS')
+      return false
     end
-end
 
-Object.send(:include, ObjectPerformLater)
+    def perform_later_enqueue(worker, queue, method, *args)
+      args = PerformLater::ArgsParser.args_to_resque(args)
+      Resque::Job.create(queue, worker, self.name, method, *args)
+    end
+end
 
+Object.send(:include, ObjectPerformLater)

data/lib/perform_later/version.rb

@@ -1,3 +1,3 @@
 module PerformLater
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/resque/plugins/later/method.rb

@@ -25,33 +25,34 @@ module Resque::Plugins::Later::Method
   end
 
   def perform_later(queue, method, *args)
-    ActiveSupport::Deprecation.warn("perform_later will be deprecated in future versions, please use the later method on your models")
-    args = PerformLater::ArgsParser.args_to_resque(args)
-    worker = PerformLater::Workers::ActiveRecord::Worker
+    return self.send(method, *args) unless PerformLater.config.enabled?
+    
 
+    worker = PerformLater::Workers::ActiveRecord::Worker
     enqueue_in_resque_or_send(worker, queue, method, args)
   end
 
   def perform_later!(queue, method, *args)
-    ActiveSupport::Deprecation.warn("perform_later! will be deprecated in future versions, please use the later method on your models")
-
-    args = PerformLater::ArgsParser.args_to_resque(args)
-    digest = PerformLater::PayloadHelper.get_digest(self.class.name, method, args)
-    worker = PerformLater::Workers::ActiveRecord::LoneWorker
+    return self.send(method, *args) unless PerformLater.config.enabled?
+    return "AR EXISTS!" if loner_exists(method, args)
     
-    return "AR EXISTS!" unless Resque.redis.get(digest).blank?
-    Resque.redis.set(digest, 'EXISTS')
-
+    worker = PerformLater::Workers::ActiveRecord::LoneWorker
     enqueue_in_resque_or_send(worker, queue, method, args)
   end
 
   private 
+    def loner_exists(method, *args)
+      args = PerformLater::ArgsParser.args_to_resque(args)
+      digest = PerformLater::PayloadHelper.get_digest(self.class.name, method, args)
+
+      return true unless Resque.redis.get(digest).blank?
+      Resque.redis.set(digest, 'EXISTS')
+
+      return false
+    end
+
     def enqueue_in_resque_or_send(worker, queue, method, *args)
-      if PerformLater.config.enabled?
-        Resque::Job.create(queue, worker, self.class.name, self.id, method, *args)   
-      else
-        args = PerformLater::ArgsParser.args_from_resque(args)
-        self.send(method, *args)
-      end
+      args = PerformLater::ArgsParser.args_to_resque(args)
+      Resque::Job.create(queue, worker, self.class.name, self.id, method, *args)   
     end
 end

data/spec/lib/object_perform_later_spec.rb

@@ -8,6 +8,14 @@ class DummyClass
   def self.do_something_with_string(value)
     value
   end
+
+  def self.do_something_with_user(user)
+    user
+  end
+
+  def self.do_something_with_optional_hash(options = {})
+    options.blank?
+  end
 end
 
 describe ObjectPerformLater do
@@ -40,11 +48,39 @@ describe ObjectPerformLater do
     Resque.peek(:generic, 0, 20).length.should == 1
   end
 
-  describe :perform_later! do
+  describe :perform_later do
+    before(:each) do
+      PerformLater.config.stub!(:enabled?).and_return(false)
+    end
     it "should pass the correct value (String)" do
+      DummyClass.perform_later(:generic, :do_something_with_string, "Avi Tzurel").should == "Avi Tzurel"
+    end
+
+    it "should pass the correct value (AR object)" do
+      user = User.create
+      DummyClass.perform_later(:generic, :do_something_with_user, user).should == user
+    end
+
+    it "should pass the correct value (optional hash)" do
+      DummyClass.perform_later(:generic, :do_something_with_optional_hash).should == true
+    end
+  end
+
+  describe :perform_later! do
+    before(:each) do
       PerformLater.config.stub!(:enabled?).and_return(false)
-      DummyClass.should_receive(:do_something_with_string).with("Avi Tzurel")
-      DummyClass.perform_later!(:generic, :do_something_with_string, "Avi Tzurel")  
+    end
+    it "should pass the correct value (String)" do
+      DummyClass.perform_later!(:generic, :do_something_with_string, "Avi Tzurel").should == "Avi Tzurel"
+    end
+
+    it "should pass the correct value (AR object)" do
+      user = User.create
+      DummyClass.perform_later!(:generic, :do_something_with_user, user).should == user
+    end
+
+    it "should pass the correct value (optional hash)" do
+      DummyClass.perform_later!(:generic, :do_something_with_optional_hash).should == true
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perform_later
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails