mongo_mapper 0.7.0 → 0.7.1

data/test/unit/test_mongo_mapper.rb

@@ -31,7 +31,6 @@ class MongoMapperTest < Test::Unit::TestCase
       'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'},
       'production'  => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test-prod'}
     }
-
     MongoMapper.config = config
     MongoMapper.config.should == config
   end
@@ -41,7 +40,16 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
+      MongoMapper.expects(:database=).with('test')
+      Mongo::DB.any_instance.expects(:authenticate).never
+      MongoMapper.connect('development')
+    end
 
+    should "work without authentication using uri" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
+      }
       Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
       MongoMapper.expects(:database=).with('test')
       Mongo::DB.any_instance.expects(:authenticate).never
@@ -52,7 +60,15 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
+      connection, logger = mock('connection'), mock('logger')
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, :logger => logger)
+      MongoMapper.connect('development', :logger => logger)
+    end
 
+    should "work with options using uri" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
+      }
       connection, logger = mock('connection'), mock('logger')
       Mongo::Connection.expects(:new).with('127.0.0.1', 27017, :logger => logger)
       MongoMapper.connect('development', :logger => logger)
@@ -62,10 +78,24 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'username' => 'john', 'password' => 'secret'}
       }
+      Mongo::DB.any_instance.expects(:authenticate).with('john', 'secret')
+      MongoMapper.connect('development')
+    end
 
+    should "work with authentication using uri" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mongodb://john:secret@127.0.0.1:27017/test'}
+      }
       Mongo::DB.any_instance.expects(:authenticate).with('john', 'secret')
       MongoMapper.connect('development')
     end
+    
+    should "raise error for invalid scheme" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mysql://127.0.0.1:5336/foo'}
+      }
+      assert_raises(MongoMapper::InvalidScheme) { MongoMapper.connect('development') }
+    end
   end
 
   context "setup" do

data/test/unit/test_pagination.rb

@@ -12,6 +12,29 @@ class PaginationTest < Test::Unit::TestCase
   context "Pagination proxy" do
     include MongoMapper::Plugins::Pagination
     
+    should "respond_to? correctly on proxy readers" do
+      proxy = Proxy.new(25, 10, 4)
+      proxy.respond_to?(:subject).should be_true
+      proxy.respond_to?(:total_entries).should be_true
+      proxy.respond_to?(:per_page).should be_true
+      proxy.respond_to?(:current_page).should be_true
+      proxy.respond_to?(:limit).should be_true
+      proxy.respond_to?(:total_pages).should be_true
+      proxy.respond_to?(:out_of_bounds?).should be_true
+      proxy.respond_to?(:previous_page).should be_true
+      proxy.respond_to?(:next_page).should be_true
+      proxy.respond_to?(:skip).should be_true
+      proxy.respond_to?(:offset).should be_true
+      
+      # make sure it doesnt respond true to everything
+      proxy.respond_to?(:blahblahblah).should be_false
+    end
+    
+    should "respond_to? correctly on proxy writers" do
+      proxy = Proxy.new(25, 10, 4)
+      proxy.respond_to?(:subject=).should be_true
+    end
+    
     should "should have accessors for subject" do
       subject = [1,2,3,4,5]
       collection = Proxy.new(25, 2)
@@ -31,6 +54,16 @@ class PaginationTest < Test::Unit::TestCase
       collection.class.should == Array
     end
     
+    should "should respond_to? correctly for methods defined on the subject" do
+      subject = [1,2,3,4,5]
+      def subject.blahblah
+        "BLAHBLAH"
+      end
+      collection = Proxy.new(25, 2, 10)
+      collection.subject = subject
+      collection.respond_to?(:blahblah).should be_true
+    end
+    
     should "return correct value for total_entries" do
       Proxy.new(25, 2, 10).total_entries.should == 25
       Proxy.new('25', 2, 10).total_entries.should == 25

data/test/unit/test_query.rb

@@ -38,6 +38,8 @@ class QueryTest < Test::Unit::TestCase
     end
     
     %w{gt lt gte lte ne in nin mod all size where exists}.each do |operator|
+      next if operator == 'size' && RUBY_VERSION >= '1.9.1' # 1.9 defines Symbol#size
+
       should "convert #{operator} conditions" do
         Query.new(Room, :age.send(operator) => 21).criteria.should == {
           :age => {"$#{operator}" => 21}
@@ -176,6 +178,10 @@ class QueryTest < Test::Unit::TestCase
       Query.new(Room, :sort => sort, :order => 'foo asc').options[:sort].should == sort
     end
     
+    should "normalize id to _id" do
+      Query.new(Room, :order => :id.asc).options[:sort].should == [['_id', 1]]
+    end
+    
     should "convert natural in order to proper" do
       sort = [['$natural', 1]]
       Query.new(Room, :order => '$natural asc').options[:sort].should == sort

data/test/unit/test_serialization.rb

@@ -23,14 +23,14 @@ class SerializationTest < Test::Unit::TestCase
     context format do
       should "be reversable" do
         serialized = @instance.send("to_#{format}")
-        unserialized = @document.new.send("from_#{format}", serialized)
+        unserialized = @document.send("from_#{format}", serialized)
 
         assert_equal @instance, unserialized
       end
       
       should "allow attribute only filtering" do
         serialized = @instance.send("to_#{format}", :only => [ :age, :name ])
-        unserialized = @document.new.send("from_#{format}", serialized)
+        unserialized = @document.send("from_#{format}", serialized)
 
         assert_equal @instance.name, unserialized.name
         assert_equal @instance.age, unserialized.age
@@ -40,7 +40,7 @@ class SerializationTest < Test::Unit::TestCase
       
       should "allow attribute except filtering" do
         serialized = @instance.send("to_#{format}", :except => [ :age, :name ])
-        unserialized = @document.new.send("from_#{format}", serialized)
+        unserialized = @document.send("from_#{format}", serialized)
         
         assert_nil unserialized.name
         assert_nil unserialized.age

data/test/unit/test_support.rb

@@ -78,7 +78,7 @@ class SupportTest < Test::Unit::TestCase
   
   context "Date#to_mongo" do
     should "be time if string" do
-      date = Date.to_mongo('10/1/2009')
+      date = Date.to_mongo('2009-10-01')
       date.should == Time.utc(2009, 10, 1)
       date.should == date
       date.month.should == 10
@@ -276,8 +276,12 @@ class SupportTest < Test::Unit::TestCase
   end
   
   context "Time#to_mongo without Time.zone" do
+    setup do
+      Time.zone = nil
+    end
+
     should "be time to milliseconds if string" do
-      Time.to_mongo('2000-01-01 01:01:01.123456').should == Time.local(2000, 1, 1, 1, 1, 1, 123000).utc
+      Time.to_mongo('2000-01-01 01:01:01.123456').to_f.should == Time.local(2000, 1, 1, 1, 1, 1, 123000).utc.to_f
     end
     
     should "be time in utc if time" do
@@ -296,13 +300,13 @@ class SupportTest < Test::Unit::TestCase
   context "Time#to_mongo with Time.zone" do
     should "be time to milliseconds if time" do
       Time.zone = 'Hawaii'
-      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).should == Time.utc(2009, 8, 16, 0, 0, 0, 123000)
+      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).to_f.should == Time.utc(2009, 8, 16, 0, 0, 0, 123000).to_f
       Time.zone = nil
     end
 
     should "be time to milliseconds if string" do
       Time.zone = 'Hawaii'
-      Time.to_mongo('2009-08-15 14:00:00.123456').should == Time.utc(2009, 8, 16, 0, 0, 0, 123000)
+      Time.to_mongo('2009-08-15 14:00:00.123456').to_f.should == Time.utc(2009, 8, 16, 0, 0, 0, 123000).to_f
       Time.zone = nil
     end
     
@@ -359,4 +363,4 @@ class SupportTest < Test::Unit::TestCase
       id.original_to_json.should == %Q({"$oid": "#{id}"})
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2010-03-09 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.18.3
+        version: 0.19.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.8.1
+        version: 1.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
@@ -96,7 +96,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/mmconsole
 - lib/mongo_mapper.rb
 - lib/mongo_mapper/document.rb
@@ -125,20 +124,25 @@ files:
 - lib/mongo_mapper/plugins/inspect.rb
 - lib/mongo_mapper/plugins/keys.rb
 - lib/mongo_mapper/plugins/logger.rb
+- lib/mongo_mapper/plugins/modifiers.rb
 - lib/mongo_mapper/plugins/pagination.rb
 - lib/mongo_mapper/plugins/pagination/proxy.rb
 - lib/mongo_mapper/plugins/protected.rb
 - lib/mongo_mapper/plugins/rails.rb
 - lib/mongo_mapper/plugins/serialization.rb
+- lib/mongo_mapper/plugins/timestamps.rb
+- lib/mongo_mapper/plugins/userstamps.rb
 - lib/mongo_mapper/plugins/validations.rb
 - lib/mongo_mapper/query.rb
 - lib/mongo_mapper/support.rb
 - lib/mongo_mapper/support/descendant_appends.rb
 - lib/mongo_mapper/support/find.rb
+- lib/mongo_mapper/version.rb
 - mongo_mapper.gemspec
 - performance/read_write.rb
 - specs.watchr
 - test/NOTE_ON_TESTING
+- test/active_model_lint_test.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_in_array_proxy.rb
@@ -155,11 +159,14 @@ files:
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
 - test/functional/test_identity_map.rb
+- test/functional/test_indexing.rb
 - test/functional/test_logger.rb
 - test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
 - test/functional/test_protected.rb
 - test/functional/test_string_id_compatibility.rb
+- test/functional/test_timestamps.rb
+- test/functional/test_userstamps.rb
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb
@@ -210,8 +217,9 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Awesome gem for modeling your domain and storing it in mongo
+summary: A Ruby Object Mapper for Mongo
 test_files: 
+- test/active_model_lint_test.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_in_array_proxy.rb
@@ -228,11 +236,14 @@ test_files:
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
 - test/functional/test_identity_map.rb
+- test/functional/test_indexing.rb
 - test/functional/test_logger.rb
 - test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
 - test/functional/test_protected.rb
 - test/functional/test_string_id_compatibility.rb
+- test/functional/test_timestamps.rb
+- test/functional/test_userstamps.rb
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb

data/VERSION

@@ -1 +0,0 @@
-0.7.0