mongoid 3.1.7 → 4.0.0.alpha1

data/lib/mongoid/sessions/storage_options.rb

@@ -0,0 +1,140 @@
+# encoding: utf-8
+module Mongoid
+  module Sessions
+    module StorageOptions
+      extend ActiveSupport::Concern
+
+      included do
+
+        cattr_accessor :storage_options, instance_writer: false do
+          storage_options_defaults
+        end
+      end
+
+      module ClassMethods
+
+        # Give this model specific custom default storage options.
+        #
+        # @example Store this model by default in "artists"
+        #   class Band
+        #     include Mongoid::Document
+        #     store_in collection: "artists"
+        #   end
+        #
+        # @example Store this model by default in the sharded db.
+        #   class Band
+        #     include Mongoid::Document
+        #     store_in database: "echo_shard"
+        #   end
+        #
+        # @example Store this model by default in a different session.
+        #   class Band
+        #     include Mongoid::Document
+        #     store_in session: "secondary"
+        #   end
+        #
+        # @example Store this model with a combination of options.
+        #   class Band
+        #     include Mongoid::Document
+        #     store_in collection: "artists", database: "secondary"
+        #   end
+        #
+        # @param [ Hash ] options The storage options.
+        #
+        # @option options [ String, Symbol ] :collection The collection name.
+        # @option options [ String, Symbol ] :database The database name.
+        # @option options [ String, Symbol ] :session The session name.
+        #
+        # @return [ Class ] The model class.
+        #
+        # @since 3.0.0
+        def store_in(options)
+          Validators::Storage.validate(self, options)
+          storage_options.merge!(options)
+        end
+
+        # Reset the store_in options
+        #
+        # @example Reset the store_in options
+        #   Model.reset_storage_options!
+        #
+        # @since 4.0.0
+        def reset_storage_options!
+          self.storage_options = storage_options_defaults.dup
+        end
+
+        # Get the default storage options.
+        #
+        # @example Get the default storage options.
+        #   Model.storage_options_defaults
+        #
+        # @return [ Hash ] Default storage options.
+        #
+        # @since 4.0.0
+        def storage_options_defaults
+          {
+            collection: name.collectionize.to_sym,
+            session: :default,
+            database: -> { Mongoid.sessions[session_name][:database] }
+          }
+        end
+
+        # Get the name of the collection this model persists to.
+        #
+        # @example Get the collection name.
+        #   Model.collection_name
+        #
+        # @return [ Symbol ] The name of the collection.
+        #
+        # @since 3.0.0
+        def collection_name
+          __evaluate__(storage_options[:collection])
+        end
+
+        # Get the session name for the model.
+        #
+        # @example Get the session name.
+        #   Model.session_name
+        #
+        # @return [ Symbol ] The name of the session.
+        #
+        # @since 3.0.0
+        def session_name
+          __evaluate__(storage_options[:session])
+        end
+
+        # Get the database name for the model.
+        #
+        # @example Get the database name.
+        #   Model.database_name
+        #
+        # @return [ Symbol ] The name of the session.
+        #
+        # @since 4.0.0
+        def database_name
+          __evaluate__(storage_options[:database])
+        end
+
+        private
+
+        # Eval the provided value, either byt calling it if it responds to call
+        # or returning the value itself.
+        #
+        # @api private
+        #
+        # @example Evaluate the name.
+        #   Model.__evaluate__(:name)
+        #
+        # @param [ String, Symbol, Proc ] name The name.
+        #
+        # @return [ Symbol ] The value as a symbol.
+        #
+        # @since 3.1.0
+        def __evaluate__(name)
+          return nil unless name
+          name.respond_to?(:call) ? name.call.to_sym : name.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/sessions/thread_options.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid
+  module Sessions
+    module ThreadOptions
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+
+        def session_name
+          Threaded.session_override || super
+        end
+
+        def database_name
+          Threaded.database_override || super
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/sessions/validators/storage.rb

@@ -19,12 +19,25 @@ module Mongoid
         #
         # @since 3.0.0
         def validate(klass, options)
-          if !options.is_a?(::Hash) || !valid_keys?(options)
+          if !valid_keys?(options) || !valid_parent?(klass)
             raise Errors::InvalidStorageOptions.new(klass, options)
           end
         end
 
         private
+        # Determine if the current klass is valid to change store_in
+        # options
+        #
+        # @api private
+        #
+        # @param [ Class ] klass
+        #
+        # @return [ true, false ] If the class is valid
+        #
+        # @since 4.0.0
+        def valid_parent?(klass)
+          !klass.superclass.include?(Mongoid::Document)
+        end
 
         # Determine if all keys in the options hash are valid.
         #
@@ -39,6 +52,7 @@ module Mongoid
         #
         # @since 3.0.0
         def valid_keys?(options)
+          return false unless options.is_a?(::Hash)
           options.keys.all? do |key|
             VALID_OPTIONS.include?(key)
           end

data/lib/mongoid/{sharding.rb → shardable.rb}

@@ -2,7 +2,9 @@
 module Mongoid
 
   # This module contains behaviour for adding shard key fields to updates.
-  module Sharding
+  #
+  # @since 4.0.0
+  module Shardable
     extend ActiveSupport::Concern
 
     included do
@@ -18,6 +20,8 @@ module Mongoid
     #   model.shard_key_fields
     #
     # @return [ Array<String> ] The shard key field names.
+    #
+    # @since 1.0.0
     def shard_key_fields
       self.class.shard_key_fields
     end

data/lib/mongoid/support/query_counter.rb

@@ -0,0 +1,23 @@
+module Mongoid
+
+  class QueryCounter
+    attr_reader :events
+
+    def initialize
+      @events = []
+    end
+
+    def instrument
+      subscriber = ActiveSupport::Notifications.subscribe('query.moped') do |*args|
+        @events << ActiveSupport::Notifications::Event.new(*args)
+      end
+      yield
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+
+    def inspect
+      @events.map { |e| e.payload[:ops].map(&:log_inspect) }.join("\n")
+    end
+  end
+end

data/lib/mongoid/threaded.rb

@@ -126,21 +126,6 @@ module Mongoid
       validations_for(document.class).push(document.id)
     end
 
-    # Clear out all the persistence options.
-    #
-    # @example Clear out the persistence options.
-    #   Threaded.clear_persistence_options(Band)
-    #
-    # @param [ Class ] klass The model class.
-    #
-    # @return [ true ] true.
-    #
-    # @since 2.0.0
-    def clear_persistence_options(klass)
-      Thread.current["[mongoid][#{klass}]:persistence-options"] = nil
-      true
-    end
-
     # Exit autosaving a document on the current thread.
     #
     # @example Exit autosave.
@@ -165,101 +150,6 @@ module Mongoid
       validations_for(document.class).delete_one(document.id)
     end
 
-    # Get the identity map off the current thread.
-    #
-    # @example Get the identity map.
-    #   Threaded.identity_map
-    #
-    # @return [ IdentityMap ] The identity map.
-    #
-    # @since 2.1.0
-    def identity_map
-      Thread.current["[mongoid]:identity-map"] ||= IdentityMap.new
-    end
-
-    # Is the identity map enabled on the current thread?
-    #
-    # @example Is the identity map enabled?
-    #   Threaded.identity_map_enabled?
-    #
-    # @return [ true, false ] If the identity map is enabled.
-    #
-    # @since 3.0.0
-    def identity_map_enabled?
-      Thread.current["[mongoid]:identity-map-enabled"] != false
-    end
-
-    # Disable the identity map on either the current thread or all threads.
-    #
-    # @example Disable the identity map on all threads.
-    #   Threaded.disable_identity_map(:all)
-    #
-    # @example Disable the identity map on the current thread.
-    #   Threaded.disable_identity_map(:current)
-    #
-    # @param [ Symbol ] option The disabling option.
-    #
-    # @since 3.0.0
-    def disable_identity_map(option)
-      if option == :all
-        Thread.list.each do |thread|
-          thread["[mongoid]:identity-map-enabled"] = false
-        end
-      else
-        Thread.current["[mongoid]:identity-map-enabled"] = false
-      end
-    end
-
-    # Enable the identity map on either the current thread or all threads.
-    #
-    # @example Enable the identity map on all threads.
-    #   Threaded.enable_identity_map(:all)
-    #
-    # @example Enable the identity map on the current thread.
-    #   Threaded.enable_identity_map(:current)
-    #
-    # @param [ Symbol ] option The disabling option.
-    #
-    # @since 3.0.0
-    def enable_identity_map(option)
-      if option == :all
-        Thread.list.each do |thread|
-          thread["[mongoid]:identity-map-enabled"] = true
-        end
-      else
-        Thread.current["[mongoid]:identity-map-enabled"] = true
-      end
-    end
-
-    # Get the persistence options for the current thread.
-    #
-    # @example Get the persistence options.
-    #   Threaded.persistence_options(Band)
-    #
-    # @param [ Class ] klass The model class.
-    #
-    # @return [ Hash ] The current persistence options.
-    #
-    # @since 2.1.0
-    def persistence_options(klass)
-      Thread.current["[mongoid][#{klass}]:persistence-options"]
-    end
-
-    # Set the persistence options on the current thread.
-    #
-    # @example Set the persistence options.
-    #   Threaded.set_persistence_options(Band, { safe: { fsync: true }})
-    #
-    # @param [ Class ] klass The model class.
-    # @param [ Hash ] options The persistence options.
-    #
-    # @return [ Hash ] The persistence options.
-    #
-    # @since 2.1.0
-    def set_persistence_options(klass, options)
-      Thread.current["[mongoid][#{klass}]:persistence-options"] = options
-    end
-
     # Get the field selection options from the current thread.
     #
     # @example Get the field selection options.

data/lib/mongoid/threaded/lifecycle.rb

@@ -139,23 +139,6 @@ module Mongoid
         Threaded.executing?("load")
       end
 
-      # Execute a block in loading revision mode.
-      #
-      # @example Execute in loading revision mode.
-      #   _loading_revision do
-      #     load_revision
-      #   end
-      #
-      # @return [ Object ] The return value of the block.
-      #
-      # @since 2.3.4
-      def _loading_revision
-        Threaded.begin_execution("load_revision")
-        yield
-      ensure
-        Threaded.exit_execution("load_revision")
-      end
-
       module ClassMethods
 
         # Execute a block in creating mode.
@@ -175,17 +158,6 @@ module Mongoid
           Threaded.exit_execution("create")
         end
 
-        # Is the current thread in loading revision mode?
-        #
-        # @example Is the current thread in loading revision mode?
-        #   proxy._loading_revision?
-        #
-        # @return [ true, false ] If the thread is loading a revision.
-        #
-        # @since 2.3.4
-        def _loading_revision?
-          Threaded.executing?("load_revision")
-        end
       end
     end
   end

data/lib/mongoid/timestamps/updated/short.rb

@@ -3,8 +3,8 @@ module Mongoid
   module Timestamps
     module Updated
 
-      # Adds a created_at timestamp to the document, but it is stored as c_at
-      # with a created_at alias.
+      # Adds an updated_at timestamp to the document, but it is stored as u_at
+      # with an updated_at alias.
       module Short
         extend ActiveSupport::Concern
 

data/lib/mongoid/{hierarchy.rb → traversable.rb}

@@ -1,6 +1,10 @@
 # encoding: utf-8
 module Mongoid
-  module Hierarchy
+
+  # Provides behaviour around traversing the document graph.
+  #
+  # @since 4.0.0
+  module Traversable
     extend ActiveSupport::Concern
 
     included do
@@ -19,7 +23,7 @@ module Mongoid
     #
     # @return [ Array<Document> ] All child documents in the hierarchy.
     def _children
-      @_children ||= collect_children
+      @__children ||= collect_children
     end
 
     # Collect all the children of this document.
@@ -37,7 +41,7 @@ module Mongoid
           child = send(name)
           Array.wrap(child).each do |doc|
             children.push(doc)
-            children.concat(doc._children) unless metadata.versioned?
+            children.concat(doc._children)
           end if child
         end
       end
@@ -116,6 +120,7 @@ module Mongoid
         child.move_changes
         child.new_record = false
       end
+      @__children = nil
     end
 
     # Return the root document in the object graph. If the current document
@@ -174,7 +179,6 @@ module Mongoid
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup
         subclass._declared_scopes = Hash.new { |hash,key| self._declared_scopes[key] }
-        subclass.autosaved_relations = autosaved_relations.dup
 
         # We only need the _type field if inheritance is in play, but need to
         # add to the root class as well for backwards compatibility.
@@ -182,7 +186,7 @@ module Mongoid
           field(:_type, default: self.name, type: String)
         end
         subclass_default = subclass.name || ->{ self.class.name }
-        subclass.field(:_type, default: subclass_default, type: String)
+        subclass.field(:_type, default: subclass_default, type: String, overwrite: true)
       end
     end
   end