jnunemaker-mongomapper 0.3.1 → 0.3.2

data/test/models.rb

@@ -6,6 +6,22 @@ class Address
   key :zip,     Integer
 end
 
+class Message
+  include MongoMapper::Document
+  key :body, String
+  belongs_to :room
+end
+
+class Enter < Message; end
+class Exit < Message;  end
+class Chat < Message;  end
+
+class Room
+  include MongoMapper::Document
+  key :name, String
+  many :messages, :polymorphic => true
+end
+
 class Project
   include MongoMapper::Document
   key :name, String

data/test/test_helper.rb

@@ -14,7 +14,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 dir = (Pathname(__FILE__).dirname +  '..' + 'lib').expand_path
 require dir + 'mongomapper'
 
-class Test::Unit::TestCase
+class Test::Unit::TestCase  
   def clear_all_collections
     MongoMapper::Document.descendants.map(&:delete_all)
   end

data/test/unit/serializers/test_json_serializer.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class JsonSerializationTest < Test::Unit::TestCase
   class Contact
-    include MongoMapper::EmbeddedDocument
+    include MongoMapper::Document
     key :name, String
     key :age, Integer
     key :created_at, Time
@@ -29,18 +29,20 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "encode all encodable attributes" do
     json = @contact.to_json
 
-    assert_match %r{"name": "Konata Izumi"}, json
-    assert_match %r{"age": 16}, json
-    assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-    assert_match %r{"awesome": true}, json
-    assert_match %r{"preferences": \{"shows": "anime"\}}, json
+    assert_no_match %r{"_id"}, json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"age":16}, json
+    assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"awesome":true}, json
+    assert_match %r{"preferences":\{"shows":"anime"\}}, json
   end
   
   should "allow attribute filtering with only" do
     json = @contact.to_json(:only => [:name, :age])
 
-    assert_match %r{"name": "Konata Izumi"}, json
-    assert_match %r{"age": 16}, json
+    assert_no_match %r{"_id"}, json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"age":16}, json
     assert_no_match %r{"awesome"}, json
     assert_no_match %r{"created_at"}, json
     assert_no_match %r{"preferences"}, json
@@ -49,6 +51,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "allow attribute filtering with except" do
     json = @contact.to_json(:except => [:name, :age])
 
+    assert_no_match %r{"_id"}, json
     assert_no_match %r{"name"}, json
     assert_no_match %r{"age"}, json
     assert_match %r{"awesome"}, json
@@ -56,6 +59,51 @@ class JsonSerializationTest < Test::Unit::TestCase
     assert_match %r{"preferences"}, json
   end
   
+  context "_id key" do
+    should "not be included by default" do
+      json = @contact.to_json
+      assert_no_match %r{"_id":}, json
+    end
+    
+    should "not be included even if :except is used" do
+      json = @contact.to_json(:except => :name)
+      assert_no_match %r{"_id":}, json
+    end
+  end
+  
+  context "id method" do
+    setup do
+      def @contact.label; "Has cheezburger"; end
+      def @contact.favorite_quote; "Constraints are liberating"; end
+    end
+    
+    should "be included by default" do
+      json = @contact.to_json
+      assert_match %r{"id"}, json
+    end
+    
+    should "be included when single method included" do
+      json = @contact.to_json(:methods => :label)
+      assert_match %r{"id"}, json
+      assert_match %r{"label":"Has cheezburger"}, json
+      assert_match %r{"name":"Konata Izumi"}, json
+      assert_no_match %r{"favorite_quote":"Constraints are liberating"}, json
+    end
+    
+    should "be included when multiple methods included" do
+      json = @contact.to_json(:methods => [:label, :favorite_quote])
+      assert_match %r{"id"}, json
+      assert_match %r{"label":"Has cheezburger"}, json
+      assert_match %r{"favorite_quote":"Constraints are liberating"}, json
+      assert_match %r{"name":"Konata Izumi"}, json
+    end
+    
+    should "not be included if :only is present" do
+      json = @contact.to_json(:only => :name)
+      assert_no_match %r{"id":}, json
+    end
+  end  
+  
   context "including methods" do
     setup do
       def @contact.label; "Has cheezburger"; end
@@ -63,14 +111,19 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "include single method" do
-      # Single method.
-      assert_match %r{"label": "Has cheezburger"}, @contact.to_json(:only => :name, :methods => :label)
+      json = @contact.to_json(:methods => :label)
+      assert_match %r{"label":"Has cheezburger"}, json
     end
     
     should "include multiple methods" do
       json = @contact.to_json(:only => :name, :methods => [:label, :favorite_quote])
-      assert_match %r{"label": "Has cheezburger"}, json
-      assert_match %r{"favorite_quote": "Constraints are liberating"}, json
+      assert_match %r{"label":"Has cheezburger"}, json
+      assert_match %r{"favorite_quote":"Constraints are liberating"}, json
+      assert_match %r{"name":"Konata Izumi"}, json
+      assert_no_match %r{"age":16}, json
+      assert_no_match %r{"awesome"}, json
+      assert_no_match %r{"created_at"}, json
+      assert_no_match %r{"preferences"}, json
     end
   end
   
@@ -83,12 +136,12 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
 
     should "allow attribute filtering with only" do
-      assert_equal %([{"name": "David"}, {"name": "Mary"}]), @contacts.to_json(:only => :name)
+      assert_equal %([{"name":"David"},{"name":"Mary"}]), @contacts.to_json(:only => :name)
     end
     
     should "allow attribute filtering with except" do
-      json = @contacts.to_json(:except => [:name, :preferences, :awesome, :created_at])
-      assert_equal %([{"age": 39}, {"age": 14}]), json
+      json = @contacts.to_json(:except => [:name, :preferences, :awesome, :created_at, :updated_at])
+      assert_equal %([{"id":"","age":39},{"id":"","age":14}]), json
     end
   end
   
@@ -98,7 +151,7 @@ class JsonSerializationTest < Test::Unit::TestCase
       2 => Contact.new(:name => 'Mary', :age => 14)
     }
 
-    assert_equal %({"1": {"name": "David"}}), contacts.to_json(:only => [1, :name])
+    assert_equal %({"1":{"name":"David"}}), contacts.to_json(:only => [1, :name])
   end
   
 end

data/test/unit/test_association_base.rb

@@ -107,6 +107,11 @@ class AssociationBaseTest < Test::Unit::TestCase
       base.proxy_class.should == ManyProxy
     end
     
+    should "be ManyPolymorphicProxy for polymorphic many" do
+      base = Base.new(:many, :messages, :polymorphic => true)
+      base.proxy_class.should == ManyPolymorphicProxy
+    end
+    
     should "be ManyEmbeddedProxy for many embedded" do
       base = Base.new(:many, :medias)
       base.proxy_class.should == ManyEmbeddedProxy

data/test/unit/test_document.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'models'
 
 class DocumentTest < Test::Unit::TestCase
   context "The Document Class" do
@@ -52,6 +53,19 @@ class DocumentTest < Test::Unit::TestCase
       @document.collection.name.should == 'foobar'
     end
   end # Document class
+  
+  context "Documents that inherit from other documents" do
+    should "default collection to inherited class" do
+      Message.collection.name.should == 'messages'
+      Enter.collection.name.should   == 'messages'
+      Exit.collection.name.should    == 'messages'
+      Chat.collection.name.should    == 'messages'
+    end
+    
+    should "track subclasses" do
+      Message.subclasses.should == [Enter, Exit, Chat]
+    end
+  end
 
   context "An instance of a document" do
     setup do
@@ -69,10 +83,6 @@ class DocumentTest < Test::Unit::TestCase
       doc.collection.should == @document.collection
     end
 
-    should "automatically have an _id key" do
-      @document.keys.keys.should include('_id')
-    end
-
     should "automatically have a created_at key" do
       @document.keys.keys.should include('created_at')
     end

data/test/unit/test_embedded_document.rb

@@ -28,8 +28,8 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
-    should "clear out document default keys" do
-      @klass.keys.size.should == 0
+    should "add _id key" do
+      @klass.keys['_id'].should_not be_nil
     end
   end
   
@@ -110,17 +110,17 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   
   context "keys" do
     should "be inherited" do
-      Grandparent.keys.keys.should == ['grandparent']
-      Parent.keys.keys.sort.should == ['grandparent', 'parent']
-      Child.keys.keys.sort.should  == ['child', 'grandparent', 'parent']
+      Grandparent.keys.keys.sort.should == ['_id', 'grandparent']
+      Parent.keys.keys.sort.should == ['_id', 'grandparent', 'parent']
+      Child.keys.keys.sort.should  == ['_id', 'child', 'grandparent', 'parent']
     end
     
     should "propogate to subclasses if key added after class definition" do
       Grandparent.key :_type, String
       
-      Grandparent.keys.keys.sort.should == ['_type', 'grandparent']
-      Parent.keys.keys.sort.should      == ['_type', 'grandparent', 'parent']
-      Child.keys.keys.sort.should       == ['_type', '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
   end
   
@@ -144,15 +144,35 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         key :age, Integer
       end
     end
+    
+    should "automatically have an _id key" do
+      @document.keys.keys.should include('_id')
+    end
+    
+    should "have id method that is string representation of _id" do
+      doc = @document.new
+      doc.id.should == doc._id.to_s
+    end
+    
+    should "be able to set _id using id=" do
+      id = MongoID.new
+      doc = @document.new(:id => id.to_s)
+      doc._id.should == id
+      doc.id.should == id.to_s
+    end
 
     context "being initialized" do
       should "accept a hash that sets keys and values" do
         doc = @document.new(:name => 'John', :age => 23)
-        doc.attributes.should == {'name' => 'John', 'age' => 23}
+        doc.attributes.keys.sort.should == ['_id', 'age', 'name']
+        doc.attributes['name'].should == 'John'
+        doc.attributes['age'].should == 23
       end
 
       should "not throw error if initialized with nil" do
-        doc = @document.new(nil)
+        lambda {
+          @document.new(nil)
+        }.should_not raise_error
       end
     end
 
@@ -199,14 +219,15 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
 
     context "attributes" do
-      should "default to empty hash" do
+      should "default to hash with _id" do
         doc = @document.new
-        doc.attributes.should == {}
+        doc.attributes.keys.should == ['_id']
       end
 
       should "return all keys that aren't nil" do
         doc = @document.new(:name => 'string', :age => nil)
-        doc.attributes.should == {'name' => 'string'}
+        doc.attributes.keys.sort.should == ['_id', 'name']
+        doc.attributes.values.should include('string')
       end
     end
     
@@ -329,16 +350,20 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
     
     context "equality" do
-      should "be true if all keys and values are equal" do
-        doc1 = @document.new(:name => 'John', :age => 27)
-        doc2 = @document.new(:name => 'John', :age => 27)
-        doc1.should == doc2
+      should "be equal if id and class are the same" do
+        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
+      end
+
+      should "not be equal if class same but id different" do
+        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
       end
 
-      should "be false if not all the keys and values are equal" do
-        doc1 = @document.new(:name => 'Steve', :age => 27)
-        doc2 = @document.new(:name => 'John', :age => 27)
-        doc1.should_not == doc2
+      should "not be equal if id same but class different" do
+        @another_document = Class.new do
+          include MongoMapper::Document
+        end
+
+        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
       end
     end
   end # instance of a embedded document

data/test/unit/test_key.rb

@@ -109,6 +109,11 @@ class KeyTest < Test::Unit::TestCase
       key.set('2000-01-01 01:01:01.123456').should == Time.local(2000, 1, 1, 1, 1, 1, 123456)
     end
 
+    should "correctly typecast Times into UTC time zone" do
+      key = Key.new(:foo, Time)
+      key.set('2000-01-01 01:01:01.123456').zone.should == "UTC"
+    end
+
     should_eventually "correctly typecast Dates" do
       key = Key.new(:foo, Date)
       key.set('2000-01-01').should == Date.new(2000, 1, 1)

data/test/unit/test_mongo_id.rb

@@ -20,10 +20,10 @@ class MongoIDTest < Test::Unit::TestCase
       MongoID.mm_typecast(id.to_s).should == id
     end
     
-    should "raise DocumentNotFound if invalid id" do
+    should "raise MongoMapper::IllegalID if invalid id" do
       lambda {
         MongoID.mm_typecast(1234)
-      }.should raise_error(MongoMapper::DocumentNotFound)
+      }.should raise_error(MongoMapper::IllegalID)
     end
     
     should "raise exception if message does not match illegal object id" do

data/test/unit/test_rails_compatibility.rb

@@ -26,9 +26,9 @@ class TestRailsCompatibility < Test::Unit::TestCase
     end
     
     should "have column names" do
-      Item.column_names.sort.should == ['for_all']
-      FirstItem.column_names.sort.should == ['first_only', 'for_all']
-      SecondItem.column_names.sort.should == ['for_all', 'second_only']
+      Item.column_names.sort.should == ['_id', 'for_all']
+      FirstItem.column_names.sort.should == ['_id', 'first_only', 'for_all']
+      SecondItem.column_names.sort.should == ['_id', 'for_all', 'second_only']
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,12 +81,13 @@ files:
 - bin/mmconsole
 - lib/mongomapper.rb
 - lib/mongomapper/associations.rb
-- lib/mongomapper/associations/array_proxy.rb
 - lib/mongomapper/associations/base.rb
 - lib/mongomapper/associations/belongs_to_polymorphic_proxy.rb
 - lib/mongomapper/associations/belongs_to_proxy.rb
+- lib/mongomapper/associations/many_documents_proxy.rb
 - lib/mongomapper/associations/many_embedded_polymorphic_proxy.rb
 - lib/mongomapper/associations/many_embedded_proxy.rb
+- lib/mongomapper/associations/many_polymorphic_proxy.rb
 - lib/mongomapper/associations/many_proxy.rb
 - lib/mongomapper/associations/proxy.rb
 - lib/mongomapper/callbacks.rb
@@ -104,6 +105,12 @@ files:
 - lib/mongomapper/validations.rb
 - mongomapper.gemspec
 - test/NOTE_ON_TESTING
+- test/functional/associations/test_belongs_to_polymorphic_proxy.rb
+- test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_many_embedded_polymorphic_proxy.rb
+- test/functional/associations/test_many_embedded_proxy.rb
+- test/functional/associations/test_many_polymorphic_proxy.rb
+- test/functional/associations/test_many_proxy.rb
 - test/functional/test_associations.rb
 - test/functional/test_callbacks.rb
 - test/functional/test_document.rb
@@ -153,6 +160,12 @@ signing_key:
 specification_version: 2
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
+- test/functional/associations/test_belongs_to_polymorphic_proxy.rb
+- test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_many_embedded_polymorphic_proxy.rb
+- test/functional/associations/test_many_embedded_proxy.rb
+- test/functional/associations/test_many_polymorphic_proxy.rb
+- test/functional/associations/test_many_proxy.rb
 - test/functional/test_associations.rb
 - test/functional/test_callbacks.rb
 - test/functional/test_document.rb

data/lib/mongomapper/associations/array_proxy.rb

@@ -1,6 +0,0 @@
-module MongoMapper
-  module Associations
-    class ArrayProxy < Proxy
-    end
-  end
-end