dalliance 0.0.2 → 0.0.3

data/lib/dalliance/railtie.rb

@@ -0,0 +1,13 @@
+require 'dalliance'
+
+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
+      end
+    end
+  end
+end

data/lib/dalliance/version.rb

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

data/lib/dalliance.rb

@@ -1,4 +1,5 @@
 require 'dalliance/version'
+require 'dalliance/railtie'
 
 require 'dalliance/progress_meter'
 
@@ -130,22 +131,51 @@ module Dalliance
       1
     end
   end
-end
-
-#http://yehudakatz.com/2009/11/12/better-ruby-idioms/
-class ActiveRecord::Base
-  def self.dalliance(*args)
-    options = args.last.is_a?(Hash) ? Dalliance.options.merge(args.pop) : Dalliance.options
+  
+  module Glue
+    extend ActiveSupport::Concern
     
-    case args.length
-    when 1
-      options[:dalliance_method] = args[0]
-    else 
-      raise ArgumentError, "Incorrect number of Arguements provided" 
+    included do
+      class_attribute :dalliance_options if respond_to?(:class_attribute)
     end
     
-    cattr_accessor :dalliance_options
-    self.dalliance_options = options
-    include Dalliance
+    module ClassMethods
+      def dalliance(*args)
+        options = args.last.is_a?(Hash) ? Dalliance.options.merge(args.pop) : Dalliance.options
+
+        case args.length
+        when 1
+          options[:dalliance_method] = args[0]
+        else 
+          raise ArgumentError, "Incorrect number of Arguements provided" 
+        end
+        
+        if dalliance_options.nil?
+          if respond_to?(:class_attribute)
+            self.dalliance_options = {}
+          else
+            write_inheritable_attribute(:dalliance_options, {})
+          end
+        else
+          if respond_to?(:class_attribute)
+            self.dalliance_options = self.dalliance_options.dup
+          else
+            write_inheritable_attribute(:dalliance_options, self.dalliance_options.dup)
+          end
+        end
+        
+        self.dalliance_options.merge!(options)
+        
+        include Dalliance
+      end
+      
+      def dalliance_options
+        if respond_to?(:class_attribute)
+          self.dalliance_options
+        else
+          read_inheritable_attribute(:dalliance_options)
+        end
+      end
+    end
   end
 end

data/spec/support/active_record.rb

@@ -42,6 +42,9 @@ end
 
 # Purely useful for test cases...
 class DallianceModel < ActiveRecord::Base
+  #We're not using the railtie in tests...
+  include Dalliance::Glue
+  
   dalliance :dalliance_success_method
 
   def dalliance_success_method

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70155485428960 !ruby/object:Gem::Requirement
+  requirement: &70192797957220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155485428960
+  version_requirements: *70192797957220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70155485427560 !ruby/object:Gem::Requirement
+  requirement: &70192797956080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155485427560
+  version_requirements: *70192797956080
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70155485426060 !ruby/object:Gem::Requirement
+  requirement: &70192797954180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155485426060
+  version_requirements: *70192797954180
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70155485425640 !ruby/object:Gem::Requirement
+  requirement: &70192797953760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155485425640
+  version_requirements: *70192797953760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155485425060 !ruby/object:Gem::Requirement
+  requirement: &70192797953260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155485425060
+  version_requirements: *70192797953260
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70155485424360 !ruby/object:Gem::Requirement
+  requirement: &70192797952420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155485424360
+  version_requirements: *70192797952420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70155485423580 !ruby/object:Gem::Requirement
+  requirement: &70192797951660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155485423580
+  version_requirements: *70192797951660
 description: ! ' Opinionated background processing for ActiveRecord w/ delayed_job
   & state_machine '
 email:
@@ -105,6 +105,7 @@ files:
 - dalliance.gemspec
 - lib/dalliance.rb
 - lib/dalliance/progress_meter.rb
+- lib/dalliance/railtie.rb
 - lib/dalliance/version.rb
 - lib/generators/dalliance/progress_meter/progress_meter_generator.rb
 - lib/generators/dalliance/progress_meter/templates/migration.rb
@@ -138,7 +139,7 @@ rubyforge_project: dalliance
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: dalliance 0.0.2
+summary: dalliance 0.0.3
 test_files:
 - spec/dalliance/asynchronous_spec.rb
 - spec/dalliance/dalliance_spec.rb