dalliance 0.2.0 → 0.2.1

data/lib/dalliance/version.rb

@@ -2,7 +2,7 @@ module Dalliance
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/dalliance/workers/delayed_job.rb

@@ -8,6 +8,11 @@ module Dalliance
       def perform
         instance_klass.constantize.find(instance_id).dalliance_process(true)
       end
+
+      #Delayed job automatically retries, so rescue the error
+      def self.rescue_error?
+        true
+      end
     end
   end
 end

data/lib/dalliance/workers/resque.rb

@@ -8,6 +8,11 @@ module Dalliance
       def self.perform(instance_klass, instance_id)
         instance_klass.constantize.find(instance_id).dalliance_process(true)
       end
+
+      #Resque fails, so don't rescue the error
+      def self.rescue_error?
+        false
+      end
     end
   end
 end

data/lib/dalliance.rb

@@ -151,7 +151,7 @@ module Dalliance
       error_dalliance!
 
       #Don't raise the error if we're backgound_processing...
-      raise e unless backgound_processing
+      raise e unless backgound_processing && self.class.dalliance_options[:worker_class].rescue_error?
     ensure
       if self.class.dalliance_options[:dalliance_progress_meter] && dalliance_progress_meter
         #Works with optimistic locking...

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -40,12 +40,18 @@ describe DallianceModel do
     end
 
     it "should call the dalliance_method w/ a Delayed::Worker" do
+      Resque::Stat.clear(:processed)
+      Resque::Stat.clear(:failed)
+
       subject.dalliance_background_process
       Resque::Worker.new(:dalliance).process
       subject.reload
 
       subject.should be_successful
       Resque.size(:dalliance).should == 0
+
+      Resque::Stat[:processed].should == 1
+      Resque::Stat[:failed].should == 0
     end
 
     it "should set the dalliance_status to completed" do
@@ -113,11 +119,17 @@ describe DallianceModel do
     end
 
     it "should NOT raise an error" do
+      Resque::Stat.clear(:processed)
+      Resque::Stat.clear(:failed)
+
       subject.dalliance_background_process
 
       Resque::Worker.new(:dalliance).process
 
       Resque.size(:dalliance).should == 0
+
+      Resque::Stat[:processed].should == 1
+      Resque::Stat[:failed].should == 1
     end
 
     it "should store the error" do

data/spec/spec_helper.rb

@@ -29,3 +29,5 @@ end
 
 #We don't need a full rails app to test...
 require 'support/active_record'
+
+#NOTE: Resque tests require REDIS $redis-server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord