mongoid 4.0.2 → 5.0.0.beta

data/lib/mongoid/indexable.rb

@@ -31,10 +31,10 @@ module Mongoid
         index_specifications.each do |spec|
           key, options = spec.key, spec.options
           if database = options[:database]
-            with(read: :primary, database: database).
-              collection.indexes.create(key, options.except(:database))
+            with(read: { mode: :primary }, database: database).
+              collection.indexes.create_one(key, options.except(:database))
           else
-            with(read: :primary).collection.indexes.create(key, options)
+            with(read: { mode: :primary }).collection.indexes.create_one(key, options)
           end
         end and true
       end
@@ -50,12 +50,18 @@ module Mongoid
       # @since 3.0.0
       def remove_indexes
         indexed_database_names.each do |database|
-          collection = with(read: :primary, database: database).collection
-          collection.indexes.each do |spec|
-            unless spec["name"] == "_id_"
-              collection.indexes.drop(spec["key"])
+          collection = with(read: { mode: :primary }, database: database).collection
+          begin
+            collection.indexes.each do |spec|
+              unless spec["name"] == "_id_"
+                collection.indexes.drop_one(spec["key"])
+                logger.info(
+                  "MONGOID: Removed index '#{spec["name"]}' on collection " +
+                  "'#{collection.name}' in database '#{database}'."
+                )
+              end
             end
-          end
+          rescue Mongo::Error::OperationFailure; end
         end and true
       end
 
@@ -142,7 +148,7 @@ module Mongoid
       #
       # @since 4.0.0
       def index_keys
-        index_specifications.map{ |spec| spec.key }
+        index_specifications.map(&:key)
       end
     end
   end

data/lib/mongoid/persistable.rb

@@ -27,7 +27,6 @@ module Mongoid
     include Incrementable
     include Logical
     include Poppable
-    include Positional
     include Pullable
     include Pushable
     include Renamable
@@ -209,7 +208,7 @@ module Mongoid
     def persist_atomic_operations(operations)
       if persisted?
         selector = atomic_selector
-        _root.collection.find(selector).update(positionally(selector, operations))
+        _root.collection.find(selector).update_one(operations)
       end
     end
   end

data/lib/mongoid/persistable/creatable.rb

@@ -61,7 +61,7 @@ module Mongoid
           _parent.insert
         else
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update(positionally(selector, atomic_inserts))
+          _root.collection.find(selector).update_one(atomic_inserts)
         end
       end
 
@@ -76,7 +76,7 @@ module Mongoid
       #
       # @since 4.0.0
       def insert_as_root
-        collection.insert(as_document)
+        collection.insert_one(as_document)
       end
 
       # Post process an insert, which sets the new record attribute to false

data/lib/mongoid/persistable/deletable.rb

@@ -62,7 +62,7 @@ module Mongoid
         _parent.remove_child(self) if notifying_parent?(options)
         if _parent.persisted?
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update(positionally(selector, atomic_deletes))
+          _root.collection.find(selector).update_one(atomic_deletes)
         end
         true
       end
@@ -78,7 +78,7 @@ module Mongoid
       #
       # @since 4.0.0
       def delete_as_root
-        collection.find(atomic_selector).remove
+        collection.find(atomic_selector).delete_one
         true
       end
 
@@ -140,7 +140,7 @@ module Mongoid
           selector.merge!(_type: name) if hereditary?
           coll = collection
           deleted = coll.find(selector).count
-          coll.find(selector).remove_all
+          coll.find(selector).delete_many
           deleted
         end
       end

data/lib/mongoid/persistable/incrementable.rb

@@ -17,7 +17,7 @@ module Mongoid
       #
       # @param [ Hash ] increments The field/inc increment pairs.
       #
-      # @return [ true, false ] If the increment succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def inc(increments)

data/lib/mongoid/persistable/logical.rb

@@ -16,7 +16,7 @@ module Mongoid
       #
       # @param [ Hash ] operations The bitwise operations.
       #
-      # @return [ true, false ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def bit(operations)

data/lib/mongoid/persistable/poppable.rb

@@ -21,7 +21,7 @@ module Mongoid
       #
       # @param [ Hash ] pops The field/value pop operations.
       #
-      # @return [ true, false ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def pop(pops)

data/lib/mongoid/persistable/pullable.rb

@@ -17,7 +17,7 @@ module Mongoid
       #
       # @param [ Hash ] pulls The field/value pull pairs.
       #
-      # @return [ true, false ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def pull(pulls)
@@ -37,7 +37,7 @@ module Mongoid
       #
       # @param [ Hash ] pulls The pull all operations.
       #
-      # @return [ true, false ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def pull_all(pulls)

data/lib/mongoid/persistable/pushable.rb

@@ -16,7 +16,7 @@ module Mongoid
       #
       # @param [ Hash ] adds The field/value pairs to add.
       #
-      # @return [ true, false ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def add_to_set(adds)
@@ -43,7 +43,7 @@ module Mongoid
       #
       # @param [ Hash ] pushes The $push operations.
       #
-      # @return [ true, false ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def push(pushes)

data/lib/mongoid/persistable/renamable.rb

@@ -17,7 +17,7 @@ module Mongoid
       #
       # @param [ Hash ] renames The rename pairs of old name/new name.
       #
-      # @return [ true, false ] If the rename suceeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def rename(renames)

data/lib/mongoid/persistable/settable.rb

@@ -16,7 +16,7 @@ module Mongoid
       #
       # @param [ Hash ] setters The field/value pairs to set.
       #
-      # @return [ true ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def set(setters)

data/lib/mongoid/persistable/unsettable.rb

@@ -17,7 +17,7 @@ module Mongoid
       # @param [ Array<String, Symbol> ] fields The names of the fields to
       #   unset.
       #
-      # @return [ true ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def unset(*fields)

data/lib/mongoid/persistable/updatable.rb

@@ -141,9 +141,9 @@ module Mongoid
           unless updates.empty?
             coll = _root.collection
             selector = atomic_selector
-            coll.find(selector).update(positionally(selector, updates))
+            coll.find(selector).update_one(updates)
             conflicts.each_pair do |key, value|
-              coll.find(selector).update(positionally(selector, { key => value }))
+              coll.find(selector).update_one({ key => value })
             end
           end
         end

data/lib/mongoid/persistable/upsertable.rb

@@ -21,7 +21,7 @@ module Mongoid
       # @since 3.0.0
       def upsert(options = {})
         prepare_upsert(options) do
-          collection.find(atomic_selector).update(as_document, [ :upsert ])
+          collection.find(atomic_selector).update_one(as_document, upsert: true)
         end
       end
 

data/lib/mongoid/query_cache.rb

@@ -107,149 +107,143 @@ module Mongoid
       end
     end
 
-    module Base # :nodoc:
-
-      def alias_query_cache_clear(*method_names)
-        method_names.each do |method_name|
-          class_eval <<-CODE, __FILE__, __LINE__ + 1
-              def #{method_name}_with_clear_cache(*args)   # def upsert_with_clear_cache(*args)
-                QueryCache.clear_cache                     #   QueryCache.clear_cache
-                #{method_name}_without_clear_cache(*args)  #   upsert_without_clear_cache(*args)
-              end                                          # end
-            CODE
+    # A Cursor that attempts to load documents from memory first before hitting
+    # the database if the same query has already been executed.
+    #
+    # @since 5.0.0
+    class CachedCursor < Mongo::Cursor
 
-          alias_method_chain method_name, :clear_cache
+      # We iterate over the cached documents if they exist already in the
+      # cursor otherwise proceed as normal.
+      #
+      # @example Iterate over the documents.
+      #   cursor.each do |doc|
+      #     # ...
+      #   end
+      #
+      # @since 5.0.0
+      def each
+        if @cached_documents
+          @cached_documents.each{ |doc| yield doc }
+        else
+          super
         end
       end
+
+      # Get a human-readable string representation of +Cursor+.
+      #
+      # @example Inspect the cursor.
+      #   cursor.inspect
+      #
+      # @return [ String ] A string representation of a +Cursor+ instance.
+      #
+      # @since 2.0.0
+      def inspect
+        "#<Mongoid::QueryCache::CachedCursor:0x#{object_id} @view=#{@view.inspect}>"
+      end
+
+      private
+
+      def process(result)
+        @remaining -= result.returned_count if limited?
+        @cursor_id = result.cursor_id
+        @coll_name ||= result.namespace.sub("#{database.name}.", '') if result.namespace
+        documents = result.documents
+        (@cached_documents ||= []).concat(documents)
+        documents
+      end
     end
 
-    # Module to include in objects which need to wrap caching behaviour around
-    # them.
+    # Included to add behaviour for clearing out the query cache on certain
+    # operations.
     #
     # @since 4.0.0
-    module Cacheable
+    module Base
 
-      private
+      def alias_query_cache_clear(*method_names)
+        method_names.each do |method_name|
+          class_eval <<-CODE, __FILE__, __LINE__ + 1
+              def #{method_name}_with_clear_cache(*args)
+                QueryCache.clear_cache
+                #{method_name}_without_clear_cache(*args)
+              end
+            CODE
 
-      def with_cache(context = :cursor, more = false, &block)
-        return yield unless QueryCache.enabled?
-        return yield if system_collection?
-        key = cache_key.push(context)
-
-        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
+          alias_method_chain method_name, :clear_cache
         end
       end
-
-      def instrument(key, &block)
-        ActiveSupport::Notifications.instrument("query_cache.mongoid", key: key, &block)
-      end
     end
 
-    # Adds behaviour around caching to a Moped Query object.
+    # Contains enhancements to the Mongo::Collection::View in order to get a
+    # cached cursor or a regular cursor on iteration.
     #
-    # @since 4.0.0
-    module Query
+    # @since 5.0.0
+    module View
       extend ActiveSupport::Concern
-      include Cacheable
 
       included do
         extend QueryCache::Base
-        alias_method_chain :cursor, :cache
-        alias_method_chain :first, :cache
-        alias_query_cache_clear :remove, :remove_all, :update, :update_all, :upsert
-      end
-
-      # Provide a wrapped query cache cursor.
-      #
-      # @example Get the wrapped caching cursor.
-      #   query.cursor_with_cache
-      #
-      # @return [ CachedCursor ] The cached cursor.
-      #
-      # @since 4.0.0
-      def cursor_with_cache
-        CachedCursor.new(session, operation)
-      end
-
-      # Override first with caching.
-      #
-      # @example Get the first with a cache.
-      #   query.first_with_cache
-      #
-      # @return [ Hash ] The first document.
-      #
-      # @since 4.0.0
-      def first_with_cache
-        with_cache(:first) do
-          first_without_cache
+        alias_query_cache_clear :delete_one,
+                                :delete_many,
+                                :update_one,
+                                :update_many,
+                                :replace_one,
+                                :find_one_and_delete,
+                                :find_one_and_replace,
+                                :find_one_and_update
+      end
+
+      # Override the default enumeration to handle if the cursor can be cached
+      # or not.
+      #
+      # @example Iterate over the view.
+      #   view.each do |doc|
+      #     # ...
+      #   end
+      #
+      # @since 5.0.0
+      def each
+        if system_collection? || !QueryCache.enabled?
+          super
+        else
+          key = cache_key
+          cursor = QueryCache.cache_table[key]
+          unless cursor
+            server = read.select_server(cluster)
+            cursor = CachedCursor.new(view, send_initial_query(server), server)
+            QueryCache.cache_table[key] = cursor
+          end
+          cursor.each do |doc|
+            yield doc
+          end if block_given?
+          cursor
         end
       end
 
       private
 
       def cache_key
-        [ operation.database, operation.collection, operation.selector, operation.limit, operation.skip, operation.fields ]
+        [ collection.namespace, selector, limit, skip, projection ]
       end
 
       def system_collection?
-        operation.collection =~ /^system./
+        collection.namespace =~ /^system./
       end
     end
 
     # Adds behaviour to the query cache for collections.
     #
-    # @since 4.0.0
+    # @since 5.0.0
     module Collection
       extend ActiveSupport::Concern
 
       included do
         extend QueryCache::Base
-        alias_query_cache_clear :insert
-      end
-    end
-
-    # A Cursor that attempts to load documents from memory first before hitting
-    # the database if the same query has already been executed.
-    #
-    # @since 4.0.0
-    class CachedCursor < Moped::Cursor
-      include Cacheable
-
-      # Override the loading of docs to attempt to fetch from the cache.
-      #
-      # @example Load the documents.
-      #   cursor.load_docs
-      #
-      # @return [ Array<Hash> ] The documents.
-      #
-      # @since 4.0.0
-      def load_docs
-        with_cache { super }
-      end
-
-      def get_more
-        with_cache(:cursor, true) { super }
-      end
-
-      private
-
-      def cache_key
-        [ @database, @collection, @selector, @options[:limit], @options[:skip], @options[:fields] ]
-      end
-
-      def system_collection?
-        @collection =~ /^system./
+        alias_query_cache_clear :insert_one, :insert_many
       end
     end
   end
 end
 
-Moped::Query.__send__(:include, Mongoid::QueryCache::Query)
-Moped::Collection.__send__(:include, Mongoid::QueryCache::Collection)
+Mongo::Collection.__send__(:include, Mongoid::QueryCache::Collection)
+Mongo::Collection::View.__send__(:include, Mongoid::QueryCache::View)