state_machine 0.10.0 → 0.10.1

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == master
 
+== 0.10.1 / 2011-03-22
+
+* Fix classes with multiple state machines failing to initialize in ActiveRecord / Mongoid / Sequel integrations
+
 == 0.10.0 / 2011-03-19
 
 * Support callback terminators in MongoMapper 0.9.0+

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'state_machine'
-  s.version           = '0.10.0'
+  s.version           = '0.10.1'
   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

@@ -373,10 +373,7 @@ module StateMachine
         # created with a set of attributes that includes this machine's
         # attribute.
         def initialize_state?(object, options)
-          if object.new_record? && !object.instance_variable_defined?('@initialized_state_machines')
-            object.instance_variable_set('@initialized_state_machines', true)
-            super
-          end
+          super if object.new_record?
         end
         
         # Defines an initialization hook into the owner class for setting the
@@ -392,7 +389,12 @@ module StateMachine
           # Hooks in to attribute initialization to set the states *prior*
           # to the attributes being set
           define_helper(:instance, :attributes=) do |machine, object, _super, new_attributes, *|
-            object.class.state_machines.initialize_states(object, :attributes => new_attributes) { _super.call }
+            if !object.instance_variable_defined?('@initialized_state_machines')
+              object.class.state_machines.initialize_states(object, :attributes => new_attributes) { _super.call }
+              object.instance_variable_set('@initialized_state_machines', true)
+            else
+              _super.call
+            end
           end
         end
         

data/lib/state_machine/integrations/mongoid.rb

@@ -234,10 +234,7 @@ module StateMachine
         # created with a set of attributes that includes this machine's
         # attribute.
         def initialize_state?(object, options)
-          if object.new_record? && !object.instance_variable_defined?('@initialized_state_machines')
-            object.instance_variable_set('@initialized_state_machines', true)
-            super
-          end
+          super if object.new_record?
         end
         
         # Defines an initialization hook into the owner class for setting the
@@ -245,7 +242,12 @@ module StateMachine
         # object
         def define_state_initializer
           define_helper(:instance, :process) do |machine, object, _super, *args|
-            object.class.state_machines.initialize_states(object, :attributes => args.first) { _super.call }
+            if !object.instance_variable_defined?('@initialized_state_machines')
+              object.class.state_machines.initialize_states(object, :attributes => args.first) { _super.call }
+              object.instance_variable_set('@initialized_state_machines', true)
+            else
+              _super.call
+            end
           end
         end
         

data/lib/state_machine/integrations/sequel.rb

@@ -270,9 +270,7 @@ module StateMachine
         # created with a set of attributes that includes this machine's
         # attribute.
         def initialize_state?(object, options)
-          if object.new? && !object.instance_variable_defined?('@initialized_state_machines')
-            object.instance_variable_set('@initialized_state_machines', true)
-            
+          if object.new?
             attributes = options[:attributes] || {}
             ignore = object.send(:setter_methods, nil, nil).map {|setter| setter.chop.to_sym} & attributes.keys.map {|key| key.to_sym}
             !ignore.map {|attribute| attribute.to_sym}.include?(attribute) 
@@ -286,7 +284,12 @@ module StateMachine
           # Hooks in to attribute initialization to set the states *prior* to
           # the attributes being set
           define_helper(:instance, :set) do |machine, object, _super, *args|
-            object.class.state_machines.initialize_states(object, :attributes => args.first) { _super.call }
+            if !object.instance_variable_defined?('@initialized_state_machines')
+              object.class.state_machines.initialize_states(object, :attributes => args.first) { _super.call }
+              object.instance_variable_set('@initialized_state_machines', true)
+            else
+              _super.call
+            end
           end
         end
         

data/test/unit/integrations/active_model_test.rb

@@ -266,6 +266,23 @@ module ActiveModelTest
     end
   end
   
+  class MachineMultipleTest < BaseTestCase
+    def setup
+      @model = new_model do
+        model_attribute :status
+      end
+      
+      @state_machine = StateMachine::Machine.new(@model, :initial => :parked, :integration => :active_model)
+      @status_machine = StateMachine::Machine.new(@model, :status, :initial => :idling, :integration => :active_model)
+    end
+    
+    def test_should_should_initialize_each_state
+      record = @model.new
+      assert_equal 'parked', record.state
+      assert_equal 'idling', record.status
+    end
+  end
+  
   class MachineWithDirtyAttributesTest < BaseTestCase
     def setup
       @model = new_model do

