mongoid 2.2.4 → 2.2.5

data/lib/mongoid/paranoia.rb

@@ -45,6 +45,7 @@ module Mongoid #:nodoc:
     #
     # @return [ true ] True.
     def remove(options = {})
+      return super if embedded? && respond_to?(:version_max) && version_max
       now = Time.now
       collection.update({ :_id => id }, { '$set' => { :deleted_at => now } })
       @attributes["deleted_at"] = now

data/lib/mongoid/railtie.rb

@@ -59,7 +59,9 @@ module Rails #:nodoc:
       #
       initializer "setup database" do
         config_file = Rails.root.join("config", "mongoid.yml")
-        if config_file.file?
+        # @todo: Durran: Remove extra check when #1291 complete.
+        if config_file.file? &&
+          YAML.load(ERB.new(File.read(config_file)).result)[Rails.env].values.flatten.any?
           ::Mongoid.load!(config_file)
         end
       end

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

@@ -232,7 +232,7 @@ module Mongoid # :nodoc:
         def substitute(replacement)
           tap do |proxy|
             if replacement.blank?
-              if assigning?
+              if assigning? && !proxy.empty?
                 base.atomic_unsets.push(proxy.first.atomic_path)
               end
               proxy.clear

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -47,8 +47,10 @@ module Mongoid #:nodoc:
     def revise
       previous = previous_revision
       if previous && versioned_attributes_changed?
-        new_version = versions.build(previous.versioned_attributes)
-        versions.shift if version_max.present? && versions.length > version_max
+        versions.build(previous.versioned_attributes)
+        if version_max.present? && versions.length > version_max
+          versions.delete(versions.first)
+        end
         self.version = (version || 1 ) + 1
       end
     end
@@ -62,7 +64,9 @@ module Mongoid #:nodoc:
     # @since 2.2.1
     def revise!
       new_version = versions.build((previous_revision || self).versioned_attributes)
-      versions.shift if version_max.present? && versions.length > version_max
+      if version_max.present? && versions.length > version_max
+        versions.delete(versions.first)
+      end
       self.version = (version || 1 ) + 1
       save
     end
@@ -167,7 +171,7 @@ module Mongoid #:nodoc:
     # @since 2.1.0
     def only_versioned_attributes(hash)
       {}.tap do |versioned|
-        hash.except("versions").each_pair do |name, value|
+        hash.except("versions", "_id").each_pair do |name, value|
           field = fields[name]
           versioned[name] = value if !field || field.versioned?
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70285743605420 !ruby/object:Gem::Requirement
+  requirement: &70179270881220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285743605420
+  version_requirements: *70179270881220
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70285743604460 !ruby/object:Gem::Requirement
+  requirement: &70179270880520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70285743604460
+  version_requirements: *70179270880520
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70285743603500 !ruby/object:Gem::Requirement
+  requirement: &70179270895860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70285743603500
+  version_requirements: *70179270895860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70285743602700 !ruby/object:Gem::Requirement
+  requirement: &70179270894860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70285743602700
+  version_requirements: *70179270894860
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70285743601320 !ruby/object:Gem::Requirement
+  requirement: &70179270893840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70285743601320
+  version_requirements: *70179270893840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70285743600280 !ruby/object:Gem::Requirement
+  requirement: &70179270892380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70285743600280
+  version_requirements: *70179270892380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285743588060 !ruby/object:Gem::Requirement
+  requirement: &70179270890180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70285743588060
+  version_requirements: *70179270890180
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70285743587280 !ruby/object:Gem::Requirement
+  requirement: &70179270889280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70285743587280
+  version_requirements: *70179270889280
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -385,7 +385,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1180237711887586276
+      hash: 4388686167094388523
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -394,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.