dm-core 1.0.0.rc2 → 1.0.0.rc3

data/lib/dm-core/property.rb

@@ -473,7 +473,7 @@ module DataMapper
     #
     # @api public
     def unique?
-      @unique
+      !!@unique
     end
 
     # Returns the hash of the property name
@@ -491,11 +491,11 @@ module DataMapper
 
     # Returns index name if property has index.
     #
-    # @return [true, Symbol, Array, nil]
+    # @return [Boolean, Symbol, Array]
     #   returns true if property is indexed by itself
     #   returns a Symbol if the property is indexed with other properties
     #   returns an Array if the property belongs to multiple indexes
-    #   returns nil if the property does not belong to any indexes
+    #   returns false if the property does not belong to any indexes
     #
     # @api public
     def index
@@ -505,11 +505,11 @@ module DataMapper
     # Returns true if property has unique index. Serial properties and
     # keys are unique by default.
     #
-    # @return [true, Symbol, Array, nil]
+    # @return [Boolean, Symbol, Array]
     #   returns true if property is indexed by itself
     #   returns a Symbol if the property is indexed with other properties
     #   returns an Array if the property belongs to multiple indexes
-    #   returns nil if the property does not belong to any indexes
+    #   returns false if the property does not belong to any indexes
     #
     # @api public
     def unique_index
@@ -794,7 +794,7 @@ module DataMapper
 
       @repository_name        = model.repository_name
       @model                  = model
-      @name                   = name.to_s.sub(/\?$/, '').to_sym
+      @name                   = name.to_s.chomp('?').to_sym
       @options                = predefined_options.merge(options).freeze
       @instance_variable_name = "@#{@name}".freeze
 
@@ -804,13 +804,13 @@ module DataMapper
       @default   = @options[:default]
 
       @serial       = @options.fetch(:serial,       false)
-      @key          = @options.fetch(:key,          @serial || false)
+      @key          = @options.fetch(:key,          @serial)
+      @unique       = @options.fetch(:unique,       @key ? :key : false)
       @required     = @options.fetch(:required,     @key)
       @allow_nil    = @options.fetch(:allow_nil,    !@required)
       @allow_blank  = @options.fetch(:allow_blank,  !@required)
-      @index        = @options.fetch(:index,        nil)
-      @unique_index = @options.fetch(:unique_index, nil)
-      @unique       = @options.fetch(:unique,       @serial || @key || false)
+      @index        = @options.fetch(:index,        false)
+      @unique_index = @options.fetch(:unique_index, @unique)
       @lazy         = @options.fetch(:lazy,         false) && !@key
 
       determine_visibility

data/lib/dm-core/query.rb

@@ -324,10 +324,10 @@ module DataMapper
     # @api semipublic
     def reverse!
       # reverse the sort order
-      @order.map! { |direction| direction.reverse! }
+      @order.map! { |direction| direction.dup.reverse! }
 
       # copy the order to the options
-      @options = @options.merge(:order => @order.map { |direction| direction.dup }).freeze
+      @options = @options.merge(:order => @order).freeze
 
       self
     end
@@ -1171,22 +1171,12 @@ module DataMapper
       add_condition(condition)
     end
 
-    if RUBY_VERSION >= '1.9'
-      def equality_operator_for_type(bind_value)
-        case bind_value
-          when Enumerable then :in
-          when Regexp     then :regexp
-          else                 :eql
-        end
-      end
-    else
-      def equality_operator_for_type(bind_value)
-        case bind_value
-          when String     then :eql
-          when Enumerable then :in
-          when Regexp     then :regexp
-          else                 :eql
-        end
+    def equality_operator_for_type(bind_value)
+      case bind_value
+        when Model, String then :eql
+        when Enumerable    then :in
+        when Regexp        then :regexp
+        else                    :eql
       end
     end
 

data/lib/dm-core/resource.rb

@@ -755,8 +755,8 @@ module DataMapper
     #   attribute values used in the new instance
     #
     # @api public
-    def initialize(attributes = {}, &block) # :nodoc:
-      self.attributes = attributes
+    def initialize(attributes = {}) # :nodoc:
+      self.attributes = attributes || {}
     end
 
     # @api private
@@ -1009,7 +1009,7 @@ module DataMapper
     #
     # @api private
     def _update
-      self.persisted_state = persisted_state.commit if valid_attributes?
+      self.persisted_state = persisted_state.commit
       clean?
     end
 
@@ -1168,14 +1168,6 @@ module DataMapper
       persisted_state.__send__(:set_default_value, subject)
     end
 
-    # @api private
-    def valid_attributes?
-      original_attributes.each_key do |property|
-        return false if property.kind_of?(Property) && !property.valid?(property.get!(self))
-      end
-      true
-    end
-
     # Execute all the queued up hooks for a given type and name
     #
     # @param [Symbol] type

data/lib/dm-core/resource/state.rb

@@ -3,6 +3,10 @@ module DataMapper
 
     # the state of the resource (abstract)
     class State
+      extend Equalizer
+
+      equalize :resource
+
       attr_reader :resource
 
       def initialize(resource)
@@ -30,20 +34,6 @@ module DataMapper
         raise NotImplementedError, "#{self.class}#rollback should be implemented"
       end
 
-      def eql?(other)
-        instance_of?(other.class) &&
-        hash == other.hash
-      end
-
-      def ==(other)
-        self.class <=> other.class &&
-        hash == other.hash
-      end
-
-      def hash
-        resource.object_id.hash
-      end
-
     private
 
       def model
@@ -70,8 +60,15 @@ module DataMapper
         identity_map[resource.key] = resource
       end
 
-      def reset_original_attributes
-        original_attributes.clear
+      def set_child_keys
+        relationships.each do |relationship|
+          set_child_key(relationship)
+        end
+      end
+
+      def set_child_key(relationship)
+        return unless relationship.loaded?(resource) && relationship.respond_to?(:resource_for)
+        set(relationship, get(relationship))
       end
 
     end # class State

data/lib/dm-core/resource/state/dirty.rb

@@ -17,11 +17,14 @@ module DataMapper
 
         def commit
           remove_from_identity_map
+          set_child_keys
+          return self unless valid_attributes?
           update_resource
           reset_original_attributes
           reset_resource_key
-          add_to_identity_map
           Clean.new(resource)
+        ensure
+          add_to_identity_map
         end
 
         def rollback
@@ -80,6 +83,13 @@ module DataMapper
           original_attributes.clear
         end
 
+        def valid_attributes?
+          original_attributes.each_key do |property|
+            return false if property.kind_of?(Property) && !property.valid?(property.get!(resource))
+          end
+          true
+        end
+
       end # class Dirty
     end # class State
   end # module Resource

data/lib/dm-core/resource/state/transient.rb

@@ -19,10 +19,11 @@ module DataMapper
         end
 
         def commit
+          set_child_keys
           set_default_values
+          return self unless valid_attributes?
           create_resource
           set_repository
-          reset_original_attributes
           add_to_identity_map
           Clean.new(resource)
         end
@@ -64,6 +65,13 @@ module DataMapper
           resource.instance_variable_set(:@_repository, repository)
         end
 
+        def valid_attributes?
+          properties.all? do |property|
+            value = get(property)
+            property.serial? && value.nil? || property.valid?(value)
+          end
+        end
+
       end # class Transient
     end # class State
   end # module Resource

data/lib/dm-core/spec/lib/adapter_helpers.rb

@@ -26,6 +26,11 @@ module DataMapper
 
               # create all tables and constraints before each spec
               if @repository.respond_to?(:auto_migrate!)
+                # If we are going to auto-migrate, we must also finalize
+                @repository.scope do
+                  DataMapper.finalize
+                end
+
                 @repository.auto_migrate!
               end
             end

data/lib/dm-core/spec/shared/adapter_spec.rb

@@ -34,6 +34,8 @@ share_examples_for 'An Adapter' do
       property :striped,   Boolean
     end
 
+    DataMapper.finalize
+
     # create all tables and constraints before each spec
     if @repository.respond_to?(:auto_migrate!)
       Heffalump.auto_migrate!

data/lib/dm-core/spec/shared/resource_spec.rb

@@ -1177,37 +1177,6 @@ share_examples_for 'A public Resource' do
     end
   end
 
