Use Plucky::Methods to determine what methods to delegate to query [F…

…ixes mongomapper#266]
danielbecker · Apr 26, 2012 · b965105 · b965105
1 parent 2f746fb
commit b965105
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 29 deletions.
diff --git a/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb b/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb
@@ -4,7 +4,8 @@ module Plugins
     module Associations
       class ManyDocumentsProxy < Collection
         include DynamicQuerying::ClassMethods
-        include Querying::PluckyMethods
+
+        def_delegators :query, *(Querying::Methods - [:to_a, :size, :empty?])
 
         def replace(docs)
           load_target

diff --git a/lib/mongo_mapper/plugins/querying.rb b/lib/mongo_mapper/plugins/querying.rb
@@ -1,6 +1,5 @@
 # encoding: UTF-8
 require 'mongo_mapper/plugins/querying/decorator'
-require 'mongo_mapper/plugins/querying/plucky_methods'
 
 module MongoMapper
   module Plugins
@@ -9,13 +8,8 @@ module Querying
 
       module ClassMethods
         extend Forwardable
-        include PluckyMethods
 
-        def_delegators :query,  :to_a, :size, :empty?
-
-        def find_each(opts={})
-          super(opts).each { |doc| yield(doc) }
-        end
+        def_delegators :query, *Querying::Methods
 
         def find_by_id(id)
           find_one(:_id => id)

diff --git a/lib/mongo_mapper/plugins/querying/decorator.rb b/lib/mongo_mapper/plugins/querying/decorator.rb
@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Querying
+      Methods = Plucky::Methods + [:find!]
+
       module Decorator
         include DynamicQuerying::ClassMethods
 

diff --git a/lib/mongo_mapper/plugins/querying/plucky_methods.rb b/lib/mongo_mapper/plugins/querying/plucky_methods.rb