mongo_mapper 0.9.2 → 0.10.0

data/UPGRADES

@@ -1,3 +1,9 @@
+0.9 => 0.10
+  * Using String IDs are no longer supported. If you are declaring your own ID, ensure it is an ObjectId, and set the default
+      key :_id, ObjectId, :default => lambda { BSON::ObjectId.new }
+  * The :dependent association option now applies to both when the parent is destroyed and when the association is reassigned (one and many associations)
+  * The default :dependent option is now :nullify for both when the parent is destroyed and when the association is reassigned
+
 0.8.6 => 0.9
   * [attribute]_before_typecast should become [attribute]_before_type_cast (note the extra _)
   * Change validates_exclusion_of :within option to :in

data/lib/mongo_mapper.rb

@@ -72,6 +72,7 @@ module MongoMapper
       autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
       autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/many_documents_as_proxy'
       autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
+      autoload :OneAsProxy,                   'mongo_mapper/plugins/associations/one_as_proxy'
       autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
       autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
@@ -84,8 +85,6 @@ Dir[File.join(File.dirname(__FILE__), 'mongo_mapper', 'extensions', '*.rb')].eac
   require extension
 end
 
-require 'mongo_mapper/support/descendant_appends'
-
 # FIXME: autoload with proxy is failing, need to investigate
 require 'mongo_mapper/plugins/associations/proxy'
 

data/lib/mongo_mapper/document.rb

@@ -3,7 +3,6 @@ module MongoMapper
   module Document
     extend ActiveSupport::Concern
     extend Plugins
-    extend Support::DescendantAppends
 
     include Plugins::ActiveModel
     include Plugins::Document

data/lib/mongo_mapper/embedded_document.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 module MongoMapper
   module EmbeddedDocument
-    extend Support::DescendantAppends
     extend ActiveSupport::Concern
     extend Plugins
 

data/lib/mongo_mapper/extensions/float.rb

@@ -3,7 +3,7 @@ module MongoMapper
   module Extensions
     module Float
       def to_mongo(value)
-        value.nil? ? nil : value.to_f
+        value.blank? ? nil : value.to_f
       end
     end
   end

data/lib/mongo_mapper/plugins.rb

@@ -8,14 +8,8 @@ module MongoMapper
     end
 
     def plugin(mod)
-      if ActiveSupport::Concern === mod
-        include mod
-      else
-        warn "[DEPRECATED] Plugins must extend ActiveSupport::Concern"
-        extend mod::ClassMethods     if mod.const_defined?(:ClassMethods)
-        include mod::InstanceMethods if mod.const_defined?(:InstanceMethods)
-        mod.configure(self)          if mod.respond_to?(:configure)
-      end
+      raise ArgumentError,  "Plugins must extend ActiveSupport::Concern" unless ActiveSupport::Concern === mod
+      include mod
       direct_descendants.each {|model| model.send(:include, mod) }
       plugins << mod
     end

data/lib/mongo_mapper/plugins/associations/belongs_to_association.rb

@@ -13,6 +13,8 @@ module MongoMapper
         end
 
         def setup(model)
