perform_later 1.0.4 → 1.0.6

data/lib/object_perform_later.rb

@@ -1,5 +1,4 @@
 module ObjectPerformLater
-
   def perform_later(queue, method, *args)
     args = PerformLater::ArgsParser.args_to_resque(args)
 
@@ -9,8 +8,8 @@ module ObjectPerformLater
 
   def perform_later!(queue, method, *args)
     args = PerformLater::ArgsParser.args_to_resque(args)
-    digest = Digest::MD5.hexdigest({:class => self.name, :args => args}.to_s)
-
+    
+    digest = PerformLater::PayloadHelper.get_digest(self.name, method, args)
     return "EXISTS!" unless Resque.redis.get(digest).blank?
     Resque.redis.set(digest, 'EXISTS')
 
@@ -21,9 +20,9 @@ module ObjectPerformLater
   private 
     def perform_later_enqueue(worker, queue, method, args)
       if PerformLater.config.enabled?
-        Resque::Job.create(queue, worker, self.name, method, *args)
+        Resque::Job.create(queue, worker, self.name, method, args)
       else
-        self.send(method, *args)
+        self.send(method, args)
       end  
     end
 end

data/lib/perform_later/args_parser.rb

@@ -8,7 +8,7 @@ module PerformLater
     YAML_STRING_FORMAT  = /\A---/
 
     def self.args_to_resque(*args)
-      args = args.map { |o|
+      args = args.flatten.map { |o|
         case o
           when ActiveRecord::Base
             "AR:#{o.class.name}:#{o.id}"
@@ -23,7 +23,7 @@ module PerformLater
     end
     
     def self.args_from_resque(*args)
-      args = args.map { |o|
+      args = args.flatten.map { |o|
         if o
           case o
           when CLASS_STRING_FORMAT  then $1.constantize

data/lib/perform_later/payload_helper.rb

@@ -0,0 +1,15 @@
+module PerformLater
+  class PayloadHelper
+    def self.get_digest(klass, method, *args)
+      args = args.flatten
+      payload = {:class => klass, :method => method.to_s, :args => args}.to_s
+      
+      puts payload
+      digest = Digest::MD5.hexdigest(payload)
+      
+
+      puts "Digest is: #{digest}"
+      digest
+    end
+  end
+end

data/lib/perform_later/version.rb

@@ -1,3 +1,3 @@
 module PerformLater
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/lib/perform_later/workers/active_record/lone_worker.rb

@@ -2,9 +2,9 @@ module PerformLater
   module Workers
     module ActiveRecord
       class LoneWorker
-        def self.perform(klass, id, method, *args)
+        def self.perform(klass, id, method, args)
           # Remove the loner flag from redis
-          digest = Digest::MD5.hexdigest({:class => klass, :args => args}.to_s)
+          digest = PerformLater::PayloadHelper.get_digest(klass, method_name, args)
           Resque.redis.del(digest)
 
           args = PerformLater::ArgsParser.args_from_resque(args)
@@ -16,4 +16,4 @@ module PerformLater
       end
     end
   end
-end
+end

data/lib/perform_later/workers/objects/lone_worker.rb

@@ -3,8 +3,8 @@ module PerformLater
     module Objects
       class LoneWorker
         def self.perform(klass_name, method, *args)
-          # Remove the loner flag from redis
-          digest = Digest::MD5.hexdigest({:class => klass, :args => args}.to_s)
+          # 
+          digest = PerformLater::PayloadHelper.get_digest(klass_name, method, args)
           Resque.redis.del(digest)
 
           args = PerformLater::ArgsParser.args_from_resque(args)

data/lib/perform_later.rb

@@ -1,8 +1,9 @@
 require 'active_support/dependencies'
 require 'perform_later/version'
 require 'perform_later/config'
-require 'resque'
+require 'perform_later/payload_helper'
 require 'perform_later/args_parser'
+require 'resque'
 require 'active_record'
 require 'resque_mailer_patch'
 require 'object_perform_later'

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

@@ -12,10 +12,10 @@ module Resque::Plugins::Later::Method
         klass          = PerformLater::Workers::ActiveRecord::Worker
         klass          = PerformLater::Workers::ActiveRecord::LoneWorker if loner
         args           = PerformLater::ArgsParser.args_to_resque(args)
-        digest         = Digest::MD5.hexdigest({:class => klass, :args => args}.to_s)
+        digest         = PerformLater::PayloadHelper.get_digest(klass, method_name, args)
 
         if loner
-          return "EXISTS!" unless Resque.redis.get(digest).blank?
+          return "AR EXISTS!" unless Resque.redis.get(digest).blank?
           Resque.redis.set(digest, 'EXISTS')
         end
         
@@ -31,7 +31,7 @@ module Resque::Plugins::Later::Method
       args = PerformLater::ArgsParser.args_to_resque(args)
       Resque::Job.create(queue, PerformLater::Workers::ActiveRecord::Worker, self.class.name, self.id, method, *args)
     else
-      self.send(method, *args)
+      self.send(method, args)
     end
   end
 end

data/spec/lib/perform_later/args_parser_spec.rb

@@ -13,12 +13,12 @@ describe PerformLater::ArgsParser do
     end
 
     it "should convert a hash into YAML string so that Resque will be able to JSON convert it" do
-      hash = {name: "something", other: "something else"}
+      hash = { name: "something", other: "something else" }
       subject.args_to_resque(hash)[0].class.name.should == "String"
     end
 
     it "should be able to load a yaml from the string and translate it into the same hash again" do
-      hash = {name: "something", other: "something else"}
+      hash = { name: "something", other: "something else" }
       yaml = subject.args_to_resque(hash)[0]
 
       loaded_yaml = YAML.load(yaml)
@@ -35,7 +35,7 @@ describe PerformLater::ArgsParser do
 
   context "args from resque" do
     it "should give me a hash back when I pass a yaml representation of it" do
-      hash = {name: "something", other: "something else"}   
+      hash = { name: "something", other: "something else" }
       yaml = hash.to_yaml
 
       args = subject.args_from_resque(yaml)

data/spec/lib/perform_later/payload_helper_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+
+describe PerformLater::PayloadHelper do
+  subject { PerformLater::PayloadHelper }
+
+  describe :get_digest do
+    it "should o something" do
+      user = User.create
+
+      digest = Digest::MD5.hexdigest({ :class => "DummyClass", 
+        :method => :some_method, 
+        :args => ["AR:User:#{user.id}"]
+        }.to_s)
+
+      args = PerformLater::ArgsParser.args_to_resque(user)
+      puts args
+      subject.get_digest("DummyClass", :some_method, args).should == digest
+    end
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perform_later
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -190,6 +190,7 @@ files:
 - lib/perform_later.rb
 - lib/perform_later/args_parser.rb
 - lib/perform_later/config.rb
+- lib/perform_later/payload_helper.rb
 - lib/perform_later/railtie.rb
 - lib/perform_later/version.rb
 - lib/perform_later/workers/active_record/lone_worker.rb
@@ -203,6 +204,7 @@ files:
 - spec/lib/object_perform_later_spec.rb
 - spec/lib/perform_later/args_parser_spec.rb
 - spec/lib/perform_later/config_spec.rb
+- spec/lib/perform_later/payload_helper_spec.rb
 - spec/lib/perform_later_spec.rb
 - spec/lib/resque/plugins/later/method_spec.rb
 - spec/spec_helper.rb
@@ -239,6 +241,7 @@ test_files:
 - spec/lib/object_perform_later_spec.rb
 - spec/lib/perform_later/args_parser_spec.rb
 - spec/lib/perform_later/config_spec.rb
+- spec/lib/perform_later/payload_helper_spec.rb
 - spec/lib/perform_later_spec.rb
 - spec/lib/resque/plugins/later/method_spec.rb
 - spec/spec_helper.rb