mongo 0.19.1 → 0.19.2

data/test/collection_test.rb

@@ -492,7 +492,36 @@ class TestCollection < Test::Unit::TestCase
 
   context "Creating indexes " do
     setup do
+      @@db.drop_collection('geo')
+      @@db.drop_collection('test-collection')
       @collection = @@db.collection('test-collection')
+      @geo        = @@db.collection('geo')
+    end
+
+    should "create a geospatial index" do
+      @geo.save({'loc' => [-100, 100]})
+      @geo.create_index([['loc', Mongo::GEO2D]])
+      assert @geo.index_information['loc_2d']
+    end
+
+    should "create a unique index" do
+      @collection.create_index([['a', Mongo::ASCENDING]], true)
+      assert @collection.index_information['a_1']['unique'] == true
+    end
+
+    should "create an index in the background" do
+      if @@version > '1.3.1'
+        @collection.create_index([['b', Mongo::ASCENDING]], :background => true)
+        assert @collection.index_information['b_1']['background'] == true
+      else
+        assert true
+      end
+    end
+
+    should "require an array of arrays" do
+      assert_raise MongoArgumentError do
+        @collection.create_index(['c', Mongo::ASCENDING])
+      end
     end
 
     should "generate indexes in the proper order" do
@@ -508,7 +537,7 @@ class TestCollection < Test::Unit::TestCase
       end
 
       should "return properly ordered index information" do
-        assert_equal [['b', 1], ['a', 1]], @collection.index_information["b_1_a_1"]
+        assert @collection.index_information['b_1_a_1']
       end
     end
   end

data/test/connection_test.rb

@@ -58,6 +58,23 @@ class TestConnection < Test::Unit::TestCase
     old_object = @mongo.db('old').collection('copy-test').find.next_document
     new_object = @mongo.db('new').collection('copy-test').find.next_document
     assert_equal old_object, new_object
+    @mongo.drop_database('old')
+    @mongo.drop_database('new')
+  end
+
+  def test_copy_database_with_auth
+    @mongo.db('old').collection('copy-test').insert('a' => 1)
+    @mongo.db('old').add_user('bob', 'secret')
+
+    assert_raise Mongo::OperationFailure do
+      @mongo.copy_database('old', 'new', 'localhost', 'bob', 'badpassword')
+    end
+
+    result = @mongo.copy_database('old', 'new', 'localhost', 'bob', 'secret')
+    assert result['ok'].to_i == 1
+
+    @mongo.drop_database('old')
+    @mongo.drop_database('new')
   end
 
   def test_database_names
@@ -76,7 +93,7 @@ class TestConnection < Test::Unit::TestCase
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
     db = Connection.new(@host, @port, :logger => logger).db('ruby-mongo-test')
-    assert output.string.include?("admin.$cmd.find")
+    assert output.string.include?("admin['$cmd'].find")
   end
 
   def test_connection_logger

data/test/cursor_test.rb

@@ -376,4 +376,18 @@ class CursorTest < Test::Unit::TestCase
       assert_equal(1, @@coll.find({}, :fields => ["a"]).count())
     end
   end
+
+  def test_has_next
+    @@coll.remove
+    200.times do |n|
+      @@coll.save("x" => n)
+    end
+
+    cursor = @@coll.find
+    while cursor.has_next?
+      assert cursor.next_document
+    end
+
+    assert_equal false, cursor.has_next?
+  end
 end

data/test/db_api_test.rb

@@ -133,12 +133,6 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 2, docs.size
     assert docs.detect { |row| row['a'] == 1 }
     assert docs.detect { |row| row['a'] == 2 }
-
-    # Find by advanced query (regexp)
-    docs = @@coll.find('a' => /[1|2]/).to_a
-    assert_equal 2, docs.size
-    assert docs.detect { |row| row['a'] == 1 }
-    assert docs.detect { |row| row['a'] == 2 }
   end
 
   def test_find_sorting
@@ -287,7 +281,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 2, info.length
 
     assert info.has_key?(name)
-    assert_equal info[name], [["a", ASCENDING]]
+    assert_equal info[name]["key"], {"a" => 1}
   ensure
     @@db.drop_index(@@coll.name, name)
   end
@@ -302,7 +296,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 2, info.length
 
     assert info.has_key?(name)
-    assert_equal info[name], [["a", ASCENDING]]
+    assert_equal info[name]['key'], {"a" => 1}
   ensure
     @@db.drop_index(@@coll.name, name)
   end
@@ -314,7 +308,7 @@ class DBAPITest < Test::Unit::TestCase
 
     assert_equal name, 'a_-1_b_1_c_-1'
     assert info.has_key?(name)
-    assert_equal [['a', DESCENDING], ['b', ASCENDING], ['c', DESCENDING]], info[name]
+    assert_equal info[name]['key'], {"a" => -1, "b" => 1, "c" => -1}
   ensure
     @@db.drop_index(@@coll.name, name)
   end
@@ -326,7 +320,7 @@ class DBAPITest < Test::Unit::TestCase
 
     assert_equal name, 'a_-1_b_1_c_-1'
     assert info.has_key?(name)
-    assert_equal [['a', DESCENDING], ['b', ASCENDING], ['c', DESCENDING]], info[name]
+    assert_equal info[name]['key'], {"a" => -1, "b" => 1, "c" => -1}
   ensure
     @@db.drop_index(@@coll.name, name)
   end

data/test/grid_test.rb

@@ -42,6 +42,19 @@ class GridTest < Test::Unit::TestCase
         assert_raise GridError do
           @grid.get(@id)
         end
+        assert_equal nil, @db['test-fs']['chunks'].find_one({:files_id => @id})
+      end
+    end
+
+    context "Storing data with a length of zero" do
+      setup do
+        @grid = Grid.new(@db, 'test-fs')
+        @id   = @grid.put('', 'sample', :metadata => {'app' => 'photos'})
+      end
+
+      should "return the zero length" do
+        data = @grid.get(@id)
+        assert_equal 0, data.read.length
       end
     end
 

data/test/unit/collection_test.rb

@@ -12,7 +12,7 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message).with do |op, msg, log|
-        op == 2001 && log.include?("db.books.update")
+        op == 2001 && log.include?("testing['books'].update")
       end
       @coll.update({}, {:title => 'Moby Dick'})
     end
@@ -22,11 +22,21 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message).with do |op, msg, log|
-        op == 2002 && log.include?("db.books.insert")
+        op == 2002 && log.include?("testing['books'].insert")
       end
       @coll.insert({:title => 'Moby Dick'})
     end
 
+    should "send sort data" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @coll = @db.collection('books')
+      @conn.expects(:receive_message).with do |op, msg, log, sock|
+        op == 2004 && log.include?("sort")
+      end.returns([[], 0, 0])
+      @coll.find({:title => 'Moby Dick'}).sort([['title', 1], ['author', 1]]).next_document
+    end
+
     should "not log binary data" do
       @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
       @db   = @conn['testing']
@@ -43,7 +53,7 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message_with_safe_check).with do |op, msg, db_name, log|
-        op == 2001 && log.include?("db.books.update")
+        op == 2001 && log.include?("testing['books'].update")
       end
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)
     end
@@ -53,7 +63,7 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message_with_safe_check).with do |op, msg, db_name, log|
-        op == 2001 && log.include?("db.books.update")
+        op == 2001 && log.include?("testing['books'].update")
       end
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 0.19.1
+  prerelease: false
+  segments: 
+  - 0
+  - 19
+  - 2
+  version: 0.19.2
 platform: ruby
 authors: 
 - Jim Menard
@@ -11,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +33,18 @@ files:
 - Rakefile
 - mongo-ruby-driver.gemspec
 - LICENSE.txt
+- lib/bson/bson_c.rb
+- lib/bson/bson_ruby.rb
+- lib/bson/byte_buffer.rb
+- lib/bson/exceptions.rb
+- lib/bson/ordered_hash.rb
+- lib/bson/types/binary.rb
+- lib/bson/types/code.rb
+- lib/bson/types/dbref.rb
+- lib/bson/types/min_max_keys.rb
+- lib/bson/types/objectid.rb
+- lib/bson/types/regexp_of_holding.rb
+- lib/bson.rb
 - lib/mongo/collection.rb
 - lib/mongo/connection.rb
 - lib/mongo/cursor.rb
@@ -49,6 +66,7 @@ files:
 - lib/mongo/util/bson_ruby.rb
 - lib/mongo/util/byte_buffer.rb
 - lib/mongo/util/conversions.rb
+- lib/mongo/util/core_ext.rb
 - lib/mongo/util/ordered_hash.rb
 - lib/mongo/util/server_version.rb
 - lib/mongo/util/support.rb
@@ -65,6 +83,7 @@ files:
 - examples/types.rb
 - bin/bson_benchmark.rb
 - bin/fail_if_no_c.rb
+- bin/gr.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -80,22 +99,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
+- test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
 - test/binary_test.rb