mongoid 2.2.6 → 2.3.0

data/lib/mongoid/timestamps/updated.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-
   module Timestamps
     # This module handles the behaviour for setting up document updated at
     # timestamp.
@@ -8,16 +7,10 @@ module Mongoid #:nodoc:
       extend ActiveSupport::Concern
 
       included do
-        field :updated_at, :type => Time
-
+        field :updated_at, :type => Time, :versioned => false
         set_callback :save, :before, :set_updated_at, :if => Proc.new { |doc|
-          doc.new_record? || doc.changed?
+          doc.timestamping? && (doc.new_record? || doc.changed?)
         }
-
-        unless methods.include? 'record_timestamps'
-          class_attribute :record_timestamps
-          self.record_timestamps = true
-        end
       end
 
       # Update the updated_at field on the Document to the current time.

data/lib/mongoid/validations.rb

@@ -44,9 +44,7 @@ module Mongoid #:nodoc:
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
       if relations[attr.to_s]
-        begin_validate
         relation = send(attr)
-        exit_validate
         relation.do_or_do_not(:in_memory) || relation
       else
         send(attr)

data/lib/mongoid/validations/associated.rb

@@ -39,8 +39,7 @@ module Mongoid #:nodoc:
         ensure
           document.exit_validate
         end
-        return if valid
-        document.errors.add(attribute, :invalid, options.merge(:value => value))
+        document.errors.add(attribute, :invalid) unless valid
       end
     end
   end

data/lib/mongoid/validations/uniqueness.rb

@@ -14,8 +14,16 @@ module Mongoid #:nodoc:
     #     validates_uniqueness_of :title
     #   end
     class UniquenessValidator < ActiveModel::EachValidator
+      attr_reader :klass
 
       # Unfortunately, we have to tie Uniqueness validators to a class.
+      #
+      # @example Setup the validator.
+      #   UniquenessValidator.new.setup(Person)
+      #
+      # @param [ Class ] klass The class getting validated.
+      #
+      # @since 1.0.0
       def setup(klass)
         @klass = klass
       end
@@ -29,57 +37,102 @@ module Mongoid #:nodoc:
       # @param [ Symbol ] attribute The field to validate on.
       # @param [ Object ] value The value of the field.
       #
-      # @todo Durran: This method needs refactoring.
+      # @return [ Errors ] The errors.
+      #
+      # @since 1.0.0
       def validate_each(document, attribute, value)
         if document.embedded?
-          return if document._parent.nil?
-          criteria = document._parent.send(document.metadata.name)
-          # If the parent document embeds_one, no need to validate uniqueness
-          return if criteria.is_a?(Mongoid::Document)
-          criteria = criteria.where(attribute => unique_search_value(value), :_id => {'$ne' => document._id})
+          return if skip_validation?(document)
+          relation = document._parent.send(document.metadata.name)
+          criteria = relation.where(criterion(document, attribute, value))
         else
-          criteria = @klass.where(attribute => unique_search_value(value))
-          unless document.new_record?
-            criteria = criteria.where(:_id => {'$ne' => document._id})
-          end
-        end
-
-        Array.wrap(options[:scope]).each do |item|
-          criteria = criteria.where(item => document.attributes[item.to_s])
-        end
-        if criteria.exists?
-          document.errors.add(
-            attribute,
-            :taken,
-            options.except(:case_sensitive, :scope).merge(:value => value)
-          )
+          criteria = klass.where(criterion(document, attribute, value))
         end
+        criteria = scope(criteria, document, attribute)
+        document.errors.add(attribute, :taken) if criteria.exists?
       end
 
       protected
 
-      # Determine if the primary key has changed on the document.
+      # Should the uniqueness validation be case sensitive?
       #
-      # @example Has the key changed?
-      #   key_changed?(document)
+      # @example Is the validation case sensitive?
+      #   validator.case_sensitive?
       #
-      # @param [ Document ] document The document to check.
+      # @return [ true, false ] If the validation is case sensitive.
       #
