mongoid 2.0.2 → 2.1.0

data/lib/mongoid/serialization.rb

@@ -33,6 +33,27 @@ module Mongoid # :nodoc:
       end
     end
 
+    class << self
+
+      # Serialize the provided object into a Mongo friendly value, using the
+      # field serialization method for the passed in type. If no type is
+      # given then we assume generic object serialization, which just returns
+      # the value itself.
+      #
+      # @example Mongoize the object.
+      #   Mongoid::Serialization.mongoize(time, Time)
+      #
+      # @param [ Object ] object The object to convert.
+      # @param [ Class ] klass The type of the object.
+      #
+      # @return [ Object ] The converted object.
+      #
+      # @since 2.1.0
+      def mongoize(object, klass = Object)
+        Fields::Mappings.for(klass).new(:mongoize).serialize(object)
+      end
+    end
+
     private
 
     # For each of the provided include options, get the relation needed and

data/lib/mongoid/state.rb

@@ -63,5 +63,39 @@ module Mongoid #:nodoc:
     def destroyed=(destroyed)
       @destroyed = destroyed && true
     end
+
+    # Determine if the document can be pushed.
+    #
+    # @example Is this pushable?
+    #   person.pushable?
+    #
+    # @return [ true, false ] Is the document new and embedded?
+    def pushable?
+      new? && embedded_many? && _parent.persisted?
+    end
+
+    # Determine if the document can be set.
+    #
+    # @example Is this settable?
+    #   person.settable?
+    #
+    # @return [ true, false ] Is this document a new embeds one?
+    #
+    # @since 2.1.0
+    def settable?
+      new? && embedded_one?
+    end
+
+    # Is the document updateable?
+    #
+    # @example Is the document updateable?
+    #   person.updateable?
+    #
+    # @return [ true, false ] If the document is changed and persisted.
+    #
+    # @since 2.1.0
+    def updateable?
+      persisted? && changed?
+    end
   end
 end

data/lib/mongoid/threaded.rb

