resque-director 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/resque/plugins/director/lifecycle.rb

@@ -10,12 +10,17 @@ module Resque
           end
         end
 
-        module ClassMethods
-
+        module ClassMethods 
           def push(queue, item)
-            if item.respond_to?(:[]=)
-              timestamp = {'resdirecttime' => Time.now.utc.to_i}
-              item[:args] = item[:args].push(timestamp)
+            begin
+              if item.respond_to?(:[]=)
+                job_class =  constantize(item[:class] || item['class'])
+                if job_class && job_class.ancestors.include?(Resque::Plugins::Director)
+                  timestamp = {'resdirecttime' => Time.now.utc.to_i}
+                  item[:args] = item[:args].push(timestamp)
+                end
+              end
+            rescue
             end
             push_without_lifecycle queue, item
           end

data/resque-director.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-director}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Nolan Frausto}]

data/spec/resque/plugins/director/lifecycle_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+class TestNonDirectedJob
+  @queue = :non_direct
+  def self.perform
+  end
+end
+
 describe Resque::Plugins::Director::Lifecycle do
   subject { Resque::Plugins::Director::Lifecycle }
   
@@ -16,5 +22,17 @@ describe Resque::Plugins::Director::Lifecycle do
       Resque.enqueue(TestJob, "arg1")
       Resque.pop("test").should == {"args"=>["arg1", {'resdirecttime' => time_stamp}], "class"=>"TestJob"}
     end
+    
+    it "should not add job timestamps to non directed jobs" do
+      Resque.enqueue(TestNonDirectedJob, "arg1")
+      Resque.pop("non_direct").should == {"args"=>["arg1"], "class"=>"TestNonDirectedJob"}
+    end
+    
+    it "should not add job timestamps that throw exceptions to direction logic" do
+      TestNonDirectedJob.stub(:ancestors).and_throw(:Exception)
+      Resque.enqueue(TestNonDirectedJob, "arg1")
+      
+      Resque.pop("non_direct").should == {"args"=>["arg1"], "class"=>"TestNonDirectedJob"}
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-director
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Nolan Frausto