state_machine 0.9.0 → 0.9.1

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 == master
 
+== 0.9.1 / 2010-05-02
+
+* Fix ActiveRecord 2.0.0 - 2.2.3 integrations failing if version info isn't already loaded
+* Fix integration with dirty attribute tracking on DataMapper 0.10.3
+* Fix observers failing in ActiveRecord 3.0.0.beta4+ integrations
+* Fix deprecation warning in Rails 3 railtie [Chris Yuan]
+
 == 0.9.0 / 2010-04-12
 
 * Use attribute-based event transitions whenever possible to ensure consistency

data/Rakefile

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

@@ -295,8 +295,8 @@ module StateMachine
     # 
     # Within the +state_machine+ block, you can also define callbacks for
     # transitions.  For more information about defining these callbacks,
-    # see StateMachine::Machine#before_transition and
-    # StateMachine::Machine#after_transition.
+    # see StateMachine::Machine#before_transition, StateMachine::Machine#after_transition,
+    # and StateMachine::Machine#around_transition.
     # 
     # == Namespaces
     # 

data/lib/state_machine/callback.rb

@@ -204,8 +204,8 @@ module StateMachine
       def bound_method(block)
         type = self.type
         arity = block.arity
-        arity += 1 if arity >= 0
-        arity += 1 if arity == 1 && type == :around 
+        arity += 1 if arity >= 0 # Make sure the object gets passed
+        arity += 1 if arity == 1 && type == :around  # Make sure the block gets passed
         
         method = if RUBY_VERSION >= '1.9'
           lambda do |object, *args|

data/lib/state_machine/initializers/rails.rb

@@ -1,6 +1,4 @@
 class StateMachine::Railtie < Rails::Railtie
-  railtie_name :state_machine
-  
   rake_tasks do
     load 'tasks/state_machine.rb'
   end

data/lib/state_machine/integrations/active_model.rb

@@ -397,14 +397,14 @@ module StateMachine
           ["#{type}_#{event}", "#{type}_transition_#{name}"].each do |event_segment|
             ["_from_#{from}", nil].each do |from_segment|
               ["_to_#{to}", nil].each do |to_segment|
-                object.class.changed
+                object.class.changed if object.class.respond_to?(:changed)
                 object.class.notify_observers([event_segment, from_segment, to_segment].join, object, transition)
               end
             end
           end
           
           # Generic updates
-          object.class.changed
+          object.class.changed if object.class.respond_to?(:changed)
           object.class.notify_observers("#{type}_transition", object, transition)
           
           true

data/lib/state_machine/integrations/active_record.rb

@@ -323,6 +323,7 @@ module StateMachine
       end
       
       def self.extended(base) #:nodoc:
+        require 'active_record/version'
         require 'state_machine/integrations/active_model/observer'
         
         ::ActiveRecord::Observer.class_eval do

data/lib/state_machine/integrations/data_mapper.rb

@@ -261,18 +261,25 @@ module StateMachine
       # Forces the change in state to be recognized regardless of whether the
       # state value actually changed
       def write(object, attribute, value)
-        result = super
-        if attribute == :state && owner_class.properties.detect {|property| property.name == self.attribute}
-          if ::DataMapper::VERSION =~ /^0\.\d\./ # Match anything < 0.10
+        if attribute == :state
+          # Force to Dirty state in 0.10.3+
+          if !(::DataMapper::VERSION =~ /^0\.(9\.|10\.[0-2]$)/)
+            object.persisted_state = ::DataMapper::Resource::State::Dirty.new(object) if object.persisted_state.is_a?(::DataMapper::Resource::State::Clean)
+          end
+          
+          result = super
+          
+          # Change original attributes in 0.9.4 - 0.10.2
+          if ::DataMapper::VERSION =~ /^0\.9\./
             object.original_values[self.attribute] = "#{value}-ignored" if object.original_values[self.attribute] == value
-          else
-            # Force the resource's state to Dirty for 0.10.13+
-            object.persisted_state = ::DataMapper::Resource::State::Dirty.new(object) unless ::DataMapper::VERSION =~ /^0\.10\.[0-2]$/ || object.persisted_state.respond_to?(:original_attributes)
-            
+          elsif ::DataMapper::VERSION =~ /^0\.10\.[0-2]$/
             property = owner_class.properties[self.attribute]
             object.original_attributes[property] = "#{value}-ignored" unless object.original_attributes.include?(property)
           end
+        else
+          result = super
         end
+        
         result
       end
       

data/lib/state_machine/transition.rb

@@ -167,23 +167,12 @@ module StateMachine
       options = {:after => true}.merge(options)
       @success = false
       
-      # Run before callbacks.  :halt is caught here so that it rolls up through
-      # any around callbacks.
-      begin
-        halted = !catch(:halt) { before(options[:after], &block); true }
-      rescue Exception => error
-        raise unless @after_block
-      end
+      halted = pausable { before(options[:after], &block) }
       
       # After callbacks are only run if:
-      # * There isn't an after block already running
       # * An around callback didn't halt after yielding
       # * They're enabled or the run didn't succeed
-      if @after_block
-        @after_block.call(halted, error)
-      elsif !(@before_run && halted) && (options[:after] || !@success)
-        after
-      end
+      after if !(@before_run && halted) && (options[:after] || !@success)
       
       @before_run
     end
@@ -247,7 +236,7 @@ module StateMachine
     # the state has already been persisted
     def reset
       @before_run = @persisted = @after_run = false
-      @around_block = nil
+      @paused_block = nil
     end
     
     # Generates a nicely formatted description of this transitions's contents.
@@ -261,6 +250,57 @@ module StateMachine
     end
     
     private
+      # Runs a block that may get paused.  If the block doesn't pause, then
+      # execution will continue as normal.  If the block gets paused, then it
+      # will take care of switching the execution context when it's resumed.
+      # 
+      # This will return true if the given block halts for a reason other than
+      # getting paused.
+      def pausable
+        begin
+          halted = !catch(:halt) { yield; true }
+        rescue Exception => error
+          raise unless @resume_block
+        end
+        
+        if @resume_block
+          @resume_block.call(halted, error)
+        else
+          halted
+        end
+      end
+      
+      # Pauses the current callback execution.  This should only occur within
+      # around callbacks when the remainder of the callback will be executed at
+      # a later point in time.
+      def pause
+        unless @resume_block
+          require 'continuation' unless defined?(callcc)
+          callcc do |block|
+            @paused_block = block
+            throw :halt, true
+          end
+        end
+      end
+      
+      # Resumes the execution of a previously paused callback execution.  Once
+      # the paused callbacks complete, the current execution will continue.
+      def resume
+        if @paused_block
+          halted, error = callcc do |block|
+            @resume_block = block
+            @paused_block.call
+          end
+          
+          @resume_block = @paused_block = nil
+          
+          raise error if error
+          !halted
+        else
+          true
+        end
+      end
+      
       # Runs the machine's +before+ callbacks for this transition.  Only
       # callbacks that are configured to match the event, from state, and to
       # state will be invoked.
@@ -278,16 +318,12 @@ module StateMachine
               # * The block fails and the callback doesn't run on failures OR
               # * The block succeeds, but after callbacks are disabled (in which
               #   case a continuation is stored for later execution)
-              return if catch(:pause) do
+              return if catch(:cancel) do
                 callback.call(object, context, self) do
                   before(complete, index, &block)
                   
-                  if @success && !complete && !@around_block && !@after_block
-                    require 'continuation' unless defined?(callcc)
-                    callcc {|block| @around_block = block}
-                  end
-                  
-                  throw :pause, true if @around_block && !@after_block || !callback.matches_success?(@success)
+                  pause if @success && !complete
+                  throw :cancel, true unless callback.matches_success?(@success)
                 end
               end
             else
@@ -318,22 +354,12 @@ module StateMachine
       # should never halt the execution of a +perform+.
       def after
         unless @after_run
-          catch(:halt) do
-            # First call any yielded around blocks
-            if @around_block
-              halted, error = callcc do |block|
-                @after_block = block
-                @around_block.call
-              end
-              
-              @after_block = @around_block = nil
-              raise error if error
-              throw :halt if halted
+          # First resume previously paused callbacks
+          if resume
+            catch(:halt) do
+              after_context = context.merge(:success => @success)
+              machine.callbacks[:after].each {|callback| callback.call(object, after_context, self)}
             end
-            
-            # Call normal after callbacks in order
-            after_context = context.merge(:success => @success)
-            machine.callbacks[:after].each {|callback| callback.call(object, after_context, self)}
           end
           
           @after_run = true

data/test/unit/integrations/active_record_test.rb

@@ -12,10 +12,9 @@ FIXTURES_ROOT = File.dirname(__FILE__) + '/../../fixtures/'
 require 'active_support/test_case'
 require 'active_record/fixtures'
 
-require 'active_record/version'
-if ActiveRecord::VERSION::STRING >= '2.1.0'
+begin
   require 'active_record/test_case'
-else
+rescue LoadError
   class ActiveRecord::TestCase < ActiveSupport::TestCase
     self.fixture_path = FIXTURES_ROOT
     self.use_instantiated_fixtures = false

data/test/unit/integrations/data_mapper_test.rb

@@ -512,7 +512,9 @@ module DataMapperTest
     end
     
     def test_should_track_attribute_change
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
+        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
+      elsif Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
         assert_equal e = {@resource.properties[:state] => 'parked-ignored'}, @record.original_attributes
       else
         assert_equal e = {:state => 'parked-ignored'},  @record.original_values
@@ -580,7 +582,9 @@ module DataMapperTest
     end
     
     def test_should_track_attribute_changes
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
+        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
+      elsif Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
         assert_equal e = {@resource.properties[:status] => 'parked-ignored'}, @record.original_attributes
       else
         assert_equal e = {:status => 'parked-ignored'},  @record.original_values

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -04:00
+date: 2010-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: []