mongo_mapper-unstable 2010.3.8 → 2010.06.23

data/test/unit/test_document.rb

@@ -6,11 +6,11 @@ class DocumentTest < Test::Unit::TestCase
     setup do
       @document = Doc()
     end
-    
+
     should "return false for embeddable" do
       Doc().embeddable?.should be_false
     end
-    
+
     should "have logger method" do
       @document.logger.should == MongoMapper.logger
       @document.logger.should be_instance_of(Logger)
@@ -39,34 +39,33 @@ class DocumentTest < Test::Unit::TestCase
       another_document = Doc()
       another_document.database.should == MongoMapper.database
     end
-    
-    should "default collection name to class name tableized" do
-      class ::Item
-        include MongoMapper::Document
-      end
-      
-      Item.collection.should be_instance_of(Mongo::Collection)
-      Item.collection.name.should == 'items'
-    end
-    
-    should "default collection name of namespaced class to tableized with dot separation" do
-      module ::BloggyPoo
-        class Post
-          include MongoMapper::Document
-        end
-      end
-
-      BloggyPoo::Post.collection.should be_instance_of(Mongo::Collection)
-      BloggyPoo::Post.collection.name.should == 'bloggy_poo.posts'
-    end
 
     should "allow setting the collection name" do
       @document.set_collection_name('foobar')
-      @document.collection.should be_instance_of(Mongo::Collection)
       @document.collection.name.should == 'foobar'
     end
+
+    context ".collection" do
+      should "default collection name to class name tableized" do
+        class ::Item
+          include MongoMapper::Document
+        end.collection.name.should == 'items'
+      end
+
+      should "default collection name of namespaced class to tableized with dot separation" do
+        module ::BloggyPoo
+          class Post
+            include MongoMapper::Document
+          end.collection.name.should == 'bloggy_poo.posts'
+        end
+      end
+
+      should "be an instance of a Mongo::Collection" do
+        @document.collection.should be_instance_of(Mongo::Collection)
+      end
+    end
   end # Document class
-  
+
   context "Documents that inherit from other documents" do
     should "default collection name to inherited class" do
       Message.collection_name.should == 'messages'
@@ -82,10 +81,10 @@ class DocumentTest < Test::Unit::TestCase
       Chat.associations.keys.should    include("room")
     end
   end
-  
+
   context "descendants" do
-    should "default to nil" do
-      Enter.descendants.should be_nil
+    should "default to an empty array" do
+      Enter.descendants.should == []
     end
 
     should "be recorded" do
@@ -100,17 +99,15 @@ class DocumentTest < Test::Unit::TestCase
         key :age, Integer
       end
     end
-    
-    should "create id during initialization" do
-      @document.new._id.should be_instance_of(Mongo::ObjectID)
+
+    should "respond to cache_key" do
+      @document.new.should respond_to(:cache_key)
     end
-    
-    should "have to_param that is string representation of id" do
-      doc = @document.new(:id => Mongo::ObjectID.new)
-      doc.to_param.should == doc.id.to_s
-      doc.to_param.should be_instance_of(String)
+
+    should "create id during initialization" do
+      @document.new._id.should be_instance_of(BSON::ObjectID)
     end
-    
+
     should "have access to logger" do
       doc = @document.new
       doc.logger.should == @document.logger
@@ -128,23 +125,23 @@ class DocumentTest < Test::Unit::TestCase
       @document.new.active.should be_true
       @document.new(:active => false).active.should be_false
     end
-    
+
     should "use default values if defined even when custom data type" do
       @document.key :window, WindowSize, :default => WindowSize.new(600, 480)
-      
+
       doc = @document.new
       doc.window.should == WindowSize.new(600, 480)
     end
 
     context "root document" do
-      should "set self to the root document on embedded documents" do        
+      should "set self to the root document on embedded documents" do
         klass = Doc()
         pets = EDoc()
-        
+
         klass.many :pets, :class => pets
-        
+
         doc = klass.new(:pets => [{}])
-        doc.pets.first._root_document.should == doc        
+        doc.pets.first._root_document.should == doc
       end
     end
 
@@ -152,7 +149,7 @@ class DocumentTest < Test::Unit::TestCase
       should "be true if no id" do
         @document.new.new?.should be_true
       end
-      
+
       should "be true if id but using custom id and not saved yet" do
         @document.key :_id, String
         doc = @document.new
@@ -161,21 +158,6 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
 
-    context "clone" do
-      should "be new" do
-        doc = @document.create(:name => "foo", :age => 27)
-        clone = doc.clone
-        clone.should be_new
-      end
-
-      should "copy the attributes" do
-        doc = @document.create(:name => "foo", :age => 27)
-        clone = doc.clone
-        clone.name.should == "foo"
-        clone.age.should == 27
-      end
-    end
-
     should "call inspect on the document's attributes instead of to_s when inspecting the document" do
       doc = @document.new(:animals => %w(dog cat))
       doc.inspect.should include(%(animals: ["dog", "cat"]))
@@ -183,43 +165,43 @@ class DocumentTest < Test::Unit::TestCase
 
     context "equality" do
       setup do
-        @oid = Mongo::ObjectID.new
+        @oid = BSON::ObjectID.new
       end
-      
+
       should "delegate hash to _id" do
         doc = @document.new
         doc.hash.should == doc._id.hash
       end
