dalliance 0.0.9 → 0.1.0

data/dalliance.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["eric.sullivan@annkissam.com"]
   s.homepage    = "https://github.com/annkissam/dalliance"
   s.summary     = %q{ Wrapper for an ActiveRecord model with a single ascynhronous method }
-  s.description = %q{ Opinionated background processing for ActiveRecord w/ delayed_job & state_machine }
+  s.description = %q{ Background processing for ActiveRecord using a 'delay' method and a state_machine }
 
   s.rubyforge_project = "dalliance"
 
@@ -17,14 +17,14 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('activesupport', '>= 3.0.0')
-  
-  s.add_dependency('delayed_job', '>= 2.0.0')
+
   s.add_dependency('state_machine')
-  
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'delayed_job_active_record'
-  s.add_development_dependency 'sqlite3'
+
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('delayed_job', '>= 2.0.0')
+  s.add_development_dependency('delayed_job_active_record')
+  s.add_development_dependency('sqlite3')
 end

data/lib/dalliance/version.rb

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

data/lib/dalliance.rb

@@ -8,33 +8,34 @@ require 'dalliance/progress_meter'
 
 module Dalliance
   extend ActiveSupport::Concern
-  
+
   class << self
     def options
       @options ||= {
         :background_processing => (defined?(Rails) ? Rails.env.production? : true),
-        :dalliance_progress_meter_total_count_method => :dalliance_progress_meter_total_count
+        :dalliance_progress_meter_total_count_method => :dalliance_progress_meter_total_count,
+        :delay_method => :delay
       }
     end
-    
+
     def background_processing?
       options[:background_processing]
     end
-    
+
     def background_processing=(value)
       options[:background_processing] = value
     end
-    
+
     def configure
       yield(self) if block_given?
     end
   end
-  
+
   included do
     has_one :dalliance_progress_meter, :as => :dalliance_progress_model, :class_name => '::Dalliance::ProgressMeter', :dependent => :destroy
-    
+
     serialize :dalliance_error_hash, Hash
-    
+
     #BEGIN state_machine(s)
     scope :pending, where(:dalliance_status => 'pending')
     scope :processing, where(:dalliance_status => 'processing')
@@ -65,37 +66,41 @@ module Dalliance
     end
     #END state_machine(s)
   end
-  
+
   module ClassMethods
     def dalliance_status_in_load_select_array
       state_machine(:dalliance_status).states.map {|state| [state.human_name, state.name] }
     end
   end
-  
+
   def error_or_completed?
     processing_error? || completed?
   end
-  
+
   def pending_or_processing?
     pending? || processing?
   end
-  
+
   #Force backgound_processing w/ true
   def dalliance_background_process(backgound_processing = nil)
     if backgound_processing || (backgound_processing.nil? && Dalliance.background_processing?)
-      delay.dalliance_process(true)
+      if respond_to?(self.class.dalliance_options[:delay_method])
+        self.send(self.class.dalliance_options[:delay_method]).dalliance_process(true)
+      else
+        raise NoMethodError.new("#{self.class.dalliance_options[:delay_method]} is undefined")
+      end
     else
       dalliance_process(false)
     end
   end
-  
+
   #backgound_processing == false will re-raise any exceptions
   def dalliance_process(backgound_processing = false)
     begin
       start_dalliance!
 
       build_dalliance_progress_meter(:total_count => calculate_dalliance_progress_meter_total_count).save!
-      
+
       self.send(self.class.dalliance_options[:dalliance_method])
 
       finish_dalliance!
@@ -104,7 +109,7 @@ module Dalliance
       self.dalliance_error_hash = {:error => e.class.name, :message => e.message, :backtrace => e.backtrace}
 
       error_dalliance!
-      
+
       #Don't raise the error if we're backgound_processing...
       raise e unless backgound_processing
     ensure
@@ -115,7 +120,7 @@ module Dalliance
       end
     end
   end
-  
+
   def dalliance_progress
     if completed?
       100
@@ -136,14 +141,14 @@ module Dalliance
       1
     end
   end
-  
+
   module Glue
     extend ActiveSupport::Concern
-    
+
     included do
       class_attribute :dalliance_options
     end
