state_machine 0.9.1 → 0.9.2

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 == master
 
+== 0.9.2 / 2010-05-24
+
+* Fix MongoMapper integration failing in Ruby 1.9.2
+* Fix Rakefile not loading in Ruby 1.9.2 [Andrea Longhi]
+* Fix nil / false :integration configuration not being respected
+
 == 0.9.1 / 2010-05-02
 
 * Fix ActiveRecord 2.0.0 - 2.2.3 integrations failing if version info isn't already loaded

data/README.rdoc

@@ -110,8 +110,10 @@ Class definition:
       end
       
       event :repair do
+        # The first transition that matches the state and passes its conditions
+        # will be used
         transition :stalled => :parked, :if => :auto_shop_busy?
-        transition :stalled => same # Loopback if we have to
+        transition :stalled => same
       end
       
       state :parked do

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'state_machine'
-  s.version           = '0.9.1'
+  s.version           = '0.9.2'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for creating state machines for attributes on any Ruby class'
   s.description       = s.summary
@@ -74,4 +74,4 @@ task :release => :package do
   Rake::Task['gem:push'].invoke
 end
 
-load 'lib/tasks/state_machine.rake'
+load File.dirname(__FILE__) + '/lib/tasks/state_machine.rake'

data/lib/state_machine/integrations/mongo_mapper.rb

@@ -253,7 +253,7 @@ module StateMachine
           owner_class.key(attribute, String) unless owner_class.keys.include?(attribute)
           
           name = self.name
-          owner_class.validates_each(attribute, :logic => lambda {
+          owner_class.validates_each(attribute, :logic => lambda {|*|
             machine = self.class.state_machine(name)
             machine.invalidate(self, :state, :invalid) unless machine.states.match(self)
           })

data/lib/state_machine/machine.rb

@@ -419,7 +419,13 @@ module StateMachine
       assert_valid_keys(options, :attribute, :initial, :action, :plural, :namespace, :integration, :messages, :use_transactions)
       
       # Find an integration that matches this machine's owner class
-      if integration = options[:integration] ? StateMachine::Integrations.find(options[:integration]) : StateMachine::Integrations.match(owner_class)
+      if options.include?(:integration)
+        integration = StateMachine::Integrations.find(options[:integration]) if options[:integration]
+      else
+        integration = StateMachine::Integrations.match(owner_class)
+      end
+
+      if integration
         extend integration
         options = integration.defaults.merge(options) if integration.respond_to?(:defaults)
       end

data/test/unit/machine_test.rb

@@ -377,12 +377,33 @@ end
 
 class MachineWithCustomIntegrationTest < Test::Unit::TestCase
   def setup
-    StateMachine::Integrations.const_set('Custom', Module.new)
-    @machine = StateMachine::Machine.new(Class.new, :integration => :custom)
+    integration = Module.new do
+      def self.matches?(klass)
+        true
+      end
+    end
+    
+    StateMachine::Integrations.const_set('Custom', integration)
   end
   
-  def test_should_be_extended_by_the_integration
-    assert (class << @machine; ancestors; end).include?(StateMachine::Integrations::Custom)
+  def test_should_be_extended_by_the_integration_if_explicit
+    machine = StateMachine::Machine.new(Class.new, :integration => :custom)
+    assert (class << machine; ancestors; end).include?(StateMachine::Integrations::Custom)
+  end
+
+  def test_should_be_extended_by_the_integration_if_implicit
+    machine = StateMachine::Machine.new(Class.new)
+    assert (class << machine; ancestors; end).include?(StateMachine::Integrations::Custom)
+  end
+
+  def test_should_not_be_extended_by_the_integration_if_nil
+    machine = StateMachine::Machine.new(Class.new, :integration => nil)
+    assert !(class << machine; ancestors; end).include?(StateMachine::Integrations::Custom)
+  end
+  
+  def test_should_not_be_extended_by_the_integration_if_false
+    machine = StateMachine::Machine.new(Class.new, :integration => false)
+    assert !(class << machine; ancestors; end).include?(StateMachine::Integrations::Custom)
   end
   
   def teardown

metadata

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