-      
+
       should "delegate eql to ==" do
         doc = @document.new
         other = @document.new
         doc.eql?(other).should == (doc == other)
         doc.eql?(doc).should == (doc == doc)
       end
-      
+
       should "know if same object as another" do
         doc = @document.new
         doc.should equal(doc)
         doc.should_not equal(@document.new)
       end
-      
+
       should "allow set operations on array of documents" do
         @document.key :parent_id, ObjectId
         @document.belongs_to :parent, :class => @document
-        
+
         parent = @document.create
         child = @document.create(:parent => parent)
-        
+
         ([child.parent] & [parent]).should == [parent]
       end
-      
+
       should "be equal if id and class are the same" do
         (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
       end
 
       should "not be equal if class same but id different" do
-        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be(false)
+        (@document.new('_id' => @oid) == @document.new('_id' => BSON::ObjectID.new)).should be(false)
       end
 
       should "not be equal if id same but class different" do

data/test/unit/test_dynamic_finder.rb

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

data/test/unit/test_embedded_document.rb

@@ -11,7 +11,7 @@ module KeyOverride
 end
 
 class EmbeddedDocumentTest < Test::Unit::TestCase
-  context "" do
+  context "EmbeddedDocuments" do
     setup do
       class ::Grandparent
         include MongoMapper::EmbeddedDocument
@@ -179,17 +179,17 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
       context "keys" do
         should "be inherited" do
-          Grandparent.keys.keys.sort.should == ['_id', 'grandparent']
-          Parent.keys.keys.sort.should == ['_id', 'grandparent', 'parent']
-          Child.keys.keys.sort.should  == ['_id', 'child', 'grandparent', 'parent']
+          Grandparent.keys.keys.sort.should == ['_id', '_type', 'grandparent']
+          Parent.keys.keys.sort.should == ['_id', '_type', 'grandparent', 'parent']
+          Child.keys.keys.sort.should  == ['_id', '_type', 'child', 'grandparent', 'parent']
         end
 
         should "propogate to descendants if key added after class definition" do
-          Grandparent.key :_type, String
+          Grandparent.key :foo, String
 
-          Grandparent.keys.keys.sort.should == ['_id', '_type', 'grandparent']
-          Parent.keys.keys.sort.should      == ['_id', '_type', 'grandparent', 'parent']
-          Child.keys.keys.sort.should       == ['_id', '_type', 'child', 'grandparent', 'parent']
+          Grandparent.keys.keys.sort.should == ['_id', '_type', 'foo', 'grandparent']
+          Parent.keys.keys.sort.should      == ['_id', '_type', 'foo', 'grandparent', 'parent']
+          Child.keys.keys.sort.should       == ['_id', '_type', 'child', 'foo', 'grandparent', 'parent']
         end
 
         should "not add anonymous objects to the ancestor tree" do
@@ -202,8 +202,8 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
 
       context "descendants" do
-        should "default to nil" do
-          Child.descendants.should be_nil
+        should "default to an empty array" do
+          Child.descendants.should == []
         end
 
         should "be recorded" do
@@ -221,10 +221,8 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         end
       end
 
-      should "have to_param that is string representation of id" do
-        doc = @document.new
-        doc.to_param.should == doc.id.to_s
-        doc.to_param.should be_instance_of(String)
+      should "respond to cache_key" do
+        @document.new.should respond_to(:cache_key)
       end
 
       should "have access to class logger" do
@@ -238,17 +236,17 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
 
       should "create id during initialization" do
-        @document.new._id.should be_instance_of(Mongo::ObjectID)
+        @document.new._id.should be_instance_of(BSON::ObjectID)
       end
 
       should "have id method returns _id" do
-        id = Mongo::ObjectID.new
+        id = BSON::ObjectID.new
         doc = @document.new(:_id => id)
         doc.id.should == id
       end
 
       should "convert string object id to mongo object id when assigning id with _id object id type" do
-        id = Mongo::ObjectID.new
+        id = BSON::ObjectID.new
         doc = @document.new(:id => id.to_s)
         doc._id.should == id
         doc.id.should  == id
@@ -308,8 +306,8 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
           @klass.new._type.should == 'FooBar'
         end
 
-        should "not change _type if already set" do
-          @klass.new(:_type => 'Foo')._type.should == 'Foo'
+        should "ignore _type attribute and always use class" do
+          @klass.new(:_type => 'Foo')._type.should == 'FooBar'
         end
       end
 
@@ -382,23 +380,6 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         end
       end
 
-      context "clone" do
-        should "regenerate the id" do
-          doc = @document.new(:name => "foo", :age => 27)
-          doc_id = doc.id
-          clone = doc.clone
-          clone_id = clone.id
-          clone_id.should_not == doc_id
-        end
-
-        should "copy the attributes" do
-          doc = @document.new(:name => "foo", :age => 27)
-          clone = doc.clone
-          clone.name.should == "foo"
-          clone.age.should == 27
-        end
-      end
-
       context "key shorcut access" do
         context "[]" do
           should "work when key found" do
@@ -574,7 +555,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
       context "equality" do
         setup do
-          @oid = Mongo::ObjectID.new
+          @oid = BSON::ObjectID.new
         end
 
         should "delegate hash to _id" do
@@ -605,7 +586,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         end
 
         should "not be equal if class same but id different" do
-          (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be_false
+          (@document.new('_id' => @oid) == @document.new('_id' => BSON::ObjectID.new)).should be_false
         end
 
         should "not be equal if id same but class different" do