mongoid 2.0.0.rc.8 → 2.0.0

data/lib/mongoid/atomicity.rb

@@ -38,10 +38,10 @@ module Mongoid #:nodoc:
         changes = child._sets
         updates["$set"].update(changes)
         unless changes.empty?
-          processed[child._conficting_modification_key] = true
+          processed[child._conflicting_modification_key] = true
         end
 
-        if processed.has_key?(child._conficting_modification_key)
+        if processed.has_key?(child._conflicting_modification_key)
           target = :other
         else
           target = "$pushAll"
@@ -70,7 +70,7 @@ module Mongoid #:nodoc:
     #   person._conflicting_modification_key
     #
     # @return [ String ] The conflicting key.
-    def _conficting_modification_key
+    def _conflicting_modification_key
       _path.sub(/\..*/, '')
     end
 

data/lib/mongoid/attributes.rb

@@ -39,8 +39,7 @@ module Mongoid #:nodoc:
     def read_attribute(name)
       access = name.to_s
       value = @attributes[access]
-      typed_value = fields.has_key?(access) ? fields[access].get(value) : value
-      accessed(access, typed_value)
+      accessed(access, value)
     end
     alias :[] :read_attribute
 
@@ -55,7 +54,7 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def remove_attribute(name)
       access = name.to_s
-      modify(access, @attributes.delete(name.to_s), nil)
+      modify(access, @attributes.delete(access), nil)
     end
 
     # Override respond_to? so it responds properly for dynamic attributes.

data/lib/mongoid/criteria.rb

@@ -214,6 +214,21 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Returns true if criteria responds to the given method.
+    #
+    # Options:
+    #
+    # name: The name of the class method on the +Document+.
+    # include_private: The arguments passed to the method.
+    #
+    # Example:
+    #
+    # <tt>criteria.respond_to?(:batch_update)</tt>
+    def respond_to?(name, include_private = false)
+      # don't include klass private methods because method_missing won't call them
+      super || @klass.respond_to?(name) || entries.respond_to?(name, include_private)
+    end
+
     # Returns the selector and options as a +Hash+ that would be passed to a
     # scope for use with named scopes.
     def scoped

data/lib/mongoid/criterion/inclusion.rb

@@ -155,7 +155,7 @@ module Mongoid #:nodoc:
           selector = case selector
             when String then {"$where" => selector}
             else
-              BSON::ObjectId.convert(klass, selector || {}).expand_complex_criteria
+              BSON::ObjectId.convert(klass, selector || {}, false).expand_complex_criteria
           end
 
           selector.each_pair do |key, value|

data/lib/mongoid/criterion/optional.rb

@@ -98,8 +98,8 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>criteria.id("4ab2bc4b8ad548971900005c")</tt>
-      # <tt>criteria.id(["4ab2bc4b8ad548971900005c", "4c454e7ebf4b98032d000001"])</tt>
+      # <tt>criteria.for_ids("4ab2bc4b8ad548971900005c")</tt>
+      # <tt>criteria.for_ids(["4ab2bc4b8ad548971900005c", "4c454e7ebf4b98032d000001"])</tt>
       #
       # Returns: <tt>self</tt>
       def for_ids(*ids)

data/lib/mongoid/default_scope.rb

@@ -28,8 +28,8 @@ module Mongoid #:nodoc:
       # @param [ Hash ] conditions The conditions to create with.
       #
       # @since 2.0.0.rc.1
-      def default_scope(conditions = {}, &block)
-        self.default_scoping = Scope.new(conditions, &block).conditions.scoped
+      def default_scope(conditions = {})
+        self.default_scoping = Scope.new(conditions).conditions.scoped
       end
     end
   end

data/lib/mongoid/dirty.rb

@@ -192,8 +192,9 @@ module Mongoid #:nodoc:
     #
     # <tt>person.accessed("aliases", [ "007" ])</tt>
     def accessed(name, value)
+      return value unless value.is_a?(Enumerable)
       @accessed ||= {}
-      @accessed[name] = value.dup if (value.is_a?(Array) || value.is_a?(Hash)) && !@accessed.has_key?(name)
+      @accessed[name] = value.dup unless @accessed.has_key?(name)
       value
     end
 

data/lib/mongoid/document.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
     #
     # @return [ Integer ] -1, 0, 1.
     def <=>(other)
-      id.to_s <=> other.id.to_s
+      raw_attributes["_id"].to_s <=> other.raw_attributes["_id"].to_s
     end
 
     # Performs equality checking on the document ids. For more robust
@@ -34,8 +34,8 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if the ids are equal, false if not.
     def ==(other)
-      return false unless other.is_a?(Document)
-      id == other.id || equal?(other)
+      self.class == other.class &&
+        raw_attributes["_id"] == other.raw_attributes["_id"]
     end
 
     # Performs class equality checking.
@@ -62,6 +62,31 @@ module Mongoid #:nodoc:
       self == (other)
     end
 
+    # Freezes the internal attributes of the document.
+    #
+    # @example Freeze the document
+    #   document.freeze
+    #
+    # @return [ Document ] The document.
+    #
+    # @since 2.0.0
+    def freeze
+      raw_attributes.freeze
+      self
+    end
+
+    # Checks if the document is frozen
+    #
+    # @example Check if frozen
+    #   document.frozen?
+    #
+    # @return [ true, false ] True if frozen, else false.
+    #
+    # @since 2.0.0
+    def frozen?
+      raw_attributes.frozen?
+    end
+
     # Delegates to id in order to allow two records of the same type and id to
     # work with something like:
     #
@@ -73,7 +98,7 @@ module Mongoid #:nodoc:
     #
     # @return [ Integer ] The hash of the document's id.
     def hash
-      id.hash
+      raw_attributes["_id"].hash
     end
 
     # Return the attributes hash with indifferent access. Used mostly for
@@ -85,7 +110,7 @@ module Mongoid #:nodoc:
     #
     # @return [ HashWithIndifferentAccess ] The attributes.
     def attributes
-      @attributes.with_indifferent_access
+      raw_attributes.with_indifferent_access
     end
 
     # Generate an id for this +Document+.
@@ -195,7 +220,7 @@ module Mongoid #:nodoc:
     #
     # @return [ Hash ] A hash of all attributes in the hierarchy.
     def as_document
-      attributes = @attributes
+      attributes = raw_attributes
       attributes.tap do |attrs|
         relations.select { |name, meta| meta.embedded? }.each do |name, meta|
           relation = send(name, false, :continue => false)
@@ -258,27 +283,5 @@ module Mongoid #:nodoc:
         :mongoid
       end
     end
-
-    # Freezes the internal attributes of the document.
-    #
-    # @example Freeze the document
-    #   document.freeze
-    #
-    # @return [ Document ] The document.
-    def freeze
-      raw_attributes.freeze
-      self
-    end
-
-    # Checks if the document is frozen
-    #
-    # @example Check if frozen
-    #   document.frozen?
-    #
-    # @return [ true, false ] True if frozen, else false.
-    def frozen?
-      raw_attributes.frozen?
-    end
-
   end
 end

data/lib/mongoid/extensions/object_id/conversions.rb

@@ -62,21 +62,22 @@ module Mongoid #:nodoc:
         # @return [ BSON::ObjectId, Array, Hash ] The converted object ids.
         #
         # @since 2.0.0.rc.7
-        def convert(klass, args)
+        def convert(klass, args, reject_blank = true)
           return args if args.is_a?(BSON::ObjectId) || !klass.using_object_ids?
           case args
           when ::String
             args.blank? ? nil : BSON::ObjectId.from_string(args)
           when ::Array
-            args.reject(&:blank?).map do |arg|
-              convert(klass, arg)
+            args = args.reject(&:blank?) if reject_blank
+            args.map do |arg|
+              convert(klass, arg, reject_blank)
             end
           when ::Hash
             args.tap do |hash|
               hash.each_pair do |key, value|
                 next unless key.to_s =~ /id/
                 begin
-                  hash[key] = convert(klass, value)
+                  hash[key] = convert(klass, value, reject_blank)
                 rescue BSON::InvalidObjectId; end
               end
             end

data/lib/mongoid/paranoia.rb

@@ -79,12 +79,12 @@ module Mongoid #:nodoc:
     module ClassMethods #:nodoc:
 
       # Override the default +Criteria+ accessor to only get existing
-      # documents.
+      # documents. Passes all arguments up to +NamedScope.criteria+
       #
       # Returns:
       #
       # A +Criteria+ for deleted_at not existing.
-      def criteria(embedded = false)
+      def criteria(*args)
         super.where(:deleted_at.exists => false)
       end
 

data/lib/mongoid/persistence/atomic/add_to_set.rb

@@ -20,8 +20,10 @@ module Mongoid #:nodoc:
           values = document.send(field)
           values.push(value) unless values.include?(value)
           values.tap do
-            document.collection.update(document._selector, operation("$addToSet"), options)
-            document.changes.delete(field.to_s) if document.persisted?
+            if document.persisted?
+              document.collection.update(document._selector, operation("$addToSet"), options)
+              document.changes.delete(field.to_s)
+            end
           end
         end
       end

data/lib/mongoid/persistence/command.rb

@@ -12,6 +12,7 @@ module Mongoid #:nodoc:
         :klass,
         :options,
         :selector,
+        :suppress,
         :validate
 
       # Initialize the persistence +Command+.
@@ -28,6 +29,7 @@ module Mongoid #:nodoc:
       def initialize(document_or_class, options = {}, selector = {})
         init(document_or_class)
         validate = options[:validate]
+        @suppress = options[:suppress]
         @validate = (validate.nil? ? true : validate)
         @selector = selector
         @options = { :safe => safe_mode?(options) }
@@ -54,6 +56,16 @@ module Mongoid #:nodoc:
           @collection = @klass.collection
         end
       end
+
+      # Should we suppress parent notifications?
+      #
+      # @example Suppress notifications?
+      #   command.suppress?
+      #
+      # @return [ true, false ] Should the parent notifcations be suppressed.
+      def suppress?
+        !!@suppress
+      end
     end
   end
 end

data/lib/mongoid/persistence/remove.rb

@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
         if document.embedded?
           Persistence::RemoveEmbedded.new(
             document,
-            options.merge(:validate => validate)
+            options.merge(:validate => validate, :suppress => suppress)
           ).persist
         else
           collection.remove({ :_id => document.id }, options)

data/lib/mongoid/persistence/remove_embedded.rb

@@ -27,7 +27,7 @@ module Mongoid #:nodoc:
       # +true+ or +false+, depending on if the removal passed.
       def persist
         parent = document._parent
-        parent.remove_child(document)
+        parent.remove_child(document) unless suppress?
         unless parent.new_record?
           update = { document._remover => removal_selector }
           collection.update(parent._selector, update, options.merge(:multi => false))

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

@@ -41,8 +41,6 @@ module Mongoid # :nodoc:
           #
           # @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]
               inverse = metadata.inverse(target)
               if inverse

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

@@ -403,7 +403,7 @@ module Mongoid # :nodoc:
           criteria.size.tap do
             criteria.each do |doc|
               target.delete(doc)
-              doc.send(method)
+              doc.send(method, :suppress => true)
             end
             reindex
           end

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

@@ -25,15 +25,30 @@ module Mongoid # :nodoc:
           args.flatten.each do |doc|
             return doc unless doc
             append(doc, options)
-            if base.persisted? && !options[:binding]
-              doc.save
-              base.add_to_set(metadata.foreign_key, doc.id)
-            end
+            base.add_to_set(metadata.foreign_key, doc.id)
+            doc.save if base.persisted? && !options[:binding]
           end
         end
         alias :concat :<<
         alias :push :<<
 
+        # Builds a new document in the relation and appends it to the target.
+        # Takes an optional type if you want to specify a subclass.
+        #
+        # @example Build a new document on the relation.
+        #   person.people.build(:name => "Bozo")
+        #
+        # @param [ Hash ] attributes The attributes to build the document with.
+        # @param [ Class ] type Optional class to build the document with.
+        #
+        # @return [ Document ] The new document.
+        def build(attributes = {}, type = nil, &block)
+          super.tap do |doc|
+            base.send(metadata.foreign_key).push(doc.id)
+          end
+        end
+        alias :new :build
+
         # Creates a new document on the references many relation. This will
         # save the document if the parent has been persisted.
         #
@@ -44,12 +59,10 @@ module Mongoid # :nodoc:
         # @param [ Class ] type The optional type of document to create.
         #
         # @return [ Document ] The newly created document.
-        def create(attributes = nil, type = nil)
-          build(attributes, type).tap do |doc|
-            if base.persisted?
-              doc.save
-              base.add_to_set(metadata.foreign_key, doc.id)
-            end
+        def create(attributes = nil, type = nil, &block)
+          build(attributes, type, &block).tap do |doc|
+            base.add_to_set(metadata.foreign_key, doc.id)
+            doc.save if base.persisted?
           end
         end
 
@@ -66,12 +79,10 @@ module Mongoid # :nodoc:
         # @raise [ Errors::Validations ] If validation failed.
         #
         # @return [ Document ] The newly created document.
-        def create!(attributes = nil, type = nil)
-          build(attributes, type).tap do |doc|
-            if base.persisted?
-              doc.save!
-              base.add_to_set(metadata.foreign_key, doc.id)
-            end
+        def create!(attributes = nil, type = nil, &block)
+          build(attributes, type, &block).tap do |doc|
+            base.add_to_set(metadata.foreign_key, doc.id)
+            doc.save! if base.persisted?
           end
         end
 
@@ -121,6 +132,23 @@ module Mongoid # :nodoc:
           remove_all(conditions, :destroy_all)
         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) do
+            unless base.frozen?
+              base.send(metadata.foreign_key_setter, target.map(&:id))
+            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.
@@ -160,6 +188,7 @@ module Mongoid # :nodoc:
             if new_target
               binding.unbind(options)
               relation.target = new_target.to_a
+              base.send(metadata.foreign_key_setter, new_target.map(&:id))
               bind(options)
             else
               relation.target = unbind(options)

data/lib/mongoid/version.rb

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

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc
-  - 8
-  version: 2.0.0.rc.8
+  version: 2.0.0
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -381,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2466233120358762618
+      hash: 2548695650621036943
       segments: 
       - 0
       version: "0"