mongoid 2.3.0 → 2.3.1

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

@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             model = type ? type.constantize : metadata.klass
-            IdentityMap.get(model, object) || metadata.criteria(object, model).first
+            metadata.criteria(object, model).from_map_or_db
           end
         end
       end

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

@@ -16,8 +16,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless query?
-            criteria = metadata.criteria(Conversions.flag(object, metadata))
-            IdentityMap.get(criteria.klass, criteria.selector) || criteria.first
+            metadata.criteria(Conversions.flag(object, metadata)).from_map_or_db
           end
         end
       end

data/lib/mongoid/relations/cascading.rb

@@ -34,18 +34,6 @@ module Mongoid # :nodoc:
         end
       end
 
-      # Get the cascading definitions.
-      #
-      # @note Refactored from using delegate for class load performance.
-      #
-      # @example Get the cascades.
-      #   model.cascades
-      #
-      # @return [ Array<String> ] The cascading relation names.
-      def cascades
-        self.class.cascades
-      end
-
       module ClassMethods #:nodoc:
 
         # Attempt to add the cascading information for the document to know how

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

@@ -39,12 +39,21 @@ module Mongoid # :nodoc:
         # @example Build a new document on the relation.
         #   person.people.build(:name => "Bozo")
         #
-        # @param [ Hash ] attributes The attributes to build the document with.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type Optional class to build the document with.
+        # @overload build(attributes = {}, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to build the document with.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type Optional class to build the document with.
+        #
+        # @overload build(attributes = {}, type = nil)
+        #   @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 = {}, options = {}, type = nil)
+          if options.is_a? Class
+            options, type = {}, options
+          end
+
           Factory.build(type || metadata.klass, attributes, options).tap do |doc|
             doc.identify
             append(doc)
@@ -86,9 +95,14 @@ module Mongoid # :nodoc:
         # @example Create a new document in the relation.
         #   person.movies.create(:name => "Bozo")
         #
-        # @param [ Hash ] attributes The attributes to build the document with.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type Optional class to create the document with.
+        # @overload create(attributes = {}, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to build the document with.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type Optional class to create the document with.
+        #
+        # @overload create(attributes = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to build the document with.
+        #   @param [ Class ] type Optional class to create the document with.
         #
         # @return [ Document ] The newly created document.
         def create(attributes = {}, options = {}, type = nil, &block)
@@ -102,9 +116,14 @@ module Mongoid # :nodoc:
         # @example Create the document.
         #   person.addresses.create!(:street => "Unter der Linden")</tt>
         #
-        # @param [ Hash ] attributes The attributes to build the document with.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type Optional class to create the document with.
+        # @overload create!(attributes = {}, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to build the document with.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type Optional class to create the document with.
+        #
+        # @overload create!(attributes = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to build the document with.
+        #   @param [ Class ] type Optional class to create the document with.
         #
         # @raise [ Errors::Validations ] If a validation error occured.
         #

data/lib/mongoid/relations/macros.rb

@@ -8,33 +8,23 @@ module Mongoid # :nodoc:
       extend ActiveSupport::Concern
 
       included do
-        cattr_accessor :embedded
+        class_attribute :embedded, :instance_reader => false
         class_attribute :relations
         self.embedded = false
         self.relations = {}
-
-        # For backwards compatibility, alias the class method for associations
-        # and embedding as well. Fix in related gems.
-        #
-        # @todo Affected libraries: Machinist
-        class << self
-          alias :associations :relations
-          alias :embedded? :embedded
-        end
       end
 
-      # Get the metadata for all the defined relations.
+      # This is convenience for librarys still on the old API.
       #
-      # @note Refactored from using delegate for class load performance.
+      # @example Get the associations.
+      #   person.associations
       #
-      # @example Get the relations.
-      #   model.relations
+      # @return [ Hash ] The relations.
       #
-      # @return [ Hash<String, Metadata> ] The relation metadata.
-      def relations
-        self.class.relations
+      # @since 2.3.1
+      def associations
+        self.relations
       end
-      alias :associations :relations
 
       module ClassMethods #:nodoc:
 

data/lib/mongoid/relations/metadata.rb

@@ -113,7 +113,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def class_name
-        @class_name ||= (self[:class_name] || classify)
+        @class_name ||= (self[:class_name] || classify).sub(/^::/,"")
       end
 
       # Get the foreign key contraint for the metadata.
@@ -202,10 +202,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.2.0
       def eager_load(criteria)
-        relation.eager_load(
-          self,
-          criteria.clone.tap { |crit| crit.inclusions.clear }
-        )
+        relation.eager_load(self, criteria.clone)
       end
 
       # Will determine if the relation is an embedded one or not. Currently

data/lib/mongoid/relations/polymorphic.rb

@@ -11,18 +11,6 @@ module Mongoid # :nodoc:
         class_attribute :polymorphic
       end
 
-      # Is the document in a polymorphic relation?
-      #
-      # @note Refactored from using delegate for class load performance.
-      #
-      # @example Is the document polymorphic?
-      #   model.polymorphic?
-      #
-      # @return [ true, false ] If the document is in a polymorphic relation.
-      def polymorphic?
-        self.class.polymorphic?
-      end
-
       module ClassMethods #:nodoc:
 
         # Attempts to set up the information needed to handle a polymorphic
@@ -46,19 +34,6 @@ module Mongoid # :nodoc:
             end
           end
         end
-
-        # Determines if the class is in a polymorphic relations, and thus must
-        # store the _type field in the database.
-        #
-        # @example Check if the class is polymorphic.
-        #   Movie.polymorphic?
-        #
-        # @return [ true, false ] True if polymorphic, false if not.
-        #
-        # @since 2.0.0.rc.1
-        def polymorphic?
-          !!polymorphic
-        end
       end
     end
   end

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

@@ -46,14 +46,23 @@ module Mongoid #:nodoc:
         # @example Build a new document on the relation.
         #   person.posts.build(:title => "A new post")
         #
-        # @param [ Hash ] attributes The attributes of the new document.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type The optional subclass to build.
+        # @overload build(attributes = {}, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes of the new document.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type The optional subclass to build.
+        #
+        # @overload build(attributes = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes of the new document.
+        #   @param [ Class ] type The optional subclass to build.
         #
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
         def build(attributes = {}, options = {}, type = nil)
+          if options.is_a? Class
+            options, type = {}, options
+          end
+
           Factory.build(type || klass, attributes, options).tap do |doc|
             append(doc)
             yield(doc) if block_given?
@@ -67,9 +76,14 @@ module Mongoid #:nodoc:
         # @example Create and save the new document.
         #   person.posts.create(:text => "Testing")
         #
-        # @param [ Hash ] attributes The attributes to create with.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type The optional type of document to create.
+        # @overload create(attributes = nil, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to create with.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type The optional type of document to create.
+        #
+        # @overload create(attributes = nil, type = nil)
+        #   @param [ Hash ] attributes The attributes to create with.
+        #   @param [ Class ] type The optional type of document to create.
         #
         # @return [ Document ] The newly created document.
         #
@@ -87,9 +101,14 @@ module Mongoid #:nodoc:
         # @example Create and save the new document.
         #   person.posts.create!(:text => "Testing")
         #
-        # @param [ Hash ] attributes The attributes to create with.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type The optional type of document to create.
+        # @overload create!(attributes = nil, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes to create with.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type The optional type of document to create.
+        #
+        # @overload create!(attributes = nil, type = nil)
+        #   @param [ Hash ] attributes The attributes to create with.
+        #   @param [ Class ] type The optional type of document to create.
         #
         # @raise [ Errors::Validations ] If validation failed.
         #
@@ -276,7 +295,7 @@ module Mongoid #:nodoc:
           tap do |proxy|
             if replacement != proxy.in_memory
               proxy.purge
-              proxy.push(replacement.compact) if replacement
+              proxy.push(replacement.compact.uniq) if replacement
             end
           end
         end

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

@@ -54,14 +54,24 @@ module Mongoid # :nodoc:
         # @example Build a new document on the relation.
         #   person.posts.build(:title => "A new post")
         #
