dalliance 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b519547f2e55bc58b10350fea242c9d297cc2983
+  data.tar.gz: e5fcb6c52d106854bf3d71a1d40104a81bf47099
+SHA512:
+  metadata.gz: 27569fb042fa3f9e8cfbbcdc691a21b3a24fae088afaf9688722447dcc878878d40fe2f94b80cf820b13db0a3eba18d73e9d2f85cb87f1f7c2928e67a0ae97db
+  data.tar.gz: 5bffde99f79d430439ea73d408a36a3146f859112ee116cb5650e4d663021f960773fcce7dd8597874c5b419b291e6a8be5af2ad9a10356523c2cf0a55b430f4

data/.gitignore

@@ -7,4 +7,5 @@ pkg/*
 *.log
 *.sqlite
 
-.rvmrc
+.rvmrc
+.ruby-version

data/lib/dalliance/version.rb

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

data/lib/dalliance.rb

@@ -103,7 +103,7 @@ module Dalliance
       end
 
       event :error_dalliance do
-        transition :processing => :processing_error
+        transition all => :processing_error
       end
 
       event :finish_dalliance do
@@ -111,6 +111,8 @@ module Dalliance
       end
     end
     #END state_machine(s)
+
+    before_destroy :validate_dalliance_status
   end
 
   module ClassMethods
@@ -150,6 +152,15 @@ module Dalliance
     validation_error? || processing_error? || completed?
   end
 
+  def validate_dalliance_status
+    unless error_or_completed?
+      errors.add(:dalliance_status, :invalid)
+      return false
+    end
+
+    true
+  end
+
   def pending_or_processing?
     pending? || processing?
   end

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -77,7 +77,7 @@ describe DallianceModel do
     context "another_queue" do
       let(:queue) { 'dalliance_2'}
 
-      before(:all) do
+      before do
         DallianceModel.dalliance_options[:queue] = queue
       end
 

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -83,7 +83,7 @@ describe DallianceModel do
     context "another_queue" do
       let(:queue) { 'dalliance_2'}
 
-      before(:all) do
+      before do
         DallianceModel.dalliance_options[:queue] = queue
       end
 

data/spec/dalliance/synchronous_spec.rb

@@ -88,4 +88,33 @@ describe DallianceModel do
       subject.dalliance_progress.should == 0
     end
   end
+
+   context "destroy" do
+    it "should return false when pending?" do
+      subject.update_column(:dalliance_status, 'pending')
+      subject.destroy.should be_false
+      subject.errors[:dalliance_status].should == ['is invalid']
+    end
+
+    it "should return false when processing?" do
+      subject.update_column(:dalliance_status, 'processing')
+      subject.destroy.should be_false
+      subject.errors[:dalliance_status].should == ['is invalid']
+    end
+
+    it "should return true when validation_error?" do
+      subject.update_column(:dalliance_status, 'validation_error')
+      subject.destroy.should be_true
+    end
+
+    it "should return true when processing_error?" do
+      subject.update_column(:dalliance_status, 'processing_error')
+      subject.destroy.should be_true
+    end
+
+    it "should return true when completed?" do
+      subject.update_column(:dalliance_status, 'completed')
+      subject.destroy.should be_true
+    end
+  end
 end

metadata

@@ -1,145 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Eric Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! ' Background processing for ActiveRecord using a ''delayable'' worker
+description: ' Background processing for ActiveRecord using a ''delayable'' worker
   and a state_machine '
 email:
 - eric.sullivan@annkissam.com
@@ -175,27 +158,26 @@ files:
 - spec/support/active_record.rb
 homepage: https://github.com/annkissam/dalliance
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dalliance
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method
 test_files:
 - spec/dalliance/asynchronous_delayed_job_spec.rb