mongo 1.3.0.rc0 → 1.3.0

data/Rakefile

@@ -5,10 +5,6 @@ require 'fileutils'
 require 'rake'
 require 'rake/testtask'
 require 'rake/gempackagetask'
-begin
-  require 'rake/contrib/rubyforgepublisher'
-rescue LoadError
-end
 require 'rbconfig'
 include Config
 ENV['TEST_MODE'] = 'TRUE'
@@ -146,16 +142,24 @@ task :ydoc do
   require File.join(File.dirname(__FILE__), 'lib', 'mongo')
   out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
-  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/GridFS.md,docs/FAQ.md,docs/REPLICA_SETS.md,docs/WRITE_CONCERN.md,docs/HISTORY.md,docs/CREDITS.md,docs/1.0_UPGRADE.md,docs/RELEASES.md"
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/GridFS.md,docs/FAQ.md,docs/REPLICA_SETS.md,docs/WRITE_CONCERN.md,docs/HISTORY.md,docs/CREDITS.md,docs/RELEASES.md"
 end
 
 namespace :bamboo do
+  task :ci_reporter do
+    begin
+      require 'ci/reporter/rake/test_unit'
+    rescue LoadError
+      warn "Warning: Unable to load ci_reporter gem."
+    end
+  end
+
   namespace :test do
-    task :ruby do
+    task :ruby => [:ci_reporter, "ci:setup:testunit"] do
       Rake::Task['test:ruby'].invoke
     end
 
-    task :c do
+    task :c => [:ci_reporter, "ci:setup:testunit"] do
       Rake::Task['gem:install_extensions'].invoke
       Rake::Task['test:c'].invoke
     end
@@ -166,29 +170,30 @@ namespace :gem do
 
   desc "Install the gem locally"
   task :install do
-    sh "gem build bson.gemspec"
-    sh "gem install --no-rdoc --no-ri bson-*.gem"
+    `gem build bson.gemspec`
+    `gem install --no-rdoc --no-ri bson-*.gem`
 
-    sh "gem build mongo.gemspec"
-    sh "gem install --no-rdoc --no-ri mongo-*.gem"
+    `gem build mongo.gemspec`
+    `gem install --no-rdoc --no-ri mongo-*.gem`
 
-    sh "rm mongo-*.gem"
-    sh "rm bson-*.gem"
+    `rm mongo-*.gem`
+    `rm bson-*.gem`
   end
 
   desc "Install the optional c extensions"
   task :install_extensions do
-    sh "gem build bson_ext.gemspec"
-    sh "gem install --no-rdoc --no-ri bson_ext-*.gem"
-    sh "rm bson_ext-*.gem"
+    `gem uninstall bson_ext`
+    `gem build bson_ext.gemspec`
+    `gem install --no-rdoc --no-ri bson_ext-*.gem`
+    `rm bson_ext-*.gem`
   end
 
   desc "Build all gems"
   task :build_all do
-    sh "gem build mongo.gemspec"
-    sh "gem build bson.gemspec"
-    sh "gem build bson.java.gemspec"
-    sh "gem build bson_ext.gemspec"
+    `gem build mongo.gemspec`
+    `gem build bson.gemspec`
+    `gem build bson.java.gemspec`
+    `gem build bson_ext.gemspec`
   end
 
 end

data/docs/HISTORY.md

@@ -1,28 +1,28 @@
 # MongoDB Ruby Driver History
 
-### 1.3.0.rc0
-2011-3-29
+### 1.3.0
+2011-4-04
 
-* Add option to set timeouts on socket read calls. Use
-  the :op_timeout option when creating a new connection.
+* Add option to set timeouts on socket read calls using the
+  Mongo::Connection :op_timeout option.
 * Add StringIO methods to GridIO objects
 * Support for BSON timestamp type with BSON::Timestamp
 * Change the BSON binary subtype from 2 to 0
 * Remove private method Connection#reset_conection
   and deprecate public method ReplSetConnection#reset_connection
-* ByteBuffer#== and OrderedHash#dup (FooBarWidget)
+* ByteBuffer#== and OrderedHash#dup (Hongli Lai)
 * Better check for UTF8 validity in Ruby 1.9
 * Added previously removed Connection#host and Connection#port
-* Added transformers to allow Mongo::Cursor to allow instantiated objects (jnunemaker)
+* Added transformers to allow Mongo::Cursor to allow instantiated objects (John Nunemaker)
 * Automated reconnection on fork
 * Added Cursor#next alias for Cursor#next_document
-* Audit tests after enabling warnings (wpiekutowski)
-* Various bug fixes thanks to FooBarWidget, Datanoise, Malitogeek
+* Audit tests after enabling warnings (Wojciech Piekutowski)
+* Various bug fixes thanks to Datanoise, Hongli Lai, and Mauro Pompilio
 
 ### 1.2.4
 2011-2-23
 
