mongoid 3.0.0 → 3.0.1

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.1
+
+### Resolved Issues
+
+* \#2191 Ensure proper visibility (private) for error message generation
+  methods.
+
+* \#2187 Ensure all levels of nested documents are serialized in json.
+
+* \#2184 Allow names of relations that conflict with ruby core kernel
+  methods to pass existence checks.
+
+* \#2181 Ensure `.first` criteria sort by ascending ids, if no other
+  sorting criteria was provided.
+
 ## 3.0.0
 
 ### New Features
@@ -916,6 +931,12 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#2178 Ensure destroy callbacks are run post replacement of an embeds one
+  relation.
+
+* \#2169 Allow saves to pass when documents are destroyed after the save
+  in a callback.
+
 * \#2144 Uniqueness validation on paranoid documents now properly scopes.
 
 * \#2127 Don't unbind parents of embedded documents mid nested

data/lib/mongoid/contextual/mongo.rb

@@ -196,6 +196,7 @@ module Mongoid
       #
       # @since 3.0.0
       def first
+        apply_id_sorting
         with_eager_loading(query.first)
       end
       alias :one :first
@@ -403,6 +404,21 @@ module Mongoid
         end
       end
 
+      # Apply an ascending id sort for use with #first queries, only if no
+      # other sorting is provided.
+      #
+      # @api private
+      #
+      # @example Apply the id sorting params.
+      #   context.apply_dd_sorting
+      #
+      # @since 3.0.0
+      def apply_id_sorting
+        unless criteria.options.has_key?(:sort)
+          query.sort(_id: 1)
+        end
+      end
+
       # Map the inverse sort symbols to the correct MongoDB values.
       #
       # @example Apply the inverse sorting params.
@@ -413,7 +429,7 @@ module Mongoid
         if spec = criteria.options[:sort]
           query.sort(Hash[spec.map{|k, v| [k, -1*v]}])
         else
-          query.sort({_id: -1})
+          query.sort(_id: -1)
         end
       end
 

data/lib/mongoid/errors/mongoid_error.rb

@@ -23,6 +23,8 @@ module Mongoid
         "\nResolution:\n  #{resolution(key, attributes)}"
       end
 
+      private
+
       # Given the key of the specific error and the options hash, translate the
       # message.
       #
@@ -40,7 +42,10 @@ module Mongoid
       # Create the problem.
       #
       # @example Create the problem.
-      #   error.problem
+      #   error.problem("error", {})
+      #
+      # @param [ String, Symbol ] key The error key.
+      # @param [ Hash ] attributes The attributes to interpolate.
       #
       # @return [ String ] The problem.
       #
@@ -52,7 +57,10 @@ module Mongoid
       # Create the summary.
       #
       # @example Create the summary.
-      #   error.summary
+      #   error.summary("error", {})
+      #
+      # @param [ String, Symbol ] key The error key.
+      # @param [ Hash ] attributes The attributes to interpolate.
       #
       # @return [ String ] The summary.
       #
@@ -64,7 +72,10 @@ module Mongoid
       # Create the resolution.
       #
       # @example Create the resolution.
-      #   error.resolution
+      #   error.resolution("error", {})
+      #
+      # @param [ String, Symbol ] key The error key.
+      # @param [ Hash ] attributes The attributes to interpolate.
       #
       # @return [ String ] The resolution.
       #

data/lib/mongoid/persistence.rb

@@ -76,7 +76,7 @@ module Mongoid
     # @since 1.0.0
     def save(options = {})
       if new_record?
-        insert(options).persisted?
+        !insert(options).new_record?
       else
         update(options)
       end

data/lib/mongoid/relations/accessors.rb

@@ -126,7 +126,7 @@ module Mongoid
         def existence_check(name, metadata)
           module_eval <<-END
             def #{name}?
-              without_autobuild { !#{name}.blank? }
+              without_autobuild { !__send__(:#{name}).blank? }
             end
             alias :has_#{name}? :#{name}?
           END

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

@@ -38,7 +38,7 @@ module Mongoid
           if _assigning?
             base.add_atomic_unset(target)
           else
-            delete if persistable?
+            destroy if persistable?
           end
           unbind_one
           return nil unless replacement

data/lib/mongoid/serialization.rb

@@ -31,56 +31,21 @@ module Mongoid
 
       names = field_names(options)
 
-      _serializing do
-        method_names = Array.wrap(options[:methods]).map do |name|
-          name.to_s if respond_to?(name)
-        end.compact
+      method_names = Array.wrap(options[:methods]).map do |name|
+        name.to_s if respond_to?(name)
+      end.compact
 
-        (names + method_names).each do |name|
-          without_autobuild do
-            serialize_attribute(attrs, name, names, options)
-          end
+      (names + method_names).each do |name|
+        without_autobuild do
+          serialize_attribute(attrs, name, names, options)
         end
-        serialize_relations(attrs, options) if options[:include]
       end
+      serialize_relations(attrs, options) if options[:include]
       attrs
     end
 
     private
 
-    # Enter the serialization block.
-    #
-    # @api private
-    #
-    # @example Begin serialization.
-    #   document._serializing do
-    #   end
-    #
-    # @return [ Object ] The result of the yield.
-    #
-    # @since 3.0.0
-    def _serializing
-      Threaded.begin("serialization")
-      yield
-    ensure
-      Threaded.exit("serialization")
-    end
-
-    # Are we in a serialization block? We use this to protect multiple
-    # unnecessary calls to #as_document.
-    #
-    # @api private
-    #
-    # @example Are we in serialization?
-    #   document._serializing?
-    #
-    # @return [ true, false ] If we are serializing.
-    #
-    # @since 3.0.0
-    def _serializing?
-      Threaded.executing?("serialization")
-    end
-
     # Get the names of all fields that will be serialized.
     #
     # @api private
@@ -92,7 +57,7 @@ module Mongoid
     #
     # @since 3.0.0
     def field_names(options)
-      names = (_serializing? ? attribute_names : as_document.keys + attribute_names).uniq.sort
+      names = (as_document.keys + attribute_names).uniq.sort
 
       only = Array.wrap(options[:only]).map(&:to_s)
       except = Array.wrap(options[:except]).map(&:to_s)

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -75,70 +75,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -416,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1324901210162009503
+      hash: 842230721201432915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: