Add support for DataMapper 0.10.0

CHANGELOG.rdoc

@@ -1,5 +1,6 @@
 == master
 
+* Add support for DataMapper 0.10.0
 * Always interpet nil return values from actions as failed attempts
 * Fix loopbacks not causing records to save in ORM integrations if no other fields were changed
 * Fix events not failing with useful errors when an object's state is invalid

lib/state_machine/integrations/data_mapper.rb

@@ -247,14 +247,21 @@ def self.matches?(klass)
 
       # Loads additional files specific to DataMapper
       def self.extended(base) #:nodoc:
+        require 'dm-core/version' unless ::DataMapper.const_defined?('VERSION')
         require 'state_machine/integrations/data_mapper/observer' if ::DataMapper.const_defined?('Observer')
       end
 
       # Forces the change in state to be recognized regardless of whether the
       # state value actually changed
       def write(object, attribute, value)
         result = super
-        object.original_values[self.attribute] = "#{value}-ignored" if attribute == :state && owner_class.properties.has_property?(self.attribute)
+        if attribute == :state && owner_class.properties.detect {|property| property.name == self.attribute}
+          if ::DataMapper::VERSION =~ /^(0\.\d\.)/ # Match anything < 0.10
+            object.original_values[self.attribute] = "#{value}-ignored"
+          else
+            object.original_attributes[owner_class.properties[self.attribute]] = "#{value}-ignored"
+          end
+        end
         result
       end
 
@@ -265,7 +272,7 @@ def invalidate(object, attribute, message, values = [])
 
       # Resets any errors previously added when invalidating the given object
       def reset(object)
-        object.errors.clear if object.respond_to?(:errors)
+        object.errors.clear if supports_validations?
       end
 
       protected
@@ -276,7 +283,7 @@ def supports_validations?
 
         # Skips defining reader/writer methods since this is done automatically
         def define_state_accessor
-          owner_class.property(attribute, String) unless owner_class.properties.has_property?(attribute)
+          owner_class.property(attribute, String) unless owner_class.properties.detect {|property| property.name == attribute}
 
           if supports_validations?
             name = self.name

test/unit/integrations/data_mapper_test.rb

@@ -25,7 +25,7 @@ def new_resource(auto_migrate = true, &block)
             storage_names[:default] = 'foo'
             def self.name; 'DataMapperTest::Foo'; end
 
-            property :id, Integer, :serial => true
+            property :id, DataMapper::Types::Serial
             property :state, String
 
             auto_migrate! if auto_migrate