@@ -0,0 +1,175 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+
+  # This module contains logic for easy access to objects that have a lifecycle
+  # on the current thread.
+  module Threaded
+    extend self
+
+    # Is the current thread in binding mode?
+    #
+    # @example Is the thread in binding mode?
+    #   Threaded.binding?
+    #
+    # @return [ true, false ] If the thread is in binding mode?
+    #
+    # @since 2.1.0
+    def binding?
+      Thread.current[:"[mongoid]:binding-mode"] ||= false
+    end
+
+    # Set the binding mode for the current thread.
+    #
+    # @example Set the binding mode.
+    #   Threaded.binding = true
+    #
+    # @param [ true, false ] mode The current binding mode.
+    #
+    # @return [ true, false ] The current binding mode.
+    #
+    # @since 2.1.0
+    def binding=(mode)
+      Thread.current[:"[mongoid]:binding-mode"] = mode
+    end
+
+    # Is the current thread in building mode?
+    #
+    # @example Is the thread in building mode?
+    #   Threaded.building?
+    #
+    # @return [ true, false ] If the thread is in building mode?
+    #
+    # @since 2.1.0
+    def building?
+      Thread.current[:"[mongoid]:building-mode"] ||= false
+    end
+
+    # Set the building mode for the current thread.
+    #
+    # @example Set the building mode.
+    #   Threaded.building = true
+    #
+    # @param [ true, false ] mode The current building mode.
+    #
+    # @return [ true, false ] The current building mode.
+    #
+    # @since 2.1.0
+    def building=(mode)
+      Thread.current[:"[mongoid]:building-mode"] = mode
+    end
+
+    # Clear out all the safety options set using the safely proxy.
+    #
+    # @example Clear out the options.
+    #   Threaded.clear_safety_options!
+    #
+    # @return [ nil ] nil
+    #
+    # @since 2.1.0
+    def clear_safety_options!
+      Thread.current[:"[mongoid]:safety-options"] = nil
+    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
+
+    # 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
+      Thread.current[:"[mongoid]: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 insert=(consumer)
+      Thread.current[:"[mongoid]:insert-consumer"] = consumer
+    end
+
+    # Get the safety options for the current thread.
+    #
+    # @example Get the safety options.
+    #   Threaded.safety_options
+    #
+    # @return [ Hash ] The current safety options.
+    #
+    # @since 2.1.0
+    def safety_options
+      Thread.current[:"[mongoid]:safety-options"]
+    end
+
+    # Set the safety options on the current thread.
+    #
+    # @example Set the safety options.
+    #   Threaded.safety_options = { :fsync => true }
+    #
+    # @param [ Hash ] options The safety options.
+    #
+    # @return [ Hash ] The safety options.
+    #
+    # @since 2.1.0
+    def safety_options=(options)
+      Thread.current[:"[mongoid]:safety-options"] = options
+    end
+
+    # Get the mongoid scope stack for chained criteria.
+    #
+    # @example Get the scope stack.
+    #   Threaded.scope_stack
+    #
+    # @return [ Hash ] The scope stack.
+    #
+    # @since 2.1.0
+    def scope_stack
+      Thread.current[:"[mongoid]:scope-stack"] ||= {}
+    end
+
+    # Get the update consumer from the current thread.
+    #
+    # @example Get the update consumer.
+    #   Threaded.update
+    #
+    # @return [ Object ] The atomic update consumer.
+    #
+    # @since 2.1.0
+    def update
+      Thread.current[:"[mongoid]:update-consumer"]
+    end
+
+    # Set the update consumer on the current thread.
+    #
+    # @example Set the update consumer.
+    #   Threaded.update = consumer
+    #
+    # @param [ Object ] consumer The update consumer.
+    #
+    # @return [ Object ] The update consumer.
+    #
+    # @since 2.1.0
+    def update=(consumer)
+      Thread.current[:"[mongoid]:update-consumer"] = consumer
+    end
+  end
+end

data/lib/mongoid/timestamps/updated.rb

@@ -26,7 +26,7 @@ module Mongoid #:nodoc:
       # @example Set the updated at time.
       #   person.set_updated_at
       def set_updated_at
-        self.updated_at = Time.now.utc
+        self.updated_at = Time.now.utc unless self.updated_at_changed?
       end
     end
   end

data/lib/mongoid/validations.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require "mongoid/validations/associated"
-require "mongoid/validations/referenced"
 require "mongoid/validations/uniqueness"
 
 module Mongoid #:nodoc:
@@ -27,7 +26,8 @@ module Mongoid #:nodoc:
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
       if relations[attr.to_s]
-        send(attr, false, :eager => true)
+        relation = ivar(attr)
+        relation ? relation.in_memory : nil
       else
         send(attr)
       end
@@ -112,11 +112,7 @@ module Mongoid #:nodoc:
       # @since 2.0.0.rc.1
       def validates_relation(metadata)
         if metadata.validate?
-          if metadata.embedded?
-            validates_associated(metadata.name)
-          else
-            validates_with(ReferencedValidator, _merge_attributes([metadata.name]))
-          end
+          validates_associated(metadata.name)
         end
       end
     end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/lib/mongoid/versioning.rb

@@ -10,11 +10,18 @@ module Mongoid #:nodoc:
     included do
       field :version, :type => Integer, :default => 1
 
-      embeds_many :versions, :class_name => self.name, :validate => false
+      embeds_many \
+        :versions,
+        :class_name => self.name,
+        :validate => false,
+        :cyclic => true,
+        :versioned => true
+
       set_callback :save, :before, :revise, :if => :revisable?
 
       class_attribute :version_max
       delegate :version_max, :to => "self.class"
+      self.cyclic = true
     end
 
     # Create a new version of the +Document+. This will load the previous
@@ -27,15 +34,45 @@ module Mongoid #:nodoc:
     #
     # @since 1.0.0
     def revise
-      previous = find_last_version
-      if previous
-        versions.target << previous.clone
+      previous = previous_revision
+      if previous && versioned_attributes_changed?
+        new_version = versions.build(previous.versioned_attributes)
         versions.shift if version_max.present? && versions.length > version_max
         self.version = (version || 1 ) + 1
-        @modifications["versions"] = [ nil, versions.as_document ] if @modifications
       end
     end
 
+    # Filters the results of +changes+ by removing any fields that should
+    # not be versioned.
+    #
+    # @return [ Hash ] A hash of versioned changed attributes.
+    #
+    # @since 2.1.0
+    def versioned_changes
+      only_versioned_attributes(changes)
+    end
+
+    # Filters the results of +attributes+ by removing any fields that should
+    # not be versioned.
+    #
+    # @return [ Hash ] A hash of versioned attributes.
+    #
+    # @since 2.1.0
+    def versioned_attributes
+      only_versioned_attributes(attributes)
+    end
+
+    # Check if any versioned fields have been modified. This is similar
+    # to +changed?+, except this method also ignores fields set to be
+    # ignored by versioning.
+    #
+    # @return [ Boolean ] Whether fields that will be versioned have changed.
+    #
+    # @since 2.1.0
+    def versioned_attributes_changed?
+      !versioned_changes.empty?
+    end
+
     # Executes a block that temporarily disables versioning. This is for cases
     # where you do not want to version on every save.
     #
@@ -63,7 +100,7 @@ module Mongoid #:nodoc:
     # @return [ Document, nil ] The previously saved document.
     #
     # @since 2.0.0
-    def find_last_version
+    def previous_revision
       self.class.
         where(:_id => id).
         any_of({ :version => version }, { :version => nil }).first
@@ -79,7 +116,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.0.0
     def revisable?
-      changed? && !versionless?
+      versioned_attributes_changed? && !versionless?
     end
 
     # Are we in versionless mode? This is true if in a versionless block on the
@@ -95,6 +132,23 @@ module Mongoid #:nodoc:
       !!@versionless
     end
 
+    # Filters fields that should not be versioned out of an attributes hash.
+    # Dynamic attributes are always versioned.
+    #
+    # @param [ Hash ] A hash with field names as keys.
+    #
+    # @return [ Hash ] The hash without non-versioned columns.
+    #
+    # @since 2.1.0
+    def only_versioned_attributes(hash)
+      {}.tap do |versioned|
+        hash.each_pair do |name, value|
+          field = fields[name]
+          versioned[name] = value if !field || field.versioned?
+        end
+      end
+    end
+
     module ClassMethods #:nodoc:
 
       # Sets the maximum number of versions to store.

data/lib/rack/mongoid.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+require "rack/mongoid/middleware/identity_map"

data/lib/rack/mongoid/middleware/identity_map.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Rack #:nodoc:
+  module Mongoid #:nodoc:
+    module Middleware #:nodoc:
+
+      # This middleware contains the behaviour needed to properly use the
+      # identity map in Rack based applications.
+      class IdentityMap
+
+        # Initialize the new middleware.
+        #
+        # @example Init the middleware.
+        # IdentityMap.new(app)
+        #
+        # @param [ Object ] app The application.
+        #
+        # @since 2.1.0
+        def initialize(app)
+          @app = app
+        end
+
+        # Make the request with the provided environment.
+        #
+        # @example Make the request.
+        # identity_map.call(env)
+        #
+        # @param [ Object ] env The environment.
+        #
+        # @return [ Array ] The status, headers, and response.
+        #
+        # @since 2.1.0
+        def call(env)
+          ::Mongoid.unit_of_work { @app.call(env) }
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/mongoid/model/model_generator.rb

@@ -15,7 +15,7 @@ module Mongoid #:nodoc:
       class_option :versioning, :type => :boolean, :default => false, :desc => "Enable mongoid versioning"
 
       def create_model_file
-        template "model.rb", File.join("app/models", class_path, "#{file_name}.rb")
+        template "model.rb.tt", File.join("app/models", class_path, "#{file_name}.rb")
       end
 
       hook_for :test_framework