mongo_mapper-unstable 2010.3.8 → 2010.06.23

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

@@ -1,57 +1,36 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class InArrayProxy < Collection
-        include Support::Find
+        include DynamicQuerying::ClassMethods
 
         def find(*args)
-          options = args.extract_options!
-
-          case args.first
-            when :first
-              first(options)
-            when :last
-              last(options)
-            when :all
-              all(options)
-            else
-              klass.find(*scoped_ids(args) << scoped_options(options))
-          end
+          query.find(*scoped_ids(args))
         end
 
         def find!(*args)
-          options = args.extract_options!
-
-          case args.first
-            when :first
-              first(options)
-            when :last
-              last(options)
-            when :all
-              all(options)
-            else
-              klass.find!(*scoped_ids(args) << scoped_options(options))
-          end
+          query.find!(*scoped_ids(args))
         end
 
         def paginate(options)
-          klass.paginate(scoped_options(options))
+          query.paginate(options)
         end
 
         def all(options={})
-          klass.all(scoped_options(options))
+          query(options).all
         end
 
         def first(options={})
-          klass.first(scoped_options(options))
+          query(options).first
         end
 
         def last(options={})
-          klass.last(scoped_options(options))
+          query(options).last
         end
 
         def count(options={})
-          options.blank? ? ids.size : klass.count(scoped_options(options))
+          options.blank? ? ids.size : query(options).count
         end
 
         def destroy_all(options={})
@@ -63,7 +42,7 @@ module MongoMapper
         end
 
         def delete_all(options={})
-          docs = all(options.merge(:select => ['_id']))
+          docs = query(options).fields(:_id).all
           docs.each { |doc| ids.delete(doc.id) }
           klass.delete(docs.map(&:id))
           reset
@@ -78,7 +57,7 @@ module MongoMapper
           doc = klass.create(attrs)
           unless doc.new?
             ids << doc.id
-            owner.save
+            proxy_owner.save
             reset
           end
           doc
@@ -88,7 +67,7 @@ module MongoMapper
           doc = klass.create!(attrs)
           unless doc.new?
             ids << doc.id
-            owner.save
+            proxy_owner.save
             reset
           end
           doc
@@ -116,16 +95,23 @@ module MongoMapper
         end
 
         private
-          def scoped_conditions
-            {:_id => ids}
+          def query(options={})
+            klass.
+              query(association.query_options).
+              update(options).
+              update(criteria)
           end
 
-          def scoped_options(options)
-            association.query_options.merge(options).merge(scoped_conditions)
+          def criteria
+            {:_id => ids}
           end
 
           def scoped_ids(args)
-            args.flatten.reject { |id| !ids.include?(id) }
+            valid = args.flatten.select do |id|
+              id = ObjectId.to_mongo(id) if klass.using_object_id?
+              ids.include?(id)
+            end
+            valid.empty? ? nil : valid
           end
 
           def find_target
@@ -133,7 +119,7 @@ module MongoMapper
           end
 
           def ids
-            owner[options[:in]]
+            proxy_owner[options[:in]]
           end
       end
     end

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

@@ -1,16 +1,16 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsAsProxy < ManyDocumentsProxy
         protected
-          def scoped_conditions
-            {type_key_name => owner.class.name, id_key_name => owner.id}
+          def criteria
+            {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
           end
 
           def apply_scope(doc)
             ensure_owner_saved
-            doc[type_key_name] = owner.class.name
-            doc[id_key_name] = owner.id
+            criteria.each { |key, value| doc[key] = value }
             doc
           end
 

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

@@ -1,49 +1,21 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsProxy < Collection
-        include Support::Find
-
-        def find(*args)
-          options = args.extract_options!
-          klass.find(*args << scoped_options(options))
-        end
-
-        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={})
-          klass.all(scoped_options(options))
-        end
-
-        def first(options={})
-          klass.first(scoped_options(options))
-        end
-
-        def last(options={})
-          klass.last(scoped_options(options))
-        end
-
-        def count(options={})
-          klass.count(scoped_options(options))
-        end
+        include DynamicQuerying::ClassMethods
+        include Querying::PluckyMethods
 
         def replace(docs)
           load_target
           target.map(&:destroy)
-          docs.each { |doc| apply_scope(doc).save }
+          docs.each { |doc| prepare(doc).save }
           reset
         end
 
         def <<(*docs)
           ensure_owner_saved
-          flatten_deeper(docs).each { |doc| apply_scope(doc).save }
+          flatten_deeper(docs).each { |doc| prepare(doc).save }
           reset
         end
         alias_method :push, :<<
@@ -52,7 +24,8 @@ module MongoMapper
         def build(attrs={})
           doc = klass.new(attrs)
           apply_scope(doc)
-          reset
+          @target ||= [] unless loaded?
+          @target << doc
           doc
         end
 
@@ -76,25 +49,38 @@ module MongoMapper
         end
 
         def delete_all(options={})
-          klass.delete_all(options.merge(scoped_conditions))
+          query(options).remove
           reset
         end
 
         def nullify
-          criteria = Query.new(klass, scoped_conditions).criteria
-          all(criteria).each do |doc|
-            doc.update_attributes(self.foreign_key => nil)
-          end
+          all.each { |doc| doc.update_attributes(self.foreign_key => nil) }
           reset
         end
 
+        def save_to_collection(options={})
+          @target.each { |doc| doc.save(options) } if @target
+        end
+
         protected
-          def scoped_conditions
-            {self.foreign_key => owner.id}
+          def query(options={})
+            klass.
+              query(association.query_options).
+              update(options).update(criteria)
+          end
+
+          def method_missing(method, *args, &block)
+            if klass.respond_to?(method)
+              result = klass.send(method, *args, &block)
+              result.is_a?(Plucky::Query) ? 
+                query.merge(result) : super
+            else
+              super
+            end
           end
 
-          def scoped_options(options)
-            association.query_options.merge(options).merge(scoped_conditions)
+          def criteria
+            {self.foreign_key => proxy_owner.id}
           end
 
           def find_target
@@ -102,17 +88,21 @@ module MongoMapper
           end
 
           def ensure_owner_saved
-            owner.save if owner.new?
+            proxy_owner.save if proxy_owner.new?
+          end
+
+          def prepare(doc)
+            klass === doc ? apply_scope(doc) : build(doc)
           end
 
           def apply_scope(doc)
             ensure_owner_saved
-            doc[foreign_key] = owner.id
+            criteria.each { |key, value| doc[key] = value }
             doc
           end
 
           def foreign_key
-            options[:foreign_key] || owner.class.name.to_s.underscore.gsub("/", "_") + "_id"
+            options[:foreign_key] || proxy_owner.class.name.to_s.underscore.gsub("/", "_") + "_id"
           end
       end
     end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -11,10 +12,10 @@ module MongoMapper
 
         private
           def find_target
-            (@_values || []).map do |v|
-              child = klass.load(v)
-              assign_references(child)
-              child
+            (@_values || []).map do |attrs|
+              klass.load(attrs).tap do |child|
+                assign_references(child)
+              end
             end
           end
       end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class OneEmbeddedProxy < Proxy
+        def build(attributes={})
+          @target = klass.new(attributes)
+          assign_references(@target)
+          loaded
+          @target
+        end
+
+        def replace(doc)
+          if doc.respond_to?(:attributes)
+            @target = klass.load(doc.attributes)
+          else
+            @target = klass.load(doc)
+          end
+          assign_references(@target)
+          loaded
+          @target
+        end
+
+        protected
+
+          def find_target
+            if @value
+              klass.load(@value).tap do |child|
+                assign_references(child)
+              end
+            end
+          end
+
+          def assign_references(doc)
+            doc._parent_document = proxy_owner if doc
+          end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,8 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class OneProxy < Proxy
-        undef_method :object_id
-        
         def build(attrs={})
           instantiate_target(:new, attrs)
         end
@@ -36,8 +35,9 @@ module MongoMapper
           reset
 
           unless doc.nil?
-            owner.save if owner.new?
-            doc[foreign_key] = owner.id
+            proxy_owner.save if proxy_owner.new?
+            doc = klass.new(doc) unless klass === doc
+            doc[foreign_key] = proxy_owner.id
             doc.save if doc.new?
             loaded
             @target = doc
@@ -46,11 +46,11 @@ module MongoMapper
 
         protected
           def find_target
-            target_class.first(association.query_options.merge(foreign_key => owner.id))
+            target_class.first(association.query_options.merge(foreign_key => proxy_owner.id))
           end
 
           def instantiate_target(instantiator, attrs={})
-            @target = target_class.send(instantiator, attrs.update(foreign_key => owner.id))
+            @target = target_class.send(instantiator, attrs.update(foreign_key => proxy_owner.id))
             loaded
             @target
           end
@@ -60,7 +60,7 @@ module MongoMapper
           end
 
           def foreign_key
-            options[:foreign_key] || owner.class.name.foreign_key
+            options[:foreign_key] || proxy_owner.class.name.foreign_key
           end
       end
     end

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

@@ -1,24 +1,26 @@
+# encoding: UTF-8
+require 'forwardable'
 module MongoMapper
   module Plugins
     module Associations
       class Proxy
+        extend Forwardable
+
         alias :proxy_respond_to? :respond_to?
         alias :proxy_extend :extend
 
         instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
 
-        attr_reader :owner, :association, :target
+        attr_reader :proxy_owner, :association, :target
 
-        alias :proxy_owner :owner
         alias :proxy_target :target
         alias :proxy_association :association
 
-        delegate :klass, :to => :proxy_association
-        delegate :options, :to => :proxy_association
-        delegate :collection, :to => :klass
+        def_delegators :proxy_association, :klass, :options
+        def_delegator  :klass, :collection
 
         def initialize(owner, association)
-          @owner, @association, @loaded = owner, association, false
+          @proxy_owner, @association, @loaded = owner, association, false
           Array(association.options[:extend]).each { |ext| proxy_extend(ext) }
           reset
         end
@@ -96,8 +98,14 @@ module MongoMapper
           end
 
           def load_target
-            @target = find_target unless loaded?
-            loaded
+            unless loaded?
+              if @target.is_a?(Array) && @target.any?
+                @target = find_target + @target.find_all { |record| record.new? }
+              else
+                @target = find_target
+              end
+              loaded
+            end
             @target
           rescue MongoMapper::DocumentNotFound
             reset

data/lib/mongo_mapper/plugins/associations.rb

@@ -1,7 +1,13 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       module ClassMethods
+        def inherited(subclass)
+          subclass.associations = associations.dup
+          super
+        end
+
         def belongs_to(association_id, options={}, &extension)
           create_association(:belongs_to, association_id, options, &extension)
         end
@@ -22,11 +28,6 @@ module MongoMapper
           @associations = hash
         end
 
-        def inherited(subclass)
-          subclass.associations = associations.dup
-          super
-        end
-
         private
           def create_association(type, name, options, &extension)
             association = Associations::Base.new(type, name, options, &extension)
@@ -67,7 +68,6 @@ module MongoMapper
           self.class.associations
         end
 
-        # @api private?
         def embedded_associations
           associations.select do |name, association|
             association.embeddable?
@@ -81,25 +81,17 @@ module MongoMapper
             proxy = association.proxy_class.new(self, association)
             self.instance_variable_set(association.ivar, proxy)
           end
-
           proxy
         end
-      end
 
-      autoload :Base,                         'mongo_mapper/plugins/associations/base'
-      autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
-      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
-      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'
-      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/belongs_to_proxy'
-      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
-      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/many_polymorphic_proxy'
-      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/many_embedded_proxy'
-      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 :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
+        def save_to_collection(options={})
+          super
+          associations.each do |association_name, association|
+            proxy = get_proxy(association)
+            proxy.save_to_collection(options) if proxy.proxy_respond_to?(:save_to_collection)
+          end
+        end
+      end
     end
   end
 end
-
-require 'mongo_mapper/plugins/associations/proxy'

data/lib/mongo_mapper/plugins/caching.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Caching
+      module InstanceMethods
+        def cache_key(*suffixes)
+          cache_key = case
+                        when new?
+                          "#{self.class.name}/new"
+                        when timestamp = self[:updated_at]
+                          "#{self.class.name}/#{id}-#{timestamp.to_s(:number)}"
+                        else
+                          "#{self.class.name}/#{id}"
+                      end
+          cache_key += "/#{suffixes.join('/')}" unless suffixes.empty?
+          cache_key
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Almost all of this callback stuff is pulled directly from ActiveSupport
 # in the interest of support rails 2 and 3 at the same time and is the
 # same copyright as rails.
@@ -76,8 +77,19 @@ module MongoMapper
           result
         end
 
-        def run_callbacks(kind, options = {}, &block)
-          self.class.send("#{kind}_callback_chain").run(self, options, &block)
+        def run_callbacks(kind, options={}, &block)
+          callback_chain_method = "#{kind}_callback_chain"
+          return unless self.class.respond_to?(callback_chain_method)
+          self.class.send(callback_chain_method).run(self, options, &block)
+          self.embedded_associations.each do |association|
+            if association.one?
+              self.send(association.name).run_callbacks(kind, options, &block)
+            else
+              self.send(association.name).each do |document|
+                document.run_callbacks(kind, options, &block)
+              end
+            end
+          end
         end
 
         private
@@ -111,7 +123,7 @@ module MongoMapper
           new(methods)
         end
 
-        def run(object, options = {}, &terminator)
+        def run(object, options={}, &terminator)
           enumerator = options[:enumerator] || :each
 
           unless block_given?
@@ -158,7 +170,7 @@ module MongoMapper
       class Callback
         attr_reader :kind, :method, :identifier, :options
 
-        def initialize(kind, method, options = {})
+        def initialize(kind, method, options={})
           @kind       = kind
           @method     = method
           @identifier = options[:identifier]
@@ -226,4 +238,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/clone.rb

@@ -1,11 +1,17 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Clone
       module InstanceMethods
-        def clone
-          clone_attributes = self.attributes
-          clone_attributes.delete("_id")
-          self.class.new(clone_attributes)
+        def initialize_copy(other)
+          @_new       = true
+          @_destroyed = false
+          default_id_value({})
+          self.attributes = other.attributes.clone.except(:_id).inject({}) do |hash, entry|
+            key, value = entry
+            hash[key] = value.duplicable? ? value.clone : value
+            hash
+          end
         end
       end
     end

data/lib/mongo_mapper/plugins/descendants.rb

@@ -1,14 +1,15 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Descendants
       module ClassMethods
         def inherited(descendant)
-          (@descendants ||= []) << descendant
+          descendants << descendant
           super
         end
 
         def descendants
-          @descendants
+          @descendants ||= []
         end
       end
     end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Dirty

data/lib/mongo_mapper/plugins/document.rb

@@ -0,0 +1,41 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Document
+      module ClassMethods
+        def embeddable?
+          false
+        end
+      end
+
+      module InstanceMethods
+        def new?
+          @_new
+        end
+
+        def destroyed?
+          @_destroyed == true
+        end
+
+        def reload
+          if doc = collection.find_one(:_id => id)
+            tap do |instance|
+              instance.class.associations.each_key do |association_name|
+                send(association_name).reset if respond_to?(association_name)
+              end
+              instance.attributes = doc
+            end
+          else
+            raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"
+          end
+        end
+
+        # Used by embedded docs to find root easily without if/respond_to? stuff.
+        # Documents are always root documents.
+        def _root_document
+          self
+        end
+      end
+    end
+  end
+end