mongoid 3.1.7 → 4.0.0.alpha1

data/lib/mongoid/contextual/command.rb

@@ -30,6 +30,32 @@ module Mongoid
       def session
         collection.database.session
       end
+
+      private
+
+      # Execute the block setting field limitations.
+      #
+      # @api private
+      #
+      # @example Execute with field limitations.
+      #   text_search.selecting do
+      #     #...
+      #   end
+      #
+      # @param [ Symbol ] param The name of the command parameter.
+      #
+      # @return [ Object ] The result of the yield.
+      #
+      # @since 4.0.0
+      def selecting(param)
+        begin
+          fields = command[param]
+          Threaded.set_selection(criteria.object_id, fields) unless fields.blank?
+          yield
+        ensure
+          Threaded.delete_selection(criteria.object_id)
+        end
+      end
     end
   end
 end

data/lib/mongoid/contextual/map_reduce.rb

@@ -314,7 +314,7 @@ module Mongoid
       # @since 3.0.15
       def __session__
         if command[:out][:inline] != 1
-          session.with(consistency: :strong)
+          session.with(read: :primary)
         else
           session
         end

data/lib/mongoid/contextual/memory.rb

@@ -1,14 +1,15 @@
 # encoding: utf-8
 require "mongoid/contextual/aggregable/memory"
+require "mongoid/relations/eager"
 
 module Mongoid
   module Contextual
     class Memory
       include Enumerable
       include Aggregable::Memory
-      include Eager
+      include Relations::Eager
       include Queryable
-      include Mongoid::Atomic::Positionable
+      include Positional
 
       # @attribute [r] root The root document.
       # @attribute [r] path The atomic path.
@@ -102,7 +103,7 @@ module Mongoid
           documents_for_iteration.each do |doc|
             yield(doc)
           end
-          # eager_loadable? ? docs : self
+          self
         else
           to_enum
         end
@@ -130,7 +131,7 @@ module Mongoid
       # @since 3.0.0
       def first
         doc = documents.first
-        eager_load_one(doc) if eager_loadable?(doc)
+        eager_load_one(doc)
         doc
       end
       alias :one :first
@@ -164,7 +165,7 @@ module Mongoid
       # @since 3.0.0
       def last
         doc = documents.last
-        eager_load_one(doc) if eager_loadable?(doc)
+        eager_load_one(doc)
         doc
       end
 

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.
@@ -123,7 +124,7 @@ module Mongoid
               yield_document(doc, &block)
             end
             @cache_loaded = true
-            eager_loadable? ? docs : self
+            self
           end
         else
           to_enum
@@ -143,7 +144,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 +195,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 +262,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 +279,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 +337,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 +393,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 +424,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 +437,21 @@ module Mongoid
 
       private
 
-      # Checks if any documents exist in the database.
+      # yield the block given or return the cached value
       #
-      # @api private
-      #
-      # @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
 

data/lib/mongoid/contextual/text_search.rb

@@ -0,0 +1,180 @@
+# 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?
+          selecting(:project) do
+            documents.each do |doc|
+              yield doc
+            end
+          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"], criteria.object_id)
+        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/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