mongoid 2.2.0 → 2.2.1

data/lib/mongoid/relations/synchronization.rb

@@ -50,6 +50,20 @@ module Mongoid # :nodoc:
         !!synced[foreign_key]
       end
 
+      # Update the inverse keys on destroy.
+      #
+      # @example Update the inverse keys.
+      #   document.remove_inverse_keys(metadata)
+      #
+      # @param [ Metadata ] meta The document metadata.
+      #
+      # @return [ Object ] The updated values.
+      #
+      # @since 2.2.1
+      def remove_inverse_keys(meta)
+        meta.criteria(send(meta.foreign_key)).pull(meta.inverse_foreign_key, id)
+      end
+
       # Update the inverse keys for the relation.
       #
       # @example Update the inverse keys
@@ -63,8 +77,9 @@ module Mongoid # :nodoc:
       def update_inverse_keys(meta)
         return unless changes.has_key?(meta.foreign_key)
         old, new = changes[meta.foreign_key]
-        meta.criteria(new - old).add_to_set(meta.inverse_foreign_key, id)
-        meta.criteria(old - new).pull(meta.inverse_foreign_key, id)
+        adds, subs = new - old, old - new
+        meta.criteria(adds).add_to_set(meta.inverse_foreign_key, id) unless adds.empty?
+        meta.criteria(subs).pull(meta.inverse_foreign_key, id) unless subs.empty?
       end
 
       module ClassMethods #:nodoc:
@@ -79,6 +94,7 @@ module Mongoid # :nodoc:
         # @since 2.1.0
         def synced(metadata)
           synced_save(metadata)
+          synced_destroy(metadata)
         end
 
         private
@@ -108,6 +124,27 @@ module Mongoid # :nodoc:
             end
           end
         end
+
+        # Set up the sync of inverse keys that needs to happen on a destroy.
+        #
+        # @example Set up the destroy syncing.
+        #   Person.synced_destroy(metadata)
+        #
+        # @param [ Metadata ] metadata The relation metadata.
+        #
+        # @return [ Class ] The class getting set up.
+        #
+        # @since 2.2.1
+        def synced_destroy(metadata)
+          tap do
+            set_callback(
+              :destroy,
+              :after
+            ) do |doc|
+              doc.remove_inverse_keys(metadata)
+            end
+          end
+        end
       end
     end
   end

data/lib/mongoid/relations/targets/enumerable.rb

@@ -156,7 +156,7 @@ module Mongoid #:nodoc:
             end
           end
           added.each do |doc|
-            next unless doc.new?
+            next if doc.persisted? && (!loaded? && !loaded.empty?)
             yield(doc)
           end
           @executed = true
@@ -316,7 +316,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def size
-          (loaded? ? loaded.count : unloaded.count) + added.count{ |d| d.new? }
+          (unloaded ? unloaded.count : loaded.count) + added.count{ |d| d.new? }
         end
         alias :length :size
 

data/lib/mongoid/serialization.rb

@@ -50,7 +50,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.1.0
       def mongoize(object, klass = Object)
-        Fields::Mappings.for(klass).new(:mongoize).serialize(object)
+        Fields::Mappings.for(klass).instantiate(:mongoize).serialize(object)
       end
     end
 

data/lib/mongoid/state.rb

@@ -83,7 +83,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.1.0
     def settable?
-      new? && embedded_one?
+      new? && embedded_one? && _parent.persisted?
     end
 
     # Is the document updateable?

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -53,6 +53,20 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Forces the creation of a new version of the +Document+, regardless of
+    # whether a change was actually made.
+    #
+    # @example Revise the document.
+    #   person.revise!
+    #
+    # @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
+      self.version = (version || 1 ) + 1
+      save
+    end
+
     # Filters the results of +changes+ by removing any fields that should
     # not be versioned.
     #
@@ -153,7 +167,7 @@ module Mongoid #:nodoc:
     # @since 2.1.0
     def only_versioned_attributes(hash)
       {}.tap do |versioned|
-        hash.each_pair do |name, value|
+        hash.except("versions").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.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70328311594300 !ruby/object:Gem::Requirement
+  requirement: &70136033446360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328311594300
+  version_requirements: *70136033446360
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70328311593640 !ruby/object:Gem::Requirement
+  requirement: &70136033445580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,24 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70328311593640
+  version_requirements: *70136033445580
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70328311593000 !ruby/object:Gem::Requirement
+  requirement: &70136033444420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70328311593000
+  version_requirements: *70136033444420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70328311587860 !ruby/object:Gem::Requirement
+  requirement: &70136033443180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +57,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70328311587860
+  version_requirements: *70136033443180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70328311586580 !ruby/object:Gem::Requirement
+  requirement: &70136033442040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +68,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70328311586580
+  version_requirements: *70136033442040
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70328311585580 !ruby/object:Gem::Requirement
+  requirement: &70136033440960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +79,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70328311585580
+  version_requirements: *70136033440960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328311584820 !ruby/object:Gem::Requirement
+  requirement: &70136033439820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +90,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70328311584820
+  version_requirements: *70136033439820
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70328311583660 !ruby/object:Gem::Requirement
+  requirement: &70136033438380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +101,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70328311583660
+  version_requirements: *70136033438380
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -161,7 +164,6 @@ files:
 - lib/mongoid/criterion/inspection.rb
 - lib/mongoid/criterion/optional.rb
 - lib/mongoid/criterion/selector.rb
-- lib/mongoid/criterion/unconvertable.rb
 - lib/mongoid/cursor.rb
 - lib/mongoid/default_scope.rb
 - lib/mongoid/dirty.rb
@@ -186,6 +188,7 @@ files:
 - lib/mongoid/extensions/false_class/equality.rb
 - lib/mongoid/extensions/hash/criteria_helpers.rb
 - lib/mongoid/extensions/hash/scoping.rb
+- lib/mongoid/extensions/integer/checks.rb
 - lib/mongoid/extensions/nil/collectionization.rb
 - lib/mongoid/extensions/object/checks.rb
 - lib/mongoid/extensions/object/reflections.rb
@@ -193,6 +196,7 @@ files:
 - lib/mongoid/extensions/object/yoda.rb
 - lib/mongoid/extensions/object_id/conversions.rb
 - lib/mongoid/extensions/proc/scoping.rb
+- lib/mongoid/extensions/string/checks.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
@@ -267,7 +271,7 @@ files:
 - lib/mongoid/persistence/atomic/push.rb
 - lib/mongoid/persistence/atomic/push_all.rb
 - lib/mongoid/persistence/atomic/rename.rb
-- lib/mongoid/persistence/atomic/set.rb
+- lib/mongoid/persistence/atomic/sets.rb
 - lib/mongoid/persistence/atomic/unset.rb
 - lib/mongoid/persistence/atomic.rb
 - lib/mongoid/persistence/deletion.rb
@@ -384,7 +388,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3524092560403003003
+      hash: 3997568018995098764
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/mongoid/criterion/unconvertable.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Criterion #:nodoc:
-
-    # Wrapper class for strings that should not be converted into
-    # BSON::ObjectIds.
-    class Unconvertable < String
-
-      # Initialize just like a normal string, and quack like it to.
-      #
-      # @example Create the new Unconvertable.
-      #   Unconvertable.new("testing")
-      #
-      # @param [ String ] value The string.
-      #
-      # @since 2.0.2
-      def initialize(value); super; end
-    end
-  end
-end