mongoid 2.4.2 → 2.4.3

data/CHANGELOG.md

@@ -3,7 +3,28 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.2 \[ In Development \] \[ Branch: 2.4.0-stable \]
+## 2.4.3 \[ In Development \] \[ Branch: 2.4.0-stable \]
+
+### Resolved Issues
+
+* \#1647 DateTime serialization when already in UTC does not convert to
+  local time.
+
+* \#1640 Update consumers should be tied to the name of the collection
+  they persist to, not the name of the class.
+
+* \#1636 Scopes no longer modify parent class scopes when subclassing.
+  (Hans Hasselberg)
+
+* \#1629 $all and $in criteria on embedded many relations now properly
+  handles regex searches and elements of varying length. (Douwe Maan)
+
+* \#1623 Default scopes no longer break Mongoid::Versioning.
+  (Hans Hasselberg)
+
+* \#1605 Fix regression of rescue responses, Rails 3.2
+
+## 2.4.2
 
 ### Resolved Issues
 

data/lib/mongoid/collection.rb

@@ -142,7 +142,7 @@ module Mongoid #:nodoc
     #
     # @since 2.0.0
     def update(selector, document, options = {})
-      updater = Threaded.update_consumer(klass)
+      updater = Threaded.update_consumer(name)
       if updater
         updater.consume(selector, document, options)
       else

data/lib/mongoid/contexts/enumerable.rb

@@ -210,6 +210,18 @@ module Mongoid #:nodoc:
 
       protected
 
+      # Get the root class collection name.
+      #
+      # @example Get the root class collection name.
+      #   context.collection_name
+      #
+      # @return [ String ] The name of the collection.
+      #
+      # @since 2.4.3
+      def collection_name
+        root ? root.collection_name : nil
+      end
+
       # Filters the documents against the criteria's selector
       #
       # @example Filter the documents.
@@ -251,10 +263,22 @@ module Mongoid #:nodoc:
         documents
       end
 
+      # Get the root document for the enumerable.
+      #
+      # @example Get the root document.
+      #   context.root
+      #
+      # @return [ Document ] The root.
       def root
         @root ||= documents.first.try(:_root)
       end
 
+      # Get the root class for the enumerable.
+      #
+      # @example Get the root class.
+      #   context.root_class
+      #
+      # @return [ Class ] The root class.
       def root_class
         @root_class ||= root ? root.class : nil
       end

data/lib/mongoid/copyable.rb

@@ -6,11 +6,10 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     COPYABLES = [
-      :@accessed,
-      :@attributes,
-      :@metadata,
-      :@modifications,
-      :@previous_modifications
+      :attributes,
+      :metadata,
+      :changed_attributes,
+      :previous_changes
     ]
 
     protected
@@ -34,8 +33,8 @@ module Mongoid #:nodoc:
       other.as_document
       instance_variables.each { |name| remove_instance_variable(name) }
       COPYABLES.each do |name|
-        value = other.instance_variable_get(name)
-        instance_variable_set(name, value ? value.dup : nil)
+        value = other.send(name)
+        instance_variable_set(:"@#{name}", value ? value.dup : nil)
       end
       attributes.delete("_id")
       if attributes.delete("versions")

data/lib/mongoid/fields/internal/date_time.rb

@@ -20,7 +20,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def deserialize(object)
-          object.try(:to_datetime)
+          super(object).try(:to_datetime)
         end
       end
     end

data/lib/mongoid/fields/internal/timekeeping.rb

@@ -32,7 +32,7 @@ module Mongoid #:nodoc:
           return nil if object.blank?
           object = object.getlocal unless Mongoid::Config.use_utc?
           if Mongoid::Config.use_activesupport_time_zone?
-            time_zone = Mongoid::Config.use_utc? ? 'UTC' : ::Time.zone
+            time_zone = Mongoid::Config.use_utc? ? "UTC" : ::Time.zone
             object = object.in_time_zone(time_zone)
           end
           object
@@ -90,6 +90,7 @@ module Mongoid #:nodoc:
             when ::String
               time.parse(value)
             when ::DateTime
+              return value if value.utc? && Mongoid.use_utc?
               time.local(value.year, value.month, value.day, value.hour, value.min, value.sec)
             when ::Date
               time.local(value.year, value.month, value.day)

data/lib/mongoid/matchers/all.rb

@@ -14,7 +14,14 @@ module Mongoid #:nodoc:
       #
       # @return [ true, false ] If the values match.
       def matches?(value)
-        @attribute == value.values.first
+        attribute_array = Array.wrap(@attribute)
+        value.values.first.all? do |e| 
+          if e.is_a?(Regexp) 
+            attribute_array.any? { |_attribute| _attribute =~ e }
+          else
+            attribute_array.include?(e)
+          end
+        end
       end
     end
   end

data/lib/mongoid/matchers/in.rb

@@ -14,7 +14,14 @@ module Mongoid #:nodoc:
       #
       # @return [ true, false ] If a value exists.
       def matches?(value)
-        Array.wrap(@attribute).any? { |e| value.values.first.include?(e) }
+        attribute_array = Array.wrap(@attribute)
+        value.values.first.any? do |e| 
+          if e.is_a?(Regexp) 
+            attribute_array.any? { |_attribute| _attribute =~ e }
+          else
+            attribute_array.include?(e)
+          end
+        end
       end
     end
   end

data/lib/mongoid/named_scope.rb

@@ -123,6 +123,21 @@ module Mongoid #:nodoc:
         end
       end
 
+      # When inheriting, we want to copy the scopes from the parent class and
+      # set the on the child to start, mimicking the behaviour of the old
+      # class_inheritable_accessor that was deprecated in Rails edge.
+      #
+      # @example Inherit from this class.
+      #   Person.inherited(Doctor)
+      #
+      # @param [ Class ] subclass The inheriting class.
+      #
+      # @since 2.0.0.rc.6
+      def inherited(subclass)
+        super
+        subclass.scopes = scopes.dup
+      end
+
       protected
 
       # Warns or raises exception if overriding another scope or method.

data/lib/mongoid/observer.rb

@@ -170,5 +170,12 @@ module Mongoid #:nodoc:
         end
       end
     end
+
+    def disabled_for?(object)
+      klass = object.class
+      return false unless klass.respond_to?(:observers)
+      klass.observers.disabled_for?(self) || Mongoid.observers.disabled_for?(self)
+    end
+
   end
 end

data/lib/mongoid/railtie.rb

@@ -23,8 +23,27 @@ module Rails #:nodoc:
         config.respond_to?(:app_generators) ? :app_generators : :generators
       end
 
+      # Maping of rescued exceptions to HTTP responses
+      #
+      # @example
+      #   railtie.rescue_responses
+      #
+      # @ return [Hash] rescued responses
+      #
+      # @since 2.4.3
+      def self.rescue_responses
+        {
+          "Mongoid::Errors::DocumentNotFound" => :not_found,
+          "Mongoid::Errors::Validations" => 422
+        }
+      end
+
       config.send(generator).orm :mongoid, :migration => false
 
+      if config.action_dispatch.rescue_responses
+        config.action_dispatch.rescue_responses.merge!(rescue_responses)
+      end
+
       rake_tasks do
         load "mongoid/railties/database.rake"
       end
@@ -81,14 +100,8 @@ module Rails #:nodoc:
       # 404s and not 500s, validation errors are 422s.
       initializer "load http errors" do |app|
         config.after_initialize do
-          responses = {
-            "Mongoid::Errors::DocumentNotFound" => :not_found,
-            "Mongoid::Errors::Validations" => 422
-          }
-          if rescue_responses = config.action_dispatch.rescue_responses
-            rescue_responses.update(responses)
-          else
-            ActionDispatch::ShowExceptions.rescue_responses.update(responses)
+          unless config.action_dispatch.rescue_responses
+            ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)
           end
         end
       end

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

@@ -55,13 +55,13 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def atomically(modifier, &block)
-          updater = Threaded.update_consumer(root_class) ||
-            Threaded.set_update_consumer(root_class, MODIFIERS[modifier].new)
+          updater = Threaded.update_consumer(collection_name) ||
+            Threaded.set_update_consumer(collection_name, MODIFIERS[modifier].new)
           count_executions do
             block.call if block
           end.tap do
             if @executions.zero?
-              Threaded.set_update_consumer(root_class, nil)
+              Threaded.set_update_consumer(collection_name, nil)
               updater.execute(collection)
             end
           end

data/lib/mongoid/relations/proxy.rb

@@ -18,6 +18,7 @@ module Mongoid # :nodoc:
       # Backwards compatibility with Mongoid beta releases.
       delegate :klass, :to => :metadata
       delegate :bind_one, :unbind_one, :to => :binding
+      delegate :collection_name, :to => :base
 
       # Convenience for setting the target and the metadata properties since
       # all proxies will need to do this.

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -131,7 +131,7 @@ module Mongoid #:nodoc:
     # @since 2.0.0
     def previous_revision
       _loading_revision do
-        self.class.
+        self.class.unscoped.
           where(:_id => id).
           any_of({ :version => version }, { :version => nil }).first
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000 Z
+date: 2012-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70314945130600 !ruby/object:Gem::Requirement
+  requirement: &70324286112920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70314945130600
+  version_requirements: *70324286112920
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70314945129660 !ruby/object:Gem::Requirement
+  requirement: &70324286112300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70314945129660
+  version_requirements: *70324286112300
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70314945129040 !ruby/object:Gem::Requirement
+  requirement: &70324286111520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70314945129040
+  version_requirements: *70324286111520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70314945128260 !ruby/object:Gem::Requirement
+  requirement: &70324286110820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70314945128260
+  version_requirements: *70324286110820
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70314945127340 !ruby/object:Gem::Requirement
+  requirement: &70324286066060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70314945127340
+  version_requirements: *70324286066060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70314945126120 !ruby/object:Gem::Requirement
+  requirement: &70324286064560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70314945126120
+  version_requirements: *70324286064560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314945106580 !ruby/object:Gem::Requirement
+  requirement: &70324286063860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70314945106580
+  version_requirements: *70324286063860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70314945098020 !ruby/object:Gem::Requirement
+  requirement: &70324286063360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70314945098020
+  version_requirements: *70324286063360
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70314945048580 !ruby/object:Gem::Requirement
+  requirement: &70324286062880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70314945048580
+  version_requirements: *70324286062880
 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: 4438000233284558311
+      hash: 907876578455724233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: