djsun-mongomapper 0.3.1.1 → 0.3.3

data/History

@@ -1,8 +1,27 @@
-0.3.2 (master)
+0.3.4 (master)
+  * BACKWORDS COMPATIBILITY BREAK: Timestamps are now optional. To use them add timestamps! to your model.
+  * BACKWORDS COMPATIBILITY BREAK: Associations keys are no longer created automatically when you use belongs_to and many. Too much was hidden from the developer. You now have to declare them like key :creator_id, String and such.
+  
+0.3.3 8/16/2009
+  * BACKWORDS COMPATIBILITY BREAK: _id is now once again a string rather than an object id and will stay that way.
+  * Custom id's can now be used because of the change to string id's
+  * Added dynamic finders to document. (dcu)
+  * Added destroy_all, delete_all and nullify for many document association
+  * Added :dependent option for many documents assocation (dcu)
+  * update_attributes now returns true or false instead of the document. (Durran Jordan and me)
+  * Keys no longer require a type
+  * Keys can now be added on the fly using []=
+  
+0.3.2 8/6/2009
   * Added many polymorphic documents association
   * Implemented build and create for many and many polymorphic documents
   * <<, push and concat now work correctly for many and many polymorphic documents
   * find(:first) now accepts order option
+  * id is now included by default with to_json
+  * _id is now always excluded from to_json
+  * Times are now always returned as UTC
+  * Default values are now a bit more intelligent for Array and Hash keys (djsun)
+  * Embedded documents now have _id as well so they can be identified more easily
   
 0.3.1 7/28/2009
 * 1 minor tweak

data/Rakefile

@@ -12,14 +12,16 @@ begin
     gem.rubyforge_project = "mongomapper"
     
     gem.add_dependency('activesupport')
-    gem.add_dependency('mongodb-mongo', '0.10.1')
+    gem.add_dependency('mongodb-mongo', '0.11.1')
     gem.add_dependency('jnunemaker-validatable', '1.7.2')
     
     gem.add_development_dependency('mocha', '0.9.4')
     gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
   end
-
-  Jeweler::RubyforgeTasks.new
+  
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/lib/mongomapper/associations/base.rb

@@ -4,9 +4,7 @@ module MongoMapper
       attr_reader :type, :name, :options
 
       def initialize(type, name, options = {})
-        @options = options
-        @type = type
-        @name = name
+        @type, @name, @options = type, name, options
       end
       
       def class_name
@@ -41,8 +39,8 @@ module MongoMapper
         @type_key_name ||= many? ? '_type' : "#{name}_type"
       end
       
-      def belongs_to_key_name
-        "#{name}_id"
+      def foreign_key
+        @options[:foreign_key] || "#{name}_id"
       end
       
       def ivar

data/lib/mongomapper/associations/belongs_to_polymorphic_proxy.rb

@@ -7,18 +7,20 @@ module MongoMapper
           id, type = doc.id, doc.class.name
         end
         
-        @owner.send("#{@association.belongs_to_key_name}=", id)
+        @owner.send("#{@association.foreign_key}=", id)
         @owner.send("#{@association.type_key_name}=", type)
         reset
       end
       
       protected
         def find_target
-          proxy_class.find(proxy_id) if proxy_id && proxy_class
+          if proxy_id && proxy_class
+            proxy_class.find_by_id(proxy_id)
+          end
         end
         
         def proxy_id
-          @proxy_id ||= @owner.send(@association.belongs_to_key_name)
+          @proxy_id ||= @owner.send(@association.foreign_key)
         end
         
         def proxy_class

data/lib/mongomapper/associations/belongs_to_proxy.rb

@@ -7,14 +7,14 @@ module MongoMapper
           id = doc.id
         end
         
-        @owner.send("#{@association.belongs_to_key_name}=", id)
+        @owner.send("#{@association.foreign_key}=", id)
         reset
       end
 
-      protected
+      protected        
         def find_target
-          if association_id = @owner.send(@association.belongs_to_key_name)
-            @association.klass.find(association_id)
+          if association_id = @owner.send(@association.foreign_key)
+            @association.klass.find_by_id(association_id)
           end
         end
     end

data/lib/mongomapper/associations/many_documents_proxy.rb

@@ -2,38 +2,38 @@ module MongoMapper
   module Associations
     class ManyDocumentsProxy < Proxy
       delegate :klass, :to => :@association
-      
+
       def find(*args)
         options = args.extract_options!
         klass.find(*args << scoped_options(options))
       end
-      
+
       def paginate(options)
         klass.paginate(scoped_options(options))
       end
-      
+
       def all(options={})
         find(:all, scoped_options(options))
       end
-      
+
       def first(options={})
         find(:first, scoped_options(options))
       end
-      
+
       def last(options={})
         find(:last, scoped_options(options))
       end
-      
+
       def count(conditions={})
         klass.count(conditions.deep_merge(scoped_conditions))
       end
-      
+
       def replace(docs)
         @target.map(&:destroy) if load_target
         docs.each { |doc| apply_scope(doc).save }
         reset
       end
-      
+
       def <<(*docs)
         ensure_owner_saved
         flatten_deeper(docs).each { |doc| apply_scope(doc).save }
@@ -41,36 +41,54 @@ module MongoMapper
       end
       alias_method :push, :<<
       alias_method :concat, :<<
-      
+
       def build(attrs={})
         doc = klass.new(attrs)
         apply_scope(doc)
         doc
       end
-      
+
       def create(attrs={})
         doc = klass.new(attrs)
         apply_scope(doc).save
         doc
       end
+
+      def destroy_all(conditions={})
+        all(:conditions => conditions).map(&:destroy)
+        reset
+      end
+
+      def delete_all(conditions={})
+        klass.delete_all(conditions.deep_merge(scoped_conditions))
+        reset
+      end
       
+      def nullify
+        criteria = FinderOptions.to_mongo_criteria(scoped_conditions)
+        all(criteria).each do |doc|
+          doc.update_attributes self.foreign_key => nil
+        end
+        reset
+      end
+
       protected
         def scoped_conditions
           {self.foreign_key => @owner.id}
         end
-        
+
         def scoped_options(options)
           options.deep_merge({:conditions => scoped_conditions})
         end
-        
+
         def find_target
           find(:all)
         end
-        
+
         def ensure_owner_saved
           @owner.save if @owner.new?
         end
-        
+
         def apply_scope(doc)
           ensure_owner_saved
           doc.send("#{self.foreign_key}=", @owner.id)

data/lib/mongomapper/associations/proxy.rb

@@ -1,12 +1,8 @@
 module MongoMapper
   module Associations
-    class Proxy
+    class Proxy < BasicObject
       attr_reader :owner, :association
-
-      instance_methods.each do |m|
-        undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/
-      end
-
+      
       def initialize(owner, association)
         @owner = owner
         @association = association

data/lib/mongomapper/associations.rb

@@ -2,12 +2,12 @@ module MongoMapper
   module Associations
     module ClassMethods
       def belongs_to(association_id, options = {})
-        create_association(:belongs_to, association_id, options)        
+        create_association(:belongs_to, association_id, options)
         self
       end
 
       def many(association_id, options = {})
-        create_association(:many, association_id, options)        
+        create_association(:many, association_id, options)
         self
       end
 
@@ -20,29 +20,52 @@ module MongoMapper
           association = Associations::Base.new(type, name, options)
           associations[association.name] = association
           define_association_methods(association)
-          define_association_keys(association)
+          define_dependent_callback(association)
           association
         end
-        
+
         def define_association_methods(association)
           define_method(association.name) do
             get_proxy(association)
           end
-          
+
           define_method("#{association.name}=") do |value|
             get_proxy(association).replace(value)
             value
           end
         end
-        
-        def define_association_keys(association)
-          if association.belongs_to?
-            key(association.belongs_to_key_name, String)
-            key(association.type_key_name, String) if association.polymorphic?            
+
+        def define_dependent_callback(association)
+          if association.options[:dependent]
+            if association.many?
+              define_dependent_callback_for_many(association)
+            elsif association.belongs_to?
+              define_dependent_callback_for_belongs_to(association)
+            end
+          end
+        end
+
+        def define_dependent_callback_for_many(association)
+          return if association.embeddable?
+
+          after_destroy do |doc|
+            case association.options[:dependent]
+            when :destroy
+              doc.get_proxy(association).destroy_all
+            when :delete_all
+              doc.get_proxy(association).delete_all
+            when :nullify
+              doc.get_proxy(association).nullify
+            end
           end
-          
-          if association.many? && association.polymorphic?
-            association.klass.send(:key, association.type_key_name, String)
+        end
+
+        def define_dependent_callback_for_belongs_to(association)
+          after_destroy do |doc|
+            case association.options[:dependent]
+            when :destroy
+              doc.get_proxy(association).destroy
+            end
           end
         end
     end
@@ -51,9 +74,9 @@ module MongoMapper
       def get_proxy(association)
         unless proxy = self.instance_variable_get(association.ivar)
           proxy = association.proxy_class.new(self, association)
-          self.instance_variable_set(association.ivar, proxy)
+          self.instance_variable_set(association.ivar, proxy) if !frozen?
         end
-        
+
         proxy
       end
     end