-        # @param [ Hash ] attributes The attributes of the new document.
-        # @param [ Hash ] options The scoped assignment options.
-        # @param [ Class ] type The optional subclass to build.
+        # @overload build(attributes = {}, options = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes of the new document.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type The optional subclass to build.
+        #
+        # @overload build(attributes = {}, type = nil)
+        #   @param [ Hash ] attributes The attributes of the new document.
+        #   @param [ Hash ] options The scoped assignment options.
+        #   @param [ Class ] type The optional subclass to build.
         #
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
         def build(attributes = {}, options = {}, type = nil)
+          if options.is_a? Class
+            options, type = {}, options
+          end
+
           Factory.build(type || klass, attributes, options).tap do |doc|
             base.send(metadata.foreign_key).push(doc.id)
             append(doc)

data/lib/mongoid/relations/targets/enumerable.rb

@@ -44,7 +44,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def <<(document)
-          added << document
+          added.push(document)
         end
         alias :push :<<
 
@@ -151,12 +151,11 @@ module Mongoid #:nodoc:
             end
           else
             unloaded.each do |doc|
-              loaded.push(doc)
+              loaded.push(added.delete_one(doc) || doc)
               yield(doc)
             end
           end
           added.each do |doc|
-            next if doc.persisted? && (!loaded? && !loaded.empty?)
             yield(doc)
           end
           @executed = true

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/lib/mongoid/versioning.rb

@@ -24,18 +24,6 @@ module Mongoid #:nodoc:
       self.cyclic = true
     end
 
-    # Get the maximum number of versions to store.
-    #
-    # @note Refactored from using delegate for class load performance.
-    #
-    # @example Get the max versions.
-    #   model.version_max
-    #
-    # @return [ Integer ] The max number of versions.
-    def version_max
-      self.class.version_max
-    end
-
     # Create a new version of the +Document+. This will load the previous
     # document from the database and set it as the next version before saving
     # the current document. It then increments the version number. If a #max_versions
@@ -50,7 +38,7 @@ module Mongoid #:nodoc:
       if previous && versioned_attributes_changed?
         versions.build(previous.versioned_attributes).attributes.delete("_id")
         if version_max.present? && versions.length > version_max
-          versions.shift
+          versions.delete(versions.first)
         end
         self.version = (version || 1 ) + 1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70134095171800 !ruby/object:Gem::Requirement
+  requirement: &70233415155800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70134095171800
+  version_requirements: *70233415155800
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70134095170860 !ruby/object:Gem::Requirement
+  requirement: &70233415154900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70134095170860
+  version_requirements: *70233415154900
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70134095170140 !ruby/object:Gem::Requirement
+  requirement: &70233415153960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70134095170140
+  version_requirements: *70233415153960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70134095169380 !ruby/object:Gem::Requirement
+  requirement: &70233415152900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70134095169380
+  version_requirements: *70233415152900
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70134095168180 !ruby/object:Gem::Requirement
+  requirement: &70233415152060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70134095168180
+  version_requirements: *70233415152060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70134095167500 !ruby/object:Gem::Requirement
+  requirement: &70233415151220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70134095167500
+  version_requirements: *70233415151220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70134095166120 !ruby/object:Gem::Requirement
+  requirement: &70233415150260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70134095166120
+  version_requirements: *70233415150260
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70134095164880 !ruby/object:Gem::Requirement
+  requirement: &70233415149060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70134095164880
+  version_requirements: *70233415149060
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -173,6 +173,7 @@ files:
 - lib/mongoid/errors/invalid_field.rb
 - lib/mongoid/errors/invalid_find.rb
 - lib/mongoid/errors/invalid_options.rb
+- lib/mongoid/errors/invalid_time.rb
 - lib/mongoid/errors/invalid_type.rb
 - lib/mongoid/errors/mixed_relations.rb
 - lib/mongoid/errors/mongoid_error.rb
@@ -196,6 +197,7 @@ files:
 - lib/mongoid/extensions/string/checks.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
+- lib/mongoid/extensions/symbol/checks.rb
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/true_class/equality.rb
 - lib/mongoid/extensions.rb
@@ -389,7 +391,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2142678717423572392
+      hash: 171855285831586391
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: