mongo_mapper-unstable 2010.2.3 → 2010.2.4

data/VERSION

@@ -1 +1 @@
-2010.02.03
+2010.02.04

data/lib/mongo_mapper.rb

@@ -102,25 +102,7 @@ end
 
 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'

data/lib/mongo_mapper/document.rb

@@ -1,13 +1,13 @@
 module MongoMapper
   module Document
-    extend DescendantAppends
+    extend Support::DescendantAppends
 
     def self.included(model)
       model.class_eval do
         include InstanceMethods
+        extend  Support::Find
         extend  ClassMethods
-        extend  Finders
-        extend Plugins
+        extend  Plugins
 
         plugin Plugins::Associations
         plugin Plugins::Clone
@@ -26,10 +26,10 @@ module MongoMapper
         
         extend Plugins::Validations::DocumentMacros
       end
-      
+
       super
     end
-    
+
     module ClassMethods
       def inherited(subclass)
         subclass.set_collection_name(collection_name)
@@ -47,7 +47,7 @@ module MongoMapper
       end
 
       def find(*args)
-        find_all_first_last_error(args)
+        assert_no_first_last_or_all(args)
         options = args.extract_options!
         return nil if args.size == 0
 
@@ -59,7 +59,7 @@ module MongoMapper
       end
 
       def find!(*args)
-        find_all_first_last_error(args)
+        assert_no_first_last_or_all(args)
         options = args.extract_options!
         raise DocumentNotFound, "Couldn't find without an ID" if args.size == 0
 
@@ -70,10 +70,6 @@ module MongoMapper
         end
       end
 
-      def find_or_create(arg)
-        first(arg) || create(arg)
-      end
-
       def find_each(options={})
         criteria, options = to_finder_options(options)
         collection.find(criteria, options).each do |doc|
@@ -85,6 +81,14 @@ module MongoMapper
         find(id)
       end
 
+      def first_or_create(arg)
+        first(arg) || create(arg)
+      end
+
+      def first_or_new(arg)
+        first(arg) || new(arg)
+      end
+
       def first(options={})
         find_one(options)
       end
@@ -136,46 +140,46 @@ module MongoMapper
       end
 
       def destroy_all(options={})
-        all(options).each(&:destroy)
+        find_each(options) { |document| document.destroy }
       end
-      
+
       def increment(*args)
         modifier_update('$inc', args)
       end
-      
+
       def decrement(*args)
         criteria, keys = criteria_and_keys_from_args(args)
         values, to_decrement = keys.values, {}
         keys.keys.each_with_index { |k, i| to_decrement[k] = -values[i].abs }
         collection.update(criteria, {'$inc' => to_decrement}, :multi => true)
       end
-      
+
       def set(*args)
         modifier_update('$set', args)
       end
-      
+
       def push(*args)
         modifier_update('$push', args)
       end
-      
+
       def push_all(*args)
         modifier_update('$pushAll', args)
       end
-      
+
       def push_uniq(*args)
         criteria, keys = criteria_and_keys_from_args(args)
         keys.each { |key, value | criteria[key] = {'$ne' => value} }
         collection.update(criteria, {'$push' => keys}, :multi => true)
       end
-      
+
       def pull(*args)
         modifier_update('$pull', args)
       end
-      
+
       def pull_all(*args)
         modifier_update('$pullAll', args)
       end
-      
+
       def pop(*args)
         modifier_update('$pop', args)
       end
@@ -266,7 +270,7 @@ module MongoMapper
           [to_criteria(criteria), keys]
         end
 
-        def find_all_first_last_error(args)
+        def assert_no_first_last_or_all(args)
           if args[0] == :first || args[0] == :last || args[0] == :all
             raise ArgumentError, "#{self}.find(:#{args}) is no longer supported, use #{self}.#{args} instead."
           end
@@ -276,11 +280,11 @@ module MongoMapper
           ids = ids.flatten.compact.uniq
           find_many(options.merge(:_id => ids)).compact
         end
-        
+
         def find_some!(ids, options={})
           ids = ids.flatten.compact.uniq
           documents = find_some(ids, options)
-          
+
           if ids.size == documents.size
             documents
           else
@@ -364,21 +368,11 @@ module MongoMapper
         options.assert_valid_keys(:safe)
         save(options) || raise(DocumentNotValid.new(self))
       end
-      
-      def update_attributes(attrs={})
-        self.attributes = attrs
-        save
-      end
-
-      def update_attributes!(attrs={})
-        self.attributes = attrs
-        save!
-      end
 
       def destroy
         delete
       end
-      
+
       def delete
         self.class.delete(id) unless new?
       end
@@ -408,7 +402,7 @@ module MongoMapper
       end
 
       def save_to_collection(options={})
-        safe = options.delete(:safe) || false
+        safe = options[:safe] || false
         @new = false
         collection.save(to_mongo, :safe => safe)
       end

data/lib/mongo_mapper/embedded_document.rb

@@ -1,12 +1,12 @@
 module MongoMapper
   module EmbeddedDocument
-    extend DescendantAppends
+    extend Support::DescendantAppends
 
     def self.included(model)
       model.class_eval do
         include InstanceMethods
         extend  ClassMethods
-        extend Plugins
+        extend  Plugins
 
         plugin Plugins::Associations
         plugin Plugins::Clone
@@ -32,9 +32,7 @@ module MongoMapper
       end
 
       def embedded_in(owner_name)
-        define_method(owner_name) do
-          self._parent_document
-        end
+        define_method(owner_name) { _parent_document }
       end
     end
 
@@ -52,16 +50,6 @@ module MongoMapper
         end
         result
       end
-
-      def update_attributes(attrs={})
-        self.attributes = attrs
-        self.save
-      end
-
-      def update_attributes!(attrs={})
-        self.attributes = attrs
-        self.save!
-      end
     end # InstanceMethods
   end # EmbeddedDocument
 end # MongoMapper

data/lib/mongo_mapper/plugins.rb

@@ -11,4 +11,20 @@ module MongoMapper
       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'

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

@@ -4,7 +4,7 @@ module MongoMapper
       class EmbeddedCollection < Collection
         def build(attributes={})
           doc = klass.new(attributes)
-          assign_root_document(doc)
+          assign_references(doc)
           self << doc
           doc
         end
@@ -22,7 +22,7 @@ module MongoMapper
         def <<(*docs)
           load_target
           docs.each do |doc|
-            assign_root_document(doc)
+            assign_references(doc)
             target << doc
           end
         end
@@ -38,7 +38,7 @@ module MongoMapper
             end
           end
 
-          def assign_root_document(*docs)
+          def assign_references(*docs)
             docs.each do |doc|
               doc._root_document = _root_document
               doc._parent_document = owner

data/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!

data/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!

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

@@ -13,7 +13,7 @@ module MongoMapper
           def find_target
             (@_values || []).map do |hash|
               child = polymorphic_class(hash).load(hash)
-              assign_root_document(child)
+              assign_references(child)
               child
             end
           end

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

@@ -13,7 +13,7 @@ module MongoMapper
           def find_target
             (@_values || []).map do |v|
               child = klass.load(v)
-              assign_root_document(child)
+              assign_references(child)
               child
             end
           end

data/lib/mongo_mapper/plugins/keys.rb

@@ -4,7 +4,7 @@ module MongoMapper
       def self.configure(model)
         model.key :_id, ObjectId
       end
-      
+
       module ClassMethods
         def inherited(descendant)
           descendant.instance_variable_set(:@keys, keys.dup)
@@ -143,25 +143,31 @@ module MongoMapper
             end
           end
       end
-      
+
       module InstanceMethods
-        def initialize(attrs={}, from_db=false)
+        def initialize(attrs={}, from_database=false)
           unless attrs.nil?
             provided_keys = attrs.keys.map { |k| k.to_s }
             unless provided_keys.include?('_id') || provided_keys.include?('id')
               write_key :_id, Mongo::ObjectID.new
             end
           end
-          
-          @new = from_db ? false : true
-          self._type = self.class.name if respond_to?(:_type=)
-          self.attributes = attrs
+
+          assign_type_if_present
+
+          if from_database
+            @new = false
+            self.attributes = attrs
+          else
+            @new = true
+            assign(attrs)
+          end
         end
-        
+
         def new?
           @new
         end
-        
+
         def attributes=(attrs)
           return if attrs.blank?
           
@@ -193,7 +199,21 @@ module MongoMapper
           attrs
         end
         alias :to_mongo :attributes
-        
+
+        def assign(attrs={})
+          self.attributes = attrs
+        end
+
+        def update_attributes(attrs={})
+          assign(attrs)
+          save
+        end
+
+        def update_attributes!(attrs={})
+          assign(attrs)
+          save!
+        end
+
         def id
           _id
         end
@@ -236,6 +256,10 @@ module MongoMapper
         end
 
         private
+          def assign_type_if_present
+            self._type = self.class.name if respond_to?(:_type=)
+          end
+          
           def ensure_key_exists(name)
             self.class.key(name) unless respond_to?("#{name}=")
           end

data/lib/mongo_mapper/plugins/protected.rb

@@ -18,6 +18,10 @@ module MongoMapper
       end
 
       module InstanceMethods
+        def assign(attrs={})
+          super(filter_protected_attrs(attrs))
+        end
+
         def update_attributes(attrs={})
           super(filter_protected_attrs(attrs))
         end

data/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'

data/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

data/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

data/test/functional/test_document.rb

@@ -407,24 +407,43 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
-  context "find_or_create" do
+  context "first_or_create" do
     should "find if exists" do
       created = @document.create(:first_name => 'John', :last_name => 'Nunemaker')
       lambda {
-        found = @document.find_or_create(:first_name => 'John', :last_name => 'Nunemaker')
+        found = @document.first_or_create(:first_name => 'John', :last_name => 'Nunemaker')
         found.should == created
       }.should_not change { @document.count }
     end
 
     should "create if not found" do
       lambda {
-        created = @document.find_or_create(:first_name => 'John', :last_name => 'Nunemaker')
+        created = @document.first_or_create(:first_name => 'John', :last_name => 'Nunemaker')
         created.first_name.should == 'John'
         created.last_name.should == 'Nunemaker'
       }.should change { @document.count }.by(1)
     end
   end
 
+  context "first_or_new" do
+    should "find if exists" do
+      created = @document.create(:first_name => 'John', :last_name => 'Nunemaker')
+      lambda {
+        found = @document.first_or_new(:first_name => 'John', :last_name => 'Nunemaker')
+        found.should == created
+      }.should_not change { @document.count }
+    end
+
+    should "initialize if not found" do
+      lambda {
+        created = @document.first_or_new(:first_name => 'John', :last_name => 'Nunemaker')
+        created.first_name.should == 'John'
+        created.last_name.should == 'Nunemaker'
+        created.should be_new
+      }.should_not change { @document.count }
+    end
+  end
+
   context "ClassMethods#delete (single document)" do
     setup do
       @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})

data/test/functional/test_protected.rb

@@ -36,6 +36,22 @@ class ProtectedTest < Test::Unit::TestCase
       @doc.admin.should be_true
     end
 
+    should "ignore protected attribute on #initialize" do
+      doc = @doc_class.new(:name => 'John', :admin => true)
+      doc.admin.should be_false
+      doc.name.should == 'John'
+    end
+
+    should "not ignore protected attributes on #initialize from the database" do
+      doc = @doc_class.new(:name => 'John')
+      doc.admin = true
+      doc.save!
+      
+      doc = @doc_class.first(:name => 'John')
+      doc.admin.should be_true
+      doc.name.should == 'John'
+    end
+
     should 'ignore protected attribute on #update_attributes' do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'

data/test/unit/test_dynamic_finder.rb

@@ -1,125 +1,123 @@
 require 'test_helper'
 
 class DynamicFinderTest < Test::Unit::TestCase
-  include MongoMapper
-  
   should "initialize with method" do
-    finder = DynamicFinder.new(:foobar)
+    finder = MongoMapper::Support::Find::DynamicFinder.new(:foobar)
     finder.method.should == :foobar
   end
   
   context "found?" do
     should "be true for find_by" do
-      DynamicFinder.new(:find_by_foo).found?.should be_true
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo).found?.should be_true
     end
     
     should "be true for find_by with !" do
-      DynamicFinder.new(:find_by_foo!).found?.should be_true
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo!).found?.should be_true
     end
     
     should "be true for find_all_by" do
-      DynamicFinder.new(:find_all_by_foo).found?.should be_true
+      MongoMapper::Support::Find::DynamicFinder.new(:find_all_by_foo).found?.should be_true
     end
     
     should "be true for find_or_initialize_by" do
-      DynamicFinder.new(:find_or_initialize_by_foo).found?.should be_true
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_initialize_by_foo).found?.should be_true
     end
     
     should "be true for find_or_create_by" do
-      DynamicFinder.new(:find_or_create_by_foo).found?.should be_true
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_create_by_foo).found?.should be_true
     end
     
     should "be false for anything else" do
       [:foobar, :bazwick].each do |method|
-        DynamicFinder.new(method).found?.should be_false
+        MongoMapper::Support::Find::DynamicFinder.new(method).found?.should be_false
       end
     end
   end
   
   context "find_all_by" do
     should "parse one attribute" do
-      DynamicFinder.new(:find_all_by_foo).attributes.should == %w(foo)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_all_by_foo).attributes.should == %w(foo)
     end
     
     should "parse multiple attributes" do
-      DynamicFinder.new(:find_all_by_foo_and_bar).attributes.should == %w(foo bar)
-      DynamicFinder.new(:find_all_by_foo_and_bar_and_baz).attributes.should == %w(foo bar baz)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_all_by_foo_and_bar).attributes.should == %w(foo bar)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_all_by_foo_and_bar_and_baz).attributes.should == %w(foo bar baz)
     end
     
     should "set finder to :all" do
-      DynamicFinder.new(:find_all_by_foo_and_bar).finder.should == :all
+      MongoMapper::Support::Find::DynamicFinder.new(:find_all_by_foo_and_bar).finder.should == :all
     end
   end
   
   context "find_by" do
     should "parse one attribute" do
-      DynamicFinder.new(:find_by_foo).attributes.should == %w(foo)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo).attributes.should == %w(foo)
     end
     
     should "parse multiple attributes" do
-      DynamicFinder.new(:find_by_foo_and_bar).attributes.should == %w(foo bar)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo_and_bar).attributes.should == %w(foo bar)
     end
     
     should "set finder to :first" do
-      DynamicFinder.new(:find_by_foo).finder.should == :first
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo).finder.should == :first
     end
     
     should "set bang to false" do
-      DynamicFinder.new(:find_by_foo).bang.should be_false
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo).bang.should be_false
     end
   end
   
   context "find_by with !" do
     should "parse one attribute" do
-      DynamicFinder.new(:find_by_foo!).attributes.should == %w(foo)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo!).attributes.should == %w(foo)
     end
     
     should "parse multiple attributes" do
-      DynamicFinder.new(:find_by_foo_and_bar!).attributes.should == %w(foo bar)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo_and_bar!).attributes.should == %w(foo bar)
     end
     
     should "set finder to :first" do
-      DynamicFinder.new(:find_by_foo!).finder.should == :first
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo!).finder.should == :first
     end
     
     should "set bang to true" do
-      DynamicFinder.new(:find_by_foo!).bang.should be_true
+      MongoMapper::Support::Find::DynamicFinder.new(:find_by_foo!).bang.should be_true
     end
   end
   
   context "find_or_initialize_by" do
     should "parse one attribute" do
-      DynamicFinder.new(:find_or_initialize_by_foo).attributes.should == %w(foo)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_initialize_by_foo).attributes.should == %w(foo)
     end
     
     should "parse multiple attributes" do
-      DynamicFinder.new(:find_or_initialize_by_foo_and_bar).attributes.should == %w(foo bar)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_initialize_by_foo_and_bar).attributes.should == %w(foo bar)
     end
     
     should "set finder to :first" do
-      DynamicFinder.new(:find_or_initialize_by_foo).finder.should == :first
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_initialize_by_foo).finder.should == :first
     end
     
     should "set instantiator to new" do
-      DynamicFinder.new(:find_or_initialize_by_foo).instantiator.should == :new
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_initialize_by_foo).instantiator.should == :new
     end
   end
 
   context "find_or_create_by" do
     should "parse one attribute" do
-      DynamicFinder.new(:find_or_create_by_foo).attributes.should == %w(foo)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_create_by_foo).attributes.should == %w(foo)
     end
     
     should "parse multiple attributes" do
-      DynamicFinder.new(:find_or_create_by_foo_and_bar).attributes.should == %w(foo bar)
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_create_by_foo_and_bar).attributes.should == %w(foo bar)
     end
     
     should "set finder to :first" do
-      DynamicFinder.new(:find_or_create_by_foo).finder.should == :first
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_create_by_foo).finder.should == :first
     end
     
     should "set instantiator to new" do
-      DynamicFinder.new(:find_or_create_by_foo).instantiator.should == :create
+      MongoMapper::Support::Find::DynamicFinder.new(:find_or_create_by_foo).instantiator.should == :create
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.2.3
+  version: 2010.2.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-04 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,9 +99,7 @@ files:
 - VERSION
 - bin/mmconsole
 - lib/mongo_mapper.rb
-- lib/mongo_mapper/descendant_appends.rb
 - lib/mongo_mapper/document.rb
-- lib/mongo_mapper/dynamic_finder.rb
 - lib/mongo_mapper/embedded_document.rb
 - lib/mongo_mapper/finder_options.rb
 - lib/mongo_mapper/plugins.rb
@@ -134,6 +132,8 @@ files:
 - lib/mongo_mapper/plugins/serialization.rb
 - lib/mongo_mapper/plugins/validations.rb
 - lib/mongo_mapper/support.rb
+- lib/mongo_mapper/support/descendant_appends.rb
+- lib/mongo_mapper/support/find.rb
 - mongo_mapper.gemspec
 - performance/read_write.rb
 - specs.watchr

data/lib/mongo_mapper/descendant_appends.rb

@@ -1,44 +0,0 @@
-module MongoMapper
-  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

data/lib/mongo_mapper/dynamic_finder.rb

@@ -1,74 +0,0 @@
-module MongoMapper
-  # @api private
-  module Finders
-    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
-    
-    protected
-      def method_missing(method, *args, &block)
-        finder = DynamicFinder.new(method)
-
-        if finder.found?
-          dynamic_find(finder, args)
-        else
-          super
-        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
-end