mongoid 2.4.4 → 2.4.5

data/CHANGELOG.md

@@ -3,7 +3,35 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.4 (branch: 2.4.0-stable)
+## 2.4.5 (branch: 2.4.0-stable)
+
+### Resolved Issues
+
+* \#1751 Mongoid's logger now responds to level for Ruby logging API
+  compatibility.
+
+* \#1744/#1750 Sorting works now for localized fields in embedded documents
+  using the criteria API. (Hans Hasselberg)
+
+* \#1746 Presence validation now shows which locales were empty for
+  localized fields. (Cyril Mougel)
+
+* \#1727 Allow dot notation in embedded criteria to work on both embeds one
+  and embeds many. (Lyle Underwood)
+
+* \#1723 Initialize callbacks should cascade through children without needing
+  to determine if the child is changed.
+
+* \#1715 Serializable hashes are now consistent on inclusion of embedded
+  documents per or post save.
+
+* \#1713 Fixing === checks when comparing a class with an instance of a
+  subclass.
+
+* \#1495 Callbacks no longer get the 'super called outside of method` errors on
+  busted 1.8.7 rubies.
+
+## 2.4.4
 
 ### Resolved Issues
 

data/lib/config/locales/bg.yml

@@ -58,3 +58,4 @@ bg:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/de.yml

@@ -58,3 +58,4 @@ de:
         scope_overwrite:
           "Scope :%{scope_name} kann nicht erzeugt werden, da bereits eine Methode
           %{model_name}.%{scope_name} existiert."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/en-GB.yml

@@ -61,3 +61,4 @@ en-GB:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/en.yml

@@ -61,3 +61,4 @@ en:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/es.yml

@@ -56,3 +56,4 @@ es:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/fr.yml

@@ -59,3 +59,4 @@ fr:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/hi.yml

@@ -50,3 +50,4 @@ en:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/hu.yml

@@ -61,3 +61,4 @@ hu:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/id.yml

@@ -59,3 +59,4 @@ id:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/it.yml

@@ -56,3 +56,4 @@ it:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/ja.yml

@@ -54,3 +54,4 @@ ja:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/kr.yml

@@ -51,3 +51,4 @@ kr:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/nl.yml

@@ -58,3 +58,4 @@ nl:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/pl.yml

@@ -56,3 +56,4 @@ pl:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/pt-BR.yml

@@ -57,3 +57,4 @@ pt-BR:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/pt.yml

@@ -57,3 +57,4 @@ pt:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/ro.yml

@@ -63,3 +63,4 @@ ro:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/ru.yml

@@ -58,3 +58,4 @@ ru:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/sv.yml

@@ -57,3 +57,4 @@ sv:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/vi.yml

@@ -59,3 +59,4 @@ vi:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/config/locales/zh-CN.yml

@@ -50,3 +50,4 @@ zh-CN:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"

data/lib/mongoid/callbacks.rb

@@ -39,9 +39,8 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def run_callbacks(kind, *args, &block)
-      run_cascading_callbacks(cascadable_children(kind), kind, *args) do
-        super(kind, *args, &block)
-      end
+      run_cascading_callbacks(cascadable_children(kind), kind, *args) {}
+      super(kind, *args, &block)
     end
 
     private
@@ -106,7 +105,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def cascadable_child?(kind, child)
-      [ :create, :destroy ].include?(kind) || child.changed? || child.new_record?
+      [ :create, :destroy, :initialize ].include?(kind) || child.changed? || child.new_record?
     end
 
     # Get the name of the callback that the child should fire. This changes

data/lib/mongoid/contexts/enumerable.rb

@@ -303,7 +303,8 @@ module Mongoid #:nodoc:
         return documents if options[:sort].blank?
         documents.sort_by do |document|
           options[:sort].map do |key, direction|
-            Sort.new(document.read_attribute(key), direction)
+            key = key.to_s.gsub(/(.*)\.#{I18n.locale}$/, '\1')
+            Sort.new(document.send(key), direction)
           end
         end
       end

data/lib/mongoid/document.rb

@@ -276,7 +276,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.4
       def ===(other)
-        self == (other.is_a?(Class) ? other : other.class)
+        other.is_a?(Class) ? self == other : other.is_a?(self)
       end
 
       # Instantiate a new object, only when loaded from the database or when

data/lib/mongoid/fields/internal/foreign_keys/array.rb

@@ -23,17 +23,22 @@ module Mongoid #:nodoc:
           # @param [ Array ] old The old elements getting removed.
           #
           # @since 2.4.0
-          def add_atomic_changes(document, name, key, mods, new, old)
-            pushes = (new || []) - (old || [])
-            pulls = (old || []) - (new || [])
-            if old.nil?
-              mods[key] = pushes
-            elsif !pushes.empty? && !pulls.empty?
-              mods[key] = document.attributes[name]
-            elsif !pushes.empty?
-              document.atomic_array_add_to_sets[key] = pushes
-            elsif !pulls.empty?
-              document.atomic_array_pulls[key] = pulls
+          def add_atomic_changes(document, name, key, mods, new_elements, old_elements)
+            old = (old_elements || [])
+            new = (new_elements || [])
+            if new.length > old.length
+              if new.first(old.length) == old
+                document.atomic_array_add_to_sets[key] = new.drop(old.length)
+              else
+                mods[key] = document.attributes[name]
+              end
+            elsif new.length < old.length
+              pulls = old - new
+              if new == old - pulls
+                document.atomic_array_pulls[key] = pulls
+              else
+                mods[key] = document.attributes[name]
+              end
             elsif new != old
               mods[key] = document.attributes[name]
             end

data/lib/mongoid/logger.rb

@@ -4,7 +4,13 @@ module Mongoid #:nodoc:
   # The Mongoid logger which wraps some other ruby compliant logger class.
   class Logger
 
-    delegate :info, :debug, :error, :fatal, :unknown, :to => :logger, :allow_nil => true
+    delegate \
+      :info,
+      :debug,
+      :error,
+      :fatal,
+      :level,
+      :unknown, :to => :logger, :allow_nil => true
 
     # Emit a warning log message.
     #

data/lib/mongoid/matchers/strategies.rb

@@ -81,8 +81,12 @@ module Mongoid #:nodoc:
       # @since 2.2.1
       def extract_attribute(document, key)
         if (key_string = key.to_s) =~ /.+\..+/
-          key_string.split('.').inject(document.attributes) do |attribs, key|
-            attribs.try(:[], key)
+          key_string.split('.').inject(document.attributes) do |_attribs, _key|
+            if _attribs.is_a?(::Array)
+              _attribs.map { |doc| doc.try(:[], _key) }
+            else
+              _attribs.try(:[], _key)
+            end
           end
         else
           document.attributes[key_string]

data/lib/mongoid/serialization.rb

@@ -34,15 +34,24 @@ module Mongoid # :nodoc:
       except |= ['_type'] unless Mongoid.include_type_for_serialization
 
       field_names = fields.keys.map { |field| field.to_s }
-      attribute_names = (attributes.keys + field_names).sort
+      attribute_names = (as_document.keys + field_names).sort
       if only.any?
         attribute_names &= only
       elsif except.any?
         attribute_names -= except
       end
 
-      method_names = Array.wrap(options[:methods]).map { |n| n.to_s if respond_to?(n.to_s) }.compact
-      Hash[(attribute_names + method_names).map { |n| [n, send(n)] }].tap do |attrs|
+      method_names = Array.wrap(options[:methods]).map do |name|
+        name.to_s if respond_to?(name)
+      end.compact
+
+      {}.tap do |attrs|
+        attribute_names.each do |name|
+          attrs[name] = attributes[name]
+        end
+        method_names.each do |name|
+          attrs[name] = send(name)
+        end
         serialize_relations(attrs, options) if options[:include]
       end
     end

data/lib/mongoid/validations/presence.rb

@@ -29,7 +29,7 @@ module Mongoid #:nodoc:
         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?
+            document.errors.add(attribute, :blank_on_locale, options.merge(:in_locale => locale)) if value.blank?
           end
         else
           document.errors.add(attribute, :blank, options) if value.blank?

data/lib/mongoid/version.rb

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

data/lib/rails/mongoid.rb

@@ -90,7 +90,7 @@ module Rails #:nodoc:
           parts = model_path.map { |path| path.camelize }
           name = parts.join("::")
           klass = name.constantize
-        rescue NameError => e
+        rescue NameError, LoadError => e
           logger.info("Attempted to constantize #{name}, trying without namespacing.")
           klass = parts.last.constantize
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70339260281720 !ruby/object:Gem::Requirement
+  requirement: &70356497238660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70339260281720
+  version_requirements: *70356497238660
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70339260281240 !ruby/object:Gem::Requirement
+  requirement: &70356497237480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70339260281240
+  version_requirements: *70356497237480
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70339260280760 !ruby/object:Gem::Requirement
+  requirement: &70356497236500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70339260280760
+  version_requirements: *70356497236500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70339260280280 !ruby/object:Gem::Requirement
+  requirement: &70356497234880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70339260280280
+  version_requirements: *70356497234880
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70339260279800 !ruby/object:Gem::Requirement
+  requirement: &70356497233800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70339260279800
+  version_requirements: *70356497233800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70339260279320 !ruby/object:Gem::Requirement
+  requirement: &70356497083440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70339260279320
+  version_requirements: *70356497083440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339260278840 !ruby/object:Gem::Requirement
+  requirement: &70356497082860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70339260278840
+  version_requirements: *70356497082860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70339260278360 !ruby/object:Gem::Requirement
+  requirement: &70356497081920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70339260278360
+  version_requirements: *70356497081920
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70339260277880 !ruby/object:Gem::Requirement
+  requirement: &70356497081280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70339260277880
+  version_requirements: *70356497081280
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -414,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -632008619262652936
+      hash: 2742246905926364196
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: