mongo_mapper 0.7.6 → 0.8.0

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

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

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -31,7 +32,7 @@ module MongoMapper
 
         private
           def assign_references(*docs)
-            docs.each { |doc| doc._parent_document = owner }
+            docs.each { |doc| doc._parent_document = proxy_owner }
           end
       end
     end

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 MongoMapper::Plugins::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,19 +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.select do |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
@@ -136,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,37 +1,36 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsProxy < Collection
-        include Support::Find
+        include MongoMapper::Plugins::DynamicQuerying::ClassMethods
 
         def find(*args)
-          options = args.extract_options!
-          klass.find(*args << scoped_options(options))
+          query.find(*args)
         end
 
         def find!(*args)
-          options = args.extract_options!
-          klass.find!(*args << scoped_options(options))
+          query.find!(*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={})
-          klass.count(scoped_options(options))
+          query(options).count
         end
 
         def replace(docs)
@@ -77,29 +76,29 @@ 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 = {})
+        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 scoped_options(options)
-            association.query_options.merge(options).merge(scoped_conditions)
+          def criteria
+            {self.foreign_key => proxy_owner.id}
           end
 
           def find_target
@@ -107,7 +106,7 @@ module MongoMapper
           end
 
           def ensure_owner_saved
-            owner.save if owner.new?
+            proxy_owner.save if proxy_owner.new?
           end
 
           def prepare(doc)
@@ -116,12 +115,12 @@ module MongoMapper
 
           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

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

@@ -1,9 +1,8 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class OneEmbeddedProxy < Proxy
-        undef_method :object_id
-
         def build(attributes={})
           @target = klass.new(attributes)
           assign_references(@target)
@@ -33,7 +32,7 @@ module MongoMapper
           end
 
           def assign_references(doc)
-            doc._parent_document = owner
+            doc._parent_document = proxy_owner
           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,9 +35,9 @@ module MongoMapper
           reset
 
           unless doc.nil?
-            owner.save if owner.new?
+            proxy_owner.save if proxy_owner.new?
             doc = klass.new(doc) unless klass === doc
-            doc[foreign_key] = owner.id
+            doc[foreign_key] = proxy_owner.id
             doc.save if doc.new?
             loaded
             @target = doc
@@ -47,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
@@ -61,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

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,7 +77,7 @@ module MongoMapper
           result
         end
 
-        def run_callbacks(kind, 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)
@@ -122,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?
@@ -169,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]