dalliance 0.2.2 → 0.2.3

data/lib/dalliance/version.rb

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

data/lib/dalliance.rb

@@ -79,12 +79,14 @@ module Dalliance
     #BEGIN state_machine(s)
     scope :pending, where(:dalliance_status => 'pending')
     scope :processing, where(:dalliance_status => 'processing')
+    scope :validation_error, where(:dalliance_status => 'validation_error')
     scope :processing_error, where(:dalliance_status => 'processing_error')
     scope :completed, where(:dalliance_status => 'completed')
 
     state_machine :dalliance_status, :initial => :pending do
       state :pending
       state :processing
+      state :validation_error
       state :processing_error
       state :completed
 
@@ -96,6 +98,10 @@ module Dalliance
         transition :pending => :processing
       end
 
+      event :validation_error_dalliance do
+        transition :processing => :validation_error
+      end
+
       event :error_dalliance do
         transition :processing => :processing_error
       end
@@ -129,8 +135,19 @@ module Dalliance
     end
   end
 
+  def store_dalliance_validation_error!
+    self.dalliance_error_hash = {}
+
+    self.errors.each do |attribute, error|
+      self.dalliance_error_hash[attribute] ||= []
+      self.dalliance_error_hash[attribute] << error
+    end
+
+    validation_error_dalliance!
+  end
+
   def error_or_completed?
-    processing_error? || completed?
+    validation_error? || processing_error? || completed?
   end
 
   def pending_or_processing?
@@ -159,7 +176,7 @@ module Dalliance
 
       self.send(self.class.dalliance_options[:dalliance_method])
 
-      finish_dalliance!
+      finish_dalliance! unless validation_error?
     rescue StandardError => e
       #Save the error for future analysis...
       self.dalliance_error_hash = {:error => e.class.name, :message => e.message, :backtrace => e.backtrace}

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -143,4 +143,37 @@ describe DallianceModel do
       subject.dalliance_progress.should == 0
     end
   end
+
+  context "validation error" do
+    before(:all) do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method
+      DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::DelayedJob
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
+    end
+
+    it "should store the error" do
+      subject.dalliance_background_process
+      Delayed::Worker.new(:queues => [:dalliance]).work_off
+      subject.reload
+
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:successful].should == ['is invalid']
+    end
+
+    it "should set the dalliance_status to validation_error" do
+      subject.dalliance_background_process
+      Delayed::Worker.new(:queues => [:dalliance]).work_off
+      subject.reload
+
+      subject.should be_validation_error
+    end
+
+    it "should set the dalliance_progress to 0" do
+      subject.dalliance_background_process
+      Delayed::Worker.new(:queues => [:dalliance]).work_off
+      subject.reload
+
+      subject.dalliance_progress.should == 0
+    end
+  end
 end

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -159,4 +159,37 @@ describe DallianceModel do
       subject.dalliance_progress.should == 0
     end
   end
+
+  context "validation error" do
+    before(:all) do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method
+      DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::Resque
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
+    end
+
+    it "should store the error" do
+      subject.dalliance_background_process
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:successful].should == ['is invalid']
+    end
+
+    it "should set the dalliance_status to validation_error" do
+      subject.dalliance_background_process
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      subject.should be_validation_error
+    end
+
+    it "should set the dalliance_progress to 0" do
+      subject.dalliance_background_process
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      subject.dalliance_progress.should == 0
+    end
+  end
 end

data/spec/dalliance/synchronous_spec.rb

@@ -65,4 +65,27 @@ describe DallianceModel do
       subject.dalliance_progress.should == 0
     end
   end
+
+  context "validation error" do
+    before(:all) do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method
+    end
+
+    it "should store the error" do
+      subject.dalliance_background_process
+
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:successful].should == ['is invalid']
+    end
+
+    it "should set the dalliance_status to validation_error" do
+      lambda { subject.dalliance_background_process }.should change(subject, :dalliance_status).from('pending').to('validation_error')
+    end
+
+    it "should set the dalliance_progress to 0" do
+      subject.dalliance_background_process
+
+      subject.dalliance_progress.should == 0
+    end
+  end
 end

data/spec/support/active_record.rb

@@ -56,4 +56,10 @@ class DallianceModel < ActiveRecord::Base
   def dalliance_error_method
     raise RuntimeError
   end
+
+  def dalliance_validation_error_method
+    errors.add(:successful, :invalid)
+
+    store_dalliance_validation_error!
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dalliance
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method