mongoid 3.1.2 → 3.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a93ef3b8e16abfb336265ee706bf8dc3ca62f89
+  data.tar.gz: 8d27fd207900247df10d6c3e49b7eebf088b97b6
+SHA512:
+  metadata.gz: f3ee03829a223c53df67171aec6ef170937e59f299e8f21e5cbc66ea10064455c4443addeb64e0c5b713acc8cec4421213f7e949c86f832aa60ff4c87620b015
+  data.tar.gz: 1e3825ba1089fe531844c0662c2137a66a050f31e4c1f52795c545ecc860ad205e96d5dba70795375f4274428bc5b9c5c48ae1ecbf8be34251c4642f87e6d087

data/CHANGELOG.md

@@ -3,6 +3,50 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 3.1.4
+
+### Resolved Issues
+
+* \#2944 Fixed uniqueness validation for localized fields when case insensitive
+  is true. (Vladimir Zhukov)
+
+## 3.1.3
+
+### Resolved Issues
+
+* Dont duplicate embedded documents when saving after calling becomes method.
+
+* \#2961 Reloading a mongoid.yml configuration now properly clears previously
+  configured sessions.
+
+* \#2937 Counts can now take a `true` argument to factor in skip and limit.
+  (Arthur Neves)
+
+* \#2921 Don't use type in identity map selection if inheritance is not
+  in play. (Arthur Neves)
+
+* \#2899 Dirty attribute methods now properly handle field aliases.
+  (Niels Ganser)
+
+* \#2895 Allow scopes that return nil to still be chainable. (niedhui)
+
+* \#2893 Removed memoization of collection name and database name so lambdas
+  with `store_in` work properly when changing.
+
+* \#2911 The `_destroy` attribute on 1-n relations when processing nested
+  attributes can now be a string or symbol when passed an array.
+
+* \#2886 Fixed namespacing issue with Rails generators.
+
+* \#2885 Fixed touch for aliased fields. (Niels Ganser)
+
+* \#2883 Allow cyclic relations to not raise mixed relation errors.
+
+* \#2867 `pluck` now properly handles aliased fields.
+
+* \#2862 Autosaving no longer performs extra unnecessary queries.
+  (Arthur Neves)
+
 ## 3.1.2
 
 ### Resolved Issues
@@ -289,6 +333,13 @@ For instructions on upgrading to newer versions, visit
 * \#2664 In memory sorting of embedded documents now properly works when
   multiple fields are provided. (Neer Friedman)
 
+## 3.0.24
+
+### Resolved Issues
+
+* \#2879 `remove_attribute` on new documents no longer creates an unnecessary
+  $unset operation.
+
 ## 3.0.23
 
 ### Resolved Issues

data/lib/mongoid/attributes.rb

@@ -136,7 +136,7 @@ module Mongoid
       end
       _assigning do
         attribute_will_change!(access)
-        delayed_atomic_unsets[atomic_attribute_name(access)] = []
+        delayed_atomic_unsets[atomic_attribute_name(access)] = [] unless new_record?
         attributes.delete(access)
       end
     end

data/lib/mongoid/config.rb

@@ -87,7 +87,11 @@ module Mongoid
     # @since 2.0.1
     def load!(path, environment = nil)
       settings = Environment.load_yaml(path, environment)
-      load_configuration(settings) if settings.present?
+      if settings.present?
+        Sessions.disconnect
+        Sessions.clear
+        load_configuration(settings)
+      end
       settings
     end
 

data/lib/mongoid/contextual/mongo.rb

@@ -44,15 +44,19 @@ module Mongoid
       #     doc.likes > 1
       #   end
       #
-      # @param [ Document ] document A document ot match.
+      # @param [ Document ] document A document to match or true if wanting
+      #   skip and limit to be factored into the count.
       #
       # @return [ Integer ] The number of matches.
       #
       # @since 3.0.0
-      def count(document = nil, &block)
+      def count(document = false, &block)
         return super(&block) if block_given?
-        return (cached? ? @count ||= query.count : query.count) unless document
-        collection.find(criteria.and(_id: document.id).selector).count
+        if document.is_a?(Document)
+          return collection.find(criteria.and(_id: document.id).selector).count
+        end
+        return query.count(document) if document
+        cached? ? @count ||= query.count : query.count
       end
 
       # Delete all documents in the database that match the selector.
@@ -332,7 +336,7 @@ module Mongoid
       #
       # @since 3.1.0
       def pluck(field)
-        normalized = field.to_s
+        normalized = klass.database_field_name(field)
         query.select(normalized => 1).map{ |doc| doc[normalized] }.compact
       end
 

data/lib/mongoid/dirty.rb

@@ -166,6 +166,7 @@ module Mongoid
     #
     # @since 2.1.0
     def attribute_change(attr)
+      attr = database_field_name(attr)
       [changed_attributes[attr], attributes[attr]] if attribute_changed?(attr)
     end
 
@@ -180,6 +181,7 @@ module Mongoid
     #
     # @since 2.1.6
     def attribute_changed?(attr)
+      attr = database_field_name(attr)
       return false unless changed_attributes.has_key?(attr)
       changed_attributes[attr] != attributes[attr]
     end
@@ -209,6 +211,7 @@ module Mongoid
     #
     # @since 2.4.0
     def attribute_was(attr)
+      attr = database_field_name(attr)
       attribute_changed?(attr) ? changed_attributes[attr] : attributes[attr]
     end
 
@@ -239,6 +242,7 @@ module Mongoid
     #
     # @since 2.4.0
     def reset_attribute!(attr)
+      attr = database_field_name(attr)
       attributes[attr] = changed_attributes.delete(attr) if attribute_changed?(attr)
     end
 

data/lib/mongoid/document.rb

@@ -190,6 +190,17 @@ module Mongoid
       became.instance_variable_set(:@destroyed, destroyed?)
       became.changed_attributes["_type"] = self.class.to_s
       became._type = klass.to_s
+
+      # mark embedded docs as persisted
+      embedded_relations.each_pair do |name, meta|
+        without_autobuild do
+          relation = became.__send__(name)
+          Array.wrap(relation).each do |r|
+            r.instance_variable_set(:@new_record, new_record?)
+          end
+        end
+      end
+
       IdentityMap.set(became) unless became.new_record?
       became
     end

data/lib/mongoid/fields.rb

@@ -218,6 +218,7 @@ module Mongoid
       #
       # @since 3.0.7
       def database_field_name(name)
+        return nil unless name
         normalized = name.to_s
         aliased_fields[normalized] || normalized
       end

data/lib/mongoid/persistence.rb

@@ -120,6 +120,7 @@ module Mongoid
     def touch(field = nil)
       return false if _root.new_record?
       current = Time.now
+      field = database_field_name(field)
       write_attribute(:updated_at, current) if respond_to?("updated_at=")
       write_attribute(field, current) if field
 

data/lib/mongoid/relations/auto_save.rb

@@ -27,21 +27,32 @@ module Mongoid
       # Begin the associated autosave.
       #
       # @example Begin autosave.
-      #   document.begin_autosave
+      #   document.__autosaving__
       #
-      # @since 3.0.0
-      def begin_autosave
+      # @since 3.1.3
+      def __autosaving__
         Threaded.begin_autosave(self)
+        yield
+      ensure
+        Threaded.exit_autosave(self)
       end
 
-      # Exit the associated autosave.
+      # Check if there is changes for auto-saving
       #
-      # @example Exit autosave.
-      #   document.exit_autosave
+      # @example Return true if there is changes on self or in
+      #           autosaved relations.
+      #   document.changed_for_autosave?
       #
-      # @since 3.0.0
-      def exit_autosave
-        Threaded.exit_autosave(self)
+      # @since 3.1.3
+      def changed_for_autosave?
+        new_record? || changed? || marked_for_destruction?
+      end
+
+      # Returns the relation, if it exists
+      #
+      # @since 3.1.3
+      def relation_changed_for_autosave(metadata)
+        ivar(metadata.name) if self.class.autosaved_relations.include?(metadata.name)
       end
 
       module ClassMethods
@@ -64,14 +75,14 @@ module Mongoid
               if before_callback_halted?
                 self.before_callback_halted = false
               else
-                begin_autosave
-                relation = document.send(metadata.name)
-                if relation
-                  (relation.do_or_do_not(:in_memory) || Array.wrap(relation)).each do |doc|
-                    doc.save
+                __autosaving__ do
+                  if document.changed_for_autosave? || relation = document.relation_changed_for_autosave(metadata)
+                    relation = document.__send__(metadata.name) unless relation
+                    (relation.do_or_do_not(:in_memory) || Array.wrap(relation)).each do |doc|
+                      doc.save
+                    end if relation
                   end
                 end
-                exit_autosave
               end
             end
           end

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -26,9 +26,9 @@ module Mongoid
             end
             attributes.each do |attrs|
               if attrs.respond_to?(:with_indifferent_access)
-                process_attributes(parent, attrs, options)
+                process_attributes(parent, attrs.with_indifferent_access, options)
               else
-                process_attributes(parent, attrs[1], options)
+                process_attributes(parent, attrs[1].with_indifferent_access, options)
               end
             end
           end

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

@@ -18,7 +18,7 @@ module Mongoid
             return object unless query?
             return [] if object.is_a?(Array)
             crit = metadata.criteria(Conversions.flag(object, metadata), base.class)
-            IdentityMap.get_many(crit.klass, crit.selector) || crit
+            IdentityMap.get_many(crit.klass, crit.send(:selector_with_type_selection)) || crit
           end
         end
       end

data/lib/mongoid/relations/metadata.rb

@@ -169,7 +169,7 @@ module Mongoid
       # Get the criteria that is used to query for this metadata's relation.
       #
       # @example Get the criteria.
-      #   metadata.criteria([ id_one, id_two ])
+      #   metadata.criteria([ id_one, id_two ], Person)
       #
       # @param [ Object ] object The foreign key used for the query.
       # @param [ Class ] type The base class.

data/lib/mongoid/relations/proxy.rb

@@ -247,11 +247,15 @@ module Mongoid
           klass, foreign_key = metadata.klass, metadata.foreign_key
           eager_loaded = klass.any_in(foreign_key => ids).entries
           ids.each do |id|
-            IdentityMap.clear_many(klass, metadata.type_relation.merge!(foreign_key => id))
+            sel = { foreign_key => id }
+            sel.merge!(metadata.type_relation) if klass.hereditary?
+            IdentityMap.clear_many(klass, sel)
           end
           eager_loaded.each do |doc|
             base_id = doc.__send__(foreign_key)
-            yield(doc,  metadata.type_relation.merge!(foreign_key => base_id))
+            sel = { foreign_key => base_id }
+            sel.merge!(metadata.type_relation) if klass.hereditary?
+            yield(doc,  sel)
           end
         end
       end

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

@@ -218,7 +218,7 @@ module Mongoid
         # @since 2.0.0.beta.1
         def initialize(base, target, metadata)
           init(base, Targets::Enumerable.new(target), metadata) do
-            raise_mixed if klass.embedded?
+            raise_mixed if klass.embedded? && !klass.cyclic?
           end
         end
 

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

@@ -18,7 +18,7 @@ module Mongoid
         # @param [ Metadata ] metadata The relation's metadata.
         def initialize(base, target, metadata)
           init(base, target, metadata) do
-            raise_mixed if klass.embedded?
+            raise_mixed if klass.embedded? && !klass.cyclic?
             characterize_one(target)
             bind_one
             target.save if persistable?

data/lib/mongoid/scoping.rb

@@ -277,7 +277,7 @@ module Mongoid
           def #{name}(*args)
             scoping = scopes[:#{name}]
             scope, extension = scoping[:scope][*args], scoping[:extension]
-            criteria = with_default_scope.merge(scope)
+            criteria = with_default_scope.merge(scope || all)
             criteria.extend(extension)
             criteria
           end

data/lib/mongoid/sessions.rb

@@ -183,7 +183,7 @@ module Mongoid
       #
       # @since 3.0.0
       def collection_name
-        @collection_name ||= __collection_name__
+        __collection_name__
       end
 
       # Get the default database name for this model.
@@ -195,7 +195,7 @@ module Mongoid
       #
       # @since 3.0.0
       def database_name
-        @database_name ||= __database_name__
+        __database_name__
       end
 
       # Get the overridden database name. This either can be overridden by
@@ -292,9 +292,8 @@ module Mongoid
       # @since 3.0.0
       def store_in(options)
         Validators::Storage.validate(self, options)
-        @collection_name, @database_name = nil, nil
         self.storage_options ||= {}
-        self.storage_options.merge! options
+        self.storage_options.merge!(options)
       end
 
       # Tell the next persistance operation to store in a specific collection,

data/lib/mongoid/validations/uniqueness.rb

@@ -104,13 +104,8 @@ module Mongoid
       #
       # @since 2.4.10
       def create_criteria(base, document, attribute, value)
-        field = document.fields[attribute.to_s]
         criteria = scope(base.unscoped, document, attribute)
-        if field.try(:localized?)
-          criteria.selector.update(criterion(document, attribute, value))
-        else
-          criteria = criteria.where(criterion(document, attribute, value))
-        end
+        criteria.selector.update(criterion(document, attribute, value))
         criteria
       end
 
@@ -129,7 +124,13 @@ module Mongoid
       #
       # @since 2.3.0
       def criterion(document, attribute, value)
-        selector = { attribute => filter(value) }
+        if localized?(document, attribute)
+          conditions = value.inject([]) { |acc, (k,v)| acc << { "#{attribute}.#{k}" => filter(v) } }
+          selector = { "$or" => conditions }
+        else
+          selector = { attribute => filter(value) }
+        end
+
         if document.persisted? && !document.embedded?
           selector.merge!(_id: { "$ne" => document.id })
         end
@@ -305,6 +306,23 @@ module Mongoid
       def persistence_options(criteria)
         (criteria.klass.persistence_options || {}).merge!(consistency: :strong)
       end
+
+      # Is the attribute localized?
+      #
+      # @api private
+      #
+      # @example Is the attribute localized?
+      #   validator.localized?(doc, :field)
+      #
+      # @param [ Document ] document The document getting validated.
+      # @param [ Symbol ] attribute The attribute to validate.
+      #
+      # @return [ true, false ] If the attribute is localized.
+      #
+      # @since 4.0.0
+      def localized?(document, attribute)
+        document.fields[attribute.to_s].try(:localized?)
+      end
     end
   end
 end

data/lib/mongoid/version.rb

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

data/lib/rails/generators/mongoid_generator.rb

@@ -10,15 +10,6 @@ module Mongoid
         @_mongoid_source_root ||=
           File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
       end
-
-      unless methods.include?(:module_namespacing)
-
-        # This is only defined on Rails edge at the moment, so include here now
-        # as per: https://github.com/mongoid/mongoid/issues/744
-        def module_namespacing(&block)
-          yield if block
-        end
-      end
     end
 
     class ActiveModel < ::Rails::Generators::ActiveModel

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.1.2
-  prerelease: 
+  version: 3.1.3
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -357,26 +348,25 @@ files:
 homepage: http://mongoid.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Elegant Persistance in Ruby for MongoDB.
 test_files: []