mongoid 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25ce5318d49b1e171f4e6fa2d4067eb933ecf0d
-  data.tar.gz: 94846f4aff6c2ba1ccf34a63789b7503e536611b
+  metadata.gz: 1b25a1415535c09fc18f98e85225d38fd4e39877
+  data.tar.gz: 7dcb8aa291c865b59a10f2a7fa1508d2ae999850
 SHA512:
-  metadata.gz: 96e54337599c2679fcb56acc7c817b1d119730f40d58eda3b0c8d2d4d66867c5c92ff6c475ce770ac52230fe8666ee29a1ecc81be1e8801a13359708bef76caf
-  data.tar.gz: 693af581fa3e7c64cf8014a9ca3a4eb1c90baddfcb26c5162d1bd842da149092ad8c1d7ec34d5d4c45f9b58c739431e8f0a3a7794346798cb1cb469e08aa16d5
+  metadata.gz: 6087a7ef04b49630a195f2019c575ca50abb1fd46b96739f77a8dba22a9cc3b5c5bcf49771a91785bb88a68e68c4227589b1560da18e7555e872f0c3c5776329
+  data.tar.gz: a0a0c271e5fe084d0e2360cab8f4296629907f85422a0ce4d46212b348428bc49c8eaab9a713faf4a63aebd41acca86bc0cefdfd1932c143c0d9336509c86e5e

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 4.0.1
+
+### Resolved Issues
+
+* \#3911 Fix relations named "parent". (nkriege)
+
+* \#3792/\#3881 Fix many internal calls to #_id instead of #id to avoid issues
+  when overloading #id (Gauthier Delacroix)
+
+* \#3847 Fix 'QueryCache#get_more' result, when collection has more documents than first query batch. (Angelica Korsun)
+
+* \#3684 Dont raise MissingAttributeError, when using a only() scope. (Arthur Neves)
+
+* \#3703 pluck method should not compact the values. (Arthur Neves)
+
+* \#3773 Use nanoseconds for cache_key timestamp instead of plain seconds. (Máximo Mussini)
+
 ## 4.0.0
 
 ### Major Changes (Backwards Incompatible)
@@ -138,7 +155,7 @@ For instructions on upgrading to newer versions, visit
 
 * \#3138 `update_attributes` can now be accessed simply by calling `update`.
 
-* \#3083 A new rake task: `rake mongoid:remove_undefined_indexes` has been added to
+* \#3083 A new rake task: `rake db:mongoid:remove_undefined_indexes` has been added to
   remove indexes from the database that are not explicitly defined in the models.
   (Aidan Feldman)
 

data/README.md

@@ -1,5 +1,9 @@
-Mongoid [![Build Status](https://travis-ci.org/mongoid/mongoid.svg)](https://travis-ci.org/mongoid/mongoid) [![Code Climate](https://codeclimate.com/github/mongoid/mongoid.png)](https://codeclimate.com/github/mongoid/mongoid) [![Coverage Status](https://coveralls.io/repos/mongoid/mongoid/badge.png?branch=master)](https://coveralls.io/r/mongoid/mongoid?branch=master) [![Gem Version](https://badge.fury.io/rb/mongoid.png)](http://badge.fury.io/rb/mongoid) [![Dependency Status](https://www.versioneye.com/ruby/mongoid/3.1.6/badge.png)](https://www.versioneye.com/ruby/mongoid/3.1.6)
-========
+# Mongoid
+[![Build Status](https://travis-ci.org/mongoid/mongoid.svg)](https://travis-ci.org/mongoid/mongoid) 
+[![Code Climate](https://codeclimate.com/github/mongoid/mongoid.svg)](https://codeclimate.com/github/mongoid/mongoid)
+[![Coverage Status](https://img.shields.io/coveralls/mongoid/mongoid/master.svg)](https://coveralls.io/r/mongoid/mongoid?branch=master)
+[![Dependency Status](https://www.versioneye.com/ruby/mongoid/4.0.0/badge.svg)](https://www.versioneye.com/ruby/mongoid/4.0.0)
+
 
 Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 

data/lib/config/locales/en.yml

@@ -19,7 +19,7 @@ en:
           message: "Calling %{method} on %{klass} resulted in a false return
             from a callback."
           summary: "If a before callback returns false when using Document.create!,
-            Document#save!, or Documnet#update_attributes! this error will get raised
+            Document#save!, or Document#update_attributes! this error will get raised
             since the document did not actually get saved."
           resolution: "Double check all before callbacks to make sure they are
             not unintentionally returning false."
@@ -336,7 +336,7 @@ en:
             %{klass}.create! without setting the parent document as an
             attribute."
           resolution: "Ensure that you've set the parent relation if
-            instantiating the embedded document direcly, or always create new
+            instantiating the embedded document directly, or always create new
             embedded documents via the parent relation."
         no_session_config:
           message: "No configuration could be found for a session named

data/lib/mongoid/atomic.rb

@@ -125,7 +125,7 @@ module Mongoid
     # @return [ Hash ] The updates and their modifiers.
     #
     # @since 2.1.0
-    def atomic_updates(use_indexes = false)
+    def atomic_updates(_use_indexes = false)
       process_flagged_destroys
       mods = Modifiers.new
       generate_atomic_updates(mods, self)
@@ -206,7 +206,7 @@ module Mongoid
         path = nil
         ids = docs.map do |doc|
           path ||= doc.flag_as_destroyed
-          doc.id
+          doc._id
         end
         pulls[path] = { "_id" => { "$in" => ids }} and path = nil
       end

data/lib/mongoid/attributes.rb

@@ -31,6 +31,8 @@ module Mongoid
     def attribute_present?(name)
       attribute = read_attribute(name)
       !attribute.blank? || attribute == false
+    rescue ActiveModel::MissingAttributeError
+      false
     end
 
     # Get the attributes that have not been cast.

data/lib/mongoid/contextual/aggregable/memory.rb

@@ -81,7 +81,7 @@ module Mongoid
           if block_given?
             super()
           else
-            count > 0 ? super(0) { |doc| doc.send(field) } : 0
+            count > 0 ? super(0) { |doc| doc.public_send(field) } : 0
           end
         end
 
@@ -101,7 +101,7 @@ module Mongoid
         #
         # @since 3.0.0
         def aggregate_by(field, method)
-          count > 0 ? send(method) { |doc| doc.send(field) }.send(field) : nil
+          count > 0 ? send(method) { |doc| doc.public_send(field) }.public_send(field) : nil
         end
       end
     end

data/lib/mongoid/contextual/mongo.rb

@@ -54,7 +54,7 @@ module Mongoid
       def count(document = false, &block)
         return super(&block) if block_given?
         if document.is_a?(Document)
-          return collection.find(criteria.and(_id: document.id).selector).count
+          return collection.find(criteria.and(_id: document._id).selector).count
         end
         return query.count(document) if document
         try_cache(:count) { query.count }
@@ -350,9 +350,9 @@ module Mongoid
           if normalized_select.size == 1
             doc[normalized_select.keys.first]
           else
-            normalized_select.keys.map { |n| doc[n] }.compact
+            normalized_select.keys.map { |n| doc[n] }
           end
-        end.compact
+        end
       end
 
       # Skips the provided number of documents.

data/lib/mongoid/criteria/#findable.rb#

@@ -0,0 +1,141 @@
+# encoding: utf-8
+module Mongoid
+  class Criteria
+    module Findable
+
+      # Execute the criteria or raise an error if no documents found.
+      #
+      # @example Execute or raise
+      #   criteria.execute_or_raise(id)
+      #
+      # @param [ Object ] args The arguments passed.
+      #
+      # @raise [ Errors::DocumentNotFound ] If nothing returned.
+      #
+      # @return [ Document, Array<Document> ] The document(s).
+      #
+      # @since 2.0.0
+      def execute_or_raise(ids, multi)
+        result = multiple_from_db(ids)
+        check_for_missing_documents!(result, ids)
+        multi ? result : result.first
+      end
+
+      # Find the matchind document(s) in the criteria for the provided ids.
+      #
+      # @example Find by an id.
+      #   criteria.find(BSON::ObjectId.new)
+      #
+      # @example Find by multiple ids.
+      #   criteria.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
+      #
+      # @param [ Array<BSON::ObjectId> ] args The ids to search for.
+      #
+      # @return [ Array<Document>, Document ] The matching document(s).
+      #
+      # @since 1.0.0
+      def find(*args)
+        ids = args.__find_args__
+        raise_invalid if ids.any?(&:nil?)
+        p "YOOO"
+        p ids
+        for_ids(ids).execute_or_raise(ids, args.multi_arged?)
+      end
+
+      # Adds a criterion to the +Criteria+ that specifies an id that must be matched.
+      #
+      # @example Add a single id criteria.
+      #   criteria.for_ids([ 1 ])
+      #
+      # @example Add multiple id criteria.
+      #   criteria.for_ids([ 1, 2 ])
+      #
+      # @param [ Array ] ids The array of ids.
+      #
+      # @return [ Criteria ] The cloned criteria.
+      def for_ids(ids)
+        ids = mongoize_ids(ids)
+        if ids.size > 1
+          send(id_finder, { _id: { "$in" => ids }})
+        else
+          send(id_finder, { _id: ids.first })
+        end
+      end
+
+      # Get the documents from the identity map, and if not found hit the
+      # database.
+      #
+      # @example Get the documents from the map or criteria.
+      #   criteria.multiple_from_map_or_db(ids)
+      #
+      # @param [ ids ] The searched ids.
+      #
+      # @return [ Array<Document> ] The found documents.
+      def multiple_from_db(ids)
+        return entries if embedded?
+        ids = mongoize_ids(ids)
+        ids.empty? ? [] : from_database(ids)
+      end
+
+      private
+
+      # Get the finder used to generate the id query.
+      #
+      # @api private
+      #
+      # @example Get the id finder.
+      #   criteria.id_finder
+      #
+      # @return [ Symbol ] The name of the finder method.
+      #
+      # @since 3.1.0
+      def id_finder
+        @id_finder ||= extract_id ? :all_of : :where
+      end
+
+      # Get documents from the database only.
+      #
+      # @api private
+      #
+      # @example Get documents from the database.
+      #   criteria.from_database(ids)
+      #
+      # @param [ Array<Object> ] ids The ids to fetch with.
+      #
+      # @return [ Array<Document> ] The matching documents.
+      #
+      # @since 3.0.0
+      def from_database(ids)
+        (ids.size > 1 ? any_in(id: ids) : where(id: ids.first)).entries
+      end
+
+      # Convert all the ids to their proper types.
+      #
+      # @api private
+      #
+      # @example Convert the ids.
+      #   criteria.mongoize_ids(ids)
+      #
+      # @param [ Array<Object> ] ids The ids to convert.
+      #
+      # @return [ Array<Object> ] The converted ids.
+      #
+      # @since 3.0.0
+      def mongoize_ids(ids)
+        ids.map{ |id| klass.fields["_id"].mongoize(id) }
+      end
+
+      # Convenience method of raising an invalid options error.
+      #
+      # @example Raise the error.
+      #   criteria.raise_invalid
+      #
+      # @raise [ Errors::InvalidOptions ] The error.
+      #
+      # @since 2.0.0
+      def raise_invalid
+        raise Errors::InvalidFind.new
+      end
+    end
+  end
+end

data/lib/mongoid/document.rb

@@ -78,11 +78,11 @@ module Mongoid
     # @example Get the identity
     #   document.identity
     #
-    # @return [ Array ] An array containing [document.class, document.id]
+    # @return [ Array ] An array containing [document.class, document._id]
     #
     # @since 3.0.0
     def identity
-      [ self.class, self.id ]
+      [ self.class, self._id ]
     end
 
     # Instantiate a new +Document+, setting the Document's attributes if
@@ -199,7 +199,7 @@ module Mongoid
       end
 
       became = klass.new(clone_document)
-      became.id = id
+      became._id = _id
       became.instance_variable_set(:@changed_attributes, changed_attributes)
       became.instance_variable_set(:@errors, ActiveModel::Errors.new(became))
       became.errors.instance_variable_set(:@messages, errors.instance_variable_get(:@messages))
@@ -225,7 +225,7 @@ module Mongoid
     # plural model name.
     #
     # If new_record?     - will append /new
-    # If not             - will append /id-updated_at.to_s(:number)
+    # If not             - will append /id-updated_at.to_s(:nsec)
     # Without updated_at - will append /id
     #
     # This is usually called insode a cache() block
@@ -238,7 +238,7 @@ module Mongoid
     # @since 2.4.0
     def cache_key
       return "#{model_key}/new" if new_record?
-      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:number)}" if do_or_do_not(:updated_at)
+      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:nsec)}" if do_or_do_not(:updated_at)
       "#{model_key}/#{id}"
     end
 

data/lib/mongoid/query_cache.rb

@@ -131,12 +131,16 @@ module Mongoid
 
       private
 
-      def with_cache(context = :cursor, &block)
+      def with_cache(context = :cursor, more = false, &block)
         return yield unless QueryCache.enabled?
         return yield if system_collection?
         key = cache_key.push(context)
 
-        if QueryCache.cache_table.has_key?(key)
+        if more
+          docs = yield
+          QueryCache.cache_table[key].push(*docs)
+          docs
+        elsif QueryCache.cache_table.has_key?(key)
           instrument(key) { QueryCache.cache_table[key] }
         else
           QueryCache.cache_table[key] = yield
@@ -230,6 +234,10 @@ module Mongoid
         with_cache { super }
       end
 
+      def get_more
+        with_cache(:cursor, true) { super }
+      end
+
       private
 
       def cache_key

data/lib/mongoid/railtie.rb

@@ -13,19 +13,6 @@ module Rails
     # @since 2.0.0
     class Railtie < Rails::Railtie
 
-      # Determine which generator to use. app_generators was introduced after
-      # 3.0.0.
-      #
-      # @example Get the generators method.
-      #   railtie.generators
-      #
-      # @return [ Symbol ] The method name to use.
-      #
-      # @since 2.0.0.rc.4
-      def self.generator
-        config.respond_to?(:app_generators) ? :app_generators : :generators
-      end
-
       # Mapping of rescued exceptions to HTTP responses
       #
       # @example
@@ -41,7 +28,7 @@ module Rails
         }
       end
 
-      config.send(generator).orm :mongoid, migration: false
+      config.app_generators.orm :mongoid, migration: false
 
       if config.action_dispatch.rescue_responses
         config.action_dispatch.rescue_responses.merge!(rescue_responses)
@@ -98,7 +85,7 @@ module Rails
       # Due to all models not getting loaded and messing up inheritance queries
       # and indexing, we need to preload the models in order to address this.
       #
-      # This will happen every request in development, once in ther other
+      # This will happen for every request in development, once in other
       # environments.
       #
       # @since 2.0.0

data/lib/mongoid/railties/database.rake

@@ -67,7 +67,7 @@ namespace :db do
 
   namespace :mongoid do
     task :load_models do
-      ::Rails.application.eager_load!
+      ::Rails.application.eager_load! if defined?(Rails)
     end
   end
 end

data/lib/mongoid/relations/accessors.rb

@@ -12,7 +12,7 @@ module Mongoid
       # document is nil, then sets the relation on this document.
       #
       # @example Build the relation.
-      #   person.__build__(:addresses, { :id => 1 }, metadata)
+      #   person.__build__(:addresses, { :_id => 1 }, metadata)
       #
       # @param [ String, Symbol ] name The name of the relation.
       # @param [ Hash, BSON::ObjectId ] object The id or attributes to use.
@@ -110,7 +110,7 @@ module Mongoid
 
       def needs_no_database_query?(object, metadata)
         object.is_a?(Document) && !object.embedded? &&
-          object.id == attributes[metadata.key]
+          object._id == attributes[metadata.key]
       end
 
       # Is the current code executing without autobuild functionality?

data/lib/mongoid/relations/binding.rb

@@ -91,7 +91,7 @@ module Mongoid
       # @api private
       #
       # @example Bind the foreign key.
-      #   binding.bind_foreign_key(post, person.id)
+      #   binding.bind_foreign_key(post, person._id)
       #
       # @param [ Document ] keyed The document that stores the foreign key.
       # @param [ Object ] id The id of the bound document.

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

@@ -55,7 +55,7 @@ module Mongoid
             if inverse_metadata
               base.__send__(inverse_metadata.primary_key)
             else
-              base.id
+              base._id
             end
           end
 

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

@@ -15,7 +15,7 @@ module Mongoid
           # @param [ String ] type Not used in this context.
           #
           # @return [ Document ] A single document.
-          def build(type = nil)
+          def build(_type = nil)
             return object unless object.is_a?(Hash)
             if _loading? && base.persisted?
               Factory.from_db(klass, object)