mongoid 2.3.2 → 2.3.3

data/CHANGELOG.md

@@ -8,7 +8,39 @@ For instructions on upgrading to newer versions, visit
 * Ranges can now be passed to #where criteria to create a $gte/$lte query under the
   covers. `Person.where(dob: start_date...end_date)`
 
-## 2.3.2 \[ In Development \] \[ Branch: 2.3.0-stable \]
+## 2.3.3 \[ In Development \] \[ Branch: 2.3.0-stable \]
+
+### Resolved Issues
+
+* \#1386 Lowered mongo/bson dependency to 1.3
+
+* \#1377 Fix aggregation functions to properly handle nil or indefined values.
+  (Maxime Garcia)
+
+* \#1373 Warn if a scope overrides another scope.
+
+* \#1372 Never persist when binding inside of a read attribute for validation.
+
+* \#1364 Fixed reloading of documents with non bson object id ids.
+
+* \#1360 Fixed performance of Mongoid's observer instantiation by hooking into
+  Active Support's load hooks, a la AR.
+
+* \#1358 Fixed type error on many to many synchronization when inverse_of is
+  set to nil.
+
+* \#1356 $in criteria can now be chained to non-complex criteria on the same
+  key without error.
+
+* \#1350, \#1351 Fixed errors in the string conversions of double quotes and
+  tilde when paramterizing keys.
+
+* \#1349 Mongoid documents should not blow up when including Enumerable.
+  (Jonas Nicklas)
+
+## 2.3.2
+
+### Resolved Issues
 
 * \#1347 Fix embedded matchers when provided a hash value that does not have a
   modifier as a key.
@@ -39,8 +71,6 @@ For instructions on upgrading to newer versions, visit
 
 * \#736 Calling #reload on embedded documents now works properly.
 
-### Resolved Issues
-
 ## 2.3.1
 
 ### Resolved Issues

data/lib/mongoid.rb

@@ -25,6 +25,7 @@ require "time"
 require "active_support/core_ext"
 require 'active_support/json'
 require "active_support/inflector"
+require "active_support/lazy_load_hooks"
 require "active_support/time_with_zone"
 require "active_model"
 require "mongo"

data/lib/mongoid/criteria.rb

@@ -396,14 +396,19 @@ module Mongoid #:nodoc:
       clone.tap do |crit|
         converted = BSON::ObjectId.convert(klass, attributes || {})
         converted.each_pair do |key, value|
-          unless crit.selector[key]
+          existing = crit.selector[key]
+          unless existing
             crit.selector[key] = { operator => value }
           else
-            if crit.selector[key].has_key?(operator)
-              new_value = crit.selector[key].values.first.send(combine, value)
-              crit.selector[key] = { operator => new_value }
+            if existing.respond_to?(:merge)
+              if existing.has_key?(operator)
+                new_value = existing.values.first.send(combine, value)
+                crit.selector[key] = { operator => new_value }
+              else
+                crit.selector[key][operator] = value
+              end
             else
-              crit.selector[key][operator] = value
+              crit.selector[key] = { operator => value }
             end
           end
         end

data/lib/mongoid/extensions/object/checks.rb

@@ -14,9 +14,6 @@ module Mongoid #:nodoc:
         # @example Is the array vacant?
         #   [].vacant?
         #
-        # @example Is the hash vacant?
-        #   {}.vacant?
-        #
         # @example Is the object vacant?
         #   nil.vacant?
         #
@@ -24,7 +21,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.2
         def _vacant?
-          is_a?(::Enumerable) || is_a?(::String) ? empty? : !self
+          is_a?(::Array) || is_a?(::String) ? empty? : !self
         end
       end
     end

data/lib/mongoid/extensions/string/inflections.rb

@@ -18,7 +18,7 @@ module Mongoid #:nodoc:
         CHAR_CONV = {
           " " => "-",
           "!" => "-excl-",
-          "\"" => "-bckslsh-",
+          "\"" => "-dblquo-",
           "#" => "-hash-",
           "$" => "-dol-",
           "%" => "-perc-",
@@ -48,7 +48,7 @@ module Mongoid #:nodoc:
           "{" => "-ocurly-",
           "|" => "-pipe-",
           "}" => "-clcurly-",
-          "~" => "-tilda-"
+          "~" => "-tilde-"
         }
 
         REVERSALS = {

data/lib/mongoid/javascript/functions.yml

@@ -10,20 +10,20 @@ group:
 
 max:
   "function(obj, prev) {
-     if (prev.max == 'start') {
+     if (obj.[field] && prev.max == 'start') {
        prev.max = obj.[field];
      }
-     if (prev.max < obj.[field]) {
+     if (obj.[field] && prev.max < obj.[field]) {
        prev.max = obj.[field];
      }
    }"
 
 min:
   "function(obj, prev) {
-     if (prev.min == 'start') {
+     if (obj.[field] && prev.min == 'start') {
        prev.min = obj.[field];
      }
-     if (prev.min > obj.[field]) {
+     if (obj.[field] && prev.min > obj.[field]) {
        prev.min = obj.[field];
      }
    }"
@@ -33,5 +33,7 @@ sum:
      if (prev.sum == 'start') {
        prev.sum = 0;
      }
-     prev.sum += obj.[field];
+     if (obj.[field]) {
+       prev.sum += obj.[field];
+     }
   }"

data/lib/mongoid/named_scope.rb

@@ -125,8 +125,14 @@ module Mongoid #:nodoc:
 
       protected
 
+      # Warns if overriding another scope or method.
+      #
+      # @example Warn if name exists.
+      #   Model.valid_scope_name?("test")
+      #
+      # @param [ String, Symbol ] name The name of the scope.
       def valid_scope_name?(name)
-        if !scopes[name] && respond_to?(name, true)
+        if scopes[name] || respond_to?(name, true)
           if Mongoid.logger
             Mongoid.logger.warn(
               "Creating scope :#{name}. " +

data/lib/mongoid/railtie.rb

@@ -115,9 +115,8 @@ module Rails #:nodoc:
       # instantiate them after being reloaded in the development environment
       initializer "instantiate observers" do
         config.after_initialize do
-          ::Mongoid.instantiate_observers
-
-          ActionDispatch::Callbacks.to_prepare do
+          ::Mongoid::instantiate_observers
+          ActionDispatch::Reloader.to_prepare do
             ::Mongoid.instantiate_observers
           end
         end

data/lib/mongoid/relations/metadata.rb

@@ -243,6 +243,19 @@ module Mongoid # :nodoc:
         !!extension
       end
 
+      # Does this metadata have a forced nil inverse_of defined. (Used in many
+      # to manies)
+      #
+      # @example Is this a forced nil inverse?
+      #   metadata.forced_nil_inverse?
+      #
+      # @return [ true, false ] If inverse_of has been explicitly set to nil.
+      #
+      # @since 2.3.3
+      def forced_nil_inverse?
+        has_key?(:inverse_of) && inverse_of.nil?
+      end
+
       # Handles all the logic for figuring out what the foreign_key is for each
       # relations query. The logic is as follows:
       #

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

@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
             args.flatten.each do |doc|
               next unless doc
               append(doc)
-              doc.save if persistable?
+              doc.save if persistable? && !doc.validated?
             end
           end
         end

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

@@ -153,7 +153,9 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def nullify
-          criteria.pull(metadata.inverse_foreign_key, base.id)
+          unless metadata.forced_nil_inverse?
+            criteria.pull(metadata.inverse_foreign_key, base.id)
+          end
           if persistable?
             base.set(
               metadata.foreign_key,

data/lib/mongoid/relations/synchronization.rb

@@ -93,8 +93,10 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def synced(metadata)
-          synced_save(metadata)
-          synced_destroy(metadata)
+          unless metadata.forced_nil_inverse?
+            synced_save(metadata)
+            synced_destroy(metadata)
+          end
         end
 
         private

data/lib/mongoid/reloading.rb

@@ -54,7 +54,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(collection.find_one(id) || {})
+      {}.merge(collection.find_one(:_id => id) || {})
     end
 
     # Reload the embedded document.
@@ -67,7 +67,7 @@ module Mongoid #:nodoc:
     # @since 2.3.2
     def reload_embedded_document
       extract_embedded_attributes({}.merge(
-        _root.collection.find_one(_root.id)
+        _root.collection.find_one(:_id => _root.id)
       ))
     end
 

data/lib/mongoid/validations.rb

@@ -44,7 +44,9 @@ 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70271939701520 !ruby/object:Gem::Requirement
+  requirement: &70239778174840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70271939701520
+  version_requirements: *70239778174840
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70271939726340 !ruby/object:Gem::Requirement
+  requirement: &70239778174200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70271939726340
+  version_requirements: *70239778174200
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70271939739080 !ruby/object:Gem::Requirement
+  requirement: &70239778173520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70271939739080
+  version_requirements: *70239778173520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70271939765740 !ruby/object:Gem::Requirement
+  requirement: &70239778172400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70271939765740
+  version_requirements: *70239778172400
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70271939772120 !ruby/object:Gem::Requirement
+  requirement: &70239778171440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70271939772120
+  version_requirements: *70239778171440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70271939777600 !ruby/object:Gem::Requirement
+  requirement: &70239778170600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70271939777600
+  version_requirements: *70239778170600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271939921440 !ruby/object:Gem::Requirement
+  requirement: &70239778169700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70271939921440
+  version_requirements: *70239778169700
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70271940131480 !ruby/object:Gem::Requirement
+  requirement: &70239778168680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70271940131480
+  version_requirements: *70239778168680
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -393,7 +393,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4419494650639076055
+      hash: 1966370546899582904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: