mongoid 3.1.6 → 4.0.0

data/lib/mongoid/contextual/mongo.rb

@@ -2,10 +2,11 @@
 require "mongoid/contextual/atomic"
 require "mongoid/contextual/aggregable/mongo"
 require "mongoid/contextual/command"
-require "mongoid/contextual/eager"
 require "mongoid/contextual/find_and_modify"
 require "mongoid/contextual/geo_near"
 require "mongoid/contextual/map_reduce"
+require "mongoid/contextual/text_search"
+require "mongoid/relations/eager"
 
 module Mongoid
   module Contextual
@@ -13,7 +14,7 @@ module Mongoid
       include Enumerable
       include Aggregable::Mongo
       include Atomic
-      include Eager
+      include Relations::Eager
       include Queryable
 
       # @attribute [r] query The Moped query.
@@ -56,7 +57,7 @@ module Mongoid
           return collection.find(criteria.and(_id: document.id).selector).count
         end
         return query.count(document) if document
-        cached? ? @count ||= query.count : query.count
+        try_cache(:count) { query.count }
       end
 
       # Delete all documents in the database that match the selector.
@@ -118,13 +119,11 @@ module Mongoid
       # @since 3.0.0
       def each(&block)
         if block_given?
-          selecting do
-            documents_for_iteration.each do |doc|
-              yield_document(doc, &block)
-            end
-            @cache_loaded = true
-            eager_loadable? ? docs : self
+          documents_for_iteration.each do |doc|
+            yield_document(doc, &block)
           end
+          @cache_loaded = true
+          self
         else
           to_enum
         end
@@ -143,7 +142,12 @@ module Mongoid
       #
       # @since 3.0.0
       def exists?
-        @exists ||= check_existence
+        return !documents.empty? if cached? && cache_loaded?
+        return @count > 0 if instance_variable_defined?(:@count)
+
+        try_cache(:exists) do
+          !!(query.dup.select(_id: 1).limit(1).first)
+        end
       end
 
       # Run an explain on the criteria.
@@ -189,9 +193,8 @@ module Mongoid
       #
       # @since 3.0.0
       def first
-        if cached? && cache_loaded?
-          documents.first
-        else
+        return documents.first if cached? && cache_loaded?
+        try_cache(:first) do
           with_sorting do
             with_eager_loading(query.first)
           end
@@ -257,7 +260,7 @@ module Mongoid
       # @since 3.0.0
       def initialize(criteria)
         @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache]
-        @collection = klass.collection
+        @collection = @klass.with(criteria.persistence_options || {}).collection
         criteria.send(:merge_type_selection)
         @query = collection.find(criteria.selector)
         apply_options
@@ -274,8 +277,10 @@ module Mongoid
       #
       # @since 3.0.0
       def last
-        with_inverse_sorting do
-          with_eager_loading(query.first)
+        try_cache(:last) do
+          with_inverse_sorting do
+            with_eager_loading(query.first)
+          end
         end
       end
 
@@ -330,14 +335,24 @@ module Mongoid
       # @note This method will return the raw db values - it performs no custom
       #   serialization.
       #
-      # @param [ String, Symbol ] field The field to pluck.
+      # @param [ String, Symbol, Array ] field Fields to pluck.
       #
-      # @return [ Array<Object> ] The plucked values.
+      # @return [ Array<Object, Array> ] The plucked values.
       #
       # @since 3.1.0
-      def pluck(field)
-        normalized = klass.database_field_name(field)
-        query.dup.select(normalized => 1).map{ |doc| doc[normalized] }.compact
+      def pluck(*fields)
+        normalized_select = fields.inject({}) do |hash, f|
+          hash[klass.database_field_name(f)] = 1
+          hash
+        end
+
+        query.dup.select(normalized_select).map do |doc|
+          if normalized_select.size == 1
+            doc[normalized_select.keys.first]
+          else
+            normalized_select.keys.map { |n| doc[n] }.compact
+          end
+        end.compact
       end
 
       # Skips the provided number of documents.
@@ -376,6 +391,20 @@ module Mongoid
         end
       end
 
+      # Execute a text command against the database.
+      #
+      # @example Find documents with the text "phase"
+      #   context.text_search("phase")
+      #
+      # @param [ String ] query The text search query.
+      #
+      # @return [ TextSearch ] The TextSearch command.
+      #
+      # @since 4.0.0
+      def text_search(query)
+        TextSearch.new(collection, criteria, query)
+      end
+
       # Update the first matching document atomically.
       #
       # @example Update the first matching document.
@@ -393,7 +422,7 @@ module Mongoid
       # Update all the matching documents atomically.
       #
       # @example Update all the matching documents.
-      #   context.update({ "$set" => { name: "Smiths" }})
+      #   context.update_all({ "$set" => { name: "Smiths" }})
       #
       # @param [ Hash ] attributes The new attributes for each document.
       #
@@ -406,21 +435,21 @@ module Mongoid
 
       private
 
-      # Checks if any documents exist in the database.
-      #
-      # @api private
+      # yield the block given or return the cached value
       #
-      # @example Check for document existsence.
-      #   context.check_existence
+      # @param [ String, Symbol ] key The instance variable name
       #
-      # @return [ true, false ] If documents exist.
+      # @return the result of the block
       #
-      # @since 3.1.0
-      def check_existence
-        if cached? && cache_loaded?
-          !documents.empty?
+      # @since 3.1.4
+      def try_cache(key, &block)
+        unless cached?
+          yield
         else
-          @count ? @count > 0 : !query.dup.select(_id: 1).limit(1).entries.first.nil?
+          unless ret = instance_variable_get("@#{key}")
+            instance_variable_set("@#{key}", ret = yield)
+          end
+          ret
         end
       end
 
@@ -593,7 +622,7 @@ module Mongoid
         if cached? && !documents.empty?
           documents
         elsif eager_loadable?
-          docs = query.map{ |doc| Factory.from_db(klass, doc) }
+          docs = query.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields]) }
           eager_load(docs)
           docs
         else
@@ -601,27 +630,6 @@ module Mongoid
         end
       end
 
-      # If we are limiting results, we need to set the field limitations on a
-      # thread local to avoid overriding the default values.
-      #
-      # @example Execute with selection.
-      #   context.selecting do
-      #     collection.find
-      #   end
-      #
-      # @return [ Object ] The yielded value.
-      #
-      # @since 2.4.4
-      def selecting
-        begin
-          fields = criteria.options[:fields]
-          Threaded.set_selection(criteria.object_id, fields) unless fields.blank?
-          yield
-        ensure
-          Threaded.delete_selection(criteria.object_id)
-        end
-      end
-
       # Yield to the document.
       #
       # @api private
@@ -636,7 +644,7 @@ module Mongoid
       # @since 3.0.0
       def yield_document(document, &block)
         doc = document.respond_to?(:_id) ?
-          document : Factory.from_db(klass, document, criteria.object_id)
+          document : Factory.from_db(klass, document, criteria.options[:fields])
         yield(doc)
         documents.push(doc) if cacheable?
       end

data/lib/mongoid/contextual/none.rb

@@ -0,0 +1,90 @@
+# encoding: utf-8
+module Mongoid
+  module Contextual
+    class None
+      include Enumerable
+      include Queryable
+
+      attr_reader :criteria, :klass
+
+      # Check if the context is equal to the other object.
+      #
+      # @example Check equality.
+      #   context == []
+      #
+      # @param [ Array ] other The other array.
+      #
+      # @return [ true, false ] If the objects are equal.
+      #
+      # @since 4.0.0
+      def ==(other)
+        other.is_a?(None)
+      end
+
+      # Iterate over the null context. There are no documents to iterate over
+      # in this case.
+      #
+      # @example Iterate over the context.
+      #   context.each do |doc|
+      #     puts doc.name
+      #   end
+      #
+      # @return [ Enumerator ] The enumerator.
+      #
+      # @since 4.0.0
+      def each
+        if block_given?
+          [].each { |doc| yield(doc) }
+          self
+        else
+          to_enum
+        end
+      end
+
+      # Do any documents exist for the context.
+      #
+      # @example Do any documents exist for the context.
+      #   context.exists?
+      #
+      # @return [ true, false ] If the count is more than zero.
+      #
+      # @since 4.0.0
+      def exists?; false; end
+
+      # Create the new null context.
+      #
+      # @example Create the new context.
+      #   Null.new(criteria)
+      #
+      # @param [ Criteria ] The criteria.
+      #
+      # @since 4.0.0
+      def initialize(criteria)
+        @criteria, @klass = criteria, criteria.klass
+      end
+
+      # Always returns nil.
+      #
+      # @example Get the last document.
+      #   context.last
+      #
+      # @return [ nil ] Always nil.
+      #
+      # @since 4.0.0
+      def last; nil; end
+
+      # Always returns zero.
+      #
+      # @example Get the length of matching documents.
+      #   context.length
+      #
+      # @return [ Integer ] Always zero.
+      #
+      # @since 4.0.0
+      def length
+        entries.length
+      end
+      alias :size :length
+    end
+  end
+end

data/lib/mongoid/contextual/text_search.rb

@@ -0,0 +1,178 @@
+# encoding: utf-8
+module Mongoid
+  module Contextual
+
+    # Wraps behaviour around a lazy text search command.
+    #
+    # @since 4.0.0
+    class TextSearch
+      include Enumerable
+      include Command
+
+      delegate :[], to: :results
+      delegate :==, :empty?, to: :entries
+
+      # Iterate over the results of the text search command.
+      #
+      # @example Iterate over the results.
+      #   text_search.each do |doc|
+      #     #...
+      #   end
+      #
+      # @return [ Enumerator ] The enumerator.
+      #
+      # @since 4.0.0
+      def each
+        if block_given?
+          documents.each do |doc|
+            yield doc
+          end
+        else
+          to_enum
+        end
+      end
+
+      # Instantiate a new text search lazy proxy.
+      #
+      # @example Instantiate the text search.
+      #   TextSearch.new(collection, criteria, "test")
+      #
+      # @param [ Moped::Collection ] collection The collection to execute on.
+      # @param [ Criteria ] criteria The criteria to filter results.
+      # @param [ String ] search_string The search string.
+      #
+      # @since 4.0.0
+      def initialize(collection, criteria, search_string)
+        @collection, @criteria = collection, criteria
+        command[:text] = collection.name.to_s
+        command[:search] = search_string
+        apply_criteria_options
+      end
+
+      # Inspect the text search object.
+      #
+      # @example Inspect the text search.
+      #   text_search.inspect
+      #
+      # @return [ String ] The inspection.
+      #
+      # @since 4.0.0
+      def inspect
+%Q{#<Mongoid::Contextual::TextSearch
+  selector:   #{criteria.selector.inspect}
+  class:      #{criteria.klass}
+  search:     #{command[:search]}
+  filter:     #{command[:filter] || "N/A"}
+  project:    #{command[:project] || "N/A"}
+  limit:      #{command[:limit] || "N/A"}
+  language:   #{command[:language] || "default"}>
+}
+      end
+
+      # Execute the text search command, and return the raw results (in hash
+      # form).
+      #
+      # @example Execute the command.
+      #   text_search.execute
+      #
+      # @return [ Hash ] The raw results.
+      #
+      # @since 4.0.0
+      def execute
+        results
+      end
+
+      # Set the language of the text search.
+      #
+      # @example Set the text search language.
+      #   text_search.language("deutsch")
+      #
+      # @param [ String ] value The name of the language.
+      #
+      # @return [ TextSearch ] The modified text search.
+      #
+      # @since 4.0.0
+      def language(value)
+        command[:language] = value
+        self
+      end
+
+      # Limits the fields returned by the text search for each document. By
+      # default, _id is always included.
+      #
+      # @example Limit the returned fields.
+      #   text_search.project(name: 1, title: 1)
+      #
+      # @param [ Hash ] value The fields to project.
+      #
+      # @return [ TextSearch ] The modified text search.
+      #
+      # @since 4.0.0
+      def project(value)
+        command[:project] = value
+        self
+      end
+
+      # Get the raw statistics returned from the text search.
+      #
+      # @example Get the stats.
+      #   text_search.stats
+      #
+      # @return [ Hash ] The raw statistics.
+      #
+      # @since 4.0.0
+      def stats
+        results["stats"]
+      end
+
+      private
+
+      # Apply the options from the criteria to the text search command.
+      #
+      # @api private
+      #
+      # @example Apply the criteria options, filter and limit only.
+      #   text_search.apply_criteria_options
+      #
+      # @return [ nil ] Nothing.
+      #
+      # @since 4.0.0
+      def apply_criteria_options
+        command[:filter] = criteria.selector
+        if limit = criteria.options[:limit]
+          command[:limit] = limit
+        end
+      end
+
+      # Get the results of the text search as documents.
+      #
+      # @api private
+      #
+      # @example Get the results as documents.
+      #   text_search.documents
+      #
+      # @return [ Array<Document> ] The documents.
+      #
+      # @since 4.0.0
+      def documents
+        results["results"].map do |attributes|
+          Factory.from_db(criteria.klass, attributes["obj"], command[:project])
+        end
+      end
+
+      # Get the raw results.
+      #
+      # @api private
+      #
+      # @example Get the raw results.
+      #   text_search.results
+      #
+      # @return [ Hash ] The raw results.
+      #
+      # @since 4.0.0
+      def results
+        @results ||= session.command(command)
+      end
+    end
+  end
+end

data/lib/mongoid/contextual.rb

@@ -2,6 +2,7 @@
 require "mongoid/contextual/queryable"
 require "mongoid/contextual/mongo"
 require "mongoid/contextual/memory"
+require "mongoid/contextual/none"
 
 module Mongoid
   module Contextual
@@ -48,6 +49,7 @@ module Mongoid
     #
     # @since 3.0.0
     def create_context
+      return None.new(self) if empty_and_chainable?
       embedded ? Memory.new(self) : Mongo.new(self)
     end
   end

data/lib/mongoid/copyable.rb

@@ -6,7 +6,7 @@ module Mongoid
     extend ActiveSupport::Concern
 
     # Clone or dup the current +Document+. This will return all attributes with
-    # the exception of the document's id and versions, and will reset all the
+    # the exception of the document's id, and will reset all the
     # instance variables.
     #
     # This clone also includes embedded documents.
@@ -22,7 +22,7 @@ module Mongoid
       # _id and id field in the document would cause problems with Mongoid
       # elsewhere.
       attrs = clone_document.except("_id", "id")
-      self.class.new(attrs, without_protection: true)
+      self.class.new(attrs)
     end
     alias :dup :clone
 
@@ -40,7 +40,6 @@ module Mongoid
     # @since 3.0.22
     def clone_document
       attrs = as_document.__deep_copy__
-      attrs["version"] = 1 if attrs.delete("versions")
       process_localized_attributes(attrs)
       attrs
     end

data/lib/mongoid/{criterion → criteria}/findable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
+  class Criteria
     module Findable
 
       # Execute the criteria or raise an error if no documents found.
@@ -16,7 +16,7 @@ module Mongoid
       #
       # @since 2.0.0
       def execute_or_raise(ids, multi)
-        result = multiple_from_map_or_db(ids)
+        result = multiple_from_db(ids)
         check_for_missing_documents!(result, ids)
         multi ? result : result.first
       end
@@ -24,12 +24,12 @@ module Mongoid
       # Find the matchind document(s) in the criteria for the provided ids.
       #
       # @example Find by an id.
-      #   criteria.find(Moped::BSON::ObjectId.new)
+      #   criteria.find(BSON::ObjectId.new)
       #
       # @example Find by multiple ids.
-      #   criteria.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
+      #   criteria.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
       #
-      # @param [ Array<Moped::BSON::ObjectId> ] args The ids to search for.
+      # @param [ Array<BSON::ObjectId> ] args The ids to search for.
       #
       # @return [ Array<Document>, Document ] The matching document(s).
       #
@@ -60,23 +60,6 @@ module Mongoid
         end
       end
 
-      # Get the document from the identity map, and if not found hit the
-      # database.
-      #
-      # @example Get the document from the map or criteria.
-      #   criteria.from_map_or_db
-      #
-      # @return [ Document ] The found document.
-      #
-      # @since 2.2.1
-      def from_map_or_db
-        id = extract_id
-        id = klass.fields["_id"].mongoize(id) if id
-        doc = IdentityMap.get(klass, id || selector_with_type_selection)
-        return nil if doc == {}
-        doc && doc.matches?(selector) ? doc : first
-      end
-
       # Get the documents from the identity map, and if not found hit the
       # database.
       #
@@ -86,11 +69,10 @@ module Mongoid
       # @param [ ids ] The searched ids.
       #
       # @return [ Array<Document> ] The found documents.
-      def multiple_from_map_or_db(ids)
+      def multiple_from_db(ids)
         return entries if embedded?
         ids = mongoize_ids(ids)
-        result = from_identity_map(ids)
-        ids.empty? ? result : result + from_database(ids)
+        ids.empty? ? [] : from_database(ids)
       end
 
       private
@@ -125,28 +107,6 @@ module Mongoid
         (ids.size > 1 ? any_in(id: ids) : where(id: ids.first)).entries
       end
 
-      # Get documents from the identity map only.
-      #
-      # @api private
-      #
-      # @example Get documents from the identity map.
-      #   criteria.from_identity_map(ids)
-      #
-      # @param [ Array<Object> ] ids The ids to fetch with.
-      #
-      # @return [ Array<Document> ] The matching documents.
-      #
-      # @since 3.0.0
-      def from_identity_map(ids)
-        result = []
-        selection = selector_with_type_selection
-        ids.reject! do |id|
-          doc = IdentityMap.get(klass, id)
-          doc && doc.matches?(selection) ? result.push(doc) : false
-        end
-        result
-      end
-
       # Convert all the ids to their proper types.
       #
       # @api private

data/lib/mongoid/{criterion/inspection.rb → criteria/inspectable.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
-    module Inspection
+  class Criteria
+    module Inspectable
 
       # Get a pretty string representation of the criteria, including the
       # selector, options, matching count and documents for inspection.

data/lib/mongoid/{criterion → criteria}/marshalable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
+  class Criteria
     module Marshalable
 
       # Provides the data needed to Marshal.dump a criteria.
@@ -21,6 +21,8 @@ module Mongoid
       # @example Load the criteria.
       #   Marshal.load(criteria)
       #
+      # @param [ Array ] data The raw data.
+      #
       # @since 3.0.15
       def marshal_load(data)
         @scoping_options, raw_selector, raw_options = data.pop(3)