-* Fix the exception message shown when there's an IOError (malditogeek)
+* Fix the exception message shown when there's an IOError (Mauro Pompilio)
 * Another update to map-reduce docs for v1.8. Note that if you use the new
   output option {:out => {:inline => true}}, then you must also specify
   :raw => true.

data/lib/mongo.rb

@@ -19,7 +19,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.3.0.rc0"
+  VERSION = "1.3.0"
 end
 
 module Mongo

data/lib/mongo/test.rb

@@ -0,0 +1,20 @@
+
+class Foo
+
+  def zed
+    puts "Foo"
+  end
+
+end
+
+class Bar < Foo
+
+  def zed(n=nil)
+    if n.nil?
+      puts "Bar"
+    else
+      super()
+    end
+  end
+
+end

data/test/async/collection_test.rb

@@ -0,0 +1,224 @@
+require 'test/test_helper'
+
+class TestCollection < Test::Unit::TestCase
+  @@connection ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost', ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@test = @@db.collection("test")
+  @@version = @@connection.server_version
+
+  def setup
+    @@test.remove
+  end
+
+  def wait_for_async
+    sleep 0.2
+  end
+
+  def test_async_update
+    id1 = @@test.save("x" => 5)
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    @@test.update({}, {"$inc" => {"x" => 1}}, :async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+
+    assert_equal 1, @@test.count()
+    assert_equal 6, @@test.find_one(:_id => id1)["x"]
+  end
+
+  if @@version >= "1.1.3"
+    def test_async_multi_update
+      failsafe = mock('failsafe will get called in block', :call => true)
+
+      @@test.save("num" => 10)
+      @@test.save("num" => 10)
+      @@test.save("num" => 10)
+      assert_equal 3, @@test.count
+
+      @@test.update({"num" => 10}, {"$set" => {"num" => 100}}, :multi => true, :async => true) do |error, result|
+        assert_nil error
+        assert result
+        failsafe.call
+      end
+      wait_for_async
+    end
+  end
+
+  def test_async_upsert
+    failsafe = mock('failsafe will get called in block')
+    failsafe.expects(:call).times(2)
+
+    @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true, :async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+
+    @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true, :async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+
+    assert_equal 1, @@test.count()
+    assert_equal 2, @@test.find_one()["count"]
+  end
+
+  def test_async_save
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    # note that the first parameter has explicit curly brackets around
+    # the hash; without those brackets as a delimiter, the :async key is
+    # viewed as part of the required +document+ parameter
+    @@test.save({"hello" => "world"}, :async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+    
+    assert_equal "world", @@test.find_one()["hello"]
+  end
+
+  def test_async_save_with_exception
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    @@test.create_index("hello", :unique => true)
+    @@test.save("hello" => "world")
+    
+    # all async calls on collections occur in :safe mode
+    @@test.save({"hello" => "world"}, :async => true) do |error, result|
+      assert error
+      assert error.instance_of?(OperationFailure)
+      assert_nil result
+      failsafe.call
+    end
+    wait_for_async
+    
+    assert_equal 1, @@test.count()
+    @@test.drop
+  end
+
+  def test_async_remove
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    @conn = Connection.new
+    @db   = @conn[MONGO_TEST_DB]
+    @test = @db['test-async-remove']
+    @test.save({:a => 50})
+    @test.remove({}, :async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+    
+    @test.drop
+  end
+
+  def test_async_count
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    @@test.drop
+
+    @@test.save("x" => 1)
+    @@test.save("x" => 2)
+
+    @@test.count(:async => true) do |error, result|
+      assert_nil error
+      assert_equal 2, result
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  # Note: #size is just an alias for #count.
+  def test_async_size
+    failsafe = mock('failsafe will get called in block', :call => true)
+    
+    @@test.drop
+
+    @@test.save("x" => 1)
+    @@test.save("x" => 2)
+
+    @@test.size(:async => true) do |error, result|
+      assert_nil error
+      assert_equal 2, result
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_find_one
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    id = @@test.save("hello" => "world", "foo" => "bar")
+
+    @@test.find_one({}, :async => true) do |error, result|
+      assert_nil error
+      assert_equal @@test.find_one(id), result
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_insert
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    doc = {"hello" => "world"}
+    @@test.insert(doc, :async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+    
+    assert_equal 1, @@test.count
+  end
+
+  def test_async_find
+    assert_raise RuntimeError do
+      @@test.find({}, :async => true)
+    end
+  end
+
+  if @@version > "1.3.0"
+    def test_async_find_and_modify
+      failsafe = mock('failsafe will get called in block', :call => true)
+
+      @@test << { :a => 1, :processed => false }
+      @@test << { :a => 2, :processed => false }
+      @@test << { :a => 3, :processed => false }
+
+      @@test.find_and_modify(:query => {}, :sort => [['a', -1]], :update => {"$set" => {:processed => true}}, :async => true) do |error, result|
+        assert_nil error
+        assert result
+        failsafe.call
+      end
+      wait_for_async
+
+      assert @@test.find_one({:a => 3})['processed']
+    end
+
+    def test_async_find_and_modify_with_invalid_options
+      failsafe = mock('failsafe will get called in block', :call => true)
+
+      @@test << { :a => 1, :processed => false }
+      @@test << { :a => 2, :processed => false }
+      @@test << { :a => 3, :processed => false }
+
+      @@test.find_and_modify(:blimey => {}, :async => true) do |error, result|
+        assert error
+        assert error.instance_of?(OperationFailure)
+        assert_nil result
+        failsafe.call
+      end
+      wait_for_async
+    end
+  end
+
+end

data/test/async/connection_test.rb

@@ -0,0 +1,24 @@
+require 'test/test_helper'
+include Mongo
+
+class ConnectionTest < Test::Unit::TestCase
+  context "Initialization: " do
+
+    context "given async connection options" do
+
+      should "default the workers pool to 1" do
+        Async::WorkerPool.expects(:new).with(1)
+
+        Connection.new('localhost', 27017)
+      end
+
+      should "override the workers pool size with the :worker_pool_size key" do
+        size = 6
+        Async::WorkerPool.expects(:new).with(size)
+
+        Connection.new('localhost', 27017, :worker_pool_size => size)
+      end
+    end # context 'given async connection options'
+
+  end # context 'Initialization'
+end

data/test/async/cursor_test.rb

@@ -0,0 +1,162 @@
+require 'test/test_helper'
+require 'logger'
+
+class CursorTest < Test::Unit::TestCase
+
+  include Mongo
+
+  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
+
+  def wait_for_async
+    sleep 0.2
+  end
+
+  def setup
+    @@coll.remove
+    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+  end
+
+  def test_async_explain
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    cursor = @@coll.find('a' => 1)
+
+    cursor.explain(:async => true) do |error, result|
+      assert_not_nil result['cursor']
+      assert_kind_of Numeric, result['n']
+      assert_kind_of Numeric, result['millis']
+      assert_kind_of Numeric, result['nscanned']
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_count
+    failsafe = mock('failsafe will get called in block')
+    failsafe.expects(:call).times(3)
+
+    @@coll.remove
+
+    @@coll.find.count(:async => true) do |error, count|
+      assert_equal 0, count
+      failsafe.call
+    end
+    wait_for_async
+
+    10.times do |i|
+      @@coll.save("x" => i)
+    end
+
+    @@coll.find.count(:async => true) do |error, count|
+      assert_equal 10, count
+      failsafe.call
+    end
+    wait_for_async
+
+    @@coll.find({"x" => 1}).count(:async => true) do |error, count|
+      assert_equal 1, count
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_close
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    @@coll.remove
+    cursor = @@coll.find
+    
+    cursor.close(:async => true) do |error, result|
+      assert_nil error
+      assert result
+      assert cursor.closed?
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_has_next
+    failsafe = mock('failsafe will get called in block', :call => true)
+
+    @@coll.remove
+    200.times do |n|
+      @@coll.save("x" => n)
+    end
+
+    cursor = @@coll.find
+    cursor.has_next?(:async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_next_document
+    failsafe = mock('failsafe will get called in block')
+    failsafe.expects(:call).times(2)
+
+    @@coll.remove
+    200.times do |n|
+      @@coll.save("x" => n)
+    end
+
+    cursor = @@coll.find
+    cursor.next_document(:async => true) do |error, result|
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+    wait_for_async
+
+    callback = Proc.new do |error, result| 
+      assert_nil error
+      assert result
+      failsafe.call
+    end
+
+    cursor.next_document(:async => true, :callback => callback)
+    wait_for_async
+  end
+
+  def test_async_to_a
+    failsafe = mock('failsafe will get called in block')
+    failsafe.expects(:call)
+
+    @@coll.remove
+    total = 200
+    total.times do |n|
+      @@coll.save("x" => n)
+    end
+
+    cursor = @@coll.find
+    cursor.to_a(:async => true) do |error, result|
+      assert_nil error
+      assert_equal total, result.size
+      failsafe.call
+    end
+    wait_for_async
+  end
+
+  def test_async_each
+    @@coll.remove
+    total = 200
+    total.times do |n|
+      @@coll.save("x" => n)
+    end
+
+    cursor = @@coll.find
+    count = 0
+    cursor.each(:async => true) do |error, result|
+      count += 1
+    end
+    wait_for_async
+    
+    assert_equal total, count
+  end
+end