dm-core 1.0.2 → 1.1.0.rc1

data/lib/dm-core/query/conditions/comparison.rb

@@ -100,11 +100,8 @@ module DataMapper
 
       # A base class for the various comparison classes.
       class AbstractComparison
-        extend Deprecate
         extend Equalizer
 
-        deprecate :property, :subject
-
         equalize :slug, :subject, :value
 
         # @api semipublic
@@ -123,8 +120,8 @@ module DataMapper
         # filtering collections, or the value in the repository when
         # performing queries.
         #
-        # In the case of custom types, this is the value as it is stored in
-        # the repository.
+        # In the case of primitive property, this is the value as it
+        # is stored in the repository.
         #
         # @return [Object]
         #
@@ -136,7 +133,7 @@ module DataMapper
         # The loaded/typecast value
         #
         # In the case of primitive types, this will be the same as +value+,
-        # however when using custom types this stores the loaded value.
+        # however when using primitive property this stores the loaded value.
         #
         # If writing an adapter, you should use +value+, while plugin authors
         # should refer to +loaded_value+.

data/lib/dm-core/query/direction.rb

@@ -13,10 +13,6 @@
 module DataMapper
   class Query
     class Direction < Operator
-      extend Deprecate
-
-      deprecate :property,  :target
-      deprecate :direction, :operator
 
       # @api private
       def reverse!

data/lib/dm-core/query/path.rb

@@ -10,7 +10,7 @@ module DataMapper
       # TODO: replace this with BasicObject
       instance_methods.each do |method|
         next if method =~ /\A__/ ||
-          %w[ send class dup object_id kind_of? instance_of? respond_to? respond_to_missing? equal? freeze frozen? should should_not instance_variables instance_variable_set instance_variable_get instance_variable_defined? remove_instance_variable extend hash inspect copy_object initialize_dup ].include?(method.to_s)
+          %w[ send class dup object_id kind_of? instance_of? respond_to? respond_to_missing? equal? freeze frozen? should should_not instance_variables instance_variable_set instance_variable_get instance_variable_defined? remove_instance_variable extend hash inspect to_s copy_object initialize_dup ].include?(method.to_s)
         undef_method method
       end
 
@@ -33,10 +33,10 @@ module DataMapper
 
       (Conditions::Comparison.slugs | [ :not ]).each do |slug|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{slug}                                                                                                    # def eql
-            #{"warn \"explicit use of '#{slug}' operator is deprecated (#{caller[0]})\"" if slug == :eql || slug == :in} #   warn "explicit use of 'eql' operator is deprecated (#{caller[0]})"
-            Operator.new(self, #{slug.inspect})                                                                          #   Operator.new(self, :eql)
-          end                                                                                                            # end
+          def #{slug}                                                                                                      # def eql
+            #{"raise \"explicit use of '#{slug}' operator is deprecated (#{caller.first})\"" if slug == :eql || slug == :in}  #   raise "explicit use of 'eql' operator is deprecated (#{caller.first})"
+            Operator.new(self, #{slug.inspect})                                                                            #   Operator.new(self, :eql)
+          end                                                                                                              # end
         RUBY
       end
 
@@ -50,11 +50,27 @@ module DataMapper
         super || (defined?(@property) ? @property.instance_of?(klass) : false)
       end
 
+      # Used for creating :order options. This technique may be deprecated,
+      # so marking as semipublic until the issue is resolved.
+      #
+      # @api semipublic
+      def asc
+        Operator.new(property, :asc)
+      end
+
+      # Used for creating :order options. This technique may be deprecated,
+      # so marking as semipublic until the issue is resolved.
+      #
+      # @api semipublic
+      def desc
+        Operator.new(property, :desc)
+      end
+
       # @api semipublic
       def respond_to?(method, include_private = false)
         super                                                                   ||
         (defined?(@property) && @property.respond_to?(method, include_private)) ||
-        @model.relationships(@repository_name).key?(method)                     ||
+        @model.relationships(@repository_name).named?(method)                   ||
         @model.properties(@repository_name).named?(method)
       end
 

data/lib/dm-core/relationship_set.rb

@@ -0,0 +1,74 @@
+require 'dm-core/support/subject_set'
+
+module DataMapper
+
+  # A {SubjectSet} that keeps track of relationships defined in a {Model}
+  #
+  class RelationshipSet < SubjectSet
+
+    # A list of all relationships in this set
+    #
+    # @deprecated use DataMapper::RelationshipSet#each or DataMapper::RelationshipSet#to_a instead
+    #
+    # @return [Array]
+    #    a list of all relationships in the set
+    #
+    # @api semipublic
+    def values
+      warn "#{self.class}#values is deprecated. Use #{self.class}#each or #{self.class}#to_a instead: #{caller.first}"
+      to_a
+    end
+
+    # A list of all relationships in this set
+    #
+    # @deprecated use DataMapper::RelationshipSet#each instead
+    #
+    # @yield [DataMapper::Associations::Relationship]
+    #    all relationships in the set
+    #
+    # @yieldparam [DataMapper::Associations::Relationship] relationship
+    #    a relationship in the set
+    #
+    # @return [RelationshipSet] self
+    #
+    # @api semipublic
+    def each_value
+      warn "#{self.class}#each_value is deprecated. Use #{self.class}#each instead: #{caller.first}"
+      each { |relationship| yield(relationship) }
+      self
+    end
+
+    # Check wether this RelationshipSet includes an entry with the given name
+    #
+    # @deprecated use DataMapper::RelationshipSet#named? instead
+    #
+    # @param [#to_s] name
+    #   the name of the entry to look for
+    #
+    # @return [Boolean]
+    #   true if the set contains a relationship with the given name
+    #
+    # @api semipublic
+    def key?(name)
+      warn "#{self.class}#key? is deprecated. Use #{self.class}#named? instead: #{caller.first}"
+      named?(name)
+    end
+
+    # Check wether this RelationshipSet includes an entry with the given name
+    #
+    # @deprecated use DataMapper::RelationshipSet#named? instead
+    #
+    # @param [#to_s] name
+    #   the name of the entry to look for
+    #
+    # @return [Boolean]
+    #   true if the set contains a relationship with the given name
+    #
+    # @api semipublic
+    def has_key?(name)
+      warn "#{self.class}#has_key? is deprecated. Use #{self.class}#named? instead: #{caller.first}"
+      named?(name)
+    end
+
+  end # class RelationshipSet
+end # module DataMapper

data/lib/dm-core/resource.rb

@@ -5,26 +5,20 @@ module DataMapper
   module Resource
     include DataMapper::Assertions
     extend Chainable
-    extend Deprecate
-
-    deprecate :new_record?, :new?
 
     # @deprecated
     def self.append_inclusions(*inclusions)
-      warn "DataMapper::Resource.append_inclusions is deprecated, use DataMapper::Model.append_inclusions instead (#{caller[0]})"
-      Model.append_inclusions(*inclusions)
+      raise "DataMapper::Resource.append_inclusions is deprecated, use DataMapper::Model.append_inclusions instead (#{caller.first})"
     end
 
     # @deprecated
     def self.extra_inclusions
-      warn "DataMapper::Resource.extra_inclusions is deprecated, use DataMapper::Model.extra_inclusions instead (#{caller[0]})"
-      Model.extra_inclusions
+      raise "DataMapper::Resource.extra_inclusions is deprecated, use DataMapper::Model.extra_inclusions instead (#{caller.first})"
     end
 
     # @deprecated
     def self.descendants
-      warn "DataMapper::Resource.descendants is deprecated, use DataMapper::Model.descendants instead (#{caller[0]})"
-      Model.descendants
+      raise "DataMapper::Resource.descendants is deprecated, use DataMapper::Model.descendants instead (#{caller.first})"
     end
 
     # Return if Resource#save should raise an exception on save failures (per-resource)
@@ -64,23 +58,18 @@ module DataMapper
     #
     # @deprecated
     def update_attributes(attributes = {}, *allowed)
-      model      = self.model
-      call_stack = caller[0]
-
-      warn "#{model}#update_attributes is deprecated, use #{model}#update instead (#{call_stack})"
-
-      if allowed.any?
-        warn "specifying allowed in #{model}#update_attributes is deprecated, " \
-          "use Hash#only to filter the attributes in the caller (#{call_stack})"
-        attributes = attributes.only(*allowed)
-      end
-
-      assert_update_clean_only(:update_attributes)
-      update(attributes)
+      raise "#{model}#update_attributes is deprecated, use #{model}#update instead (#{caller.first})"
     end
 
     # Makes sure a class gets all the methods when it includes Resource
     #
+    # Note that including this module into an anonymous class will leave
+    # the model descendant tracking mechanism with no possibility to reliably
+    # track the anonymous model across code reloads. This means that
+    # {DataMapper::DescendantSet} will currently leak memory in scenarios where
+    # anonymous models are reloaded multiple times (as is the case in dm-rails
+    # development mode for example).
+    #
     # @api private
     def self.included(model)
       model.extend Model
@@ -358,7 +347,7 @@ module DataMapper
     # original value, and then removing all the ivars for properties
     # and relationships.  On the next access of those ivars, the
     # resource will eager load what it needs.  While this is more of
-    # a lazy reload, it should result is more consistent behavior
+    # a lazy reload, it should result in more consistent behavior
     # since no cached results will remain from the initial load.
     #
     # @return [Resource]
@@ -616,7 +605,7 @@ module DataMapper
       dirty_attributes = {}
 
       original_attributes.each_key do |property|
-        next unless property.respond_to?(:value)
+        next unless property.respond_to?(:dump)
         dirty_attributes[property] = property.dump(property.get!(self))
       end
 
@@ -632,7 +621,7 @@ module DataMapper
     #
     # @api private
     def collection
-      return @_collection if (@_collection && @_collection.query.conditions.matches?(self)) || new? || readonly?
+      return @_collection if @_collection || new? || readonly?
       collection_for_self
     end
 
@@ -782,7 +771,7 @@ module DataMapper
 
     # Gets this instance's Model's properties
     #
-    # @return [Array(Property)]
+    # @return [PropertySet]
     #   List of this Resource's Model's properties
     #
     # @api private
@@ -792,7 +781,7 @@ module DataMapper
 
     # Gets this instance's Model's relationships
     #
-    # @return [Array(Associations::Relationship)]
+    # @return [RelationshipSet]
     #   List of this instance's Model's Relationships
     #
     # @api private
@@ -852,7 +841,7 @@ module DataMapper
     def clear_subjects
       model_properties = properties
 
-      (model_properties - model_properties.key | relationships.values).each do |subject|
+      (model_properties - model_properties.key | relationships).each do |subject|
         next unless subject.loaded?(self)
         remove_instance_variable(subject.instance_variable_name)
       end
@@ -914,7 +903,7 @@ module DataMapper
     def parent_relationships
       parent_relationships = []
 
-      relationships.each_value do |relationship|
+      relationships.each do |relationship|
         next unless relationship.respond_to?(:resource_for)
         set_default_value(relationship)
         next unless relationship.loaded?(self) && relationship.get!(self)
@@ -934,7 +923,7 @@ module DataMapper
     def child_relationships
       child_relationships = []
 
-      relationships.each_value do |relationship|
+      relationships.each do |relationship|
         next unless relationship.respond_to?(:collection_for)
         set_default_value(relationship)
         next unless relationship.loaded?(self)
@@ -1046,7 +1035,7 @@ module DataMapper
     def save_parents(execute_hooks)
       run_once(true) do
         parent_relationships.map do |relationship|
-          parent = relationship.get!(self)
+          parent = relationship.get(self)
 
           if parent.__send__(:save_parents, execute_hooks) && parent.__send__(:save_self, execute_hooks)
             relationship.set(self, parent)  # set the FK values
@@ -1070,7 +1059,7 @@ module DataMapper
     # Checks if the resource has unsaved changes
     #
     # @return [Boolean]
-    #  true if the resource has unsaged changes
+    #  true if the resource has unsaved changes
     #
     # @api semipublic
     def dirty_self?

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

@@ -11,6 +11,7 @@ module DataMapper
 
       def initialize(resource)
         @resource = resource
+        @model    = resource.model
       end
 
       def get(subject, *args)
@@ -36,16 +37,14 @@ module DataMapper
 
     private
 
-      def model
-        @model ||= resource.model
-      end
+      attr_reader :model
 
       def properties
         @properties ||= model.properties(repository.name)
       end
 
       def relationships
-        @relationships ||= model.relationships(repository.name).values
+        @relationships ||= model.relationships(repository.name)
       end
 
       def identity_map

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

@@ -29,12 +29,9 @@ module DataMapper
         remove_ivars(model)
         model.instance_methods(false).each { |method| model.send(:undef_method, method) }
 
-        DataMapper::Model.descendants.delete(model)
       end
 
-      unless DataMapper::Model.descendants.empty?
-        raise 'DataMapper::Model.descendants is not empty'
-      end
+      DataMapper::Model.descendants.clear
     end
 
     def self.remove_ivars(object, instance_variables = object.instance_variables)

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

@@ -52,8 +52,11 @@ module DataMapper
 
       def require_plugins
         plugins = ENV['PLUGINS'] || ENV['PLUGIN']
-        plugins = plugins.to_s.split(/[,\s]+/).push('dm-migrations').uniq
-        plugins.each { |plugin| require plugin }
+        plugins = plugins.to_s.split(/[,\s]+/)
+        unless ENV['ADAPTER'] == 'in_memory'
+          plugins.push('dm-migrations')
+        end
+        plugins.uniq.each { |plugin| require plugin }
       end
 
       def spec_adapters
@@ -111,7 +114,7 @@ module DataMapper
         end
 
         def connection_uri
-          "#{adapter_name}://#{username}:#{password}@localhost/#{storage_name}"
+          "#{adapter_name}://#{username}:#{password}@#{host}/#{storage_name}"
         end
 
         def storage_name
@@ -127,11 +130,15 @@ module DataMapper
         end
 
         def username
-          'datamapper'
+          ENV.fetch('DM_DB_USER', 'datamapper')
         end
 
         def password
-          'datamapper'
+          ENV.fetch('DM_DB_PASSWORD', 'datamapper')
+        end
+
+        def host
+          ENV.fetch('DM_DB_HOST', 'localhost')
         end
 
         # Test the connection

data/lib/dm-core/spec/shared/public/property_spec.rb

@@ -11,7 +11,8 @@ share_examples_for 'A public Property' do
       end
     end
 
-    @model = Blog::Article
+    @model     = Blog::Article
+    @options ||= {}
   end
 
   describe "with a sub-type" do
@@ -21,7 +22,32 @@ share_examples_for 'A public Property' do
       @type.accept_options :foo, :bar
     end
 
+    describe "predefined options" do
+      before :all do
+        class ::ChildSubType < @subtype
+          default nil
+        end
+        @child_subtype = ChildSubType
+      end
+
+      describe "when parent type overrides a default" do
+        before do
+          @subtype.default "foo"
+        end
+
+        after do
+          DataMapper::Property.descendants.delete(ChildSubType)
+          Object.send(:remove_const, :ChildSubType)
+        end
+
+        it "should not override the child's type setting" do
+          @child_subtype.default.should eql(nil)
+        end
+      end
+    end
+
     after :all do
+      DataMapper::Property.descendants.delete(SubType)
       Object.send(:remove_const, :SubType)
     end
 
@@ -45,7 +71,7 @@ share_examples_for 'A public Property' do
           before :all do
             @type.foo true
             @type.bar 1
-            @property = @type.new(@model, @name)
+            @property = @type.new(@model, @name, @options)
           end
 
           it "should set the pre-defined option values" do
@@ -86,7 +112,7 @@ share_examples_for 'A public Property' do
       [true, false].each do |value|
         describe "when created with :#{opt} => #{value}" do
           before :all do
-            @property = @type.new(@model, @name, opt => value)
+            @property = @type.new(@model, @name, @options.merge(opt => value))
           end
 
           it "should return #{value}" do
@@ -98,7 +124,7 @@ share_examples_for 'A public Property' do
       describe "when created with :#{opt} => true and :required => true" do
         it "should fail with ArgumentError" do
           lambda {
-            @property = @type.new(@model, @name, opt => true, :required => true)
+            @property = @type.new(@model, @name, @options.merge(opt => true, :required => true))
           }.should raise_error(ArgumentError,
             "options[:required] cannot be mixed with :allow_nil or :allow_blank")
         end
@@ -112,7 +138,7 @@ share_examples_for 'A public Property' do
         describe "when created with :#{method} => #{value}" do
           before :all do
             opt = method.to_s.chomp('?').to_sym
-            @property = @type.new(@model, @name, opt => value)
+            @property = @type.new(@model, @name, @options.merge(opt => value))
           end
 
           it "should return #{value}" do
@@ -126,7 +152,7 @@ share_examples_for 'A public Property' do
   describe "#lazy?" do
     describe "when created with :lazy => true, :key => false" do
       before :all do
-        @property = @type.new(@model, @name, :lazy => true, :key => false)
+        @property = @type.new(@model, @name, @options.merge(:lazy => true, :key => false))
       end
 
       it "should return true" do
@@ -136,7 +162,7 @@ share_examples_for 'A public Property' do
 
     describe "when created with :lazy => true, :key => true" do
       before :all do
-        @property = @type.new(@model, @name, :lazy => true, :key => true)
+        @property = @type.new(@model, @name, @options.merge(:lazy => true, :key => true))
       end
 
       it "should return false" do
@@ -145,22 +171,10 @@ share_examples_for 'A public Property' do
     end
   end
 
-  describe "#custom?" do
-    describe "when DM::Type is not provided" do
-      before :all do
-        @property = @type.new(@model, @name)
-      end
-
-      it "should be false" do
-        @property.custom?.should be(false)
-      end
-    end
-  end
-
   describe '#instance_of?' do
     subject { property.instance_of?(klass) }
 
-    let(:property) { @type.new(@model, @name) }
+    let(:property) { @type.new(@model, @name, @options) }
 
     context 'when provided the property class' do
       let(:klass) { @type }
@@ -184,7 +198,7 @@ share_examples_for 'A public Property' do
   describe '#kind_of?' do
     subject { property.kind_of?(klass) }
 
-    let(:property) { @type.new(@model, @name) }
+    let(:property) { @type.new(@model, @name, @options) }
 
     context 'when provided the property class' do
       let(:klass) { @type }