+          model.key foreign_key, ObjectId unless model.key?(foreign_key)
+
           model.associations_module.module_eval <<-end_eval
             def #{name}
               proxy = get_proxy(associations[#{name.inspect}])

data/lib/mongo_mapper/plugins/associations/many_association.rb

@@ -41,11 +41,11 @@ module MongoMapper
             end
           end_eval
 
-          if options[:dependent] && !embeddable?
-            association = self
-            options = self.options
+          association = self
+          options = self.options
 
-            model.after_destroy do
+          model.before_destroy do
+            if !association.embeddable?
               case options[:dependent]
                 when :destroy
                   self.get_proxy(association).destroy_all

data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -8,7 +8,15 @@ module MongoMapper
 
         def replace(docs)
           load_target
-          target.each { |t| t.destroy }
+          
+          (target - docs).each do |t|
+            case options[:dependent]
+              when :destroy    then t.destroy
+              when :delete_all then t.delete
+              else t.update_attributes(self.foreign_key => nil)
+            end
+          end
+          
           docs.each { |doc| prepare(doc).save }
           reset
         end

data/lib/mongo_mapper/plugins/associations/one_as_proxy.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class OneAsProxy < OneProxy
+        protected
+          def criteria
+            {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
+          end
+        
+        private
+          def type_key_name
+            "#{options[:as]}_type"
+          end
+        
+          def id_key_name
+            "#{options[:as]}_id"
+          end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/associations/one_association.rb

@@ -8,7 +8,35 @@ module MongoMapper
         end
 
         def proxy_class
-          @proxy_class ||= klass.embeddable? ? OneEmbeddedProxy : OneProxy
+          @proxy_class ||=
+            if klass.embeddable?
+              OneEmbeddedProxy
+            elsif as?
+              OneAsProxy
+            else
+              OneProxy
+            end
+        end
+        
+        def setup(model)
+          super
+                    
+          association = self
+          options = self.options
+
+          model.before_destroy do
+            if !association.embeddable?
+              proxy = self.get_proxy(association)
+              
+              unless proxy.nil?
+                case options[:dependent]
+                  when :destroy then proxy.destroy
+                  when :delete  then proxy.delete
+                  else proxy.nullify
+                end
+              end
+            end
+          end
         end
 
         def autosave?

data/lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb

@@ -16,7 +16,6 @@ module MongoMapper
           else
             @target = klass.load(doc)
           end
-          @target.default_id_value if @target && @target.id.nil?
           assign_references(@target)
           loaded
           @target

data/lib/mongo_mapper/plugins/associations/one_proxy.rb

@@ -19,38 +19,51 @@ module MongoMapper
           load_target
 
           if !target.nil? && target != doc
-            if options[:dependent] && target.persisted?
+            if target.persisted?
               case options[:dependent]
-                when :delete
-                  target.delete
-                when :destroy
-                  target.destroy
-                when :nullify
-                  target[foreign_key] = nil
+                when :delete  then target.delete
+                when :destroy then target.destroy
+                else
+                  nullify_scope(target)
                   target.save
               end
             end
           end
-
-          if doc.nil?
-            target.update_attributes(foreign_key => nil) unless target.nil?
-          else
+          
+          unless doc.nil?
             proxy_owner.save unless proxy_owner.persisted?
             doc = klass.new(doc) unless doc.is_a?(klass)
-            doc[foreign_key] = proxy_owner.id
+            apply_scope(doc)
             doc.save unless doc.persisted?
-            loaded
-            @target = doc
           end
+
+          loaded
+          @target = doc
+        end
+        
+        def destroy
+          target.destroy
+          reset
+        end
+        
+        def delete
+          target.delete
+          reset
+        end
+        
+        def nullify
+          nullify_scope(target)
+          target.save
+          reset
         end
 
         protected
           def find_target
-            target_class.first(association.query_options.merge(foreign_key => proxy_owner.id))
+            target_class.first(association.query_options.merge(criteria))
           end
 
           def instantiate_target(instantiator, attrs={})
-            @target = target_class.send(instantiator, attrs.update(foreign_key => proxy_owner.id))
+            @target = target_class.send(instantiator, attrs.update(criteria))
             loaded
             @target
           end
@@ -62,6 +75,20 @@ module MongoMapper
           def foreign_key
             options[:foreign_key] || proxy_owner.class.name.foreign_key
           end
+
+          def criteria
+            {self.foreign_key => proxy_owner.id}
+          end
+
+          def nullify_scope(doc)
+            criteria.each { |key, value| doc[key] = nil }
+            doc
+          end
+
+          def apply_scope(doc)
+            criteria.each { |key, value| doc[key] = value }
+            doc
+          end
       end
     end
   end

data/lib/mongo_mapper/plugins/clone.rb

@@ -8,7 +8,7 @@ module MongoMapper
         def initialize_copy(other)
           @_new       = true
           @_destroyed = false
-          default_id_value
+          @_id        = nil
           associations.each do |name, association|
             instance_variable_set(association.ivar, nil)
           end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -20,10 +20,6 @@ module MongoMapper
           clear_changes { super }
         end
 
-        def save!(*)
-          clear_changes { super }
-        end
-
         def reload(*)
           super.tap { clear_changes }
         end
@@ -51,19 +47,14 @@ module MongoMapper
 
         def write_key(key, value)
           key = key.to_s
-          old = read_key(key)
-          attribute_will_change!(key) if attribute_should_change?(key, old, value)
-          changed_attributes.delete(key) unless attribute_value_changed?(key, attribute_was(key), value)
-          super(key, value)
-        end
-
-        def attribute_should_change?(key, old, value)
-          attribute_changed?(key) == false && attribute_value_changed?(key, old, value)
+          attribute_will_change!(key) unless attribute_changed?(key)
+          super(key, value).tap do
+            changed_attributes.delete(key) unless attribute_value_changed?(key)
+          end
         end
 
-        def attribute_value_changed?(key_name, old, value)
-          value = nil if keys[key_name.to_s].number? && value.blank?
-          old != value
+        def attribute_value_changed?(key_name)
+          attribute_was(key_name) != read_key(key_name)
         end
       end
     end

data/lib/mongo_mapper/plugins/document.rb

@@ -21,12 +21,12 @@ module MongoMapper
 
         def reload
           if doc = collection.find_one(:_id => id)
-            tap do |instance|
-              instance.class.associations.each_value do |association|
-                get_proxy(association).reset
-              end
-              instance.attributes = doc
+            self.class.associations.each_value do |association|
+              get_proxy(association).reset
             end
+            instance_variables.each { |ivar| instance_variable_set(ivar, nil) }
+            self.attributes = doc
+            self
           else
             raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"
           end

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -11,7 +11,7 @@ module MongoMapper
       end
 
       module InstanceMethods
-        def run_callbacks(callback, &block)
+        def run_callbacks(callback, *args, &block)
           embedded_docs = []
 
           embedded_associations.each do |association|
@@ -20,12 +20,12 @@ module MongoMapper
 
           block = embedded_docs.inject(block) do |chain, doc|
             if doc.class.respond_to?("_#{callback}_callbacks")
-              lambda { doc.run_callbacks(callback, &chain) }
+              lambda { doc.run_callbacks(callback, *args, &chain) }
             else
               chain
             end
           end
-          super callback, &block
+          super callback, *args, &block
         end
       end
     end

data/lib/mongo_mapper/plugins/keys.rb

@@ -47,11 +47,6 @@ module MongoMapper
           object_id_keys.include?(name.to_sym)
         end
 
-        # API Private
-        def can_default_id?
-          keys['_id'].can_default_id?
-        end
-
         def to_mongo(instance)
           return nil if instance.nil?
           instance.to_mongo
@@ -163,7 +158,6 @@ module MongoMapper
 
       module InstanceMethods
         def initialize(attrs={})
-          default_id_value(attrs)
           @_new = true
           assign(attrs)
         end
@@ -171,7 +165,6 @@ module MongoMapper
         def initialize_from_database(attrs={})
           @_new = false
           load_from_database(attrs)
-          default_id_value(attrs)
           self
         end
 
@@ -266,18 +259,6 @@ module MongoMapper
           keys.values.select { |key| key.embeddable? }
         end
 
-        def default_id_value(attrs={})
-          id_provided = !attrs.nil? && attrs.keys.map { |k| k.to_s }.detect { |k| k == 'id' || k == '_id' }
-          if !id_provided && self.class.can_default_id?
-            unless keys['_id'].default_value
-              warn "[DEPRECATED] Custom IDs will no longer be automatically populated. If you definte your own :_id key, set a default:\n  key :_id, String, :default => lambda { BSON::ObjectId.new }"
-              warn caller.grep(/test/).join("\n")
-            end
-
-            write_key :_id, BSON::ObjectId.new
-          end
-        end
-
         private
           def load_from_database(attrs)
             return if attrs.blank?

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -21,10 +21,6 @@ module MongoMapper
           type.embeddable?
         end
 
-        def can_default_id?
-          type && (type == ObjectId || type == BSON::ObjectId || type == String)
-        end
-
         def number?
           type == Integer || type == Float
         end

data/lib/mongo_mapper/railtie.rb

@@ -37,10 +37,9 @@ module MongoMapper
     initializer "mongo_mapper.prepare_dispatcher" do |app|
       # See http://groups.google.com/group/mongomapper/browse_thread/thread/68f62e8eda43b43a/4841dba76938290c
       # to_prepare is called before each request in development mode and the first request in production.
+
       ActionDispatch::Callbacks.to_prepare do
         unless app.config.cache_classes
-          # Rails reloading was making descendants fill up and leak memory, these make sure they get cleared
-          ActiveSupport::DescendantsTracker.clear
           MongoMapper::Plugins::IdentityMap.models.clear
         end
       end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.9.2'
+  Version = '0.10.0'
 end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -102,6 +102,21 @@ class BelongsToProxyTest < Test::Unit::TestCase
     @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
   end
 
+  should "define foreign key if it doesn't exist" do
+    @category_class = Doc()
+    @post_class.belongs_to :category, :class => @category_class
+
+    @post_class.key?(:category_id).should be_true
+  end
+
+  should "not define foreign key if it already exists" do
+    @category_class = Doc()
+    @post_class.key :category_id, String
+    @post_class.belongs_to :category, :class => @category_class
+
+    @post_class.keys['category_id'].type.should == String
+  end
+
   context ":dependent" do
     setup do
       # FIXME: make use of already defined models