dm-core 0.10.0 → 0.10.1

data/lib/dm-core/resource.rb

@@ -21,7 +21,7 @@ module DataMapper
     # @deprecated
     def self.descendants
       warn "DataMapper::Resource.descendants is deprecated, use DataMapper::Model.descendants instead (#{caller[0]})"
-      DataMapper::Model.descendants
+      Model.descendants
     end
 
     # Deprecated API for updating attributes and saving Resource
@@ -118,6 +118,16 @@ module DataMapper
       @saved == true
     end
 
+    # Checks if this Resource instance is destroyed
+    #
+    # @return [Boolean]
+    #   true if the resource has been destroyed
+    #
+    # @api public
+    def destroyed?
+      @destroyed == true
+    end
+
     # Checks if the resource has no changes to save
     #
     # @return [Boolean]
@@ -283,7 +293,7 @@ module DataMapper
     # @api public
     def reload
       if saved?
-        reload_attributes(loaded_properties)
+        eager_load(loaded_properties)
         child_relationships.each { |relationship| relationship.get!(self).reload }
       end
 
@@ -364,13 +374,13 @@ module DataMapper
     # @api public
     def destroy!
       if saved? && repository.delete(Collection.new(query, [ self ])) == 1
+        @destroyed = true
         @collection.delete(self) if @collection
         reset
         freeze
-        true
-      else
-        false
       end
+
+      destroyed?
     end
 
     # Compares another Resource for equality
@@ -388,9 +398,7 @@ module DataMapper
     # @api public
     def eql?(other)
       return true if equal?(other)
-      return false unless instance_of?(other.class)
-
-      cmp?(other, :eql?)
+      instance_of?(other.class) && cmp?(other, :eql?)
     end
 
     # Compares another Resource for equivalency
@@ -408,8 +416,8 @@ module DataMapper
     # @api public
     def ==(other)
       return true if equal?(other)
-      return false unless other.respond_to?(:model) && model.base_model.equal?(other.model.base_model)
-
+      other.respond_to?(:model)                       &&
+      model.base_model.equal?(other.model.base_model) &&
       cmp?(other, :==)
     end
 
@@ -429,7 +437,7 @@ module DataMapper
         raise ArgumentError, "Cannot compare a #{other.model} instance with a #{model} instance"
       end
       cmp = 0
-      model.default_order(repository_name).map do |direction|
+      model.default_order(repository_name).each do |direction|
         cmp = direction.get(self) <=> direction.get(other)
         break if cmp != 0
       end
@@ -506,27 +514,6 @@ module DataMapper
       properties[name].loaded?(self)
     end
 
-    # Fetches all the names of the attributes that have been loaded,
-    # even if they are lazy but have been called
-    #
-    # @example
-    #   class Foo
-    #     include DataMapper::Resource
-    #
-    #     property :name,        String
-    #     property :description, Text,   :lazy => false
-    #   end
-    #
-    #   Foo.new.loaded_properties   #=>  [ #<Property @model=Foo @name=:name> ]
-    #
-    # @return [Array(Property)]
-    #   names of attributes that have been loaded
-    #
-    # @api private
-    def loaded_properties
-      properties.select { |property| property.loaded?(self) }
-    end
-
     # Checks if an attribute has unsaved changes
     #
     # @param [Symbol] name
@@ -690,10 +677,9 @@ module DataMapper
       model.relationships(repository_name)
     end
 
-    # Returns identity map of repository this object
-    # was loaded from
+    # Returns the identity map for the model from the repository
     #
-    # @return [DataMapper::IdentityMap]
+    # @return [IdentityMap]
     #   identity map of repository this object was loaded from
     #
     # @api semipublic
@@ -701,26 +687,41 @@ module DataMapper
       repository.identity_map(model)
     end
 
-    # Reloads attributes that belong to given lazy loading
-    # context, and not yet loaded
+    # Fetches all the names of the attributes that have been loaded,
+    # even if they are lazy but have been called
+    #
+    # @return [Array<Property>]
+    #   names of attributes that have been loaded
     #
     # @api private
-    def lazy_load(property_names)
-      reload_attributes(properties.in_context(property_names) - loaded_properties)
+    def loaded_properties
+      properties.select { |property| property.loaded?(self) }
+    end
+
+    # Lazy loads attributes not yet loaded
+    #
+    # @param [Array<Property>] fields
+    #   the properties to reload
+    #
+    # @return [self]
+    #
+    # @api private
+    def lazy_load(fields)
+      eager_load(fields - loaded_properties)
     end
 
     # Reloads specified attributes
     #
-    # @param [Enumerable(Symbol)] attributes
-    #   name(s) of attribute(s) to reload
+    # @param [Array<Property>] fields
+    #   the properties to reload
     #
     # @return [Resource]
     #   the receiver, the current Resource instance
     #
     # @api private
-    def reload_attributes(attributes)
-      unless attributes.empty? || new?
-        collection.reload(:fields => attributes)
+    def eager_load(fields)
+      unless fields.empty? || new?
+        collection.reload(:fields => fields)
       end
 
       self
@@ -751,9 +752,9 @@ module DataMapper
       parent_relationships
     end
 
-    # Returns array of child relationships for which this resource is parent and is loaded
+    # Returns loaded child relationships
     #
-    # @return [Array<DataMapper::Associations::OneToMany::Relationship>]
+    # @return [Array<Associations::OneToMany::Relationship>]
     #   array of child relationships for which this resource is parent and is loaded
     #
     # @api private
@@ -770,14 +771,13 @@ module DataMapper
       end
 
       many_to_many, other = child_relationships.partition do |relationship|
-        relationship.kind_of?(DataMapper::Associations::ManyToMany::Relationship)
+        relationship.kind_of?(Associations::ManyToMany::Relationship)
       end
 
       many_to_many + other
     end
 
-    # Saves this Resource instance to the repository,
-    # setting default values for any unset properties
+    # Creates the resource with default values
     #
     # If resource is not dirty or a new (not yet saved),
     # this method returns false
@@ -878,6 +878,11 @@ module DataMapper
 
     # Raises an exception if #update is performed on a dirty resource
     #
+    # @param [Symbol] method
+    #   the name of the method to use in the exception
+    #
+    # @return [undefined]
+    #
     # @raise [UpdateConflictError]
     #   raise if the resource is dirty
     #

data/lib/dm-core/support/chainable.rb

@@ -1,5 +1,3 @@
-# TODO: move this to Extlib::Chainable
-
 module DataMapper
   module Chainable
 

data/lib/dm-core/support/equalizer.rb

@@ -0,0 +1,23 @@
+module DataMapper
+  module Equalizer
+    def equalize(*methods)
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def eql?(other)
+          return true if equal?(other)
+          instance_of?(other.class) &&
+          #{methods.map { |method| "#{method}.eql?(other.#{method})" }.join(' && ')}
+        end
+
+        def ==(other)
+          return true if equal?(other)
+          #{methods.map { |method| "other.respond_to?(#{method.inspect})" }.join(' && ')} &&
+          #{methods.map { |method| "#{method} == other.#{method}" }.join(' && ')}
+        end
+
+        def hash
+          [ #{methods.join(', ')} ].hash
+        end
+      RUBY
+    end
+  end
+end

data/lib/dm-core/types/object.rb

@@ -2,8 +2,8 @@ module DataMapper
   module Types
     class Object < Type
       primitive String
-      size 65535
-      lazy true
+      length    65535
+      lazy      true
 
       # TODO: document
       # @api private
@@ -14,13 +14,13 @@ module DataMapper
       # TODO: document
       # @api private
       def self.dump(value, property)
-        Base64.encode64(Marshal.dump(value))
+        [ Marshal.dump(value) ].pack('m')
       end
 
       # TODO: document
       # @api private
       def self.load(value, property)
-        value.nil? ? nil : Marshal.load(Base64.decode64(value))
+        Marshal.load(value.unpack('m').first) unless value.nil?
       end
     end
   end

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

data/lib/dm-core.rb

@@ -1,13 +1,4 @@
-# This file begins the loading sequence.
-#
-# Quick Overview:
-# * Requires fastthread, support libs, and base.
-# * Sets the application root and environment for compatibility with frameworks
-#   such as Rails or Merb.
-#
-
 require 'addressable/uri'
-require 'base64'
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'date'
@@ -27,6 +18,7 @@ dir = Pathname(__FILE__).dirname.expand_path / 'dm-core'
 
 require dir / 'support' / 'chainable'
 require dir / 'support' / 'deprecate'
+require dir / 'support' / 'equalizer'
 
 require dir / 'model'
 require dir / 'model' / 'descendant_set'
@@ -117,9 +109,9 @@ DataMapper::Logger.new(StringIO.new, :fatal)
 # === Logging
 # To turn on error logging to STDOUT, issue:
 #
-#   DataMapper::Logger.new(STDOUT, :debug)
+#   DataMapper::Logger.new($stdout, :debug)
 #
-# You can pass a file location ("/path/to/log/file.log") in place of STDOUT.
+# You can pass a file location ("/path/to/log/file.log") in place of $stdout.
 # see DataMapper::Logger for more information.
 #
 module DataMapper

data/spec/public/model/relationship_spec.rb

@@ -799,8 +799,8 @@ describe DataMapper::Associations do
             @engine_relationship = ElectricCar.relationships(@repository.name)[:engine]
           end
 
-          it 'should have a source model equal to the descendant' do
-            @engine_relationship.source_model.should equal(ElectricCar)
+          it 'should have a source model equal to the ancestor' do
+            @engine_relationship.source_model.should equal(Car)
           end
 
           it 'should have a child key prefix the same as the inverse relationship' do
@@ -823,8 +823,8 @@ describe DataMapper::Associations do
             @engine_relationship = ElectricCar.relationships(@repository.name)[:engine]
           end
 
-          it 'should have a source model equal to the descendant' do
-            @engine_relationship.source_model.should equal(ElectricCar)
+          it 'should have a source model equal to the ancestor' do
+            @engine_relationship.source_model.should equal(Car)
           end
 
           it 'should have a child key prefix inferred from the source model name' do