dm-core 0.10.2 → 1.0.0.rc1

data/lib/dm-core/associations/many_to_many.rb

@@ -162,9 +162,9 @@ module DataMapper
             namespace.const_get(name)
           else
             model = Model.new do
-              # all properties added to the anonymous through model are keys by default
+              # all properties added to the anonymous through model are keys
               def property(name, type, options = {})
-                options[:key] = true unless options.key?(:key)
+                options[:key] = true
                 options.delete(:index)
                 super
               end
@@ -196,7 +196,7 @@ module DataMapper
         def through_relationship_name
           if anonymous_through_model?
             namespace = through_model_namespace_name.first
-            relationship_name = Extlib::Inflection.underscore(through_model.name.sub(/\A#{namespace.name}::/, '')).tr('/', '_')
+            relationship_name = ActiveSupport::Inflector.underscore(through_model.name.sub(/\A#{namespace.name}::/, '')).tr('/', '_')
             relationship_name.pluralize.to_sym
           else
             options[:through]
@@ -302,20 +302,6 @@ module DataMapper
           )
         end
 
-        # Loads association targets and sets resulting value on
-        # given source resource
-        #
-        # @param [Resource] source
-        #   the source resource for the association
-        #
-        # @return [undefined]
-        #
-        # @api private
-        def lazy_load(source)
-          # FIXME: delegate to super once SEL is enabled
-          set!(source, collection_for(source))
-        end
-
         # Returns collection class used by this type of
         # relationship
         #
@@ -374,7 +360,10 @@ module DataMapper
             return false
           end
 
-          each { |resource| resource.reset }
+          each do |resource|
+            resource.persisted_state = Resource::State::Immutable.new(resource)
+          end
+
           clear
 
           true
@@ -391,7 +380,7 @@ module DataMapper
           source  = self.source
 
           @intermediaries ||= if through.loaded?(source)
-            through.get!(source)
+            through.get_collection(source)
           else
             reset_intermediaries
           end
@@ -422,27 +411,27 @@ module DataMapper
         private
 
         # @api private
-        def _create(safe, attributes)
+        def _create(attributes, execute_hooks = true)
           via = self.via
           if via.respond_to?(:resource_for)
             resource = super
-            if create_intermediary(safe, resource)
+            if create_intermediary(execute_hooks, resource)
               resource
             end
           else
-            if intermediary = create_intermediary(safe)
-              super(safe, attributes.merge(via.inverse => intermediary))
+            if intermediary = create_intermediary(execute_hooks)
+              super(attributes.merge(via.inverse => intermediary), execute_hooks)
             end
           end
         end
 
         # @api private
-        def _save(safe)
+        def _save(execute_hooks = true)
           via = self.via
 
           if @removed.any?
             # delete only intermediaries linked to the removed targets
-            return false unless intermediaries.all(via => @removed).send(safe ? :destroy : :destroy!)
+            return false unless intermediaries.all(via => @removed).send(execute_hooks ? :destroy : :destroy!)
 
             # reset the intermediaries so that it reflects the current state of the datastore
             reset_intermediaries
@@ -452,9 +441,9 @@ module DataMapper
 
           if via.respond_to?(:resource_for)
             super
-            loaded_entries.all? { |resource| create_intermediary(safe, resource) }
+            loaded_entries.all? { |resource| create_intermediary(execute_hooks, resource) }
           else
-            if intermediary = create_intermediary(safe)
+            if loaded_entries.any? && (intermediary = create_intermediary(execute_hooks))
               inverse = via.inverse
               loaded_entries.each { |resource| inverse.set(resource, intermediary) }
             end
@@ -464,14 +453,14 @@ module DataMapper
         end
 
         # @api private
-        def create_intermediary(safe, resource = nil)
+        def create_intermediary(execute_hooks, resource = nil)
           intermediary_for = self.intermediary_for
 
           intermediary_resource = intermediary_for[resource]
           return intermediary_resource if intermediary_resource
 
           intermediaries = self.intermediaries
-          method         = safe ? :save : :save!
+          method         = execute_hooks ? :save : :save!
 
           return unless intermediaries.send(method)
 
@@ -490,7 +479,7 @@ module DataMapper
           through = self.through
           source  = self.source
 
-          through.set!(source, through.collection_for(source))
+          through.set_collection(source, through.collection_for(source))
         end
 
         # @api private

data/lib/dm-core/associations/many_to_one.rb

@@ -4,7 +4,7 @@ module DataMapper
       # Relationship class with implementation specific
       # to n side of 1 to n association
       class Relationship < Associations::Relationship
-        OPTIONS = superclass::OPTIONS.dup << :required
+        OPTIONS = superclass::OPTIONS.dup << :required << :key
 
         # @api semipublic
         alias source_repository_name child_repository_name
@@ -26,6 +26,11 @@ module DataMapper
           @required
         end
 
+        # @api semipublic
+        def key?
+          @key
+        end
+
         # @api private
         def nullable?
           klass = self.class
@@ -50,7 +55,7 @@ module DataMapper
             properties[property_name] || begin
               # create the property within the correct repository
               DataMapper.repository(repository_name) do
-                type = parent_property.send(parent_property.type == DataMapper::Types::Boolean ? :type : :primitive)
+                type = parent_property.send(parent_property.type == DataMapper::Property::Boolean ? :type : :primitive)
                 model.property(property_name, type, child_key_options(parent_property))
               end
             end
@@ -106,15 +111,15 @@ module DataMapper
         #   Query options
         #
         # @api semipublic
-        def get(source, other_query = nil)
-          assert_kind_of 'source', source, source_model
-
-          lazy_load(source) unless loaded?(source)
+        def get(source, query = nil)
+          lazy_load(source)
+          collection = get_collection(source)
+          collection.first(query) if collection
+        end
 
+        def get_collection(source)
           resource = get!(source)
-          if other_query.nil? || query_for(source, other_query).conditions.matches?(resource)
-            resource
-          end
+          resource.collection_for_self if resource
         end
 
         # Sets value of association target (ex.: author) for given source resource
@@ -128,36 +133,14 @@ module DataMapper
         #
         # @api semipublic
         def set(source, target)
-          target_model = self.target_model
-
-          assert_kind_of 'source', source, source_model
-          assert_kind_of 'target', target, target_model, Hash, NilClass
-
-          if target.kind_of?(Hash)
-            target = target_model.new(target)
-          end
-
-          source_key.set(source, target.nil? ? [] : target_key.get(target))
+          target = typecast(target)
+          source_key.set(source, target_key.get(target))
           set!(source, target)
         end
 
-        private
-
-        # Initializes the relationship, always using max cardinality of 1.
-        #
         # @api semipublic
-        def initialize(name, source_model, target_model, options = {})
-          if options.key?(:nullable)
-            nullable_options = options.only(:nullable)
-            required_options = { :required => !options.delete(:nullable) }
-            warn "#{nullable_options.inspect} is deprecated, use #{required_options.inspect} instead (#{caller[2]})"
-            options.update(required_options)
-          end
-
-          @required      = options.fetch(:required, true)
-          target_model ||= Extlib::Inflection.camelize(name)
-          options        = { :min => @required ? 1 : 0, :max => 1 }.update(options)
-          super
+        def default_for(source)
+          typecast(super)
         end
 
         # Loads association target and sets resulting value on
@@ -170,7 +153,7 @@ module DataMapper
         #
         # @api private
         def lazy_load(source)
-          return unless valid_source?(source)
+          return if loaded?(source) || !valid_source?(source)
 
           # SEL: load all related resources in the source collection
           collection = source.collection
@@ -183,6 +166,26 @@ module DataMapper
           end
         end
 
+        private
+
+        # Initializes the relationship, always using max cardinality of 1.
+        #
+        # @api semipublic
+        def initialize(name, source_model, target_model, options = {})
+          if options.key?(:nullable)
+            nullable_options = options.only(:nullable)
+            required_options = { :required => !options.delete(:nullable) }
+            warn "#{nullable_options.inspect} is deprecated, use #{required_options.inspect} instead (#{caller[2]})"
+            options.update(required_options)
+          end
+
+          @required      = options.fetch(:required, true)
+          @key           = options.fetch(:key,      false)
+          target_model ||= ActiveSupport::Inflector.camelize(name)
+          options        = { :min => @required ? 1 : 0, :max => 1 }.update(options)
+          super
+        end
+
         # Sets the association targets in the resource
         #
         # @param [Resource] source
@@ -199,6 +202,15 @@ module DataMapper
           set(source, targets.first)
         end
 
+        # @api private
+        def typecast(target)
+          if target.kind_of?(Hash)
+            target_model.new(target)
+          else
+            target
+          end
+        end
+
         # Returns the inverse relationship class
         #
         # @api private
@@ -210,18 +222,22 @@ module DataMapper
         #
         # @api private
         def inverse_name
-          super || Extlib::Inflection.underscore(Extlib::Inflection.demodulize(source_model.name)).pluralize.to_sym
+          super || ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(source_model.name)).pluralize.to_sym
         end
 
         # @api private
         def child_key_options(parent_property)
-          options = parent_property.options.only(:length, :precision, :scale).update(:index => name, :required => required?)
+          options = parent_property.options.only(:length, :precision, :scale).update(
+            :index    => name,
+            :required => required?,
+            :key      => key?
+          )
 
-          min = parent_property.min
-          max = parent_property.max
+          if parent_property.primitive == Integer
+            min = parent_property.min
+            max = parent_property.max
 
-          if parent_property.primitive == Integer && min && max
-            options.update(:min => min, :max => max)
+            options.update(:min => min, :max => max) if min && max
           end
 
           options

data/lib/dm-core/associations/one_to_many.rb

@@ -43,8 +43,8 @@ module DataMapper
           collection.relationship = self
           collection.source       = source
 
-          # make the collection empty if the source is not saved
-          collection.replace([]) unless source.saved?
+          # make the collection empty if the source is new
+          collection.replace([]) if source.new?
 
           collection
         end
@@ -53,13 +53,15 @@ module DataMapper
         # (ex.: author)
         #
         # @api semipublic
-        def get(source, other_query = nil)
-          assert_kind_of 'source', source, source_model
-
-          lazy_load(source) unless loaded?(source)
+        def get(source, query = nil)
+          lazy_load(source)
+          collection = get_collection(source)
+          query ? collection.all(query) : collection
+        end
 
-          collection = get!(source)
-          other_query.nil? ? collection : collection.all(other_query)
+        # @api private
+        def get_collection(source)
+          get!(source)
         end
 
         # Sets value of association targets (ex.: paragraphs) for given source resource
@@ -67,21 +69,13 @@ module DataMapper
         #
         # @api semipublic
         def set(source, targets)
-          assert_kind_of 'source',  source,  source_model
-          assert_kind_of 'targets', targets, Array
-
-          lazy_load(source) unless loaded?(source)
-
+          lazy_load(source)
           get!(source).replace(targets)
         end
 
-        private
-
-        # @api semipublic
-        def initialize(name, target_model, source_model, options = {})
-          target_model ||= Extlib::Inflection.camelize(name.to_s.singular)
-          options        = { :min => 0, :max => source_model.n }.update(options)
-          super
+        # @api private
+        def set_collection(source, target)
+          set!(source, target)
         end
 
         # Loads association targets and sets resulting value on
@@ -94,6 +88,8 @@ module DataMapper
         #
         # @api private
         def lazy_load(source)
+          return if loaded?(source)
+
           # SEL: load all related resources in the source collection
           collection = source.collection
           if source.saved? && collection.size > 1
@@ -105,6 +101,20 @@ module DataMapper
           end
         end
 
+        # @api semipublic
+        def default_for(source)
+          collection_for(source).replace(Array(super))
+        end
+
+        private
+
+        # @api semipublic
+        def initialize(name, target_model, source_model, options = {})
+          target_model ||= ActiveSupport::Inflector.camelize(name.to_s.singularize)
+          options        = { :min => 0, :max => source_model.n }.update(options)
+          super
+        end
+
         # Sets the association targets in the resource
         #
         # @param [Resource] source
@@ -140,7 +150,7 @@ module DataMapper
         #
         # @api private
         def inverse_name
-          super || Extlib::Inflection.underscore(Extlib::Inflection.demodulize(source_model.name)).to_sym
+          super || ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(source_model.name)).to_sym
         end
 
         # @api private
@@ -257,11 +267,11 @@ module DataMapper
         end
 
         # @api private
-        def _save(safe)
+        def _save(execute_hooks = true)
           assert_source_saved 'The source must be saved before saving the collection'
 
           # update removed resources to not reference the source
-          @removed.all? { |resource| resource.destroyed? || resource.__send__(safe ? :save : :save!) } && super
+          @removed.all? { |resource| resource.destroyed? || resource.__send__(execute_hooks ? :save : :save!) } && super
         end
 
         # @api private

data/lib/dm-core/associations/one_to_one.rb

@@ -3,8 +3,11 @@ module DataMapper
     module OneToOne #:nodoc:
       class Relationship < Associations::Relationship
         %w[ public protected private ].map do |visibility|
-          superclass.send("#{visibility}_instance_methods", false).each do |method|
-            undef_method method unless method.to_s == 'initialize'
+          methods = superclass.send("#{visibility}_instance_methods", false) |
+                    DataMapper::Subject.send("#{visibility}_instance_methods", false)
+
+          methods.each do |method|
+            undef_method method.to_sym unless method.to_s == 'initialize'
           end
         end
 
@@ -12,12 +15,16 @@ module DataMapper
         # for given source
         #
         # @api semipublic
-        def get(source, other_query = nil)
-          assert_kind_of 'source', source, source_model
-
-          return unless loaded?(source) || valid_source?(source)
+        def get(source, query = nil)
+          relationship.get(source, query).first
+        end
 
-          relationship.get(source, other_query).first
+        # Get the resource directly
+        #
+        # @api semipublic
+        def get!(source)
+          collection = relationship.get!(source)
+          collection.first if collection
         end
 
         # Sets and returns association target
@@ -25,12 +32,21 @@ module DataMapper
         #
         # @api semipublic
         def set(source, target)
-          assert_kind_of 'source', source, source_model
-          assert_kind_of 'target', target, target_model, Hash, NilClass
-
           relationship.set(source, [ target ].compact).first
         end
 
+        # Sets the resource directly
+        #
+        # @api semipublic
+        def set!(source, target)
+          set(source, target)
+        end
+
+        # @api semipublic
+        def default_for(source)
+          relationship.default_for(source).first
+        end
+
         # @api public
         def kind_of?(klass)
           super || relationship.kind_of?(klass)
@@ -56,7 +72,7 @@ module DataMapper
         # @api semipublic
         def initialize(name, target_model, source_model, options = {})
           klass = options.key?(:through) ? ManyToMany::Relationship : OneToMany::Relationship
-          target_model ||= Extlib::Inflection.camelize(name).freeze
+          target_model ||= ActiveSupport::Inflector.camelize(name).freeze
           @relationship = klass.new(name, target_model, source_model, options)
         end