dalliance 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4602c362e675dce64388b7b9366ffe48f24030
-  data.tar.gz: c2a034af3788a4c600f93c3125b0a1ba193f5526
+  metadata.gz: 413b181998e6b583f6ecf882cafde4c16a47de1f
+  data.tar.gz: 42cdf7593a1f5075f527e8276d4414f0822c2a58
 SHA512:
-  metadata.gz: 53633a3663c48cb77ab1dbc163c163ed3bfba20d0eeee7d29e60cffcbb9a66fa749fb6f387d66e059306f8415e94d4ee075457ded1f9c5c78778def4d1366d17
-  data.tar.gz: 11dd4c5759cdf43e4106185c18a90ba7feea066ec1713f3dc9012ccfef988e6f0ca9e0946c39f1b421ceb50f047b7cf19f2f17bb8aa2e610fa343ee1db6a6311
+  metadata.gz: c79a0d24fbb2866986b96fb1f800b7093fc1b2ff836cff2a9dd6169b91af707e397a07ea0bf2e2d869c294cc970b37a428d05fd63712141b83845116ca7c67df
+  data.tar.gz: 7c80667448c0e00990774c2938f1f7862d830194e491281dca65dfdeeaa6bd8e460e708f706f6c5011d2cac51e48ff809c9033060df8059065d61e8545ddab7c

data/lib/dalliance.rb

@@ -1,6 +1,8 @@
 require 'state_machine'
 require 'benchmark'
 
+require 'dalliance/state_machine'
+
 require 'dalliance/version'
 require 'dalliance/workers'
 require 'dalliance/progress_meter'
@@ -137,6 +139,12 @@ module Dalliance
     end
   end
 
+  def dalliance_log(message)
+    if self.class.dalliance_options[:logger]
+      self.class.dalliance_options[:logger].info(message)
+    end
+  end
+
   def store_dalliance_validation_error!
     self.dalliance_error_hash = {}
 
@@ -145,7 +153,20 @@ module Dalliance
       self.dalliance_error_hash[attribute] << error
     end
 
-    validation_error_dalliance!
+    begin
+      validation_error_dalliance!
+    rescue
+      begin
+        self.dalliance_status = 'validation_error'
+
+        dalliance_log("[dalliance] #{self.class.name}(#{id}) - #{dalliance_status} #{self.dalliance_error_hash}")
+
+        self.dalliance_error_hash = { error: 'Persistance Failure: See Logs' }
+
+        self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
+      rescue
+      end
+    end
   end
 
   def error_or_completed?
@@ -192,7 +213,20 @@ module Dalliance
       #Save the error for future analysis...
       self.dalliance_error_hash = {:error => e.class.name, :message => e.message, :backtrace => e.backtrace}
 
-      error_dalliance!
+      begin
+        error_dalliance!
+      rescue
+        begin
+          self.dalliance_status = 'processing_error'
+
+          dalliance_log("[dalliance] #{self.class.name}(#{id}) - #{dalliance_status} #{dalliance_error_hash}")
+
+          self.dalliance_error_hash = { error: 'Persistance Failure: See Logs' }
+
+          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
+        rescue
+        end
+      end
 
       #Don't raise the error if we're backgound_processing...
       raise e unless backgound_processing && self.class.dalliance_options[:worker_class].rescue_error?
@@ -205,9 +239,7 @@ module Dalliance
 
       duration = Time.now - start_time
 
-      if self.class.dalliance_options[:logger]
-        self.class.dalliance_options[:logger].info("[dalliance] #{self.class.name}(#{id}) - #{dalliance_status} #{duration.to_i}")
-      end
+      dalliance_log("[dalliance] #{self.class.name}(#{id}) - #{dalliance_status} #{duration.to_i}")
 
       if self.class.dalliance_options[:duration_column]
         self.class.where(id: self.id).update_all(self.class.dalliance_options[:duration_column] => duration.to_i)
@@ -274,4 +306,4 @@ module Dalliance
       end
     end
   end
-end
+end

data/lib/dalliance/engine.rb

@@ -11,4 +11,4 @@ module Dalliance
       end
     end
   end
-end
+end

data/lib/dalliance/state_machine.rb

@@ -0,0 +1,15 @@
+# Rails 4.1.0 and StateMachine don't play nice
+# https://github.com/pluginaweek/state_machine/issues/295
+require 'state_machine/version'
+
+if defined?(Rails)
+  if StateMachine::VERSION > '1.2.0'
+    # If you see this message, please test removing this file
+    # If it's still required, please bump up the version above
+    Rails.logger.warn "Please remove me, StateMachine version has changed"
+  end
+end
+
+module StateMachine::Integrations::ActiveModel
+  public :around_validation
+end

data/lib/dalliance/version.rb

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

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -142,6 +142,18 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 0
     end
+
+    it "should handle persistance errors" do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method_with_state_machine_exception
+
+      subject.dalliance_background_process
+      Delayed::Worker.new(:queues => [:dalliance]).work_off
+      subject.reload
+
+      subject.should be_processing_error
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+    end
   end
 
   context "validation error" do
@@ -175,5 +187,17 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 0
     end
+
+    it "should handle persistance errors" do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method_with_state_machine_exception
+
+      subject.dalliance_background_process
+      Delayed::Worker.new(:queues => [:dalliance]).work_off
+      subject.reload
+
+      subject.should be_validation_error
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+    end
   end
-end
+end

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -158,6 +158,18 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 0
     end
+
+    it "should handle persistance errors" do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method_with_state_machine_exception
+
+      subject.dalliance_background_process
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      subject.should be_processing_error
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+    end
   end
 
   context "validation error" do
@@ -191,5 +203,17 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 0
     end
+
+    it "should handle persistance errors" do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method_with_state_machine_exception
+
+      subject.dalliance_background_process
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      subject.should be_validation_error
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+    end
   end
-end
+end

data/spec/dalliance/synchronous_spec.rb

@@ -64,6 +64,16 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 0
     end
+
+    it "should handle persistance errors" do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method_with_state_machine_exception
+
+      expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
+
+      subject.should be_processing_error
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+    end
   end
 
   context "validation error" do
@@ -87,6 +97,16 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 0
     end
+
+    it "should handle persistance errors" do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_validation_error_method_with_state_machine_exception
+
+      subject.dalliance_background_process
+
+      subject.should be_validation_error
+      subject.dalliance_error_hash.should_not be_empty
+      subject.dalliance_error_hash[:error].should == 'Persistance Failure: See Logs'
+    end
   end
 
    context "destroy" do
@@ -117,4 +137,4 @@ describe DallianceModel do
       subject.destroy.should be_true
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -14,20 +14,22 @@ require 'dalliance'
 
 RSpec.configure do |config|
   #http://blog.rubyhead.com/2010/04/27/database-during-tests/
-  config.before do
-    ActiveRecord::Base.connection.begin_db_transaction
-    ActiveRecord::Base.connection.increment_open_transactions
-  end
+  # config.before do
+  #   ActiveRecord::Base.connection.begin_db_transaction
+  #   ActiveRecord::Base.connection.increment_open_transactions
+  # end
 
-  config.after do
-    if ActiveRecord::Base.connection.open_transactions != 0
-      ActiveRecord::Base.connection.rollback_db_transaction
-      ActiveRecord::Base.connection.decrement_open_transactions
-    end
-  end
+  # config.after do
+  #   if ActiveRecord::Base.connection.open_transactions != 0
+  #     ActiveRecord::Base.connection.rollback_db_transaction
+  #     ActiveRecord::Base.connection.decrement_open_transactions
+  #   end
+  # end
 end
 
 #We don't need a full rails app to test...
 require 'support/active_record'
 
-#NOTE: Resque tests require REDIS $redis-server
+#NOTE: Resque tests require REDIS
+# $brew install redis
+# $redis-server /usr/local/etc/redis.conf

data/spec/support/active_record.rb

@@ -62,4 +62,16 @@ class DallianceModel < ActiveRecord::Base
 
     store_dalliance_validation_error!
   end
-end
+
+  def dalliance_error_method_with_state_machine_exception
+    self.stub(:error_dalliance!).and_raise(RuntimeError.new)
+
+    dalliance_error_method
+  end
+
+  def dalliance_validation_error_method_with_state_machine_exception
+    self.stub(:validation_error_dalliance!).and_raise(RuntimeError.new)
+
+    dalliance_validation_error_method
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Eric Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,6 +142,7 @@ files:
 - lib/dalliance/engine.rb
 - lib/dalliance/progress_meter.rb
 - lib/dalliance/schema.rb
+- lib/dalliance/state_machine.rb
 - lib/dalliance/version.rb
 - lib/dalliance/workers.rb
 - lib/dalliance/workers/delayed_job.rb
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dalliance
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method