data/test/unit/integrations/active_record_test.rb

@@ -513,6 +513,22 @@ module ActiveRecordTest
     end
   end
   
+  class MachineMultipleTest < BaseTestCase
+    def setup
+      @model = new_model do
+        connection.add_column :foo, :status, :string
+      end
+      @state_machine = StateMachine::Machine.new(@model, :initial => :parked)
+      @status_machine = StateMachine::Machine.new(@model, :status, :initial => :idling)
+    end
+    
+    def test_should_should_initialize_each_state
+      record = @model.new
+      assert_equal 'parked', record.state
+      assert_equal 'idling', record.status
+    end
+  end
+  
   class MachineWithLoopbackTest < BaseTestCase
     def setup
       @model = new_model do

data/test/unit/integrations/data_mapper_test.rb

@@ -454,6 +454,23 @@ module DataMapperTest
     end
   end
   
+  class MachineMultipleTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        property :status, String
+        auto_migrate!
+      end
+      @state_machine = StateMachine::Machine.new(@resource, :initial => :parked)
+      @status_machine = StateMachine::Machine.new(@resource, :status, :initial => :idling)
+    end
+    
+    def test_should_should_initialize_each_state
+      record = @resource.new
+      assert_equal 'parked', record.state
+      assert_equal 'idling', record.status
+    end
+  end
+  
   class MachineWithLoopbackTest < BaseTestCase
     def setup
       @resource = new_resource do

data/test/unit/integrations/mongo_mapper_test.rb

@@ -450,6 +450,22 @@ module MongoMapperTest
     end
   end
   
+  class MachineMultipleTest < BaseTestCase
+    def setup
+      @model = new_model do
+        key :status, String, :default => 'idling'
+      end
+      @state_machine = StateMachine::Machine.new(@model, :initial => :parked)
+      @status_machine = StateMachine::Machine.new(@model, :status, :initial => :idling)
+    end
+    
+    def test_should_should_initialize_each_state
+      record = @model.new
+      assert_equal 'parked', record.state
+      assert_equal 'idling', record.status
+    end
+  end
+  
   class MachineWithLoopbackTest < BaseTestCase
     def setup
       @model = new_model do

data/test/unit/integrations/mongoid_test.rb

@@ -424,6 +424,22 @@ module MongoidTest
     end
   end
   
+  class MachineMultipleTest < BaseTestCase
+    def setup
+      @model = new_model do
+        key :status, String, :default => 'idling'
+      end
+      @state_machine = StateMachine::Machine.new(@model, :initial => :parked)
+      @status_machine = StateMachine::Machine.new(@model, :status, :initial => :idling)
+    end
+    
+    def test_should_should_initialize_each_state
+      record = @model.new
+      assert_equal 'parked', record.state
+      assert_equal 'idling', record.status
+    end
+  end
+  
   class MachineWithLoopbackTest < BaseTestCase
     def setup
       @model = new_model do

data/test/unit/integrations/sequel_test.rb

@@ -453,6 +453,25 @@ module SequelTest
     end
   end
   
+  class MachineMultipleTest < BaseTestCase
+    def setup
+      @model = new_model
+      DB.alter_table :foo do
+        add_column :status, :string, :default => 'idling'
+      end
+      @model.class_eval { get_db_schema(true) }
+      
+      @state_machine = StateMachine::Machine.new(@model, :initial => :parked)
+      @status_machine = StateMachine::Machine.new(@model, :status, :initial => :idling)
+    end
+    
+    def test_should_should_initialize_each_state
+      record = @model.new
+      assert_equal 'parked', record.state
+      assert_equal 'idling', record.status
+    end
+  end
+  
   class MachineWithAliasedAttributeTest < BaseTestCase
     def setup
       @model = new_model do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
+  hash: 53
+  prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -04:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Adds support for creating state machines for attributes on any Ruby class