mongo_mapper 0.5.8 → 0.6.0

data/test/unit/test_finder_options.rb

@@ -57,9 +57,28 @@ class FinderOptionsTest < Test::Unit::TestCase
     end
     
     should "convert id to _id" do
-      FinderOptions.new(Room, :id => '1').criteria.should == {
-        :_id => '1'
-      }
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :id => id).criteria.should == {:_id => id}
+    end
+    
+    should "make sure that _id's are object ids" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :_id => id.to_s).criteria.should == {:_id => id}
+    end
+    
+    should "work fine with _id's that are object ids" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :_id => id).criteria.should == {:_id => id}
+    end
+    
+    should "make sure other object id typed keys get converted" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Message, :room_id => id.to_s).criteria.should == {:room_id => id}
+    end
+    
+    should "work fine with object ids for object id typed keys" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Message, :room_id => id).criteria.should == {:room_id => id}
     end
     
     should "use $in for arrays" do

data/test/unit/test_mongo_mapper.rb

@@ -0,0 +1,65 @@
+require 'test_helper'
+
+class Address; end
+
+class MongoMapperTest < Test::Unit::TestCase  
+  should "be able to write and read connection" do
+    conn = Mongo::Connection.new
+    MongoMapper.connection = conn
+    MongoMapper.connection.should == conn
+  end
+  
+  should "default connection to new mongo ruby driver" do
+    MongoMapper.connection = nil
+    MongoMapper.connection.should be_instance_of(Mongo::Connection)
+  end
+  
+  should "be able to write and read default database" do
+    MongoMapper.database = 'test'
+    MongoMapper.database.should be_instance_of(Mongo::DB)
+    MongoMapper.database.name.should == 'test'
+  end
+  
+  should "have document not found error" do
+    lambda {
+      MongoMapper::DocumentNotFound
+    }.should_not raise_error
+  end
+  
+  context "use_time_zone?" do
+    should "be true if Time.zone set" do
+      Time.zone = 'Hawaii'
+      MongoMapper.use_time_zone?.should be_true
+      Time.zone = nil
+    end
+    
+    should "be false if Time.zone not set" do
+      MongoMapper.use_time_zone?.should be_false
+    end
+  end
+  
+  context "time_class" do
+    should "be Time.zone if using time zones" do
+      Time.zone = 'Hawaii'
+      MongoMapper.time_class.should == Time.zone
+      Time.zone = nil
+    end
+    
+    should "be Time if not using time zones" do
+      MongoMapper.time_class.should == Time
+    end
+  end
+  
+  context "normalize_object_id" do
+    should "turn string into object id" do
+      id = Mongo::ObjectID.new
+      MongoMapper.normalize_object_id(id.to_s).should == id
+    end
+    
+    should "leave object id alone" do
+      id = Mongo::ObjectID.new
+      MongoMapper.normalize_object_id(id).should == id
+    end
+  end
+  
+end

data/test/unit/test_rails_compatibility.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
 class TestRailsCompatibility < Test::Unit::TestCase
+  class BigStuff
+    include MongoMapper::Document
+  end
+  
   class Item
     include MongoMapper::EmbeddedDocument
     key :for_all, String
@@ -31,5 +35,15 @@ class TestRailsCompatibility < Test::Unit::TestCase
       instance = Item.new
       instance.new_record?.should == instance.new?
     end
+    
+    should "implement human_name" do
+      Item.human_name.should == 'Item'
+    end
+  end
+  
+  context "Document" do
+    should "implement human_name" do
+      BigStuff.human_name.should == 'Big Stuff'
+    end
   end
 end

data/test/unit/test_support.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class SupportTest < Test::Unit::TestCase
+  include MongoMapper::Types
+  
   context "Array#to_mongo" do
     should "convert value to_a" do
       Array.to_mongo([1, 2, 3, 4]).should == [1, 2, 3, 4]
@@ -162,6 +164,29 @@ class SupportTest < Test::Unit::TestCase
     end
   end
   
+  context "ObjectId#to_mongo" do
+    should "return nil for nil" do
+      ObjectId.to_mongo(nil).should be_nil
+    end
+    
+    should "return value if object id" do
+      id = Mongo::ObjectID.new
+      ObjectId.to_mongo(id).should be(id)
+    end
+    
+    should "return object id if string" do
+      id = Mongo::ObjectID.new
+      ObjectId.to_mongo(id.to_s).should be(id)
+    end
+  end
+  
+  context "ObjectId#from_mongo" do
+    should "return value" do
+      id = Mongo::ObjectID.new
+      ObjectId.from_mongo(id).should == id
+    end
+  end
+  
   context "NilClass#to_mongo" do
     should "return nil" do
       nil.to_mongo(nil).should be_nil
@@ -190,6 +215,26 @@ class SupportTest < Test::Unit::TestCase
     end
   end
   
+  context "Set#to_mongo" do
+    should "convert value to_a" do
+      Set.to_mongo(Set.new([1,2,3])).should == [1,2,3]
+    end
+
+    should "convert to empty array if nil" do
+      Set.to_mongo(nil).should == []
+    end
+  end
+
+  context "Set#from_mongo" do
+    should "be a set if array" do
+      Set.from_mongo([1,2,3]).should == Set.new([1,2,3])
+    end
+
+    should "be empty set if nil" do
+      Set.from_mongo(nil).should == Set.new([])
+    end
+  end
+  
   context "String#to_mongo" do
     should "convert value to_s" do
       [21, '21'].each do |value|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-11-14 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.8
     version: 
 description: 
 email: nunemaker@gmail.com
@@ -124,6 +124,7 @@ files:
 - lib/mongo_mapper/serialization.rb
 - lib/mongo_mapper/serializers/json_serializer.rb
 - lib/mongo_mapper/support.rb
+- lib/mongo_mapper/types.rb
 - lib/mongo_mapper/validations.rb
 - mongo_mapper.gemspec
 - specs.watchr
@@ -144,6 +145,7 @@ files:
 - test/functional/test_logger.rb
 - test/functional/test_pagination.rb
 - test/functional/test_rails_compatibility.rb
+- test/functional/test_string_id_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb
@@ -156,7 +158,7 @@ files:
 - test/unit/test_embedded_document.rb
 - test/unit/test_finder_options.rb
 - test/unit/test_key.rb
-- test/unit/test_mongomapper.rb
+- test/unit/test_mongo_mapper.rb
 - test/unit/test_observing.rb
 - test/unit/test_pagination.rb
 - test/unit/test_rails_compatibility.rb
@@ -209,6 +211,7 @@ test_files:
 - test/functional/test_logger.rb
 - test/functional/test_pagination.rb
 - test/functional/test_rails_compatibility.rb
+- test/functional/test_string_id_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb
@@ -221,7 +224,7 @@ test_files:
 - test/unit/test_embedded_document.rb
 - test/unit/test_finder_options.rb
 - test/unit/test_key.rb
-- test/unit/test_mongomapper.rb
+- test/unit/test_mongo_mapper.rb
 - test/unit/test_observing.rb
 - test/unit/test_pagination.rb
 - test/unit/test_rails_compatibility.rb

data/test/unit/test_mongomapper.rb

@@ -1,28 +0,0 @@
-require 'test_helper'
-
-class Address; end
-
-class MongoMapperTest < Test::Unit::TestCase  
-  should "be able to write and read connection" do
-    conn = Mongo::Connection.new
-    MongoMapper.connection = conn
-    MongoMapper.connection.should == conn
-  end
-  
-  should "default connection to new mongo ruby driver" do
-    MongoMapper.connection = nil
-    MongoMapper.connection.should be_instance_of(Mongo::Connection)
-  end
-  
-  should "be able to write and read default database" do
-    MongoMapper.database = DefaultDatabase
-    MongoMapper.database.should be_instance_of(Mongo::DB)
-    MongoMapper.database.name.should == DefaultDatabase
-  end
-  
-  should "have document not found error" do
-    lambda {
-      MongoMapper::DocumentNotFound
-    }.should_not raise_error
-  end
-end