dalliance 0.0.1 → 0.0.2

data/README.rdoc

@@ -30,7 +30,7 @@ Handle your migrations:
 Create a method called dalliance_progress_meter_total_count
 (or provide the dalliance_progress_meter_total_count_method option)
 
-Inside process_method call progress_meter.increment! after each iteration
+Inside process_method call dalliance_progress_meter.increment! after each iteration
 
 In your views you can then call dalliance_progress to get feedback on your asynchronous process
      

data/lib/dalliance/progress_meter.rb

@@ -21,6 +21,14 @@ module Dalliance
       self[:total_count] ||= 1
     end
     
+    def total_count=(count)
+      if count <= 0
+        self[:total_count] = 1
+      else
+        self[:total_count] = count
+      end
+    end
+    
     before_validation :calculate_progress
 
     def calculate_progress

data/lib/dalliance/version.rb

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

data/lib/dalliance.rb

@@ -17,6 +17,10 @@ module Dalliance
       options[:background_processing]
     end
     
+    def background_processing=(value)
+      options[:background_processing] = value
+    end
+    
     def configure
       yield(self) if block_given?
     end
@@ -28,10 +32,10 @@ module Dalliance
     serialize :dalliance_error_hash, Hash
     
     #BEGIN state_machine(s)
-    scope :dalliance_pending, where(:dalliance_status => 'pending')
-    scope :dalliance_processing, where(:dalliance_status => 'processing')
-    scope :dalliance_processing_error, where(:dalliance_status => 'processing_error')
-    scope :dalliance_completed, where(:dalliance_status => 'completed')
+    scope :pending, where(:dalliance_status => 'pending')
+    scope :processing, where(:dalliance_status => 'processing')
+    scope :processing_error, where(:dalliance_status => 'processing_error')
+    scope :completed, where(:dalliance_status => 'completed')
 
     state_machine :dalliance_status, :initial => :pending do
       state :pending
@@ -64,6 +68,14 @@ module Dalliance
     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?)
@@ -93,7 +105,7 @@ module Dalliance
       raise e unless backgound_processing
     ensure
       if dalliance_progress_meter
-        dalliance_progress_meter.destroy 
+        dalliance_progress_meter.destroy
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70098455466720 !ruby/object:Gem::Requirement
+  requirement: &70155485428960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70098455466720
+  version_requirements: *70155485428960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70098455466100 !ruby/object:Gem::Requirement
+  requirement: &70155485427560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70098455466100
+  version_requirements: *70155485427560
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70098455465500 !ruby/object:Gem::Requirement
+  requirement: &70155485426060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70098455465500
+  version_requirements: *70155485426060
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70098455465020 !ruby/object:Gem::Requirement
+  requirement: &70155485425640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70098455465020
+  version_requirements: *70155485425640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70098455464440 !ruby/object:Gem::Requirement
+  requirement: &70155485425060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098455464440
+  version_requirements: *70155485425060
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70098455463520 !ruby/object:Gem::Requirement
+  requirement: &70155485424360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098455463520
+  version_requirements: *70155485424360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70098455462940 !ruby/object:Gem::Requirement
+  requirement: &70155485423580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098455462940
+  version_requirements: *70155485423580
 description: ! ' Opinionated background processing for ActiveRecord w/ delayed_job
   & state_machine '
 email:
@@ -138,7 +138,7 @@ rubyforge_project: dalliance
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: dalliance 0.0.1
+summary: dalliance 0.0.2
 test_files:
 - spec/dalliance/asynchronous_spec.rb
 - spec/dalliance/dalliance_spec.rb