mongo_mapper-unstable 2009.11.2 → 2009.11.6

data/VERSION

@@ -1 +1 @@
-2009.11.02
+2009.11.06

data/lib/mongo_mapper/associations/base.rb

@@ -37,7 +37,7 @@ module MongoMapper
       end
 
       def klass
-        @klass ||= options[:class] ? options[:class] : class_name.constantize
+        @klass ||= options[:class] || class_name.constantize
       end
 
       def many?

data/lib/mongo_mapper/associations/many_documents_proxy.rb

@@ -10,6 +10,11 @@ module MongoMapper
         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))

data/lib/mongo_mapper/document.rb

@@ -55,7 +55,7 @@ module MongoMapper
       # @overload find(ids, options)
       #
       # @raise DocumentNotFound raised when no ID or arguments are provided
-      def find(*args)
+      def find!(*args)
         options = args.extract_options!
         case args.first
           when :first then first(options)
@@ -73,6 +73,12 @@ module MongoMapper
             end
         end
       end
+      
+      def find(*args)
+        find!(*args)
+      rescue DocumentNotFound
+        nil
+      end
 
       def paginate(options)
         per_page      = options.delete(:per_page) || self.per_page

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -171,20 +171,20 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
 
       should "not work for id not in association" do
         lambda {
-          @post.comments.find(@comment5.id)
+          @post.comments.find!(@comment5.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
     context "with multiple ids" do
       should "work for ids in association" do
-        posts = @post.comments.find(@comment1.id, @comment2.id)
+        posts = @post.comments.find!(@comment1.id, @comment2.id)
         posts.should == [@comment1, @comment2]
       end
 
       should "not work for ids not in association" do
         lambda {
-          @post.comments.find(@comment1.id, @comment2.id, @comment4.id)
+          @post.comments.find!(@comment1.id, @comment2.id, @comment4.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -259,7 +259,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       
       should "not work for id not in association" do
         lambda {
-          @lounge.messages.find(@hm2.id)
+          @lounge.messages.find!(@hm2.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
@@ -286,7 +286,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       
       should "not work for ids not in association" do
         lambda {
-          @lounge.messages.find(@lm1.id, @lm2.id, @hm2.id)
+          @lounge.messages.find!(@lm1.id, @lm2.id, @hm2.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/associations/test_many_proxy.rb

@@ -321,7 +321,7 @@ class ManyProxyTest < Test::Unit::TestCase
       
       should "not work for id not in association" do
         lambda {
-          @project1.statuses.find(@archived.id)
+          @project1.statuses.find!(@archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
@@ -334,7 +334,7 @@ class ManyProxyTest < Test::Unit::TestCase
       
       should "not work for ids not in association" do
         lambda {
-          @project1.statuses.find(@brand_new.id, @complete.id, @archived.id)
+          @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/test_document.rb

@@ -288,8 +288,12 @@ class DocumentTest < Test::Unit::TestCase
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
       end
 
-      should "raise document not found if nothing provided" do
-        lambda { @document.find }.should raise_error(MongoMapper::DocumentNotFound)
+      should "return nil if nothing provided for find" do
+        @document.find.should be_nil
+      end
+
+      should "raise document not found if nothing provided for find!" do
+        lambda { @document.find! }.should raise_error(MongoMapper::DocumentNotFound)
       end
 
       context "with a single id" do
@@ -297,9 +301,13 @@ class DocumentTest < Test::Unit::TestCase
           @document.find(@doc1.id).should == @doc1
         end
 
-        should "raise error if document not found" do
+        should "return nil if document not found with find" do
+          @document.find(123).should be_nil
+        end
+
+        should "raise error if document not found with find!" do
           lambda {
-            @document.find(123)
+            @document.find!(123)
           }.should raise_error(MongoMapper::DocumentNotFound)
         end
       end
@@ -1023,14 +1031,14 @@ class DocumentTest < Test::Unit::TestCase
       steph = DocDaughter.create(:name => 'Steph')
 
       lambda {
-        DocSon.find(steph.id)
+        DocSon.find!(steph.id)
       }.should raise_error(MongoMapper::DocumentNotFound)
     end
 
     should "not raise error for find with parent" do
       john = DocSon.create(:name => 'John')
 
-      DocParent.find(john.id).should == john
+      DocParent.find!(john.id).should == john
     end
 
     should "count scoped to class" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2009.11.2
+  version: 2009.11.6
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -05:00
+date: 2009-11-06 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency