dm-core 0.10.0 → 0.10.1

data/History.txt

@@ -1,7 +1,27 @@
-=== 0.10.0 / 2009-10-15
+=== 0.10.1 / 2009-09-30
 
-  * Countless enhancements:
+* 4 minor enhancements:
 
-    * Total rewrite of most of dm-core, including YARD docs for more
-      than half the methods and ~90% coverage of code.  More to be done
-      but this is a great start.
+  * On Ruby 1.8.7+ allow #pop and #shift in Collection to work with
+    multiple entries.
+  * Added NullOperation condition
+  * Added Resource#destroyed?
+  * Updated ManyToMany::Collection#intermediaries to be public
+
+* 6 bug fixes:
+
+  * Fixed Query::Path to work with .like
+  * Replaced usage of base64 lib with pack/unpack
+  * Ensure the correct ordering of links for more complex joins
+  * Simplified SELECT query generation
+  * Simplified Relationship inheritance by subclasses
+  * Ensure Property.new options allow an Array of Symbols for :unique,
+    and :unique_index
+
+=== 0.10.0 / 2009-09-15
+
+* Countless enhancements:
+
+  * Total rewrite of most of dm-core, including YARD docs for more
+    than half the methods and ~90% coverage of code.  More to be done
+    but this is a great start.

data/Manifest.txt

@@ -54,6 +54,7 @@ lib/dm-core/spec/adapter_shared_spec.rb
 lib/dm-core/spec/data_objects_adapter_shared_spec.rb
 lib/dm-core/support/chainable.rb
 lib/dm-core/support/deprecate.rb
+lib/dm-core/support/equalizer.rb
 lib/dm-core/support/logger.rb
 lib/dm-core/support/naming_conventions.rb
 lib/dm-core/transaction.rb

data/README.txt

@@ -25,7 +25,7 @@ see all <tt>false</tt> results. Do the same in DataMapper and it's
     @parent = Tree.first(:name => 'bob')
 
     @parent.children.each do |child|
-      puts @parent.object_id == child.parent.object_id
+      puts @parent.equal?(child.parent)  # => true
     end
   end
 
@@ -38,16 +38,13 @@ the fields that actually changed. So it plays well with others. You can
 use it in an Integration data-store without worrying that your application will
 be a bad actor causing trouble for all of your other processes.
 
-You can also configure which strategy you'd like to use to track dirtiness.
-
 == Eager Loading
 
-Ready for something amazing? The following example executes only two queries.
+Ready for something amazing? The following example executes only two queries
+regardless of how many rows the inner and outer queries return.
 
   repository do
-    zoos = Zoo.all
-    first = zoos.first
-    first.exhibits  # Loads the exhibits for all the Zoo objects in the zoos variable.
+    Zoo.all.each { |zoo| zoo.exhibits.to_a }
   end
 
 Pretty impressive huh? The idea is that you aren't going to load a set of
@@ -55,7 +52,7 @@ objects and use only an association in just one of them. This should hold up
 pretty well against a 99% rule. When you don't want it to work like this, just
 load the item you want in it's own set. So the DataMapper thinks ahead. We
 like to call it "performant by default". This feature single-handedly wipes
-out the "N+1 Query Problem". No need to specify an <tt>include</tt> option in
+out the "N+1 Query Problem". No need to specify an <tt>:include</tt> option in
 your finders.
 
 == Laziness Can Be A Virtue
@@ -67,36 +64,84 @@ place to get what it needs. Since ActiveRecord returns everything by default,
 adding a text field to a table slows everything down drastically, across the
 board.
 
-Not so with the DataMapper. Text fields are treated like in-row associations
-by default, meaning they only load when you need them. If you want more
-control you can enable or disable this feature for any field (not just
-text-fields) by passing a @lazy@ option to your field mapping with a value of
-<tt>true</tt> or <tt>false</tt>.
+Not so with the DataMapper. Text fields are lazily loaded, meaning they
+only load when you need them. If you want more control you can enable or
+disable this feature for any field (not just text-fields) by passing a
+@:lazy@ option to your field mapping with a value of <tt>true</tt> or
+<tt>false</tt>.
 
   class Animal
     include DataMapper::Resource
 
-    property :name, String
+    property :name,  String
     property :notes, Text, :lazy => false
   end
 
-Plus, lazy-loading of text fields happens automatically and intelligently when
+Plus, lazy-loading of Text fields happens automatically and intelligently when
 working with associations.  The following only issues 2 queries to load up all
 of the notes fields on each animal:
 
   repository do
-    animals = Animal.all
-    animals.each do |pet|
-      pet.notes
+    Animal.all.each { |animal| animal.notes.to_a }
+  end
+
+Did you notice the the <tt>#to_a</tt> call in the above example?  That
+was necessary because even DataMapper collections are lazy.  If you don't
+iterate over them, or in this case ask them to become Arrays, they won't
+execute until you need them.  We needed to call <tt>#to_a</tt> to force
+the lazy load because without it, the above example would have only
+executed one query.  This extra bit of laziness can come in very handy,
+for example:
+
+  animals = Animal.all
+
+  unless note.blank?
+    animals.each do |animal|
+      animal.update(:note => note)
+    end
+  end
+
+In the above example, the Animals won't be retrieved until you actually
+need them.  This comes in handy in cases where you initialize the
+collection before you know if you need it, like in a web app controller.
+
+== Collection Chaining
+
+DataMapper's lazy collections are also handy because you can get the
+same effect as named scopes, without any special syntax, eg:
+
+  class Animal
+    # ... setup ...
+
+    def self.mammals
+      all(:mammal => true)
+    end
+
+    def self.zoo(zoo)
+      all(:zoo => zoo)
     end
   end
 
+  zoo = Zoo.first(:name => 'Greater Vancouver Zoo')
+
+  Animal.mammals.zoo(zoo).to_a  # => executes one query
+
+In the above example, we ask the Animal model for all the mammals,
+and then all the animals in a specific zoo, and DataMapper will chain
+the collection queries together and execute a single query to retrieve
+the matching records.  There's no special syntax, and no custom DSLs
+to learn, it's just plain ruby all the way down.
+
+You can even use this on association collections, eg:
+
+  zoo.animals.mammals.to_a  # => executes one query
+
 == Plays Well With Others
 
 In ActiveRecord, all your fields are mapped, whether you want them or not.
 This slows things down. In the DataMapper you define your mappings in your
 model. So instead of an _ALTER TABLE ADD field_ in your data-store, you simply
-add a <tt>property :name, :string</tt> to your model. DRY. No schema.rb. No
+add a <tt>property :name, String</tt> to your model. DRY. No schema.rb. No
 migration files to conflict or die without reverting changes. Your model
 drives the data-store, not the other way around.
 
@@ -107,7 +152,9 @@ now? In DataMapper you control the mappings:
 
   class Fruit
     include DataMapper::Resource
+
     storage_names[:repo] = 'frt'
+
     property :name, String, :field => 'col2Name'
   end
 
@@ -127,21 +174,18 @@ It's just a little thing, but it's so much nicer than writing
 <tt>Zoo.find(:all, :conditions => ['name = ?', 'Dallas'])</tt>. What if you
 need other comparisons though? Try these:
 
-  Zoo.first(:name => 'Galveston')
-
   # 'gt' means greater-than. We also do 'lt'.
   Person.all(:age.gt => 30)
 
   # 'gte' means greather-than-or-equal-to. We also do 'lte'.
   Person.all(:age.gte => 30)
 
+  # 'not' allows you to match all people without the name "bob"
   Person.all(:name.not => 'bob')
 
   # If the value of a pair is an Array, we do an IN-clause for you.
   Person.all(:name.like => 'S%', :id => [ 1, 2, 3, 4, 5 ])
 
-  Zoo.get(11)
-
   # Does a NOT IN () clause for you.
   Person.all(:name.not => [ 'bob', 'rick', 'steve' ])
 

data/Rakefile

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby -KU
-
 require 'pathname'
 require 'rubygems'
 require 'rake'

data/deps.rip

@@ -1,2 +1,2 @@
-git://github.com/datamapper/extlib.git next
+git://github.com/datamapper/extlib.git master
 git://github.com/sporkmonger/addressable.git addressable-2.1.0

data/dm-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-07-30}
+  s.date = %q{2009-09-30}
   s.description = %q{Faster, Better, Simpler.}
   s.email = ["dan.kubb@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".autotest", ".gitignore", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "dm-core.gemspec", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/in_memory_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/oracle_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/adapters/yaml_adapter.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/collection.rb", "lib/dm-core/core_ext/kernel.rb", "lib/dm-core/core_ext/symbol.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/migrations.rb", "lib/dm-core/model.rb", "lib/dm-core/model/descendant_set.rb", "lib/dm-core/model/hook.rb", "lib/dm-core/model/is.rb", "lib/dm-core/model/property.rb", "lib/dm-core/model/relationship.rb", "lib/dm-core/model/scope.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/query/conditions/comparison.rb", "lib/dm-core/query/conditions/operation.rb", "lib/dm-core/query/direction.rb", "lib/dm-core/query/operator.rb", "lib/dm-core/query/path.rb", "lib/dm-core/query/sort.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/spec/adapter_shared_spec.rb", "lib/dm-core/spec/data_objects_adapter_shared_spec.rb", "lib/dm-core/support/chainable.rb", "lib/dm-core/support/deprecate.rb", "lib/dm-core/support/logger.rb", "lib/dm-core/support/naming_conventions.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/performance.rb", "script/profile.rb", "spec/lib/adapter_helpers.rb", "spec/lib/collection_helpers.rb", "spec/lib/counter_adapter.rb", "spec/lib/pending_helpers.rb", "spec/lib/rspec_immediate_feedback_formatter.rb", "spec/public/associations/many_to_many_spec.rb", "spec/public/associations/many_to_one_spec.rb", "spec/public/associations/one_to_many_spec.rb", "spec/public/associations/one_to_one_spec.rb", "spec/public/collection_spec.rb", "spec/public/model/relationship_spec.rb", "spec/public/model_spec.rb", "spec/public/property_spec.rb", "spec/public/resource_spec.rb", "spec/public/sel_spec.rb", "spec/public/setup_spec.rb", "spec/public/shared/association_collection_shared_spec.rb", "spec/public/shared/collection_shared_spec.rb", "spec/public/shared/finder_shared_spec.rb", "spec/public/shared/resource_shared_spec.rb", "spec/public/shared/sel_shared_spec.rb", "spec/public/transaction_spec.rb", "spec/public/types/discriminator_spec.rb", "spec/semipublic/adapters/abstract_adapter_spec.rb", "spec/semipublic/adapters/in_memory_adapter_spec.rb", "spec/semipublic/adapters/mysql_adapter_spec.rb", "spec/semipublic/adapters/oracle_adapter_spec.rb", "spec/semipublic/adapters/postgres_adapter_spec.rb", "spec/semipublic/adapters/sqlite3_adapter_spec.rb", "spec/semipublic/adapters/yaml_adapter_spec.rb", "spec/semipublic/associations/many_to_one_spec.rb", "spec/semipublic/associations/relationship_spec.rb", "spec/semipublic/associations_spec.rb", "spec/semipublic/collection_spec.rb", "spec/semipublic/property_spec.rb", "spec/semipublic/query/conditions_spec.rb", "spec/semipublic/query/path_spec.rb", "spec/semipublic/query_spec.rb", "spec/semipublic/resource_spec.rb", "spec/semipublic/shared/resource_shared_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/ci.rb", "tasks/dm.rb", "tasks/doc.rb", "tasks/gemspec.rb", "tasks/hoe.rb", "tasks/install.rb"]
+  s.files = [".autotest", ".gitignore", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "deps.rip", "dm-core.gemspec", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/in_memory_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/oracle_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/adapters/yaml_adapter.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/collection.rb", "lib/dm-core/core_ext/kernel.rb", "lib/dm-core/core_ext/symbol.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/migrations.rb", "lib/dm-core/model.rb", "lib/dm-core/model/descendant_set.rb", "lib/dm-core/model/hook.rb", "lib/dm-core/model/is.rb", "lib/dm-core/model/property.rb", "lib/dm-core/model/relationship.rb", "lib/dm-core/model/scope.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/query/conditions/comparison.rb", "lib/dm-core/query/conditions/operation.rb", "lib/dm-core/query/direction.rb", "lib/dm-core/query/operator.rb", "lib/dm-core/query/path.rb", "lib/dm-core/query/sort.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/spec/adapter_shared_spec.rb", "lib/dm-core/spec/data_objects_adapter_shared_spec.rb", "lib/dm-core/support/chainable.rb", "lib/dm-core/support/deprecate.rb", "lib/dm-core/support/equalizer.rb", "lib/dm-core/support/logger.rb", "lib/dm-core/support/naming_conventions.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/performance.rb", "script/profile.rb", "spec/lib/adapter_helpers.rb", "spec/lib/collection_helpers.rb", "spec/lib/counter_adapter.rb", "spec/lib/pending_helpers.rb", "spec/lib/rspec_immediate_feedback_formatter.rb", "spec/public/associations/many_to_many_spec.rb", "spec/public/associations/many_to_one_spec.rb", "spec/public/associations/one_to_many_spec.rb", "spec/public/associations/one_to_one_spec.rb", "spec/public/collection_spec.rb", "spec/public/migrations_spec.rb", "spec/public/model/relationship_spec.rb", "spec/public/model_spec.rb", "spec/public/property_spec.rb", "spec/public/resource_spec.rb", "spec/public/sel_spec.rb", "spec/public/setup_spec.rb", "spec/public/shared/association_collection_shared_spec.rb", "spec/public/shared/collection_shared_spec.rb", "spec/public/shared/finder_shared_spec.rb", "spec/public/shared/resource_shared_spec.rb", "spec/public/shared/sel_shared_spec.rb", "spec/public/transaction_spec.rb", "spec/public/types/discriminator_spec.rb", "spec/semipublic/adapters/abstract_adapter_spec.rb", "spec/semipublic/adapters/in_memory_adapter_spec.rb", "spec/semipublic/adapters/mysql_adapter_spec.rb", "spec/semipublic/adapters/oracle_adapter_spec.rb", "spec/semipublic/adapters/postgres_adapter_spec.rb", "spec/semipublic/adapters/sqlite3_adapter_spec.rb", "spec/semipublic/adapters/yaml_adapter_spec.rb", "spec/semipublic/associations/many_to_one_spec.rb", "spec/semipublic/associations/relationship_spec.rb", "spec/semipublic/associations_spec.rb", "spec/semipublic/collection_spec.rb", "spec/semipublic/property_spec.rb", "spec/semipublic/query/conditions_spec.rb", "spec/semipublic/query/path_spec.rb", "spec/semipublic/query_spec.rb", "spec/semipublic/resource_spec.rb", "spec/semipublic/shared/condition_shared_spec.rb", "spec/semipublic/shared/resource_shared_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/ci.rb", "tasks/dm.rb", "tasks/doc.rb", "tasks/gemspec.rb", "tasks/hoe.rb", "tasks/install.rb"]
   s.homepage = %q{http://datamapper.org}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<extlib>, ["~> 0.9.13"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.1"])
     else
       s.add_dependency(%q<extlib>, ["~> 0.9.13"])
-      s.add_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_dependency(%q<addressable>, ["~> 2.1"])
     end
   else
     s.add_dependency(%q<extlib>, ["~> 0.9.13"])
-    s.add_dependency(%q<addressable>, ["~> 2.0"])
+    s.add_dependency(%q<addressable>, ["~> 2.1"])
   end
 end

data/lib/dm-core/adapters/abstract_adapter.rb

@@ -14,6 +14,9 @@ module DataMapper
     class AbstractAdapter
       include Extlib::Assertions
       extend Extlib::Assertions
+      extend Equalizer
+
+      equalize :name, :options, :resource_naming_convention, :field_naming_convention
 
       # Adapter name
       #
@@ -139,64 +142,6 @@ module DataMapper
         raise NotImplementedError, "#{self.class}#delete not implemented"
       end
 
-      # Compares another AbstractAdapter for equality
-      #
-      # @example with an equal adapter
-      #   adapter.eql?(equal_adapter)  # => true
-      #
-      # @example with a different adapter
-      #   adapter.eql?(different_adapter)  # => false
-      #
-      # AbstractAdapter is equal to +other+ if they are the same object (identity)
-      # or if they are of the same class and have the same name
-      #
-      # @param [AbstractAdapter] other
-      #   the other AbstractAdapter to compare with
-      #
-      # @return [Boolean]
-      #   true if they are equal, false if not
-      #
-      # @api public
-      def eql?(other)
-        if equal?(other)
-          return true
-        end
-
-        unless instance_of?(other.class)
-          return false
-        end
-
-        cmp?(other, :eql?)
-      end
-
-      # Compares another AbstractAdapter for equivalency
-      #
-      # @example with an equivalent adapter
-      #   adapter == equivalent_adapter  # => true
-      #
-      # @example with a different adapter
-      #   adapter == different_adapter  # => false
-      #
-      # AbstractAdapter is equal to +other+ if they are the same object (identity)
-      # or if they both have the same name
-      #
-      # @param [AbstractAdapter] other
-      #   the other AbstractAdapter to compare with
-      #
-      # @return [Boolean]
-      #   true if they are equal, false if not
-      #
-      # @api public
-      def ==(other)
-        return true if equal?(other)
-
-        other.respond_to?(:name)                       &&
-        other.respond_to?(:options)                    &&
-        other.respond_to?(:resource_naming_convention) &&
-        other.respond_to?(:field_naming_convention)    &&
-        cmp?(other, :==)
-      end
-
       protected
 
       # Set the serial value of the Resource
@@ -254,24 +199,6 @@ module DataMapper
         @resource_naming_convention = NamingConventions::Resource::UnderscoredAndPluralized
         @field_naming_convention    = NamingConventions::Field::Underscored
       end
-
-      # Compare other object for equality of equivalency
-      #
-      # @param [AbstractAdapter] other
-      #   the other adapter
-      # @param [Symbol] operator
-      #   the comparison operator
-      #
-      # @return [Boolean]
-      #   true if the other object is equal or equivalent
-      #
-      # @api private
-      def cmp?(other, operator)
-        name.send(operator, other.name)                                             &&
-        options.send(operator, other.options)                                       &&
-        resource_naming_convention.send(operator, other.resource_naming_convention) &&
-        field_naming_convention.send(operator, other.field_naming_convention)
-      end
     end # class AbstractAdapter
 
     const_added(:AbstractAdapter)

data/lib/dm-core/adapters/data_objects_adapter.rb

@@ -312,54 +312,23 @@ module DataMapper
         #
         # @api private
         def select_statement(query)
-          model      = query.model
-          fields     = query.fields
-          conditions = query.conditions
-          limit      = query.limit
-          offset     = query.offset
-          order_by   = query.order
-          group_by   = nil
-
-          # FIXME: using a boolean for qualify does not work in some cases,
-          # such as when you have a self-referrential many to many association.
-          # if you don't qualfiy the columns with a unique alias, then the
-          # SQL query will fail.  This may mean though, that it might not
-          # be enough to pass in a Property, but we may need to know the
-          # table and the alias we should use for the column.
-
-          qualify = query.links.any?
-
-          if qualify || query.unique?
-            group_by = fields.select { |property| property.kind_of?(Property) }
+          qualify  = query.links.any?
+          fields   = query.fields
+          order_by = query.order
+          group_by = if qualify || query.unique?
+            fields.select { |property| property.kind_of?(Property) }
           end
 
-          unless (limit && limit > 1) || offset > 0 || qualify
-            # TODO: move this method to Query, so that it walks the conditions
-            # and finds an OR operator
-
-            # TODO: handle cases where two or more properties need to be
-            # used together to be unique
-
-            # if a unique property is used, and there is no OR operator, then an ORDER
-            # and LIMIT are unecessary because it should only return a single row
-            if conditions.kind_of?(Query::Conditions::AndOperation) &&
-               conditions.any? { |operand| operand.kind_of?(Query::Conditions::EqualToComparison) && operand.subject.respond_to?(:unique?) && operand.subject.unique? } &&
-               !conditions.any? { |operand| operand.kind_of?(Query::Conditions::OrOperation) }
-              order_by = nil
-              limit    = nil
-            end
-          end
-
-          conditions_statement, bind_values = conditions_statement(conditions, qualify)
+          conditions_statement, bind_values = conditions_statement(query.conditions, qualify)
 
           statement = "SELECT #{columns_statement(fields, qualify)}"
-          statement << " FROM #{quote_name(model.storage_name(name))}"
+          statement << " FROM #{quote_name(query.model.storage_name(name))}"
           statement << join_statement(query, qualify)                      if qualify
           statement << " WHERE #{conditions_statement}"                    unless conditions_statement.blank?
           statement << " GROUP BY #{columns_statement(group_by, qualify)}" if group_by && group_by.any?
           statement << " ORDER BY #{order_statement(order_by, qualify)}"   if order_by && order_by.any?
 
-          add_limit_offset!(statement, limit, offset, bind_values)
+          add_limit_offset!(statement, query.limit, query.offset, bind_values)
 
           return statement, bind_values
         end

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

@@ -343,6 +343,26 @@ module DataMapper
           super
         end
 
+        # Return the intermediaries between the source and the targets
+        #
+        # @return [Collection]
+        #   the intermediary collection
+        #
+        # @api public
+        def intermediaries
+          return @intermediaries if @intermediaries
+
+          intermediaries = if through.loaded?(source)
+            through.get!(source)
+          else
+            through.set!(source, through.collection_for(source))
+          end
+
+          scoped = intermediaries.all(via => self)
+
+          @intermediaries = scoped.query == intermediaries.query ? intermediaries : scoped
+        end
+
         private
 
         # TODO: document
@@ -363,9 +383,13 @@ module DataMapper
         # TODO: document
         # @api private
         def _save(safe)
-          # delete only intermediaries linked to the removed targets
-          unless @removed.empty? || intermediaries(@removed).send(safe ? :destroy : :destroy!)
-            return false
+          if @removed.any?
+            # delete only intermediaries linked to the removed targets
+            removed_intermediaries = intermediaries.all(via => @removed).each do |resource|
+              intermediaries.delete(resource)
+            end
+
+            return false unless removed_intermediaries.send(safe ? :destroy : :destroy!)
           end
 
           if via.respond_to?(:resource_for)
@@ -374,25 +398,13 @@ module DataMapper
           else
             if intermediary = create_intermediary(safe)
               inverse = via.inverse
-              loaded_entries.map { |resource| inverse.set(resource, intermediary) }
+              loaded_entries.each { |resource| inverse.set(resource, intermediary) }
             end
 
             super
           end
         end
 
-        # TODO: document
-        # @api private
-        def intermediaries(targets = self)
-          intermediaries = if through.loaded?(source)
-            through.get!(source)
-          else
-            through.set!(source, through.collection_for(source))
-          end
-
-          intermediaries.all(via => targets)
-        end
-
         # TODO: document
         # @api private
         def create_intermediary(safe, attributes = {})

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

@@ -61,7 +61,7 @@ module DataMapper
         # @api semipublic
         alias source_key child_key
 
-        # Returns a Resoruce for this relationship with a given source
+        # Returns a Resource for this relationship with a given source
         #
         # @param [Resource] source
         #   A Resource to scope the collection with
@@ -123,13 +123,6 @@ module DataMapper
           set!(source, target)
         end
 
-        # TODO: document
-        # @api private
-        def inherited_by(model)
-          model.relationships(source_repository_name)[name] ||
-            self.class.new(name, model, parent_model_name, options_with_inverse)
-        end
-
         private
 
         # Initializes the relationship, always using max cardinality of 1.
@@ -142,43 +135,6 @@ module DataMapper
           super
         end
 
-        # Dynamically defines reader method for source side of association
-        # (for instance, method article for model Paragraph)
-        #
-        # @api semipublic
-        def create_reader
-          return if source_model.resource_method_defined?(name.to_s)
-
-          source_model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            public  # TODO: make this configurable
-
-            # FIXME: if the writer is used, caching nil in the ivar
-            # and then the FK(s) are set, the cache in the writer should
-            # be cleared.
-
-            def #{name}(query = nil)                          # def article(query = nil)
-              relationships[#{name.inspect}].get(self, query) #   relationships["article"].get(self, query)
-            end                                               # end
-          RUBY
-        end
-
-        # Dynamically defines writer method for source side of association
-        # (for instance, method article= for model Paragraph)
-        #
-        # @api semipublic
-        def create_writer
-          writer_name = "#{name}="
-
-          return if source_model.resource_method_defined?(writer_name)
-
-          source_model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            public  # TODO: make this configurable
-            def #{writer_name}(target)                         # def article=(target)
-              relationships[#{name.inspect}].set(self, target) #   relationships["article"].set(self, target)
-            end                                                # end
-          RUBY
-        end
-
         # Loads association target and sets resulting value on
         # given source resource
         #

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

@@ -82,13 +82,6 @@ module DataMapper
           get!(source).replace(targets)
         end
 
-        # TODO: document
-        # @api private
-        def inherited_by(model)
-          model.relationships(source_repository_name)[name] ||
-            self.class.new(name, child_model_name, model, options_with_inverse)
-        end
-
         private
 
         # TODO: document
@@ -99,36 +92,6 @@ module DataMapper
           super
         end
 
-        # Dynamically defines reader method for source side of association
-        # (for instance, method paragraphs for model Article)
-        #
-        # @api semipublic
-        def create_reader
-          return if source_model.resource_method_defined?(name.to_s)
-
-          source_model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{name}(query = nil)                           # def paragraphs(query = nil)
-              relationships[#{name.inspect}].get(self, query)  #   relationships[:paragraphs].get(self, query)
-            end                                                # end
-          RUBY
-        end
-
-        # Dynamically defines reader method for source side of association
-        # (for instance, method paragraphs= for model Article)
-        #
-        # @api semipublic
-        def create_writer
-          writer_name = "#{name}="
-
-          return if source_model.resource_method_defined?(writer_name)
-
-          source_model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{writer_name}(targets)                          # def paragraphs=(targets)
-              relationships[#{name.inspect}].set(self, targets)  #   relationships[:paragraphs].set(self, targets)
-            end                                                  # end
-          RUBY
-        end
-
         # Loads association targets and sets resulting value on
         # given source resource
         #
@@ -315,7 +278,7 @@ module DataMapper
           assert_source_saved 'The source must be saved before saving the collection'
 
           # update removed resources to not reference the source
-          @removed.all? { |resource| resource.send(safe ? :save : :save!) } && super
+          @removed.all? { |resource| resource.destroyed? || resource.send(safe ? :save : :save!) } && super
         end
 
         # TODO: document