state_machine 0.10.2 → 0.10.3

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == master
 
+== 0.10.3 / 2011-04-07
+
+* Fix state initialization failing in ActiveRecord 3.0.2+ when using with_state scopes for the default scope
+
 == 0.10.2 / 2011-03-31
 
 * Use more integrated state initialization hooks for ActiveRecord, Mongoid, and Sequel

data/README.rdoc

@@ -459,7 +459,7 @@ machines, see StateMachine::Integrations::DataMapper.
 === Mongoid
 
 The Mongoid integration adds support for automatically saving the record,
-basic scopes, validation errors and callbacks.  For example,
+basic scopes, validation errors, and observers.  For example,
 
   class Vehicle
     include Mongoid::Document
@@ -490,6 +490,18 @@ basic scopes, validation errors and callbacks.  For example,
       ...
     end
   end
+  
+  class VehicleObserver < Mongoid::Observer
+    # Callback for :ignite event *before* the transition is performed
+    def before_ignite(vehicle, transition)
+      # log message
+    end
+    
+    # Generic transition callback *after* the transition is performed
+    def after_transition(vehicle, transition)
+      Audit.log(vehicle, transition)
+    end
+  end
 
 For more information about the various behaviors added for Mongoid state
 machines, see StateMachine::Integrations::Mongoid.

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'state_machine'
-  s.version           = '0.10.2'
+  s.version           = '0.10.3'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for creating state machines for attributes on any Ruby class'
   s.description       = s.summary

data/lib/state_machine/integrations/active_record.rb

@@ -400,16 +400,19 @@ module StateMachine
         # Creates a scope for finding records *with* a particular state or
         # states for the attribute
         def create_with_scope(name)
-          define_scope(name, lambda {|values| {attribute => values}})
+          create_scope(name, lambda {|values| ["#{attribute_column} IN (?)", values]})
         end
         
         # Creates a scope for finding records *without* a particular state or
         # states for the attribute
         def create_without_scope(name)
-          define_scope(name, lambda {|values|
-            connection = owner_class.connection
-            ["#{connection.quote_table_name(owner_class.table_name)}.#{connection.quote_column_name(attribute)} NOT IN (?)", values]
-          })
+          create_scope(name, lambda {|values| ["#{attribute_column} NOT IN (?)", values]})
+        end
+        
+        # Generates the fully-qualifed column name for this machine's attribute
+        def attribute_column
+          connection = owner_class.connection
+          "#{connection.quote_table_name(owner_class.table_name)}.#{connection.quote_column_name(attribute)}"
         end
         
         # Runs a new database transaction, rolling back any changes by raising
@@ -420,7 +423,7 @@ module StateMachine
         end
         
         # Defines a new named scope with the given name
-        def define_scope(name, scope)
+        def create_scope(name, scope)
           lambda {|model, values| model.where(scope.call(values))}
         end
         

data/lib/state_machine/integrations/active_record/versions.rb

@@ -10,7 +10,7 @@ module StateMachine
           super if defined?(I18n)
         end
         
-        def define_scope(name, scope)
+        def create_scope(name, scope)
           if owner_class.respond_to?(:named_scope)
             name = name.to_sym
             machine_name = self.name

data/test/unit/integrations/active_record_test.rb

@@ -1819,6 +1819,27 @@ module ActiveRecordTest
     $stderr.puts 'Skipping ActiveRecord Scope tests. `gem install active_record` >= v2.1.0 and try again.'
   end
   
+  if ActiveRecord.const_defined?(:Relation)
+    class MachineWithDefaultScope < BaseTestCase
+      def setup
+        @model = new_model
+        @machine = StateMachine::Machine.new(@model, :initial => :parked)
+        @machine.state :idling
+        
+        @model.class_eval do
+          default_scope with_state(:parked, :idling)
+        end
+      end
+      
+      def test_should_set_initial_state_on_created_object
+        object = @model.new
+        assert_equal 'parked', object.state
+      end
+    end
+  else
+    $stderr.puts 'Skipping ActiveRecord Default Scope tests. `gem install active_record` >= v3.0.0 and try again.'
+  end
+  
   if Object.const_defined?(:I18n)
     class MachineWithInternationalizationTest < BaseTestCase
       def setup

data/test/unit/integrations/mongoid_test.rb

@@ -1402,6 +1402,23 @@ module MongoidTest
     end
   end
   
+  class MachineWithDefaultScope < BaseTestCase
+    def setup
+      @model = new_model
+      @machine = StateMachine::Machine.new(@model, :initial => :parked)
+      @machine.state :idling
+      
+      @model.class_eval do
+        default_scope with_state(:parked, :idling)
+      end
+    end
+    
+    def test_should_set_initial_state_on_created_object
+      object = @model.new
+      assert_equal 'parked', object.state
+    end
+  end
+  
   class MachineWithInternationalizationTest < BaseTestCase
     def setup
       I18n.backend = I18n::Backend::Simple.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -04:00
+date: 2011-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: []