Some house cleaning. Reorganized stuff a bit.

lib/mongo_mapper.rb

@@ -102,25 +102,7 @@ def self.normalize_object_id(value)
 
 require 'mongo_mapper/support'
 require 'mongo_mapper/finder_options'
-require 'mongo_mapper/dynamic_finder'
-require 'mongo_mapper/descendant_appends'
-
 require 'mongo_mapper/plugins'
-require 'mongo_mapper/plugins/associations'
-require 'mongo_mapper/plugins/callbacks'
-require 'mongo_mapper/plugins/clone'
-require 'mongo_mapper/plugins/descendants'
-require 'mongo_mapper/plugins/dirty'
-require 'mongo_mapper/plugins/equality'
-require 'mongo_mapper/plugins/identity_map'
-require 'mongo_mapper/plugins/inspect'
-require 'mongo_mapper/plugins/keys'
-require 'mongo_mapper/plugins/logger'
-require 'mongo_mapper/plugins/pagination'
-require 'mongo_mapper/plugins/protected'
-require 'mongo_mapper/plugins/rails'
-require 'mongo_mapper/plugins/serialization'
-require 'mongo_mapper/plugins/validations'
 
 require 'mongo_mapper/document'
 require 'mongo_mapper/embedded_document'

lib/mongo_mapper/document.rb

@@ -1,12 +1,12 @@
 module MongoMapper
   module Document
-    extend DescendantAppends
+    extend Support::DescendantAppends
 
     def self.included(model)
       model.class_eval do
         include InstanceMethods
         extend  ClassMethods
-        extend  Finders
+        extend  Support::Find
         extend  Plugins
 
         plugin Plugins::Associations

lib/mongo_mapper/embedded_document.rb

@@ -1,6 +1,6 @@
 module MongoMapper
   module EmbeddedDocument
-    extend DescendantAppends
+    extend Support::DescendantAppends
 
     def self.included(model)
       model.class_eval do

lib/mongo_mapper/plugins.rb

@@ -11,4 +11,20 @@ def plugin(mod)
       plugins << mod
     end
   end
-end
+end
+
+require 'mongo_mapper/plugins/associations'
+require 'mongo_mapper/plugins/callbacks'
+require 'mongo_mapper/plugins/clone'
+require 'mongo_mapper/plugins/descendants'
+require 'mongo_mapper/plugins/dirty'
+require 'mongo_mapper/plugins/equality'
+require 'mongo_mapper/plugins/identity_map'
+require 'mongo_mapper/plugins/inspect'
+require 'mongo_mapper/plugins/keys'
+require 'mongo_mapper/plugins/logger'
+require 'mongo_mapper/plugins/pagination'
+require 'mongo_mapper/plugins/protected'
+require 'mongo_mapper/plugins/rails'
+require 'mongo_mapper/plugins/serialization'
+require 'mongo_mapper/plugins/validations'

lib/mongo_mapper/plugins/associations/in_array_proxy.rb

@@ -2,7 +2,7 @@ module MongoMapper
   module Plugins
     module Associations
       class InArrayProxy < Collection
-        include ::MongoMapper::Finders
+        include Support::Find
 
         def find(*args)
           options = args.extract_options!

lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -2,7 +2,7 @@ module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsProxy < Collection
-        include ::MongoMapper::Finders
+        include Support::Find
 
         def find(*args)
           options = args.extract_options!

lib/mongo_mapper/support.rb

@@ -211,4 +211,7 @@ class Mongo::ObjectID
   def to_json(options = nil)
     %Q("#{to_s}")
   end
-end
+end
+
+require 'mongo_mapper/support/descendant_appends'
+require 'mongo_mapper/support/find'

lib/mongo_mapper/support/descendant_appends.rb

@@ -0,0 +1,46 @@
+module MongoMapper
+  module Support
+    module DescendantAppends
+      def included(model)
+        extra_extensions.each { |extension| model.extend(extension) }
+        extra_inclusions.each { |inclusion| model.send(:include, inclusion) }
+        descendants << model
+      end
+
+      # @api public
+      def descendants
+        @descendants ||= Set.new
+      end
+
+      # @api public
+      def append_extensions(*extensions)
+        extra_extensions.concat extensions
+
+        # Add the extension to existing descendants
+        descendants.each do |model|
+          extensions.each { |extension| model.extend(extension) }
+        end
+      end
+
+      # @api public
+      def append_inclusions(*inclusions)
+        extra_inclusions.concat inclusions
+
+        # Add the inclusion to existing descendants
+        descendants.each do |model|
+          inclusions.each { |inclusion| model.send(:include, inclusion) }
+        end
+      end
+
+      # @api private
+      def extra_extensions
+        @extra_extensions ||= []
+      end
+
+      # @api private
+      def extra_inclusions
+        @extra_inclusions ||= []
+      end
+    end
+  end
+end

lib/mongo_mapper/support/find.rb

@@ -0,0 +1,77 @@
+module MongoMapper
+  module Support
+    # @api private
+    module Find
+      def dynamic_find(finder, args)
+        attributes = {}
+
+        finder.attributes.each_with_index do |attr, index|
+          attributes[attr] = args[index]
+        end
+
+        options = args.extract_options!.merge(attributes)
+
+        if result = send(finder.finder, options)
+          result
+        else
+          if finder.raise?
+            raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
+          end
+
+          if finder.instantiator
+            self.send(finder.instantiator, attributes)
+          end
+        end
+      end
+
+      class DynamicFinder
+        attr_reader :method, :attributes, :finder, :bang, :instantiator
+
+        def initialize(method)
+          @method = method
+          @finder = :first
+          @bang   = false
+          match
+        end
+
+        def found?
+          @finder.present?
+        end
+
+        def raise?
+          bang == true
+        end
+
+        protected
+          def match
+            case method.to_s
+              when /^find_(all_by|by)_([_a-zA-Z]\w*)$/
+                @finder = :all if $1 == 'all_by'
+                names = $2
+              when /^find_by_([_a-zA-Z]\w*)\!$/
+                @bang = true
+                names = $1
+              when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
+                @instantiator = $1 == 'initialize' ? :new : :create
+                names = $2
+              else
+                @finder = nil
+            end
+
+            @attributes = names && names.split('_and_')
+          end
+      end
+
+      protected
+        def method_missing(method, *args, &block)
+          finder = DynamicFinder.new(method)
+
+          if finder.found?
+            dynamic_find(finder, args)
+          else
+            super
+          end
+        end
+    end
+  end
+end