mongoid 2.0.0.rc.4 → 2.0.0.rc.5

data/lib/mongoid/attributes.rb

@@ -218,7 +218,7 @@ module Mongoid #:nodoc:
         if value.is_a?(Hash)
           metadata.nested_builder(value, {}).build(self)
         else
-          send("#{name}=", value, :building => true)
+          send("#{name}=", value, :binding => true)
         end
       end
     end

data/lib/mongoid/config.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "uri"
 require "mongoid/config/database"
+require "mongoid/config/replset_database"
 
 module Mongoid #:nodoc
 
@@ -42,6 +43,7 @@ module Mongoid #:nodoc
     option :autocreate_indexes, :default => false
     option :skip_version_check, :default => false
     option :time_zone, :default => nil
+    option :binding_defaults, :default => { :binding => false, :continue => true }
 
     # Adds a new I18n locale file to the load path.
     #
@@ -56,7 +58,7 @@ module Mongoid #:nodoc
       Dir[
         File.join(
           File.dirname(__FILE__), "..", "config", "locales", "#{language_code}.yml"
-        )
+      )
       ].each do |file|
         I18n.load_path << File.expand_path(file)
       end
@@ -315,7 +317,11 @@ module Mongoid #:nodoc
     #
     # @since 2.0.0.rc.1
     def configure_databases(options)
-      @master, @slaves = Database.new(options).configure
+      if options.has_key?('hosts')
+        @master, @slaves = ReplsetDatabase.new(options).configure
+      else
+        @master, @slaves = Database.new(options).configure
+      end
     end
 
     # Get the secondary databases from settings.
@@ -329,7 +335,7 @@ module Mongoid #:nodoc
     def configure_extras(extras)
       @databases = (extras || []).inject({}) do |dbs, (name, options)|
         dbs.tap do |extra|
-          dbs[name], dbs["#{name}_slaves"] = Database.new(options).configure
+        dbs[name], dbs["#{name}_slaves"] = Database.new(options).configure
         end
       end
     end

data/lib/mongoid/config/replset_database.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Config #:nodoc:
+    class ReplsetDatabase < Hash
+
+      # Configure the database connections. This will return an array
+      # containing one Mongo::DB and nil (to keep compatibility with Mongoid::Config::Database)
+      # If you want the reads to go to a secondary node use the :read_secondary(true): option
+      #
+      # @example Configure the connection.
+      #   db.configure
+      #
+      # @return [ Array<Mongo::DB, nil ] The Mongo databases.
+      #
+      # @since 2.0.0.rc.5
+      def configure
+        #yes, construction is weird but the driver wants "A list of host-port pairs ending with a hash containing any options"
+        #mongo likes symbols
+        options = self.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo}
+        connection = Mongo::ReplSetConnection.new(*(self['hosts'] << options))
+        [ connection.db(self['database']), nil ]
+      end
+
+      # Create the new db configuration class.
+      #
+      # @example Initialize the class.
+      #   Config::ReplsetDatabase.new(
+      #     "hosts" => [[host1,port1],[host2,port2]]
+      #   )
+      #
+      # replSet does not supports auth
+      #
+      # @param [ Hash ] options The configuration options.
+      #
+      # @option options [ Array ] :hosts The database host.
+      # @option options [ String ] :database The database name.
+      # @option options [ Boolean ] :read_secondary Tells the driver to read from secondaries.
+      # ...
+      #
+      # @see Mongo::ReplSetConnection for all options
+      #
+      # @since 2.0.0.rc.5
+      def initialize(options = {})
+        merge!(options)
+      end
+    end
+  end
+end

data/lib/mongoid/persistence.rb

@@ -145,8 +145,8 @@ module Mongoid #:nodoc:
       # @param [ Hash ] attributes The attributes to create with.
       #
       # @return [ Document ] The newly created document.
-      def create(attributes = {})
-        new(attributes).tap(&:save)
+      def create(attributes = {}, &block)
+        new(attributes, &block).tap(&:save)
       end
 
       # Create a new document. This will instantiate a new document and
@@ -160,8 +160,8 @@ module Mongoid #:nodoc:
       # @param [ Hash ] attributes The attributes to create with.
       #
       # @return [ Document ] The newly created document.
-      def create!(attributes = {})
-        document = new(attributes)
+      def create!(attributes = {}, &block)
+        document = new(attributes, &block)
         fail_validate!(document) if document.insert.errors.any?
         document
       end

data/lib/mongoid/relations/accessors.rb

@@ -25,7 +25,7 @@ module Mongoid # :nodoc:
       def build(name, object, metadata, options = {})
         relation = create_relation(object, metadata)
         set(name, relation).tap do |relation|
-          relation.bind(options) if relation
+          relation.load!(options) if relation && options[:eager]
         end
       end
 
@@ -39,10 +39,8 @@ module Mongoid # :nodoc:
       # @return [ Hash ] The options.
       #
       # @since 2.0.0.rc.1
-      def configurables(args)
-        options = args.extract_options!
-        options.merge!(:building => false) unless options[:building] == true
-        { :building => true, :continue => true }.merge(options)
+      def options(args)
+        Mongoid.binding_defaults.merge(args.extract_options!)
       end
 
       # Create a relation from an object and metadata.
@@ -111,11 +109,16 @@ module Mongoid # :nodoc:
           tap do
             define_method(name) do |*args|
               reload, variable = args.first, "@#{name}"
-              options = configurables(args)
+              options = options(args)
               if instance_variable_defined?(variable) && !reload
                 instance_variable_get(variable)
               else
-                build(name, @attributes[metadata.key], metadata, options)
+                build(
+                  name,
+                  @attributes[metadata.key],
+                  metadata,
+                  options.merge(:binding => true, :eager => metadata.embedded?)
+                )
               end
             end
           end
@@ -138,12 +141,12 @@ module Mongoid # :nodoc:
         def setter(name, metadata)
           tap do
             define_method("#{name}=") do |*args|
-              object, options = args.first, configurables(args)
+              object, options = args.first, options(args)
               variable = "@#{name}"
               if relation_exists?(name)
                 set(name, ivar(name).substitute(object, options))
               else
-                build(name, object, metadata, options)
+                build(name, object, metadata, options.merge(:eager => true))
               end
             end
           end

data/lib/mongoid/relations/binding.rb

@@ -6,6 +6,8 @@ module Mongoid # :nodoc:
     class Binding
       attr_reader :base, :target, :metadata
 
+      OPTIONS = { :binding => true, :continue => false }
+
       # Create the new binding.
       #
       # @example Initialize a binding.

data/lib/mongoid/relations/bindings/embedded/in.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -32,14 +32,14 @@ module Mongoid # :nodoc:
                 target.do_or_do_not(
                   inverse,
                   false,
-                  :building => true,
+                  :binding => true,
                   :continue => false
-                ).push(base, :building => true, :continue => false)
+                ).push(base, :binding => true, :continue => false)
               else
                 target.do_or_do_not(
                   metadata.inverse_setter(target),
                   base,
-                  :building => true,
+                  :binding => true,
                   :continue => false
                 )
               end
@@ -65,7 +65,12 @@ module Mongoid # :nodoc:
                 inverse = metadata.inverse(target)
                 target.do_or_do_not(inverse).delete(base)
               else
-                target.do_or_do_not(metadata.inverse_setter(target), nil, :continue => false)
+                target.do_or_do_not(
+                  metadata.inverse_setter(target),
+                  nil,
+                  :binding => true,
+                  :continue => false
+                )
               end
             end
           end

data/lib/mongoid/relations/bindings/embedded/many.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -37,7 +37,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind_one(doc, options = {})
@@ -47,7 +47,7 @@ module Mongoid # :nodoc:
               doc.do_or_do_not(
                 name,
                 base,
-                :building => true,
+                :binding => true,
                 :continue => false
               ) unless name == "versions="
             end
@@ -63,7 +63,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind(options = {})
@@ -78,12 +78,17 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc, options = {})
             if options[:continue]
-              doc.do_or_do_not(metadata.inverse_setter(target), nil, :continue => false)
+              doc.do_or_do_not(
+                metadata.inverse_setter(target),
+                nil,
+                :binding => true,
+                :continue => false
+              )
             end
           end
         end

data/lib/mongoid/relations/bindings/embedded/one.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The options to pass through.
           #
           # @option options [ true, false ] :continue Do we continue binding?
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -28,7 +28,7 @@ module Mongoid # :nodoc:
               target.do_or_do_not(
                 metadata.inverse_setter(target),
                 base,
-                :building => true,
+                :binding => true,
                 :continue => false
               )
             end
@@ -45,7 +45,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The options to pass through.
           #
           # @option options [ true, false ] :continue Do we continue unbinding?
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind(options = {})
@@ -53,6 +53,7 @@ module Mongoid # :nodoc:
               target.do_or_do_not(
                 metadata.inverse_setter(target),
                 nil,
+                :binding => true,
                 :continue => false
               )
             end

data/lib/mongoid/relations/bindings/referenced/in.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -34,17 +34,13 @@ module Mongoid # :nodoc:
               if options[:continue]
                 if base.referenced_many?
                   target.do_or_do_not(
-                    inverse,
-                    false,
-                    :building => true,
-                    :continue => false
-                  ).push(base, :building => true, :continue => false)
+                    inverse, false, OPTIONS
+                  ).push(base, :binding => true, :continue => false)
                 else
                   target.do_or_do_not(
                     metadata.inverse_setter(target),
                     base,
-                    :building => true,
-                    :continue => false
+                    OPTIONS
                   )
                 end
               end
@@ -67,7 +63,7 @@ module Mongoid # :nodoc:
           def unbind(options = {})
             base.do_or_do_not(metadata.foreign_key_setter, nil)
             if options[:continue]
-              target.do_or_do_not(metadata.inverse_setter(target), nil, :continue => false)
+              target.do_or_do_not(metadata.inverse_setter(target), nil, OPTIONS)
             end
           end
           alias :unbind_one :unbind

data/lib/mongoid/relations/bindings/referenced/many.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -37,7 +37,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind_one(doc, options = {})
@@ -46,8 +46,7 @@ module Mongoid # :nodoc:
               doc.do_or_do_not(
                 metadata.inverse_setter,
                 base,
-                :building => true,
-                :continue => false
+                OPTIONS
               )
             end
           end
@@ -62,7 +61,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind(options = {})
@@ -77,13 +76,17 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc, options = {})
             if options[:continue]
               doc.do_or_do_not(metadata.foreign_key_setter, nil)
-              doc.do_or_do_not(metadata.inverse_setter, nil, :continue => false)
+              doc.do_or_do_not(
+                metadata.inverse_setter,
+                nil,
+                OPTIONS
+              )
             end
           end
         end

data/lib/mongoid/relations/bindings/referenced/many_to_many.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -37,19 +37,21 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind_one(doc, options = {})
             keys = base.do_or_do_not(metadata.foreign_key)
             keys.push(doc.id) unless keys.include?(doc.id)
             if options[:continue]
-              doc.do_or_do_not(
-                metadata.inverse(target),
-                false,
-                :building => true,
-                :continue => false
-              ).push(base, :continue => false)
+              inverse = metadata.inverse(target)
+              if inverse
+                doc.do_or_do_not(
+                  inverse,
+                  false,
+                  OPTIONS
+                ).push(base, :continue => false)
+              end
             end
           end
 
@@ -63,7 +65,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind(options = {})
@@ -78,13 +80,16 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The binding options.
           #
           # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc, options = {})
             base.do_or_do_not(metadata.foreign_key).delete(doc.id)
             if options[:continue]
-              doc.do_or_do_not(metadata.inverse(target)).delete(base)
+              inverse = metadata.inverse(target)
+              if inverse
+                doc.do_or_do_not(inverse).delete(base)
+              end
             end
           end
         end

data/lib/mongoid/relations/bindings/referenced/one.rb

@@ -20,7 +20,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The options to pass through.
           #
           # @option options [ true, false ] :continue Do we continue binding?
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind(options = {})
@@ -29,8 +29,7 @@ module Mongoid # :nodoc:
               target.do_or_do_not(
                 metadata.inverse_setter,
                 base,
-                :building => true,
-                :continue => false
+                OPTIONS
               )
             end
           end
@@ -46,13 +45,17 @@ module Mongoid # :nodoc:
           # @param [ Hash ] options The options to pass through.
           #
           # @option options [ true, false ] :continue Do we continue unbinding?
-          # @option options [ true, false ] :building Are we in build mode?
+          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def unbind(options = {})
             if options[:continue]
               target.do_or_do_not(metadata.foreign_key_setter, nil)
-              target.do_or_do_not(metadata.inverse_setter, nil, :continue => false)
+              target.do_or_do_not(
+                metadata.inverse_setter,
+                nil,
+                OPTIONS
+              )
             end
           end
           alias :unbind_one :unbind

data/lib/mongoid/relations/builders.rb

@@ -48,7 +48,7 @@ module Mongoid # :nodoc:
         def builder(name)
           tap do
             define_method("build_#{name}") do |*args|
-              attributes = (args.any? ? args : []) + [{:building => true}]
+              attributes = (args.any? ? args : []) + [{:binding => true}]
               send("#{name}=", *attributes)
             end
           end

data/lib/mongoid/relations/embedded/in.rb

@@ -20,14 +20,14 @@ module Mongoid # :nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
           binding.bind(options)
-          base.save if target.persisted? && !options[:building]
+          base.save if target.persisted? && !options[:binding]
         end
 
         # Instantiate a new embedded_in relation.
@@ -58,7 +58,7 @@ module Mongoid # :nodoc:
         # @param [ Proxy ] old_target The previous target of the relation.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #

data/lib/mongoid/relations/embedded/many.rb

@@ -19,14 +19,14 @@ module Mongoid # :nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
           binding.bind(options)
-          target.each(&:save) if base.persisted? && !options[:building]
+          target.each(&:save) if base.persisted? && !options[:binding]
         end
 
         # Bind the inverse relation between a single document in this proxy
@@ -53,7 +53,21 @@ module Mongoid # :nodoc:
         #
         # @return [ Many ] The empty relation.
         def clear
-          substitute(nil)
+          load! and substitute(nil)
+        end
+
+        # Returns a count of the number of documents in the association that have
+        # actually been persisted to the database.
+        #
+        # Use #size if you want the total number of documents.
+        #
+        # @example Get the count of persisted documents.
+        #   person.addresses.count
+        #
+        # @return [ Integer ] The total number of persisted embedded docs, as
+        #   flagged by the #persisted? method.
+        def count
+          target.select(&:persisted?).size
         end
 
         # Create a new document in the relation. This is essentially the same
@@ -181,6 +195,24 @@ module Mongoid # :nodoc:
           end
         end
 
+        # Will load the target into an array if the target had not already been
+        # loaded.
+        #
+        # @example Load the relation into memory.
+        #   relation.load!
+        #
+        # @return [ Many ] The relation.
+        #
+        # @since 2.0.0.rc.5
+        def load!(options = {})
+          tap do |relation|
+            unless relation.loaded?
+              relation.bind(options)
+              relation.loaded = true
+            end
+          end
+        end
+
         # Paginate the association. Will create a new criteria, set the documents
         # on it and execute in an enumerable context.
         #
@@ -249,7 +281,7 @@ module Mongoid # :nodoc:
         # @param [ Array<Document> ] old_target The relations previous target.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
@@ -275,7 +307,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def append(document, options = {})
-          target << document
+          load! and target.push(document)
           characterize_one(document)
           bind_one(document, options)
           document._index = target.size - 1
@@ -319,7 +351,7 @@ module Mongoid # :nodoc:
         #
         # @return [ Criteria, Object ] A Criteria or return value from the target.
         def method_missing(name, *args, &block)
-          return super if target.respond_to?(name)
+          load! and return super if target.respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
             klass.send(name, *args)

data/lib/mongoid/relations/embedded/one.rb

@@ -19,14 +19,14 @@ module Mongoid # :nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
           binding.bind(options)
-          target.save if base.persisted? && !options[:building]
+          target.save if base.persisted? && !options[:binding]
         end
 
         # Instantiate a new embeds_one relation.
@@ -55,7 +55,7 @@ module Mongoid # :nodoc:
         # @param [ Document ] old_target The previous target of the relation.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #

data/lib/mongoid/relations/macros.rb

@@ -164,7 +164,7 @@ module Mongoid # :nodoc:
           end
         end
         alias :has_many_related :references_many
-        alias :has_many :referenced_in
+        alias :has_many :references_many
 
         # Adds a relational many-to-many association between many of this
         # Document and many of another Document.

data/lib/mongoid/relations/many.rb

@@ -22,10 +22,8 @@ module Mongoid #:nodoc:
       def <<(*args)
         options = default_options(args)
         args.flatten.each do |doc|
-          unless target.include?(doc)
-            append(doc, options)
-            doc.save if base.persisted? && !options[:building]
-          end
+          append(doc, options)
+          doc.save if base.persisted? && !options[:binding]
         end
       end
       alias :concat :<<
@@ -43,27 +41,13 @@ module Mongoid #:nodoc:
       # @return [ Document ] The new document.
       def build(attributes = {}, type = nil)
         instantiated(type).tap do |doc|
-          append(doc, default_options(:building => true))
+          append(doc, default_options(:binding => true))
           doc.write_attributes(attributes)
           doc.identify
         end
       end
       alias :new :build
 
-      # Returns a count of the number of documents in the association that have
-      # actually been persisted to the database.
-      #
-      # Use #size if you want the total number of documents.
-      #
-      # @example Get the count of persisted documents.
-      #   person.addresses.count
-      #
-      # @return [ Integer ] The total number of persisted embedded docs, as
-      #   flagged by the #persisted? method.
-      def count
-        target.select(&:persisted?).size
-      end
-
       # Creates a new document on the references many relation. This will
       # save the document if the parent has been persisted.
       #
@@ -147,7 +131,7 @@ module Mongoid #:nodoc:
       # @return [ Hash ] The options merged with the actuals.
       def default_options(args = {})
         options = args.is_a?(Hash) ? args : args.extract_options!
-        DEFAULT_OPTIONS.merge(options)
+        Mongoid.binding_defaults.merge(options)
       end
 
       # Find the first object given the supplied attributes or create/initialize it.
@@ -162,24 +146,6 @@ module Mongoid #:nodoc:
       def find_or(method, attrs = {})
         find(:first, :conditions => attrs) || send(method, attrs)
       end
-
-      # If the target array does not respond to the supplied method then try to
-      # find a named scope or criteria on the class and send the call there.
-      #
-      # If the method exists on the array, use the default proxy behavior.
-      #
-      # @param [ Symbol, String ] name The name of the method.
-      # @param [ Array ] args The method args
-      # @param [ Proc ] block Optional block to pass.
-      #
-      # @return [ Criteria, Object ] A Criteria or return value from the target.
-      def method_missing(name, *args, &block)
-        return super if target.respond_to?(name) || [].respond_to?(name)
-        klass = metadata.klass
-        klass.send(:with_scope, criteria) do
-          klass.send(name, *args)
-        end
-      end
     end
   end
 end

data/lib/mongoid/relations/metadata.rb

@@ -416,11 +416,11 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def determine_foreign_key
-        return self[:foreign_key] if self[:foreign_key]
+        return self[:foreign_key].to_s if self[:foreign_key]
         suffix = relation.foreign_key_suffix
         if relation.stores_foreign_key?
           if relation.macro == :references_and_referenced_in_many
-            class_name.underscore << suffix
+            name.to_s.singularize << suffix
           else
             name.to_s << suffix
           end

data/lib/mongoid/relations/one.rb

@@ -6,6 +6,24 @@ module Mongoid # :nodoc:
     # behaviour or those proxies.
     class One < Proxy
 
+      # Will load the target into an array if the target had not already been
+      # loaded.
+      #
+      # @example Load the relation into memory.
+      #   relation.load!
+      #
+      # @return [ One ] The relation.
+      #
+      # @since 2.0.0.rc.5
+      def load!(options = {})
+        tap do |relation|
+          unless relation.loaded?
+            relation.bind(options)
+            relation.loaded = true
+          end
+        end
+      end
+
       # Substitutes the supplied target documents for the existing document
       # in the relation.
       #

data/lib/mongoid/relations/proxy.rb

@@ -6,15 +6,13 @@ module Mongoid # :nodoc:
     # common behaviour for all of them.
     class Proxy
 
-      DEFAULT_OPTIONS = { :building => false, :continue => true }
-
       # We undefine most methods to get them sent through to the target.
       instance_methods.each do |method|
         undef_method(method) unless
           method =~ /(^__|^send$|^object_id$|^extend$|^tap$)/
       end
 
-      attr_accessor :base, :metadata, :target
+      attr_accessor :base, :loaded, :metadata, :target
 
       # Backwards compatibiloty with Mongoid beta releases.
       delegate :klass, :to => :metadata
@@ -89,7 +87,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def loaded?
-        !target.is_a?(Mongoid::Criteria)
+        !!@loaded
       end
 
       # Takes the supplied documents and sets the metadata on them. Used when

data/lib/mongoid/relations/referenced/in.rb

@@ -21,7 +21,7 @@ module Mongoid # :nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
@@ -79,7 +79,7 @@ module Mongoid # :nodoc:
         # @param [ Document, Array<Document> ] old_target The previous target.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #

data/lib/mongoid/relations/referenced/many.rb

@@ -19,14 +19,14 @@ module Mongoid #:nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
-          loaded and binding.bind(options)
-          target.map(&:save) if base.persisted? && !options[:building]
+          binding.bind(options)
+          target.map(&:save) if base.persisted? && !options[:binding]
         end
 
         # Clear the relation. Will delete the documents from the db if they are
@@ -37,12 +37,25 @@ module Mongoid #:nodoc:
         #
         # @return [ Many ] The relation emptied.
         def clear
-          tap do |relation|
+          load! and tap do |relation|
             relation.unbind(default_options)
             target.clear
           end
         end
 
+        # Returns a count of the number of documents in the association that have
+        # actually been persisted to the database.
+        #
+        # Use #size if you want the total number of documents in memory.
+        #
+        # @example Get the count of persisted documents.
+        #   person.posts.count
+        #
+        # @return [ Integer ] The total number of persisted documents.
+        def count
+          criteria.count
+        end
+
         # Deletes all related documents from the database given the supplied
         # conditions.
         #
@@ -128,6 +141,25 @@ module Mongoid #:nodoc:
           init(base, target, metadata)
         end
 
+        # Will load the target into an array if the target had not already been
+        # loaded.
+        #
+        # @example Load the relation into memory.
+        #   relation.load!
+        #
+        # @return [ Many ] The relation.
+        #
+        # @since 2.0.0.rc.5
+        def load!(options = {})
+          tap do |relation|
+            unless relation.loaded?
+              relation.target = target.entries
+              relation.bind(options)
+              relation.loaded = true
+            end
+          end
+        end
+
         # Removes all associations between the base document and the target
         # documents by deleting the foreign keys and the references, orphaning
         # the target documents in the process.