-      # @return [ true, false ] True if changed, false if not.
-      def key_changed?(document)
-        (document.primary_key || {}).each do |key|
-          return true if document.send("#{key}_changed?")
-        end; false
+      # @since 2.3.0
+      def case_sensitive?
+        !(options[:case_sensitive] == false)
       end
 
-      # ensure :case_sensitive is true by default
-      def unique_search_value(value)
-        if options[:case_sensitive] == false
-          value ? Regexp.new("^#{Regexp.escape(value.to_s)}$", Regexp::IGNORECASE) : nil
-        else
-          value
+      # Get the default criteria for checking uniqueness.
+      #
+      # @example Get the criteria.
+      #   validator.criterion(person, :title, "Sir")
+      #
+      # @param [ Document ] document The document to validate.
+      # @param [ Symbol ] attribute The name of the attribute.
+      # @param [ Object ] value The value of the object.
+      #
+      # @return [ Criteria ] The uniqueness criteria.
+      #
+      # @since 2.3.0
+      def criterion(document, attribute, value)
+        { attribute => filter(value) }.tap do |selector|
+          if document.persisted? || document.embedded?
+            selector.merge!(:_id => { "$ne" => document.id })
+          end
         end
       end
+
+      # Filter the value based on whether the check is case sensitive or not.
+      #
+      # @example Filter the value.
+      #   validator.filter("testing")
+      #
+      # @param [ Object ] value The value to filter.
+      #
+      # @return [ Object, Regexp ] The value, filtered or not.
+      #
+      # @since 2.3.0
+      def filter(value)
+        !case_sensitive? && value ? /^#{Regexp.escape(value.to_s)}$/i : value
+      end
+
+      # Scope the criteria to the scope options provided.
+      #
+      # @example Scope the criteria.
+      #   validator.scope(criteria, document)
+      #
+      # @param [ Criteria ] criteria The criteria to scope.
+      # @param [ Document ] document The document being validated.
+      #
+      # @return [ Criteria ] The scoped criteria.
+      #
+      # @since 2.3.0
+      def scope(criteria, document, attribute)
+        unless document.primary_key == Array.wrap(attribute)
+          Array.wrap(options[:scope]).each do |item|
+            criteria = criteria.where(item => document.attributes[item.to_s])
+          end
+        end
+        criteria
+      end
+
+      # Should validation be skipped?
+      #
+      # @example Should the validation be skipped?
+      #   validator.skip_validation?(doc)
+      #
+      # @param [ Document ] document The embedded document.
+      #
+      # @return [ true, false ] If the validation should be skipped.
+      #
+      # @since 2.3.0
+      def skip_validation?(document)
+        !document._parent || document.embedded_one?
+      end
     end
   end
 end

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -15,6 +15,7 @@ module Mongoid #:nodoc:
         :class_name => self.name,
         :validate => false,
         :cyclic => true,
+        :inverse_of => nil,
         :versioned => true
 
       set_callback :save, :before, :revise, :if => :revisable?
@@ -47,9 +48,9 @@ module Mongoid #:nodoc:
     def revise
       previous = previous_revision
       if previous && versioned_attributes_changed?
-        versions.build(previous.versioned_attributes)
+        versions.build(previous.versioned_attributes).attributes.delete("_id")
         if version_max.present? && versions.length > version_max
-          versions.delete(versions.first)
+          versions.shift
         end
         self.version = (version || 1 ) + 1
       end
@@ -64,9 +65,7 @@ module Mongoid #:nodoc:
     # @since 2.2.1
     def revise!
       new_version = versions.build((previous_revision || self).versioned_attributes)
-      if version_max.present? && versions.length > version_max
-        versions.delete(versions.first)
-      end
+      versions.shift if version_max.present? && versions.length > version_max
       self.version = (version || 1 ) + 1
       save
     end
@@ -171,7 +170,7 @@ module Mongoid #:nodoc:
     # @since 2.1.0
     def only_versioned_attributes(hash)
       {}.tap do |versioned|
-        hash.except("versions", "_id").each_pair do |name, value|
+        hash.except("versions").each_pair do |name, value|
           field = fields[name]
           versioned[name] = value if !field || field.versioned?
         end

data/lib/rails/generators/mongoid_generator.rb

@@ -63,7 +63,7 @@ module Rails
       def type_class
         return "Time" if type.to_s == "datetime"
         return "String" if type.to_s == "text"
-        return type.to_s.camelcase
+        type.to_s.camelcase
       end
     end
   end

data/lib/rails/mongoid.rb

@@ -36,7 +36,6 @@ module Rails #:nodoc:
     #
     # @param [ Application ] app The rails application.
     def load_models(app)
-      return unless ::Mongoid.preload_models
       app.config.paths["app/models"].each do |path|
         Dir.glob("#{path}/**/*.rb").sort.each do |file|
           load_model(file.gsub("#{path}/" , "").gsub(".rb", ""))
@@ -44,6 +43,14 @@ module Rails #:nodoc:
       end
     end
 
+    # Conditionally calls `Rails::Mongoid.load_models(app)` if the
+    # `::Mongoid.preload_models` is `true`.
+    #
+    # @param [ Application ] app The rails application.
+    def preload_models(app)
+      load_models(app) if ::Mongoid.preload_models
+    end
+
     private
 
     # I don't want to mock out kernel for unit testing purposes, so added this
@@ -70,10 +77,12 @@ module Rails #:nodoc:
     #
     # @since 2.1.0
     def determine_model(file)
-      model_path = file[0..-4].split('/')[2..-1]
-      klass = model_path.map { |path| path.camelize }.join('::').constantize
-      if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
-        return klass
+      if file =~ /app\/models\/(.*).rb$/
+        model_path = $1.split('/')
+        klass = model_path.map { |path| path.camelize }.join('::').constantize
+        if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
+          return klass
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.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: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70168480357500 !ruby/object:Gem::Requirement
+  requirement: &70134095171800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70168480357500
+  version_requirements: *70134095171800
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70168480357020 !ruby/object:Gem::Requirement
+  requirement: &70134095170860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70168480357020
+  version_requirements: *70134095170860
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70168480356540 !ruby/object:Gem::Requirement
+  requirement: &70134095170140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70168480356540
+  version_requirements: *70134095170140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70168480356060 !ruby/object:Gem::Requirement
+  requirement: &70134095169380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70168480356060
+  version_requirements: *70134095169380
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70168480355580 !ruby/object:Gem::Requirement
+  requirement: &70134095168180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70168480355580
+  version_requirements: *70134095168180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70168480355100 !ruby/object:Gem::Requirement
+  requirement: &70134095167500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70168480355100
+  version_requirements: *70134095167500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70168480354620 !ruby/object:Gem::Requirement
+  requirement: &70134095166120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70168480354620
+  version_requirements: *70134095166120
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70168480354140 !ruby/object:Gem::Requirement
+  requirement: &70134095164880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70168480354140
+  version_requirements: *70134095164880
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -215,6 +215,7 @@ files:
 - 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
@@ -239,6 +240,7 @@ files:
 - lib/mongoid/keys.rb
 - lib/mongoid/logger.rb
 - lib/mongoid/matchers/all.rb
+- lib/mongoid/matchers/and.rb
 - lib/mongoid/matchers/default.rb
 - lib/mongoid/matchers/exists.rb
 - lib/mongoid/matchers/gt.rb
@@ -312,6 +314,7 @@ files:
 - lib/mongoid/relations/cascading/strategy.rb
 - lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/constraint.rb
+- lib/mongoid/relations/conversions.rb
 - lib/mongoid/relations/cyclic.rb
 - lib/mongoid/relations/embedded/atomic/operation.rb
 - lib/mongoid/relations/embedded/atomic/pull.rb
@@ -349,6 +352,7 @@ files:
 - lib/mongoid/state.rb
 - lib/mongoid/threaded.rb
 - lib/mongoid/timestamps/created.rb
+- lib/mongoid/timestamps/timeless.rb
 - lib/mongoid/timestamps/updated.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
@@ -385,7 +389,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2081146589811076586
+      hash: -2142678717423572392
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -394,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.