-  describe 'invalid resources' do
-    before do
-      class ::EmptyObject
-        include DataMapper::Resource
-      end
-
-      class ::KeylessObject
-        include DataMapper::Resource
-        property :name, String
-      end
-    end
-
-    it 'should raise an error for a resource without attributes' do
-      lambda { EmptyObject.new }.should raise_error
-    end
-
-    it 'should raise an error for a resource without a key' do
-      lambda { KeylessObject.new }.should raise_error
-    end
-
-    after do
-      # clean out invalid models so that global model cleanup
-      # does not throw an exception when working with models
-      # in an invalid state
-      [ EmptyObject, KeylessObject ].each do |model|
-        Object.send(:remove_const, model.name.to_sym)
-        DataMapper::Model.descendants.delete(model)
-      end
-    end
-  end
-
   describe 'lazy loading' do
     before :all do
       rescue_if @skip do

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.0.0.rc3'
 end

data/spec/public/associations/many_to_many/read_multiple_join_spec.rb

@@ -38,6 +38,8 @@ describe 'Many to Many Associations read across multiple join associations' do
 
       has n, :sale_items
     end
+
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/public/associations/many_to_many_spec.rb

@@ -66,7 +66,7 @@ end
       @publication_model = Blog::Publication
 
       # initialize the join model
-      Blog::Author.relationships(:default)[:articles].through
+      DataMapper.finalize
 
       @join_model = Blog::ArticleAuthor
     end
@@ -157,6 +157,7 @@ end
       @author_model      = Blog::Author
       @article_model     = Blog::Article
       @publication_model = Blog::Publication
+      DataMapper.finalize
 
       @join_model = Blog::Site
     end

data/spec/public/associations/many_to_one_spec.rb

@@ -59,6 +59,7 @@ describe 'Many to One Associations' do
 
       property :name, String, :key => true, :default => 'a default value'
     end
+    DataMapper.finalize
 
     @user_model      = Blog::User
     @author_model    = Blog::Author

data/spec/public/associations/many_to_one_with_boolean_cpk_spec.rb

@@ -20,6 +20,7 @@ describe 'Many to One Associations when foreign key is part of a composite key,
 
       has n, :many_models, :child_key => [ :integer_key ]
     end
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/public/associations/one_to_many_spec.rb

@@ -44,6 +44,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_hel
         end
       end
 
+      DataMapper.finalize
+
       @author_model      = Blog::Author
       @article_model     = Blog::Article
       @publication_model = Blog::Publication

data/spec/public/associations/one_to_one_spec.rb

@@ -58,6 +58,7 @@ describe 'One to One Associations' do
 
       property :name, String, :key => true, :default => 'a default value'
     end
+    DataMapper.finalize
 
     @user_model      = Blog::User
     @author_model    = Blog::Author
@@ -148,6 +149,7 @@ describe 'One to One Through Associations' do
 
       property :name, String, :key => true, :default => 'a default value'
     end
+    DataMapper.finalize
 
     @referral_model  = Blog::Referral
     @user_model      = Blog::User

data/spec/public/associations/one_to_one_with_boolean_cpk_spec.rb

@@ -22,6 +22,7 @@ describe 'One to One Associations when foreign key is part of a composite key an
 
       belongs_to :parent_model, :child_key => [ :integer_key, :boolean_key ]
     end
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/public/collection_spec.rb

@@ -34,6 +34,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
         end
       end
 
+      DataMapper.finalize
+
       @article_model     = Blog::Article
       @publication_model = Blog::Publication
     end

data/spec/public/finalize_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe DataMapper do
+  describe '.setup' do
+    it "should not raise with valid models" do
+      class ::ValidObject
+        include DataMapper::Resource
+        property :id, Integer, :key => true
+      end
+      lambda { DataMapper.finalize }.should_not raise_error
+      DataMapper::Model.descendants.delete(ValidObject)
+      Object.send(:remove_const, :ValidObject)
+    end
+
+    it "should raise on an empty model" do
+      class ::EmptyObject
+        include DataMapper::Resource
+      end
+      lambda { DataMapper.finalize }.should raise_error
+      DataMapper::Model.descendants.delete(EmptyObject)
+      Object.send(:remove_const, :EmptyObject)
+    end
+
+    it "should raise on a keyless model" do
+      class ::KeylessObject
+        include DataMapper::Resource
+        property :name, String
+      end
+      lambda { DataMapper.finalize }.should raise_error
+      DataMapper::Model.descendants.delete(KeylessObject)
+      Object.send(:remove_const, :KeylessObject)
+    end
+  end
+end

data/spec/public/model/hook_spec.rb

@@ -12,6 +12,7 @@ describe DataMapper::Model::Hook do
     end
 
     class ::ModelHookSpecsSubclass < ModelHookSpecs; end
+    DataMapper.finalize
   end
 
   before :all do