mongoid 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a93ef3b8e16abfb336265ee706bf8dc3ca62f89
-  data.tar.gz: 8d27fd207900247df10d6c3e49b7eebf088b97b6
+  metadata.gz: e112d2050bea71c9b4ec085c77518391924fd579
+  data.tar.gz: 7b83e17ffe01d545d5a08833d1a07e8ef120a2bb
 SHA512:
-  metadata.gz: f3ee03829a223c53df67171aec6ef170937e59f299e8f21e5cbc66ea10064455c4443addeb64e0c5b713acc8cec4421213f7e949c86f832aa60ff4c87620b015
-  data.tar.gz: 1e3825ba1089fe531844c0662c2137a66a050f31e4c1f52795c545ecc860ad205e96d5dba70795375f4274428bc5b9c5c48ae1ecbf8be34251c4642f87e6d087
+  metadata.gz: 0344a52659debedd1ed969e05676a35c65edd806471bdcb9d8045e8404293b27451449d434d9f1d6c2174f3dc8475a9eff978bcbbaabd3f54f0a53f980b8a625
+  data.tar.gz: e196f3ebc85543dc36a9e6f49f1f024c993d626ab4990604ad5061961ed3e8a0cfecbfd6f3a18c048127819d9897b1f0eb25d588ed141dc4d9f8b96d7c38fbaf

data/CHANGELOG.md

@@ -7,6 +7,35 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#3044 Ensure enumerable targets match arrays in case statements.
+
+* \#3034 `first_or_create` on criterion now properly passes the block to create
+  instead of calling after the document was created.
+
+* \#3021 Removed `mongoid.yml` warning from initializer, this is now handled by
+  the session configuration options.
+
+* \#3018 Uniqueness validator now properly serializes values in its check.
+  (Jerry Clinesmith)
+
+* \#3011 Fixed aliased field support for uniqueness validation. (Johnny Shields)
+
+* \#3008 Fixed subclasses not being able to inherit scopes properly when scope
+  is added post class load. (Mike Dillon)
+
+* \#2991 `Document.timeless` now properly scopes to the instance and not thread.
+
+* \#2980 Dynamic fields now properly handle in place editing of hashes and
+  arrays. (Matthew Widmann)
+
+* \#2979 `pluck` no longer modifies the context in place. (Brian Goff)
+
+* \#2970 Fixed counter cache to properly use the name of the relation if available
+  then the inverse class name second if not.
+
+* \#2959 Nested attributes will now respect `autosave: false` if defined on the
+  relation.
+
 * \#2944 Fixed uniqueness validation for localized fields when case insensitive
   is true. (Vladimir Zhukov)
 

data/lib/config/locales/en.yml

@@ -75,14 +75,6 @@ en:
             expecting the option to be there, please consult the following page
             with repect to Mongoid's configuration:\n\n
             \_\_http://mongoid.org/en/mongoid/docs/installation.html"
-        invalid_database:
-          message: "Database should be a Mongo::DB, not %{name}."
-          summary: "When setting a master database in the Mongoid configuration
-            it must be an actual instance of a Mongo::DB, and not just a name
-            of the database. This check is performed when calling
-            Mongoid.master = object."
-          resolution: "Make sure that when setting the configuration
-            programatically that you are passing an actual db instance."
         invalid_field:
           message: "Defining a field named '%{name}' is not allowed."
           summary: "Defining this field would override the method '%{name}',

data/lib/mongoid/attributes.rb

@@ -252,6 +252,7 @@ module Mongoid
 
       class_eval <<-READER
         def #{name}
+          attribute_will_change!(#{name.inspect})
           read_attribute(#{name.inspect})
         end
       READER
@@ -270,6 +271,7 @@ module Mongoid
     def define_dynamic_before_type_cast_reader(name)
       class_eval <<-READER
         def #{name}_before_type_cast
+          attribute_will_change!(#{name.inspect})
           read_attribute_before_type_cast(#{name.inspect})
         end
       READER
@@ -322,10 +324,12 @@ module Mongoid
         write_attribute(getter, args.first)
       elsif attr.before_type_cast?
         define_dynamic_before_type_cast_reader(attr.reader)
+        attribute_will_change!(attr.reader)
         read_attribute_before_type_cast(attr.reader)
       else
         getter = attr.reader
         define_dynamic_reader(getter)
+        attribute_will_change!(attr.reader)
         read_attribute(getter)
       end
     end

data/lib/mongoid/contextual/mongo.rb

@@ -337,7 +337,7 @@ module Mongoid
       # @since 3.1.0
       def pluck(field)
         normalized = klass.database_field_name(field)
-        query.select(normalized => 1).map{ |doc| doc[normalized] }.compact
+        query.dup.select(normalized => 1).map{ |doc| doc[normalized] }.compact
       end
 
       # Skips the provided number of documents.

data/lib/mongoid/criterion/modifiable.rb

@@ -181,10 +181,8 @@ module Mongoid
       # @return [ Document ] The first or new document.
       #
       # @since 3.1.0
-      def first_or(method, attrs = nil)
-        document = first || create_document(method, attrs)
-        yield(document) if block_given?
-        document
+      def first_or(method, attrs = {}, &block)
+        first || create_document(method, attrs, &block)
       end
     end
   end

data/lib/mongoid/dirty.rb

@@ -97,7 +97,7 @@ module Mongoid
     def post_persist
       reset_persisted_children
       move_changes
-      Threaded.clear_options!
+      clear_timeless_option
     end
 
     # Get the previous changes on the document.

data/lib/mongoid/errors.rb

@@ -6,7 +6,6 @@ require "mongoid/errors/document_not_found"
 require "mongoid/errors/eager_load"
 require "mongoid/errors/invalid_collection"
 require "mongoid/errors/invalid_config_option"
-require "mongoid/errors/invalid_database"
 require "mongoid/errors/invalid_field"
 require "mongoid/errors/invalid_field_option"
 require "mongoid/errors/invalid_find"

data/lib/mongoid/hierarchy.rb

@@ -172,7 +172,7 @@ module Mongoid
         subclass.fields = fields.dup
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup
-        subclass.scopes = scopes.dup
+        subclass._declared_scopes = Hash.new { |hash,key| self._declared_scopes[key] }
         subclass.autosaved_relations = autosaved_relations.dup
 
         # We only need the _type field if inheritance is in play, but need to

data/lib/mongoid/nested_attributes.rb

@@ -46,10 +46,8 @@ module Mongoid
           meth = "#{name}_attributes="
           self.nested_attributes["#{name}_attributes"] = meth
           metadata = relations[name.to_s]
-          unless metadata
-            raise Errors::NestedAttributesMetadataNotFound.new(self, name)
-          end
-          autosave(metadata.merge!(autosave: true))
+          raise Errors::NestedAttributesMetadataNotFound.new(self, name) unless metadata
+          autosave_nested_attributes(metadata)
           re_define_method(meth) do |attrs|
             _assigning do
               metadata.nested_builder(attrs, options).build(self, mass_assignment_options)
@@ -57,6 +55,24 @@ module Mongoid
           end
         end
       end
+
+      private
+
+      # Add the autosave information for the nested relation.
+      #
+      # @api private
+      #
+      # @example Add the autosave if appropriate.
+      #   Person.autosave_nested_attributes(metadata)
+      #
+      # @param [ Metadata ] metadata The existing relation metadata.
+      #
+      # @since 3.1.4
+      def autosave_nested_attributes(metadata)
+        unless metadata.autosave == false
+          autosave(metadata.merge!(autosave: true))
+        end
+      end
     end
   end
 end

data/lib/mongoid/paranoia.rb

@@ -64,7 +64,7 @@ module Mongoid
         update({ "$set" => { paranoid_field => time }})
       @destroyed = true
       IdentityMap.remove(self)
-      Threaded.clear_options!
+      clear_timeless_option
       true
     end
     alias :delete :remove

data/lib/mongoid/persistence.rb

@@ -301,7 +301,6 @@ module Mongoid
         coll = collection
         deleted = coll.find(selector).count
         coll.find(selector).remove_all
-        Threaded.clear_options!
         deleted
       end
 

data/lib/mongoid/persistence/atomic/operation.rb

@@ -88,9 +88,7 @@ module Mongoid
         #
         # @since 2.1.0
         def prepare
-          doc = yield(document)
-          Threaded.clear_options!
-          doc
+          yield(document)
         end
 
         private

data/lib/mongoid/persistence/deletion.rb

@@ -24,7 +24,7 @@ module Mongoid
         document.freeze
         document.destroyed = true
         IdentityMap.remove(document)
-        Threaded.clear_options!
+        document.clear_timeless_option
         true
       end
     end

data/lib/mongoid/railtie.rb

@@ -77,17 +77,6 @@ module Rails
         end
       end
 
-      # After initialization we will warn the user if we can't find a mongoid.yml and
-      # alert to create one.
-      initializer "warn when configuration is missing" do
-        config.after_initialize do
-          unless Rails.root.join("config", "mongoid.yml").file? || ::Mongoid.configured?
-            puts "\nMongoid config not found. Create a config file at: config/mongoid.yml"
-            puts "to generate one run: rails generate mongoid:config\n\n"
-          end
-        end
-      end
-
       # Set the proper error types for Rails. DocumentNotFound errors should be
       # 404s and not 500s, validation errors are 422s.
       initializer "load http errors" do |app|

data/lib/mongoid/relations/embedded/batchable.rb

@@ -62,7 +62,6 @@ module Mongoid
             )
             post_process_batch_remove(docs, method)
           end
-          Threaded.clear_options!
           reindex
         end
 
@@ -305,6 +304,7 @@ module Mongoid
             _unscoped.delete_one(doc)
             unbind_one(doc)
             execute_callback :after_remove, doc
+            doc.clear_timeless_option
             doc.as_document
           end
         end

data/lib/mongoid/relations/metadata.rb

@@ -160,7 +160,7 @@ module Mongoid
       # @since 3.1.0
       def counter_cache_column_name
         if self[:counter_cache] == true
-          "#{inverse_class_name.demodulize.underscore.pluralize}_count"
+          "#{inverse || inverse_class_name.demodulize.underscore.pluralize}_count"
         else
           self[:counter_cache].to_s
         end

data/lib/mongoid/relations/targets/enumerable.rb

@@ -16,7 +16,7 @@ module Mongoid
         # @attribute [rw] _unloaded A criteria representing persisted docs.
         attr_accessor :_added, :_loaded, :_unloaded
 
-        delegate :===, :is_a?, :kind_of?, to: []
+        delegate :is_a?, :kind_of?, to: []
 
         # Check if the enumerable is equal to the other object.
         #
@@ -33,6 +33,21 @@ module Mongoid
           entries == other.entries
         end
 
+        # Check equality of the enumerable against the provided object for case
+        # statements.
+        #
+        # @example Check case equality.
+        #   enumerable === Array
+        #
+        # @param [ Object ] other The object to check.
+        #
+        # @return [ true, false ] If the objects are equal in a case.
+        #
+        # @since 3.1.4
+        def ===(other)
+          other.class == Class ? Array == other : self == other
+        end
+
         # Append a document to the enumerable.
         #
         # @example Append the document.

data/lib/mongoid/scoping.rb

@@ -8,12 +8,37 @@ module Mongoid
 
     included do
       class_attribute :default_scoping
-      class_attribute :scopes
-      self.scopes = {}
+      class_attribute :_declared_scopes
+      self._declared_scopes = {}
     end
 
     module ClassMethods
 
+      # Returns a hash of all the scopes defined for this class, including
+      # scopes defined on ancestor classes.
+      #
+      # @example Get the defined scopes for a class
+      #   class Band
+      #     include Mongoid::Document
+      #     field :active, type: Boolean
+      #
+      #     scope :active, where(active: true)
+      #   end
+      #   Band.scopes
+      #
+      # @return [ Hash ] The scopes defined for this class
+      #
+      # @since 3.1.4
+      def scopes
+        defined_scopes = {}
+        ancestors.reverse.each do |klass|
+          if klass.respond_to?(:_declared_scopes)
+            defined_scopes.merge!(klass._declared_scopes)
+          end
+        end
+        defined_scopes.freeze
+      end
+
       # Add a default scope to the model. This scope will be applied to all
       # criteria unless #unscoped is specified.
       #
@@ -94,7 +119,7 @@ module Mongoid
         normalized = name.to_sym
         check_scope_validity(value)
         check_scope_name(normalized)
-        scopes[normalized] = {
+        _declared_scopes[normalized] = {
           scope: strip_default_scope(value),
           extension: Module.new(&block)
         }
@@ -226,7 +251,7 @@ module Mongoid
       #
       # @since 2.1.0
       def check_scope_name(name)
-        if scopes[name] || respond_to?(name, true)
+        if _declared_scopes[name] || respond_to?(name, true)
           if Mongoid.scope_overwrite_exception
             raise Errors::ScopeOverwrite.new(self.name, name)
           else
@@ -273,9 +298,9 @@ module Mongoid
       #
       # @since 3.0.0
       def define_scope_method(name)
-        (class << self; self; end).class_eval <<-SCOPE
+        (class << self; self; end).class_eval <<-SCOPE, __FILE__, __LINE__ + 1
           def #{name}(*args)
-            scoping = scopes[:#{name}]
+            scoping = _declared_scopes[:#{name}]
             scope, extension = scoping[:scope][*args], scoping[:extension]
             criteria = with_default_scope.merge(scope || all)
             criteria.extend(extension)

data/lib/mongoid/threaded.rb

@@ -141,16 +141,6 @@ module Mongoid
       true
     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!
-      self.timeless = false
-    end
-
     # Exit autosaving a document on the current thread.
     #
     # @example Exit autosave.
@@ -355,42 +345,6 @@ module Mongoid
       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
-
-    # 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 autosaved on the current thread?
     #
     # @example Is the document autosaved?

data/lib/mongoid/timestamps/timeless.rb

@@ -7,6 +7,23 @@ module Mongoid
     module Timeless
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :timestamping
+        self.timestamping = true
+      end
+
+      # Clears out the timeless option.
+      #
+      # @example Clear the timeless option.
+      #   document.clear_timeless_option
+      #
+      # @return [ true ] True.
+      #
+      # @since 3.1.4
+      def clear_timeless_option
+        self.class.timestamping = true
+      end
+
       # Begin an execution that should skip timestamping.
       #
       # @example Save a document but don't timestamp.
@@ -16,21 +33,11 @@ module Mongoid
       #
       # @since 2.3.0
       def timeless
-        Threaded.timeless = true
+        self.class.timestamping = false
         self
       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
+      private
 
       module ClassMethods
 
@@ -43,7 +50,7 @@ module Mongoid
         #
         # @since 2.3.0
         def timeless
-          Threaded.timeless = true
+          self.timestamping = false
           self
         end
       end

data/lib/mongoid/validations/uniqueness.rb

@@ -105,7 +105,7 @@ module Mongoid
       # @since 2.4.10
       def create_criteria(base, document, attribute, value)
         criteria = scope(base.unscoped, document, attribute)
-        criteria.selector.update(criterion(document, attribute, value))
+        criteria.selector.update(criterion(document, attribute, value.mongoize))
         criteria
       end
 
@@ -124,11 +124,13 @@ module Mongoid
       #
       # @since 2.3.0
       def criterion(document, attribute, value)
-        if localized?(document, attribute)
-          conditions = value.inject([]) { |acc, (k,v)| acc << { "#{attribute}.#{k}" => filter(v) } }
+        field = document.database_field_name(attribute)
+
+        if localized?(document, field)
+          conditions = value.inject([]) { |acc, (k,v)| acc << { "#{field}.#{k}" => filter(v) } }
           selector = { "$or" => conditions }
         else
-          selector = { attribute => filter(value) }
+          selector = { field => filter(value) }
         end
 
         if document.persisted? && !document.embedded?

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "3.1.3"
+  VERSION = "3.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,6 @@ files:
 - lib/mongoid/errors/eager_load.rb
 - lib/mongoid/errors/invalid_collection.rb
 - lib/mongoid/errors/invalid_config_option.rb
-- lib/mongoid/errors/invalid_database.rb
 - lib/mongoid/errors/invalid_field.rb
 - lib/mongoid/errors/invalid_field_option.rb
 - lib/mongoid/errors/invalid_find.rb

data/lib/mongoid/errors/invalid_database.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-module Mongoid
-  module Errors
-
-    # Raised when the database connection has not been set up properly, either
-    # by attempting to set an object on the db that is not a +Mongo::DB+, or
-    # not setting anything at all.
-    #
-    # @example Create the error.
-    #   InvalidDatabase.new("Not a DB")
-    class InvalidDatabase < MongoidError
-      def initialize(database)
-        super(
-          compose_message("invalid_database", { name: database.class.name })
-        )
-      end
-    end
-  end
-end