-    
+
     module ClassMethods
       def dalliance(*args)
         options = args.last.is_a?(Hash) ? Dalliance.options.merge(args.pop) : Dalliance.options
@@ -151,21 +156,21 @@ module Dalliance
         case args.length
         when 1
           options[:dalliance_method] = args[0]
-        else 
-          raise ArgumentError, "Incorrect number of Arguements provided" 
+        else
+          raise ArgumentError, "Incorrect number of Arguements provided"
         end
-        
+
         if dalliance_options.nil?
           self.dalliance_options = {}
         else
           self.dalliance_options = self.dalliance_options.dup
         end
-        
+
         self.dalliance_options.merge!(options)
-        
+
         include Dalliance
       end
-      
+
       def dalliance_options
         self.dalliance_options
       end

data/spec/dalliance/asynchronous_spec.rb

@@ -2,87 +2,100 @@ require 'spec_helper'
 
 describe DallianceModel do
   subject { DallianceModel.create }
-  
+
   before(:all) do
     Dalliance.options[:background_processing] = true
   end
-  
+
+  context "no delay method" do
+    before(:all) do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
+      DallianceModel.dalliance_options[:delay_method] = :not_delay
+    end
+
+    it "should raise an error" do
+      expect { subject.dalliance_background_process }.to raise_error(NoMethodError)
+    end
+  end
+
   context "success" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
+      DallianceModel.dalliance_options[:delay_method] = :delay
     end
 
     it "should not call the dalliance_method w/o a Delayed::Worker" do
       subject.dalliance_background_process
       subject.reload
-      
+
       subject.should_not be_successful
       Delayed::Job.count.should == 1
     end
-  
+
     it "should call the dalliance_method w/ a Delayed::Worker" do
       subject.dalliance_background_process
       Delayed::Worker.new.work_off
       subject.reload
-      
+
       subject.should be_successful
       Delayed::Job.count.should == 0
     end
-    
+
     it "should set the dalliance_status to completed" do
       subject.dalliance_background_process
       Delayed::Worker.new.work_off
       subject.reload
-      
+
       subject.should be_completed
     end
-    
+
     it "should set the dalliance_progress to 100" do
       subject.dalliance_background_process
       Delayed::Worker.new.work_off
       subject.reload
-      
+
       subject.dalliance_progress.should == 100
     end
   end
-  
+
   context "raise error" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
+      DallianceModel.dalliance_options[:delay_method] = :delay
     end
-      
+
     it "should NOT raise an error" do
       subject.dalliance_background_process
-    
+
       Delayed::Worker.new.work_off
-      
+
       Delayed::Job.count.should == 0
     end
-    
+
     it "should store the error" do
       subject.dalliance_background_process
       Delayed::Worker.new.work_off
       subject.reload
-      
+
       subject.dalliance_error_hash.should_not be_empty
       subject.dalliance_error_hash[:error].should == RuntimeError.name #We store the class name...
       subject.dalliance_error_hash[:message].should == 'RuntimeError'
       subject.dalliance_error_hash[:backtrace].should_not be_blank
     end
-    
+
     it "should set the dalliance_status to processing_error" do
       subject.dalliance_background_process
       Delayed::Worker.new.work_off
       subject.reload
-      
+
       subject.should be_processing_error
     end
-    
+
     it "should set the dalliance_progress to 0" do
       subject.dalliance_background_process
       Delayed::Worker.new.work_off
       subject.reload
-      
+
       subject.dalliance_progress.should == 0
     end
   end

data/spec/spec_helper.rb

@@ -4,9 +4,9 @@ require 'bundler/setup'
 #Automatically included in a rails app...
 require 'active_support'
 require 'state_machine'
-require 'delayed_job'
 
 #Required for testing...
+require 'delayed_job'
 require 'delayed_job_active_record'
 
 require 'dalliance'
@@ -17,12 +17,12 @@ RSpec.configure do |config|
     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
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: state_machine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,16 +58,16 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: state_machine
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +123,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! ' Opinionated background processing for ActiveRecord w/ delayed_job
-  & state_machine '
+description: ! ' Background processing for ActiveRecord using a ''delay'' method and
+  a state_machine '
 email:
 - eric.sullivan@annkissam.com
 executables: []