dalliance 0.0.3 → 0.0.4

data/dalliance.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Eric Sullivan"]
   s.email       = ["eric.sullivan@annkissam.com"]
   s.homepage    = "https://github.com/annkissam/dalliance"
-  s.summary     = Dalliance::VERSION::SUMMARY
+  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.rubyforge_project = "dalliance"

data/lib/dalliance/progress_meter.rb

@@ -46,6 +46,9 @@ module Dalliance
     def increment!
       self.current_count += 1
       self.save!
+      
+      #Will this work too?
+      #Dalliance::ProgressMeter.increment_counter(:current_count, self.id)
     end
   end
 end

data/lib/dalliance/railtie.rb

@@ -1,12 +1,13 @@
 require 'dalliance'
+require 'dalliance/schema'
 
 module Dalliance
-  if defined? Rails::Railtie
-    class Railtie < Rails::Railtie
-      initializer 'dalliance.active_record' do
-        ActiveSupport.on_load :active_record do
-          include Dalliance::Glue
-        end
+  class Railtie < Rails::Railtie
+    initializer 'dalliance.active_record' do
+      ActiveSupport.on_load :active_record do
+        include Dalliance::Glue
+        
+        ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, Dalliance::Schema)
       end
     end
   end

data/lib/dalliance/schema.rb

@@ -0,0 +1,8 @@
+module Dalliance
+  module Schema
+    def add_dalliance
+      column :dalliance_error_hash, :text, {}
+      column :dalliance_status, :string, {:null => false, :default => 'pending'}
+    end
+  end
+end

data/lib/dalliance/version.rb

@@ -2,12 +2,10 @@ module Dalliance
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-
-    SUMMARY = "dalliance #{STRING}"
   end
 end
 

data/lib/dalliance.rb

@@ -1,5 +1,8 @@
 require 'dalliance/version'
-require 'dalliance/railtie'
+
+if defined?(Rails::Railtie)
+  require 'dalliance/railtie'
+end
 
 require 'dalliance/progress_meter'
 
@@ -28,7 +31,7 @@ module Dalliance
   end
   
   included do
-    has_one :dalliance_progress_meter, :as => :dalliance_progress_model, :class_name => '::Dalliance::ProgressMeter'
+    has_one :dalliance_progress_meter, :as => :dalliance_progress_model, :class_name => '::Dalliance::ProgressMeter', :dependent => :destroy
     
     serialize :dalliance_error_hash, Hash
     
@@ -136,7 +139,7 @@ module Dalliance
     extend ActiveSupport::Concern
     
     included do
-      class_attribute :dalliance_options if respond_to?(:class_attribute)
+      class_attribute :dalliance_options
     end
     
     module ClassMethods
@@ -151,17 +154,9 @@ module Dalliance
         end
         
         if dalliance_options.nil?
-          if respond_to?(:class_attribute)
-            self.dalliance_options = {}
-          else
-            write_inheritable_attribute(:dalliance_options, {})
-          end
+          self.dalliance_options = {}
         else
-          if respond_to?(:class_attribute)
-            self.dalliance_options = self.dalliance_options.dup
-          else
-            write_inheritable_attribute(:dalliance_options, self.dalliance_options.dup)
-          end
+          self.dalliance_options = self.dalliance_options.dup
         end
         
         self.dalliance_options.merge!(options)
@@ -170,11 +165,7 @@ module Dalliance
       end
       
       def dalliance_options
-        if respond_to?(:class_attribute)
-          self.dalliance_options
-        else
-          read_inheritable_attribute(:dalliance_options)
-        end
+        self.dalliance_options
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70192797957220 !ruby/object:Gem::Requirement
+  requirement: &70177446511680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70192797957220
+  version_requirements: *70177446511680
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70192797956080 !ruby/object:Gem::Requirement
+  requirement: &70177446510680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70192797956080
+  version_requirements: *70177446510680
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70192797954180 !ruby/object:Gem::Requirement
+  requirement: &70177446509420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70192797954180
+  version_requirements: *70177446509420
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70192797953760 !ruby/object:Gem::Requirement
+  requirement: &70177446508020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192797953760
+  version_requirements: *70177446508020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70192797953260 !ruby/object:Gem::Requirement
+  requirement: &70177446507520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192797953260
+  version_requirements: *70177446507520
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70192797952420 !ruby/object:Gem::Requirement
+  requirement: &70177446506860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192797952420
+  version_requirements: *70177446506860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70192797951660 !ruby/object:Gem::Requirement
+  requirement: &70177446505960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192797951660
+  version_requirements: *70177446505960
 description: ! ' Opinionated background processing for ActiveRecord w/ delayed_job
   & state_machine '
 email:
@@ -106,6 +106,7 @@ files:
 - lib/dalliance.rb
 - lib/dalliance/progress_meter.rb
 - lib/dalliance/railtie.rb
+- lib/dalliance/schema.rb
 - lib/dalliance/version.rb
 - lib/generators/dalliance/progress_meter/progress_meter_generator.rb
 - lib/generators/dalliance/progress_meter/templates/migration.rb
@@ -139,7 +140,7 @@ rubyforge_project: dalliance
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: dalliance 0.0.3
+summary: Wrapper for an ActiveRecord model with a single ascynhronous method
 test_files:
 - spec/dalliance/asynchronous_spec.rb
 - spec/dalliance/dalliance_spec.rb