mongoid 2.3.5 → 2.4.0

data/lib/mongoid/threaded/lifecycle.rb

@@ -22,10 +22,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def _assigning
-        Threaded.begin_assign
+        Threaded.begin(:assign)
         yield
       ensure
-        Threaded.exit_assign
+        Threaded.exit(:assign)
       end
 
       # Is the current thread in assigning mode?
@@ -37,7 +37,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _assigning?
-        Threaded.assigning?
+        Threaded.executing?(:assign)
       end
 
       # Execute a block in binding mode.
@@ -51,10 +51,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _binding
-        Threaded.begin_bind
+        Threaded.begin(:bind)
         yield
       ensure
-        Threaded.exit_bind
+        Threaded.exit(:bind)
       end
 
       # Is the current thread in binding mode?
@@ -66,7 +66,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _binding?
-        Threaded.binding?
+        Threaded.executing?(:bind)
       end
 
       # Execute a block in building mode.
@@ -80,10 +80,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _building
-        Threaded.begin_build
+        Threaded.begin(:build)
         yield
       ensure
-        Threaded.exit_build
+        Threaded.exit(:build)
       end
 
       # Is the current thread in building mode?
@@ -95,7 +95,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _building?
-        Threaded.building?
+        Threaded.executing?(:build)
       end
 
       # Is the current thread in creating mode?
@@ -107,7 +107,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _creating?
-        Threaded.creating?
+        Threaded.executing?(:create)
       end
 
       # Execute a block in loading mode.
@@ -121,10 +121,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.2
       def _loading
-        Threaded.begin_load
+        Threaded.begin(:load)
         yield
       ensure
-        Threaded.exit_load
+        Threaded.exit(:load)
       end
 
       # Is the current thread in loading mode?
@@ -136,7 +136,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.2
       def _loading?
-        Threaded.loading?
+        Threaded.executing?(:load)
       end
 
       # Execute a block in loading revision mode.
@@ -150,10 +150,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.4
       def _loading_revision
-        Threaded.begin_load_revision
+        Threaded.begin(:load_revision)
         yield
       ensure
-        Threaded.exit_load_revision
+        Threaded.exit(:load_revision)
       end
 
       module ClassMethods #:nodoc:
@@ -169,10 +169,10 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def _creating
-          Threaded.begin_create
+          Threaded.begin(:create)
           yield
         ensure
-          Threaded.exit_create
+          Threaded.exit(:create)
         end
 
         # Is the current thread in loading revision mode?
@@ -184,7 +184,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.3.4
         def _loading_revision?
-          Threaded.loading_revision?
+          Threaded.executing?(:load_revision)
         end
       end
     end

data/lib/mongoid/timestamps/updated.rb

@@ -8,9 +8,7 @@ module Mongoid #:nodoc:
 
       included do
         field :updated_at, :type => Time, :versioned => false
-        set_callback :save, :before, :set_updated_at, :if => Proc.new { |doc|
-          doc.timestamping? && (doc.new_record? || doc.changed?)
-        }
+        set_callback :save, :before, :set_updated_at, :if => :able_to_set_updated_at?
       end
 
       # Update the updated_at field on the Document to the current time.
@@ -21,6 +19,18 @@ module Mongoid #:nodoc:
       def set_updated_at
         self.updated_at = Time.now.utc unless updated_at_changed?
       end
+
+      # Is the updated timestamp able to be set?
+      #
+      # @example Can the timestamp be set?
+      #   document.able_to_set_updated_at?
+      #
+      # @return [ true, false ] If the timestamp can be set.
+      #
+      # @since 2.4.0
+      def able_to_set_updated_at?
+        !frozen? && timestamping? && (new_record? || changed?)
+      end
     end
   end
 end

data/lib/mongoid/validations.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "mongoid/validations/associated"
 require "mongoid/validations/uniqueness"
+require "mongoid/validations/presence"
 
 module Mongoid #:nodoc:
 
@@ -43,11 +44,14 @@ module Mongoid #:nodoc:
     #
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
-      if relations[attr.to_s]
+      attribute = attr.to_s
+      if relations[attribute]
         begin_validate
         relation = send(attr)
         exit_validate
         relation.do_or_do_not(:in_memory) || relation
+      elsif fields[attribute] && fields[attribute].localized?
+        attributes[attribute]
       else
         send(attr)
       end
@@ -119,6 +123,23 @@ module Mongoid #:nodoc:
         validates_with(UniquenessValidator, _merge_attributes(args))
       end
 
+      # Validates whether or not a field is present - meaning nil or empty.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_presence_of :title
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_presence_of(*args)
+        validates_with(PresenceValidator, _merge_attributes(args))
+      end
+
       protected
 
       # Adds an associated validator for the relation if the validate option

data/lib/mongoid/validations/presence.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Validations #:nodoc:
+
+    # Validates that the specified attributes are not blank (as defined by
+    # Object#blank?).
+    #
+    # @example Define the presence validator.
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     field :title
+    #
+    #     validates_presence_of :title
+    #   end
+    class PresenceValidator < ActiveModel::EachValidator
+
+      # Validate the document for the attribute and value.
+      #
+      # @example Validate the document.
+      #   validator.validate_each(doc, :title, "")
+      #
+      # @param [ Document ] document The document to validate.
+      # @param [ Symbol ] attribute The attribute name.
+      # @param [ Object ] value The current value of the field.
+      #
+      # @since 2.4.0
+      def validate_each(document, attribute, value)
+        field = document.fields[attribute.to_s]
+        if field && field.localized? && !value.blank?
+          value.each_pair do |locale, value|
+            document.errors.add(attribute, :blank, options) if value.blank?
+          end
+        else
+          document.errors.add(attribute, :blank, options) if value.blank?
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/validations/uniqueness.rb

@@ -47,14 +47,25 @@ module Mongoid #:nodoc:
           criteria = relation.where(criterion(document, attribute, value))
           criteria = scope(criteria, document, attribute)
           if document.primary_key == Array.wrap(attribute)
-            document.errors.add(attribute, :taken) if criteria.count > 1
+            if criteria.count > 1
+              document.errors.add(
+                attribute,
+                :taken, options.except(:case_sensitive, :scope).merge(:value => value)
+              )
+            end
           else
-            document.errors.add(attribute, :taken) if criteria.exists?
+            if criteria.exists?
+              document.errors.add(
+                attribute,
+                :taken,
+                options.except(:case_sensitive, :scope).merge(:value => value)
+              )
+            end
           end
         else
           criteria = klass.where(criterion(document, attribute, value))
           criteria = scope(criteria, document, attribute)
-          document.errors.add(attribute, :taken) if criteria.exists?
+          document.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value)) if criteria.exists?
         end
       end
 

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -36,7 +36,9 @@ module Mongoid #:nodoc:
     def revise
       previous = previous_revision
       if previous && versioned_attributes_changed?
-        versions.build(previous.versioned_attributes).attributes.delete("_id")
+        versions.build(
+          previous.versioned_attributes, :without_protection => true
+        ).attributes.delete("_id")
         if version_max.present? && versions.length > version_max
           versions.delete(versions.first)
         end
@@ -52,7 +54,9 @@ module Mongoid #:nodoc:
     #
     # @since 2.2.1
     def revise!
-      new_version = versions.build((previous_revision || self).versioned_attributes)
+      new_version = versions.build(
+        (previous_revision || self).versioned_attributes, :without_protection => true
+      )
       versions.shift if version_max.present? && versions.length > version_max
       self.version = (version || 1 ) + 1
       save

data/lib/rails/mongoid.rb

@@ -15,6 +15,7 @@ module Rails #:nodoc:
     #
     # @since 2.1.0
     def create_indexes(pattern)
+      logger = Logger.new($stdout)
       Dir.glob(pattern).each do |file|
         logger = Logger.new($stdout)
         begin
@@ -22,9 +23,14 @@ module Rails #:nodoc:
           if model
             model.create_indexes
             logger.info("Generated indexes for #{model}")
+          else
+            logger.info("Not a Mongoid parent model: #{file}")
           end
         rescue => e
-          logger.error("ERROR: #{e.message}")
+          logger.error %Q{Failed to create indexes for #{model}:
+            #{e.class}:#{e.message}
+            #{e.backtrace.join("\n")}
+          }
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70140286687420 !ruby/object:Gem::Requirement
+  requirement: &70168048476500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70140286687420
+  version_requirements: *70168048476500
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70140286686940 !ruby/object:Gem::Requirement
+  requirement: &70168048475740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70140286686940
+  version_requirements: *70168048475740
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70140286686460 !ruby/object:Gem::Requirement
+  requirement: &70168048474680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70140286686460
+  version_requirements: *70168048474680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70140286685980 !ruby/object:Gem::Requirement
+  requirement: &70168048473620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70140286685980
+  version_requirements: *70168048473620
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70140286685500 !ruby/object:Gem::Requirement
+  requirement: &70168048473140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70140286685500
+  version_requirements: *70168048473140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70140286685020 !ruby/object:Gem::Requirement
+  requirement: &70168048472640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70140286685020
+  version_requirements: *70168048472640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70140286684540 !ruby/object:Gem::Requirement
+  requirement: &70168048472160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70140286684540
+  version_requirements: *70168048472160
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70140286684060 !ruby/object:Gem::Requirement
+  requirement: &70168048471300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,18 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70140286684060
+  version_requirements: *70168048471300
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: &70168048470800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: *70168048470800
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -145,6 +156,8 @@ files:
 - lib/mongoid/collections.rb
 - lib/mongoid/components.rb
 - lib/mongoid/config/database.rb
+- lib/mongoid/config/environment.rb
+- lib/mongoid/config/options.rb
 - lib/mongoid/config/replset_database.rb
 - lib/mongoid/config.rb
 - lib/mongoid/contexts/enumerable/sort.rb
@@ -160,6 +173,7 @@ files:
 - lib/mongoid/criterion/inclusion.rb
 - lib/mongoid/criterion/inspection.rb
 - lib/mongoid/criterion/optional.rb
+- lib/mongoid/criterion/scoping.rb
 - lib/mongoid/criterion/selector.rb
 - lib/mongoid/cursor.rb
 - lib/mongoid/default_scope.rb
@@ -177,18 +191,23 @@ files:
 - lib/mongoid/errors/invalid_type.rb
 - lib/mongoid/errors/mixed_relations.rb
 - lib/mongoid/errors/mongoid_error.rb
+- lib/mongoid/errors/no_environment.rb
+- lib/mongoid/errors/scope_overwrite.rb
 - lib/mongoid/errors/too_many_nested_attribute_records.rb
 - lib/mongoid/errors/unsaved_document.rb
 - lib/mongoid/errors/unsupported_version.rb
 - lib/mongoid/errors/validations.rb
 - lib/mongoid/errors.rb
+- lib/mongoid/extensions/array/deep_copy.rb
 - lib/mongoid/extensions/array/deletion.rb
 - lib/mongoid/extensions/false_class/equality.rb
 - lib/mongoid/extensions/hash/criteria_helpers.rb
+- lib/mongoid/extensions/hash/deep_copy.rb
 - lib/mongoid/extensions/hash/scoping.rb
 - lib/mongoid/extensions/integer/checks.rb
 - lib/mongoid/extensions/nil/collectionization.rb
 - lib/mongoid/extensions/object/checks.rb
+- lib/mongoid/extensions/object/deep_copy.rb
 - lib/mongoid/extensions/object/reflections.rb
 - lib/mongoid/extensions/object/substitutable.rb
 - lib/mongoid/extensions/object/yoda.rb
@@ -203,31 +222,31 @@ files:
 - lib/mongoid/extensions.rb
 - lib/mongoid/extras.rb
 - lib/mongoid/factory.rb
+- lib/mongoid/fields/internal/array.rb
+- lib/mongoid/fields/internal/big_decimal.rb
+- lib/mongoid/fields/internal/bignum.rb
+- lib/mongoid/fields/internal/binary.rb
+- lib/mongoid/fields/internal/boolean.rb
+- lib/mongoid/fields/internal/date.rb
+- lib/mongoid/fields/internal/date_time.rb
+- lib/mongoid/fields/internal/fixnum.rb
+- lib/mongoid/fields/internal/float.rb
+- lib/mongoid/fields/internal/foreign_keys/array.rb
+- lib/mongoid/fields/internal/foreign_keys/object.rb
+- lib/mongoid/fields/internal/hash.rb
+- lib/mongoid/fields/internal/integer.rb
+- lib/mongoid/fields/internal/localized.rb
+- lib/mongoid/fields/internal/nil_class.rb
+- lib/mongoid/fields/internal/object.rb
+- lib/mongoid/fields/internal/object_id.rb
+- lib/mongoid/fields/internal/range.rb
+- lib/mongoid/fields/internal/set.rb
+- lib/mongoid/fields/internal/string.rb
+- lib/mongoid/fields/internal/symbol.rb
+- lib/mongoid/fields/internal/time.rb
+- lib/mongoid/fields/internal/time_with_zone.rb
+- lib/mongoid/fields/internal/timekeeping.rb
 - lib/mongoid/fields/mappings.rb
-- lib/mongoid/fields/serializable/array.rb
-- lib/mongoid/fields/serializable/big_decimal.rb
-- lib/mongoid/fields/serializable/bignum.rb
-- lib/mongoid/fields/serializable/binary.rb
-- lib/mongoid/fields/serializable/boolean.rb
-- lib/mongoid/fields/serializable/date.rb
-- lib/mongoid/fields/serializable/date_time.rb
-- lib/mongoid/fields/serializable/fixnum.rb
-- lib/mongoid/fields/serializable/float.rb
-- lib/mongoid/fields/serializable/foreign_keys/array.rb
-- lib/mongoid/fields/serializable/foreign_keys/object.rb
-- lib/mongoid/fields/serializable/hash.rb
-- lib/mongoid/fields/serializable/integer.rb
-- lib/mongoid/fields/serializable/localized.rb
-- lib/mongoid/fields/serializable/nil_class.rb
-- lib/mongoid/fields/serializable/object.rb
-- lib/mongoid/fields/serializable/object_id.rb
-- lib/mongoid/fields/serializable/range.rb
-- lib/mongoid/fields/serializable/set.rb
-- lib/mongoid/fields/serializable/string.rb
-- lib/mongoid/fields/serializable/symbol.rb
-- lib/mongoid/fields/serializable/time.rb
-- lib/mongoid/fields/serializable/time_with_zone.rb
-- lib/mongoid/fields/serializable/timekeeping.rb
 - lib/mongoid/fields/serializable.rb
 - lib/mongoid/fields.rb
 - lib/mongoid/finders.rb
@@ -327,7 +346,6 @@ files:
 - lib/mongoid/relations/embedded/in.rb
 - lib/mongoid/relations/embedded/many.rb
 - lib/mongoid/relations/embedded/one.rb
-- lib/mongoid/relations/embedded/sort.rb
 - lib/mongoid/relations/macros.rb
 - lib/mongoid/relations/many.rb
 - lib/mongoid/relations/metadata.rb
@@ -360,6 +378,7 @@ files:
 - lib/mongoid/timestamps/updated.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
+- lib/mongoid/validations/presence.rb
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
 - lib/mongoid/version.rb
@@ -393,7 +412,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2509135384989613869
+      hash: -3374480126099241138
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: