state_machine 0.7.3 → 0.7.4

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.7.4 / 2009-05-23
+
+* Fix #save! not firing event attributes properly in ActiveRecord integrations
+* Fix log files being included in gems
+
 == 0.7.3 / 2009-04-25
 
 * Require DataMapper version be >= 0.9.4

data/Rakefile

@@ -5,11 +5,12 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'state_machine'
-  s.version           = '0.7.3'
+  s.version           = '0.7.4'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for creating state machines for attributes on any Ruby class'
+  s.description       = s.summary
   
-  s.files             = FileList['{examples,lib,tasks,test}/**/*'] + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc) - FileList['test/app_root/{log,log/*,script,script/*}']
+  s.files             = FileList['{examples,lib,tasks,test}/**/*'] + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc) - FileList['test/*.log']
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']

data/lib/state_machine/integrations/active_record.rb

@@ -327,7 +327,7 @@ module StateMachine
         
         # Adds hooks into validation for automatically firing events
         def define_action_helpers
-          if super && action == :save
+          if super(:create_or_update) && action == :save
             @instance_helper_module.class_eval do
               define_method(:valid?) do |*args|
                 self.class.state_machines.fire_attribute_events(self, :save, false) { super(*args) }

data/lib/state_machine/machine.rb

@@ -1268,18 +1268,21 @@ module StateMachine
       
       # Adds helper methods for automatically firing events when an action
       # is invoked
-      def define_action_helpers
+      def define_action_helpers(action_hook = self.action)
         action = self.action
+        private_method = owner_class.private_method_defined?(action_hook)
         
-        if owner_class.method_defined?(action) && !owner_class.state_machines.any? {|attribute, machine| machine.action == action && machine != self}
+        if (owner_class.method_defined?(action_hook) || private_method) && !owner_class.state_machines.any? {|attribute, machine| machine.action == action && machine != self}
           # Action is defined and hasn't already been overridden by another machine
           @instance_helper_module.class_eval do
             # Override the default action to invoke the before / after hooks
-            define_method(action) do |*args|
+            define_method(action_hook) do |*args|
               value = nil
               result = self.class.state_machines.fire_attribute_events(self, action) { value = super(*args) }
               value.nil? ? result : value
             end
+            
+            private action_hook if private_method
           end
           
           true

data/test/unit/integrations/active_record_test.rb

@@ -662,6 +662,55 @@ begin
       end
     end
     
+    class MachineWithEventAttributesOnSaveBangTest < ActiveRecord::TestCase
+      def setup
+        @model = new_model
+        @machine = StateMachine::Machine.new(@model)
+        @machine.event :ignite do
+          transition :parked => :idling
+        end
+        
+        @record = @model.new
+        @record.state = 'parked'
+        @record.state_event = 'ignite'
+      end
+      
+      def test_should_fail_if_event_is_invalid
+        @record.state_event = 'invalid'
+        assert_raise(ActiveRecord::RecordInvalid) { @record.save! }
+      end
+      
+      def test_should_fail_if_event_has_no_transition
+        @record.state = 'idling'
+        assert_raise(ActiveRecord::RecordInvalid) { @record.save! }
+      end
+      
+      def test_should_be_successful_if_event_has_transition
+        assert @record.save!
+      end
+      
+      def test_should_run_before_callbacks
+        ran_callback = false
+        @machine.before_transition { ran_callback = true }
+        
+        @record.save!
+        assert ran_callback
+      end
+      
+      def test_should_persist_new_state
+        @record.save!
+        assert_equal 'idling', @record.state
+      end
+      
+      def test_should_run_after_callbacks
+        ran_callback = false
+        @machine.after_transition { ran_callback = true }
+        
+        @record.save!
+        assert ran_callback
+      end
+    end
+    
     class MachineWithObserversTest < ActiveRecord::TestCase
       def setup
         @model = new_model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -04:00
+date: 2009-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: 
+description: Adds support for creating state machines for attributes on any Ruby class
 email: aaron@pluginaweek.org
 executables: []
 
@@ -22,90 +22,88 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- examples/Car_state.png
+- examples/AutoShop_state.png
 - examples/rails-rest
-- examples/rails-rest/view_edit.html.erb
-- examples/rails-rest/migration.rb
 - examples/rails-rest/view_show.html.erb
 - examples/rails-rest/controller.rb
 - examples/rails-rest/model.rb
-- examples/rails-rest/view_new.html.erb
 - examples/rails-rest/view_index.html.erb
-- examples/car.rb
-- examples/Vehicle_state.png
-- examples/AutoShop_state.png
-- examples/vehicle.rb
+- examples/rails-rest/view_new.html.erb
+- examples/rails-rest/view_edit.html.erb
+- examples/rails-rest/migration.rb
 - examples/merb-rest
-- examples/merb-rest/view_edit.html.erb
 - examples/merb-rest/view_show.html.erb
 - examples/merb-rest/controller.rb
 - examples/merb-rest/model.rb
-- examples/merb-rest/view_new.html.erb
 - examples/merb-rest/view_index.html.erb
-- examples/traffic_light.rb
+- examples/merb-rest/view_new.html.erb
+- examples/merb-rest/view_edit.html.erb
+- examples/vehicle.rb
 - examples/TrafficLight_state.png
 - examples/auto_shop.rb
-- examples/Car_state.png
+- examples/traffic_light.rb
+- examples/Vehicle_state.png
+- examples/car.rb
+- lib/state_machine.rb
 - lib/state_machine
-- lib/state_machine/node_collection.rb
-- lib/state_machine/event.rb
-- lib/state_machine/guard.rb
-- lib/state_machine/integrations.rb
+- lib/state_machine/condition_proxy.rb
+- lib/state_machine/machine_collection.rb
+- lib/state_machine/machine.rb
+- lib/state_machine/event_collection.rb
 - lib/state_machine/integrations
-- lib/state_machine/integrations/data_mapper
-- lib/state_machine/integrations/data_mapper/observer.rb
-- lib/state_machine/integrations/sequel.rb
 - lib/state_machine/integrations/active_record
-- lib/state_machine/integrations/active_record/observer.rb
 - lib/state_machine/integrations/active_record/locale.rb
-- lib/state_machine/integrations/active_record.rb
+- lib/state_machine/integrations/active_record/observer.rb
 - lib/state_machine/integrations/data_mapper.rb
-- lib/state_machine/eval_helpers.rb
+- lib/state_machine/integrations/sequel.rb
+- lib/state_machine/integrations/active_record.rb
+- lib/state_machine/integrations/data_mapper
+- lib/state_machine/integrations/data_mapper/observer.rb
 - lib/state_machine/matcher_helpers.rb
-- lib/state_machine/transition.rb
+- lib/state_machine/assertions.rb
+- lib/state_machine/matcher.rb
+- lib/state_machine/eval_helpers.rb
+- lib/state_machine/guard.rb
+- lib/state_machine/integrations.rb
 - lib/state_machine/callback.rb
-- lib/state_machine/machine_collection.rb
+- lib/state_machine/event.rb
 - lib/state_machine/extensions.rb
 - lib/state_machine/state.rb
+- lib/state_machine/transition.rb
+- lib/state_machine/node_collection.rb
 - lib/state_machine/state_collection.rb
-- lib/state_machine/assertions.rb
-- lib/state_machine/matcher.rb
-- lib/state_machine/condition_proxy.rb
-- lib/state_machine/machine.rb
-- lib/state_machine/event_collection.rb
-- lib/state_machine.rb
 - tasks/state_machine.rb
 - tasks/state_machine.rake
-- test/sequel.log
-- test/active_record.log
-- test/test_helper.rb
-- test/functional
-- test/functional/state_machine_test.rb
-- test/classes
-- test/classes/switch.rb
 - test/unit
-- test/unit/matcher_helpers_test.rb
+- test/unit/assertions_test.rb
+- test/unit/integrations_test.rb
 - test/unit/node_collection_test.rb
-- test/unit/matcher_test.rb
+- test/unit/invalid_event_test.rb
+- test/unit/event_test.rb
+- test/unit/state_collection_test.rb
+- test/unit/callback_test.rb
+- test/unit/condition_proxy_test.rb
 - test/unit/integrations
+- test/unit/integrations/sequel_test.rb
 - test/unit/integrations/data_mapper_test.rb
 - test/unit/integrations/active_record_test.rb
-- test/unit/integrations/sequel_test.rb
-- test/unit/machine_collection_test.rb
-- test/unit/state_machine_test.rb
-- test/unit/state_collection_test.rb
-- test/unit/invalid_event_test.rb
-- test/unit/callback_test.rb
-- test/unit/invalid_transition_test.rb
-- test/unit/transition_test.rb
 - test/unit/eval_helpers_test.rb
-- test/unit/event_collection_test.rb
-- test/unit/event_test.rb
-- test/unit/state_test.rb
 - test/unit/guard_test.rb
-- test/unit/assertions_test.rb
-- test/unit/condition_proxy_test.rb
+- test/unit/state_test.rb
+- test/unit/transition_test.rb
+- test/unit/matcher_test.rb
+- test/unit/invalid_transition_test.rb
 - test/unit/machine_test.rb
-- test/unit/integrations_test.rb
+- test/unit/machine_collection_test.rb
+- test/unit/state_machine_test.rb
+- test/unit/event_collection_test.rb
+- test/unit/matcher_helpers_test.rb
+- test/test_helper.rb
+- test/classes
+- test/classes/switch.rb
+- test/functional
+- test/functional/state_machine_test.rb
 - CHANGELOG.rdoc
 - init.rb
 - LICENSE
@@ -138,26 +136,26 @@ signing_key:
 specification_version: 2
 summary: Adds support for creating state machines for attributes on any Ruby class
 test_files: 
-- test/functional/state_machine_test.rb
-- test/unit/matcher_helpers_test.rb
+- test/unit/assertions_test.rb
+- test/unit/integrations_test.rb
 - test/unit/node_collection_test.rb
-- test/unit/matcher_test.rb
-- test/unit/integrations/data_mapper_test.rb
-- test/unit/integrations/active_record_test.rb
-- test/unit/integrations/sequel_test.rb
-- test/unit/machine_collection_test.rb
-- test/unit/state_machine_test.rb
-- test/unit/state_collection_test.rb
 - test/unit/invalid_event_test.rb
+- test/unit/event_test.rb
+- test/unit/state_collection_test.rb
 - test/unit/callback_test.rb
-- test/unit/invalid_transition_test.rb
-- test/unit/transition_test.rb
+- test/unit/condition_proxy_test.rb
+- test/unit/integrations/sequel_test.rb
+- test/unit/integrations/data_mapper_test.rb
+- test/unit/integrations/active_record_test.rb
 - test/unit/eval_helpers_test.rb
-- test/unit/event_collection_test.rb
-- test/unit/event_test.rb
-- test/unit/state_test.rb
 - test/unit/guard_test.rb
-- test/unit/assertions_test.rb
-- test/unit/condition_proxy_test.rb
+- test/unit/state_test.rb
+- test/unit/transition_test.rb
+- test/unit/matcher_test.rb
+- test/unit/invalid_transition_test.rb
 - test/unit/machine_test.rb
-- test/unit/integrations_test.rb
+- test/unit/machine_collection_test.rb
+- test/unit/state_machine_test.rb
+- test/unit/event_collection_test.rb
+- test/unit/matcher_helpers_test.rb
+- test/functional/state_machine_test.rb