mongoid 2.2.6 → 2.3.0

data/lib/mongoid/relations/referenced/in.rb

@@ -71,7 +71,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          target.persisted? && !binding? && !building?
+          target.persisted? && !binding? && !_building?
         end
 
         class << self

data/lib/mongoid/relations/referenced/many.rb

@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
             args.flatten.each do |doc|
               next unless doc
               append(doc)
-              doc.save if persistable? && !doc.validated?
+              doc.save if persistable?
             end
           end
         end
@@ -47,13 +47,14 @@ module Mongoid #:nodoc:
         #   person.posts.build(:title => "A new post")
         #
         # @param [ Hash ] attributes The attributes of the new document.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type The optional subclass to build.
         #
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
-        def build(attributes = {}, type = nil)
-          Factory.build(type || klass, attributes).tap do |doc|
+        def build(attributes = {}, options = {}, type = nil)
+          Factory.build(type || klass, attributes, options).tap do |doc|
             append(doc)
             yield(doc) if block_given?
           end
@@ -67,13 +68,14 @@ module Mongoid #:nodoc:
         #   person.posts.create(:text => "Testing")
         #
         # @param [ Hash ] attributes The attributes to create with.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type The optional type of document to create.
         #
         # @return [ Document ] The newly created document.
         #
         # @since 2.0.0.beta.1
-        def create(attributes = nil, type = nil, &block)
-          build(attributes, type, &block).tap do |doc|
+        def create(attributes = nil, options = {}, type = nil, &block)
+          build(attributes, options, type, &block).tap do |doc|
             base.persisted? ? doc.save : raise_unsaved(doc)
           end
         end
@@ -86,6 +88,7 @@ module Mongoid #:nodoc:
         #   person.posts.create!(:text => "Testing")
         #
         # @param [ Hash ] attributes The attributes to create with.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type The optional type of document to create.
         #
         # @raise [ Errors::Validations ] If validation failed.
@@ -93,8 +96,8 @@ module Mongoid #:nodoc:
         # @return [ Document ] The newly created document.
         #
         # @since 2.0.0.beta.1
-        def create!(attributes = nil, type = nil, &block)
-          build(attributes, type, &block).tap do |doc|
+        def create!(attributes = nil, options = {}, type = nil, &block)
+          build(attributes, options, type, &block).tap do |doc|
             base.persisted? ? doc.save! : raise_unsaved(doc)
           end
         end
@@ -321,28 +324,6 @@ module Mongoid #:nodoc:
           klass.collection
         end
 
-        # Get the value for the foreign key in convertable or unconvertable
-        # form.
-        #
-        # @todo Durran: Find a common place for this.
-        #
-        # @example Get the value.
-        #   relation.convertable
-        #
-        # @return [ String, BSON::ObjectId ] The string or object id.
-        #
-        # @since 2.0.2
-        def convertable
-          inverse = metadata.inverse_klass
-          if inverse.using_object_ids? || base.id.is_a?(BSON::ObjectId)
-            base.id
-          else
-            base.id.tap do |id|
-              id.unconvertable_to_bson = true if id.is_a?(String)
-            end
-          end
-        end
-
         # Returns the criteria object for the target class with its documents set
         # to target.
         #
@@ -353,7 +334,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.beta.1
         def criteria
-          Many.criteria(metadata, convertable)
+          Many.criteria(metadata, Conversions.flag(base.id, metadata))
         end
 
         # Perform the necessary cascade operations for documents that just got
@@ -408,7 +389,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def persistable?
-          base.persisted? && !binding? && !building?
+          base.persisted? && !binding? && !_building?
         end
 
         # Deletes all related documents from the database given the supplied

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -55,13 +55,14 @@ module Mongoid # :nodoc:
         #   person.posts.build(:title => "A new post")
         #
         # @param [ Hash ] attributes The attributes of the new document.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type The optional subclass to build.
         #
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
-        def build(attributes = {}, type = nil)
-          Factory.build(type || klass, attributes).tap do |doc|
+        def build(attributes = {}, options = {}, type = nil)
+          Factory.build(type || klass, attributes, options).tap do |doc|
             base.send(metadata.foreign_key).push(doc.id)
             append(doc)
             yield(doc) if block_given?
@@ -142,9 +143,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def nullify
-          unless metadata.forced_nil_inverse?
-            criteria.pull(metadata.inverse_foreign_key, base.id)
-          end
+          criteria.pull(metadata.inverse_foreign_key, base.id)
           if persistable?
             base.set(
               metadata.foreign_key,

data/lib/mongoid/relations/referenced/one.rb

@@ -51,14 +51,12 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def substitute(replacement)
-          tap do |proxy|
-            proxy.unbind_one
-            proxy.target.delete if persistable?
-            return nil unless replacement
-            proxy.target = replacement
-            proxy.bind_one
-            replacement.save if persistable?
+          unbind_one
+          if persistable?
+            metadata.destructive? ? send(metadata.dependent) : save
           end
+          return nil unless replacement
+          One.new(base, replacement, metadata)
         end
 
         private
@@ -84,7 +82,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          base.persisted? && !binding? && !building?
+          base.persisted? && !binding? && !_building?
         end
 
         class << self

data/lib/mongoid/relations/synchronization.rb

@@ -77,7 +77,7 @@ module Mongoid # :nodoc:
       def update_inverse_keys(meta)
         return unless changes.has_key?(meta.foreign_key)
         old, new = changes[meta.foreign_key]
-        adds, subs = new - old, old - new
+        adds, subs = new - (old || []), (old || []) - new
         meta.criteria(adds).add_to_set(meta.inverse_foreign_key, id) unless adds.empty?
         meta.criteria(subs).pull(meta.inverse_foreign_key, id) unless subs.empty?
       end
@@ -93,10 +93,8 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def synced(metadata)
-          unless metadata.forced_nil_inverse?
-            synced_save(metadata)
-            synced_destroy(metadata)
-          end
+          synced_save(metadata)
+          synced_destroy(metadata)
         end
 
         private

data/lib/mongoid/safety.rb

@@ -7,7 +7,7 @@ module Mongoid #:nodoc:
   module Safety
     extend ActiveSupport::Concern
 
-    # Execute the following class-level persistence operation in safe mode.
+    # Execute the following instance-level persistence operation in safe mode.
     #
     # @example Upsert in safe mode.
     #   person.safely.upsert
@@ -27,6 +27,18 @@ module Mongoid #:nodoc:
       tap { Threaded.safety_options = safety }
     end
 
+    # Execute the following instance-level persistence operation without safe mode.
+    # Allows per-request overriding of safe mode when the persist_in_safe_mode
+    # config option is turned on.
+    #
+    # @example Upsert in safe mode.
+    #   person.unsafely.upsert
+    #
+    # @return [ Proxy ] The safety proxy.
+    def unsafely
+      tap { Threaded.safety_options = false }
+    end
+
     class << self
 
       # Static class method of easily getting the desired safe mode options
@@ -43,9 +55,13 @@ module Mongoid #:nodoc:
       def merge_safety_options(options = {})
         options ||= {}
         return options if options[:safe]
-        options.merge!(
-          { :safe => Threaded.safety_options || Mongoid.persist_in_safe_mode }
-        )
+
+        unless Threaded.safety_options.nil?
+          safety = Threaded.safety_options
+        else
+          safety = Mongoid.persist_in_safe_mode
+        end
+        options.merge!({ :safe => safety })
       end
     end
 
@@ -70,6 +86,20 @@ module Mongoid #:nodoc:
       def safely(safety = true)
         tap { Threaded.safety_options = safety }
       end
+
+      # Execute the following class-level persistence operation without safe mode.
+      # Allows per-request overriding of safe mode when the persist_in_safe_mode
+      # config option is turned on.
+      #
+      # @example Upsert in safe mode.
+      #   Person.unsafely.create(:name => "John")
+      #
+      # @return [ Proxy ] The safety proxy.
+      #
+      # @since 2.3.0
+      def unsafely
+        tap { Threaded.safety_options = false }
+      end
     end
   end
 end

data/lib/mongoid/serialization.rb

@@ -5,11 +5,9 @@ module Mongoid # :nodoc:
   # and XML serialization.
   module Serialization
     extend ActiveSupport::Concern
-    include ActiveModel::Serialization
 
-    # Gets the document as a serializable hash, used by ActiveModel's JSON and
-    # XML serializers. This override is just to be able to pass the :include
-    # and :except options to get associations in the hash.
+    # Gets the document as a serializable hash, used by ActiveModel's JSON
+    # serializer.
     #
     # @example Get the serializable hash.
     #   document.serializable_hash
@@ -19,16 +17,32 @@ module Mongoid # :nodoc:
     #
     # @param [ Hash ] options The options to pass.
     #
-    # @option options [ Symbol ] :include What relations to include
+    # @option options [ Symbol ] :include What relations to include.
     # @option options [ Symbol ] :only Limit the fields to only these.
     # @option options [ Symbol ] :except Dont include these fields.
+    # @option options [ Symbol ] :methods What methods to include.
     #
     # @return [ Hash ] The document, ready to be serialized.
     #
     # @since 2.0.0.rc.6
     def serializable_hash(options = nil)
       options ||= {}
-      super(options).tap do |attrs|
+
+      only   = Array.wrap(options[:only]).map(&:to_s)
+      except = Array.wrap(options[:except]).map(&:to_s)
+
+      except |= ['_type']
+
+      field_names = fields.keys.map { |field| field.to_s }
+      attribute_names = (attributes.keys + field_names).sort
+      if only.any?
+        attribute_names &= only
+      elsif except.any?
+        attribute_names -= except
+      end
+
+      method_names = Array.wrap(options[:methods]).map { |n| n.to_s if respond_to?(n.to_s) }.compact
+      Hash[(attribute_names + method_names).map { |n| [n, send(n)] }].tap do |attrs|
         serialize_relations(attrs, options) if options[:include]
       end
     end

data/lib/mongoid/threaded.rb

@@ -178,6 +178,17 @@ module Mongoid #:nodoc:
       Thread.current[:"[mongoid]:safety-options"] = nil
     end
 
+    # Clear out all options set on a one-time basis.
+    #
+    # @example Clear out the options.
+    #   Threaded.clear_options!
+    #
+    # @since 2.3.0
+    def clear_options!
+      clear_safety_options!
+      self.timeless = false
+    end
+
     # Exit the assigning block.
     #
     # @example Exit the assigning block.
@@ -314,6 +325,30 @@ module Mongoid #:nodoc:
       Thread.current[:"[mongoid]:scope-stack"] ||= {}
     end
 
+    # Get the value of the one-off timeless call.
+    #
+    # @example Get the timeless value.
+    #   Threaded.timeless
+    #
+    # @return [ true, false ] The timeless setting.
+    #
+    # @since 2.3.0
+    def timeless
+      !!Thread.current[:"[mongoid]:timeless"]
+    end
+
+    # Set the value of the one-off timeless call.
+    #
+    # @example Set the timeless value.
+    #   Threaded.timeless = true
+    #
+    # @param [ true, false ] value The value.
+    #
+    # @since 2.3.0
+    def timeless=(value)
+      Thread.current[:"[mongoid]:timeless"] = value
+    end
+
     # Get the update consumer from the current thread.
     #
     # @example Get the update consumer.
@@ -340,6 +375,18 @@ module Mongoid #:nodoc:
       Thread.current[:"[mongoid][#{klass}]:update-consumer"] = consumer
     end
 
+    # Is the current thread setting timestamps?
+    #
+    # @example Is the current thread timestamping?
+    #   Threaded.timestamping?
+    #
+    # @return [ true, false ] If timestamps can be applied.
+    #
+    # @since 2.3.0
+    def timestamping?
+      !timeless
+    end
+
     # Is the document validated on the current thread?
     #
     # @example Is the document validated?

data/lib/mongoid/timestamps.rb

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

data/lib/mongoid/timestamps/created.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-
   module Timestamps
     # This module handles the behaviour for setting up document created at
     # timestamp.
@@ -9,13 +8,7 @@ module Mongoid #:nodoc:
 
       included do
         field :created_at, :type => Time
-
-        set_callback :create, :before, :set_created_at
-
-        unless methods.include? 'record_timestamps'
-          class_attribute :record_timestamps
-          self.record_timestamps = true
-        end
+        set_callback :create, :before, :set_created_at, :if => :timestamping?
       end
 
       # Update the created_at field on the Document to the current time. This is

data/lib/mongoid/timestamps/timeless.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Timestamps
+
+    # This module adds behaviour for turning off timestamping in single or
+    # multiple calls.
+    module Timeless
+      extend ActiveSupport::Concern
+
+      # Begin an execution that should skip timestamping.
+      #
+      # @example Save a document but don't timestamp.
+      #   person.timeless.save
+      #
+      # @return [ Document ] The document this was called on.
+      #
+      # @since 2.3.0
+      def timeless
+        tap { Threaded.timeless = true }
+      end
+
+      # Are we currently timestamping?
+      #
+      # @example Should timestamps be applied?
+      #   person.timestamping?
+      #
+      # @return [ true, false ] If the current thread is timestamping.
+      #
+      # @since 2.3.0
+      def timestamping?
+        Threaded.timestamping?
+      end
+
+      module ClassMethods #:nodoc
+
+        # Begin an execution that should skip timestamping.
+        #
+        # @example Create a document but don't timestamp.
+        #   Person.timeless.create(:title => "Sir")
+        #
+        # @return [ Class ] The class this was called on.
+        #
+        # @since 2.3.0
+        def timeless
+          tap { Threaded.timeless = true }
+        end
+      end
+    end
+  end
+end