mongoid 3.0.23 → 3.1.0

data/lib/mongoid/relations/touchable.rb

@@ -4,11 +4,6 @@ module Mongoid
     module Touchable
       extend ActiveSupport::Concern
 
-      included do
-        class_attribute :touchables
-        self.touchables = []
-      end
-
       module ClassMethods
 
         # Add the metadata to the touchable relations if the touch option was
@@ -23,9 +18,43 @@ module Mongoid
         #
         # @since 3.0.0
         def touchable(metadata)
-          self.touchables.push(metadata.name) if metadata.touchable?
+          if metadata.touchable?
+            name = metadata.name
+            method_name = define_relation_touch_method(name)
+            after_create method_name
+            after_destroy method_name
+            after_touch method_name
+          end
           self
         end
+
+        private
+
+        # Define the method that will get called for touching belongs_to
+        # relations.
+        #
+        # @api private
+        #
+        # @example Define the touch relation.
+        #   Model.define_relation_touch_method(:band)
+        #
+        # @param [ Symbol ] name The name of the relation.
+        #
+        # @since 3.1.0
+        #
+        # @return [ Symbol ] The method name.
+        def define_relation_touch_method(name)
+          method_name = "touch_#{name}_after_create_or_destroy"
+          class_eval <<-TOUCH
+            def #{method_name}
+              without_autobuild do
+                relation = __send__(:#{name})
+                relation.touch if relation
+              end
+            end
+          TOUCH
+          method_name.to_sym
+        end
       end
     end
   end

data/lib/mongoid/reloading.rb

@@ -21,11 +21,13 @@ module Mongoid
         raise Errors::DocumentNotFound.new(self.class, id, id)
       end
       @attributes = reloaded
+      @attributes_before_type_cast = {}
       changed_attributes.clear
       apply_defaults
       reload_relations
       IdentityMap.set(self)
-      run_callbacks(:initialize)
+      run_callbacks(:find) unless _find_callbacks.empty?
+      run_callbacks(:initialize) unless _initialize_callbacks.empty?
       self
     end
 
@@ -53,7 +55,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(collection.find(_id: id).one || {})
+      {}.merge(with(consistency: :strong).collection.find(_id: id).one || {})
     end
 
     # Reload the embedded document.
@@ -66,7 +68,7 @@ module Mongoid
     # @since 2.3.2
     def reload_embedded_document
       extract_embedded_attributes({}.merge(
-        _root.collection.find(_id: _root.id).one
+        _root.with(consistency: :strong).collection.find(_id: _root.id).one
       ))
     end
 

data/lib/mongoid/scoping.rb

@@ -204,10 +204,10 @@ module Mongoid
       #
       # @since 3.0.0
       def without_default_scope
-        Threaded.begin("without_default_scope")
+        Threaded.begin_execution("without_default_scope")
         yield
       ensure
-        Threaded.exit("without_default_scope")
+        Threaded.exit_execution("without_default_scope")
       end
 
       private

data/lib/mongoid/sessions.rb

@@ -109,6 +109,20 @@ module Mongoid
         Threaded.sessions[:default] ||= Sessions::Factory.default
       end
 
+      # Disconnect all active sessions.
+      #
+      # @example Disconnect all active sessions.
+      #   Mongoid::Sessions.disconnect
+      #
+      # @return [ true ] True.
+      #
+      # @since 3.1.0
+      def disconnect
+        Threaded.sessions.values.each do |session|
+          session.disconnect
+        end
+      end
+
       # Get a session with the provided name.
       #
       # @example Get a session with the name.
@@ -211,7 +225,7 @@ module Mongoid
       # @since 3.0.0
       def mongo_session
         session = __session__
-        session.use(database_override || database_name)
+        session.use(database_override || current_database_name(session))
         session
       end
 
@@ -323,7 +337,7 @@ module Mongoid
       # @since 3.0.0
       def __collection_name__
         if storage_options && name = storage_options[:collection]
-          name.to_sym
+          __evaluate__(name)
         else
           default_collection_name
         end
@@ -339,7 +353,7 @@ module Mongoid
       # @since 3.0.0
       def __database_name__
         if storage_options && name = storage_options[:database]
-          name.to_sym
+          __evaluate__(name)
         else
           Mongoid.sessions[__session_name__][:database]
         end
@@ -355,7 +369,7 @@ module Mongoid
       # @since 3.0.0
       def __session_name__
         if storage_options && name = storage_options[:session]
-          name.to_sym
+          __evaluate__(name)
         else
           :default
         end
@@ -372,10 +386,46 @@ module Mongoid
       def __session__
         if !(name = session_override).nil?
           Sessions.with_name(name)
-        elsif storage_options && name = storage_options[:session]
-          Sessions.with_name(name)
         else
-          Sessions.default
+          Sessions.with_name(__session_name__)
+        end
+      end
+
+      # 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)
+        name.respond_to?(:call) ? name.call.to_sym : name.to_sym
+      end
+
+      # Get the name of the current database to use. Will check for a session
+      # override with a database first, then database name.
+      #
+      # @api private
+      #
+      # @example Get the current database name.
+      #   Model.current_database_name
+      #
+      # @param [ Moped::Session ] session The current session.
+      #
+      # @return [ Symbol ] The current database name.
+      #
+      # @since 3.1.0
+      def current_database_name(session)
+        if session_override && name = session.options[:database]
+          name
+        else
+          database_name
         end
       end
     end

data/lib/mongoid/sessions/factory.rb

@@ -100,9 +100,30 @@ module Mongoid
       # @since 3.0.0
       def parse(config)
         options = config[:options].try(:dup) || {}
-        parsed = config.has_key?(:uri) ? MongoUri.new(config[:uri]).to_hash : config
+        parsed = if config.has_key?(:uri)
+          MongoUri.new(config[:uri]).to_hash
+        else
+          inject_ports(config)
+        end
         [ parsed, options.symbolize_keys ]
       end
+
+      # Will inject the default port of 27017 if not supplied.
+      #
+      # @example Inject default ports.
+      #   factory.inject_ports(config)
+      #
+      # @param [ Hash ] config The session configuration.
+      #
+      # @return [ Hash ] The altered configuration.
+      #
+      # @since 3.1.0
+      def inject_ports(config)
+        config["hosts"] = config["hosts"].map do |host|
+          host =~ /:/ ? host : "#{host}:27017"
+        end
+        config
+      end
     end
   end
 end

data/lib/mongoid/threaded.rb

@@ -11,14 +11,14 @@ module Mongoid
     # Begin entry into a named thread local stack.
     #
     # @example Begin entry into the stack.
-    #   Threaded.begin(:create)
+    #   Threaded.begin_execution(:create)
     #
     # @param [ String ] name The name of the stack
     #
     # @return [ true ] True.
     #
     # @since 2.4.0
-    def begin(name)
+    def begin_execution(name)
       stack(name).push(true)
     end
 
@@ -77,14 +77,14 @@ module Mongoid
     # Exit from a named thread local stack.
     #
     # @example Exit from the stack.
-    #   Threaded.exit(:create)
+    #   Threaded.exit_execution(:create)
     #
     # @param [ Symbol ] name The name of the stack
     #
     # @return [ true ] True.
     #
     # @since 2.4.0
-    def exit(name)
+    def exit_execution(name)
       stack(name).pop
     end
 
@@ -241,32 +241,6 @@ module Mongoid
       end
     end
 
-    # Get the insert consumer from the current thread.
-    #
-    # @example Get the insert consumer.
-    #   Threaded.insert
-    #
-    # @return [ Object ] The batch insert consumer.
-    #
-    # @since 2.1.0
-    def insert(name)
-      Thread.current["[mongoid][#{name}]:insert-consumer"]
-    end
-
-    # Set the insert consumer on the current thread.
-    #
-    # @example Set the insert consumer.
-    #   Threaded.insert = consumer
-    #
-    # @param [ Object ] consumer The insert consumer.
-    #
-    # @return [ Object ] The insert consumer.
-    #
-    # @since 2.1.0
-    def set_insert(name, consumer)
-      Thread.current["[mongoid][#{name}]:insert-consumer"] = consumer
-    end
-
     # Get the persistence options for the current thread.
     #
     # @example Get the persistence options.

data/lib/mongoid/threaded/lifecycle.rb

@@ -22,10 +22,10 @@ module Mongoid
       #
       # @since 2.2.0
       def _assigning
-        Threaded.begin("assign")
+        Threaded.begin_execution("assign")
         yield
       ensure
-        Threaded.exit("assign")
+        Threaded.exit_execution("assign")
       end
 
       # Is the current thread in assigning mode?
@@ -51,10 +51,10 @@ module Mongoid
       #
       # @since 2.1.0
       def _binding
-        Threaded.begin("bind")
+        Threaded.begin_execution("bind")
         yield
       ensure
-        Threaded.exit("bind")
+        Threaded.exit_execution("bind")
       end
 
       # Is the current thread in binding mode?
@@ -80,10 +80,10 @@ module Mongoid
       #
       # @since 2.1.0
       def _building
-        Threaded.begin("build")
+        Threaded.begin_execution("build")
         yield
       ensure
-        Threaded.exit("build")
+        Threaded.exit_execution("build")
       end
 
       # Is the current thread in building mode?
@@ -121,10 +121,10 @@ module Mongoid
       #
       # @since 2.3.2
       def _loading
-        Threaded.begin("load")
+        Threaded.begin_execution("load")
         yield
       ensure
-        Threaded.exit("load")
+        Threaded.exit_execution("load")
       end
 
       # Is the current thread in loading mode?
@@ -150,10 +150,10 @@ module Mongoid
       #
       # @since 2.3.4
       def _loading_revision
-        Threaded.begin("load_revision")
+        Threaded.begin_execution("load_revision")
         yield
       ensure
-        Threaded.exit("load_revision")
+        Threaded.exit_execution("load_revision")
       end
 
       module ClassMethods
@@ -169,10 +169,10 @@ module Mongoid
         #
         # @since 2.1.0
         def _creating
-          Threaded.begin("create")
+          Threaded.begin_execution("create")
           yield
         ensure
-          Threaded.exit("create")
+          Threaded.exit_execution("create")
         end
 
         # Is the current thread in loading revision mode?

data/lib/mongoid/timestamps.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "mongoid/timestamps/created"
 require "mongoid/timestamps/updated"
+require "mongoid/timestamps/short"
 require "mongoid/timestamps/timeless"
 
 module Mongoid

data/lib/mongoid/timestamps/created.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require "mongoid/timestamps/created/short"
+
 module Mongoid
   module Timestamps
     # This module handles the behaviour for setting up document created at

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid
+  module Timestamps
+    module Created
+
+      # Adds a created_at timestamp to the document, but it is stored as c_at
+      # with a created_at alias.
+      module Short
+        extend ActiveSupport::Concern
+
+        included do
+          include Created
+          fields.delete("created_at")
+          field :c_at, type: Time, as: :created_at
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/timestamps/short.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+module Mongoid
+  module Timestamps
+    module Short
+      extend ActiveSupport::Concern
+      include Created::Short
+      include Updated::Short
+    end
+  end
+end

data/lib/mongoid/timestamps/updated.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require "mongoid/timestamps/updated/short"
+
 module Mongoid
   module Timestamps
     # This module handles the behaviour for setting up document updated at

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

@@ -0,0 +1,19 @@
+# encoding: utf-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.
+      module Short
+        extend ActiveSupport::Concern
+
+        included do
+          include Updated
+          fields.delete("updated_at")
+          field :u_at, type: Time, as: :updated_at
+        end
+      end
+    end
+  end
+end