@@ -137,7 +169,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def nullify
-          loaded and target.each do |doc|
+          load! and target.each do |doc|
             doc.send(metadata.foreign_key_setter, nil)
             doc.send(
               :remove_instance_variable, "@#{metadata.inverse(doc)}"
@@ -157,7 +189,7 @@ module Mongoid #:nodoc:
         # @param [ Array<Document> ] target The replacement target.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
@@ -178,7 +210,7 @@ module Mongoid #:nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
@@ -201,7 +233,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def append(document, options = {})
-          loaded and target.push(document)
+          load! and target.push(document)
           characterize_one(document)
           binding.bind_one(document, options)
         end
@@ -228,21 +260,24 @@ module Mongoid #:nodoc:
         #
         # @return [ Criteria ] A new criteria.
         def criteria
-          metadata.klass.criteria(false)
+          metadata.klass.where(metadata.foreign_key => base.id)
         end
 
-        # Will load the target into an array if the target had not already been
-        # loaded.
+        # If the target array does not respond to the supplied method then try to
+        # find a named scope or criteria on the class and send the call there.
         #
-        # @example Load the relation into memory.
-        #   relation.loaded
+        # If the method exists on the array, use the default proxy behavior.
         #
-        # @return [ Many ] The relation.
+        # @param [ Symbol, String ] name The name of the method.
+        # @param [ Array ] args The method args
+        # @param [ Proc ] block Optional block to pass.
         #
-        # @since 2.0.0.rc.1
-        def loaded
-          tap do |relation|
-            relation.target = target.entries unless loaded?
+        # @return [ Criteria, Object ] A Criteria or return value from the target.
+        def method_missing(name, *args, &block)
+          load! and return super if [].respond_to?(name)
+          klass = metadata.klass
+          klass.send(:with_scope, criteria) do
+            klass.send(name, *args)
           end
         end
 

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -5,43 +5,7 @@ module Mongoid # :nodoc:
 
       # This class defines the behaviour for all relations that are a
       # many-to-many between documents in different collections.
-      class ManyToMany < Relations::Many
-
-        # Binds the base object to the inverse of the relation. This is so we
-        # are referenced to the actual objects themselves and dont hit the
-        # database twice when setting the relations up.
-        #
-        # This is called after first creating the relation, or if a new object
-        # is set on the relation.
-        #
-        # @example Bind the relation.
-        #   person.preferences.bind
-        #
-        # @param [ Hash ] options The options to bind with.
-        #
-        # @option options [ true, false ] :building Are we in build mode?
-        # @option options [ true, false ] :continue Continue binding the
-        #   inverse?
-        #
-        # @since 2.0.0.rc.1
-        def bind(options = {})
-          loaded and binding.bind(options)
-          target.map(&:save) if base.persisted? && !options[:building]
-        end
-
-        # Clear the relation. Will delete the documents from the db if they are
-        # already persisted.
-        #
-        # @example Clear the relation.
-        #   person.preferences.clear
-        #
-        # @return [ Many ] The relation emptied.
-        def clear
-          tap do |relation|
-            relation.unbind(default_options)
-            target.clear
-          end
-        end
+      class ManyToMany < Referenced::Many
 
         # Delete a single document from the relation.
         #
@@ -52,8 +16,9 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def delete(document, options = {})
-          target.delete(document)
-          binding.unbind_one(document, options)
+          target.delete(document).tap do |doc|
+            binding.unbind_one(doc, default_options.merge!(options)) if doc
+          end
         end
 
         # Deletes all related documents from the database given the supplied
@@ -126,19 +91,6 @@ module Mongoid # :nodoc:
           klass.find(arg, :conditions => selector)
         end
 
-        # Instantiate a new references_many relation. Will set the foreign key
-        # and the base on the inverse object.
-        #
-        # @example Create the new relation.
-        #   Referenced::ManyToMany.new(base, target, metadata)
-        #
-        # @param [ Document ] base The document this relation hangs off of.
-        # @param [ Array<Document> ] target The target of the relation.
-        # @param [ Metadata ] metadata The relation's metadata.
-        def initialize(base, target, metadata)
-          init(base, target, metadata)
-        end
-
         # Removes all associations between the base document and the target
         # documents by deleting the foreign keys and the references, orphaning
         # the target documents in the process.
@@ -148,7 +100,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def nullify
-          loaded and target.each do |doc|
+          load! and target.each do |doc|
             base.send(metadata.foreign_key).delete(doc.id)
             dereference(doc)
           end
@@ -166,7 +118,7 @@ module Mongoid # :nodoc:
         # @param [ Array<Document> ] target The replacement target.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
@@ -195,7 +147,7 @@ module Mongoid # :nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
@@ -208,21 +160,6 @@ module Mongoid # :nodoc:
 
         private
 
-        # Appends the document to the target array, updating the index on the
-        # document at the same time.
-        #
-        # @example Append the document to the relation.
-        #   relation.append(document)
-        #
-        # @param [ Document ] document The document to append to the target.
-        #
-        # @since 2.0.0.rc.1
-        def append(document, options = {})
-          loaded and target.push(document)
-          characterize_one(document)
-          binding.bind_one(document, options)
-        end
-
         # Instantiate the binding associated with this relation.
         #
         # @example Get the binding.
@@ -245,7 +182,7 @@ module Mongoid # :nodoc:
         #
         # @return [ Criteria ] A new criteria.
         def criteria
-          metadata.klass.criteria(false)
+          metadata.klass.any_in(metadata.inverse_foreign_key => [ base.id ])
         end
 
         # Dereferences the supplied document from the base of the relation.
@@ -260,21 +197,6 @@ module Mongoid # :nodoc:
           document.save
         end
 
-        # Will load the target into an array if the target had not already been
-        # loaded.
-        #
-        # @example Load the relation into memory.
-        #   relation.loaded
-        #
-        # @return [ ManyToMany ] The relation.
-        #
-        # @since 2.0.0.rc.1
-        def loaded
-          tap do |relation|
-            relation.target = target.entries if target.is_a?(Mongoid::Criteria)
-          end
-        end
-
         class << self
 
           # Return the builder that is responsible for generating the documents

data/lib/mongoid/relations/referenced/one.rb

@@ -19,14 +19,14 @@ module Mongoid # :nodoc:
         #
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
           binding.bind(options)
-          target.save if base.persisted? && !options[:building]
+          target.save if base.persisted? && !options[:binding]
         end
 
         # Instantiate a new references_one relation. Will set the foreign key
@@ -70,7 +70,7 @@ module Mongoid # :nodoc:
         # @param [ Document ] old_target The previous target of the relation.
         # @param [ Hash ] options The options to bind with.
         #
-        # @option options [ true, false ] :building Are we in build mode?
+        # @option options [ true, false ] :binding Are we in build mode?
         # @option options [ true, false ] :continue Continue binding the
         #   inverse?
         #

data/lib/mongoid/validations.rb

@@ -30,7 +30,11 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.1
       def read_attribute_for_validation(attr)
-        relations[attr.to_s] ? send(attr, false, :continue => false) : send(attr)
+        if relations[attr.to_s]
+          send(attr, false, :continue => false, :eager => true)
+        else
+          send(attr)
+        end
       end
 
       # Used to prevent infinite loops in associated validations.

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.rc.4"
+  VERSION = "2.0.0.rc.5"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 4
-  version: 2.0.0.rc.4
+  - 5
+  version: 2.0.0.rc.5
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +01:00
+date: 2011-01-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,6 +172,7 @@ files:
 - lib/mongoid/collections.rb
 - lib/mongoid/components.rb
 - lib/mongoid/config/database.rb
+- lib/mongoid/config/replset_database.rb
 - lib/mongoid/config.rb
 - lib/mongoid/contexts/enumerable/sort.rb
 - lib/mongoid/contexts/enumerable.rb
@@ -354,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 588977190582466333
+      hash: -3904513981579822953
       segments: 
       - 0
       version: "0"