mongo 1.3.1 → 1.4.0

data/lib/mongo/util/ssl_socket.rb

@@ -0,0 +1,38 @@
+require 'openssl'
+
+module Mongo
+
+  # A basic wrapper over Ruby's SSLSocket that initiates
+  # a TCP connection over SSL and then provides an basic interface
+  # mirroring Ruby's TCPSocket, vis., TCPSocket#send and TCPSocket#read.
+  class SSLSocket
+
+    def initialize(host, port)
+      @socket = ::TCPSocket.new(host, port)
+      @ssl = OpenSSL::SSL::SSLSocket.new(@socket)
+      @ssl.sync_close = true
+      @ssl.connect
+    end
+
+    def setsockopt(key, value, n)
+      @socket.setsockopt(key, value, n)
+    end
+
+    # Write to the SSL socket.
+    #
+    # @param buffer a buffer to send.
+    # @param flags socket flags. Because Ruby's SSL
+    def send(buffer, flags=0)
+      @ssl.syswrite(buffer)
+    end
+
+    def read(length, buffer)
+      @ssl.sysread(length, buffer)
+    end
+
+    def close
+      @ssl.close
+    end
+
+  end
+end

data/lib/mongo/util/support.rb

@@ -44,7 +44,6 @@ module Mongo
       Digest::MD5.hexdigest("#{username}:mongo:#{plaintext}")
     end
 
-
     def validate_db_name(db_name)
       unless [String, Symbol].include?(db_name.class)
         raise TypeError, "db_name must be a string or symbol"
@@ -59,6 +58,15 @@ module Mongo
       db_name
     end
 
+    def validate_read_preference(value)
+      if [:primary, :secondary, nil].include?(value)
+        return true
+      else
+        raise MongoArgumentError, "#{value} is not a valid read preference. " +
+          "Please specify either :primary or :secondary."
+      end
+    end
+
     def format_order_clause(order)
       case order
         when String, Symbol then string_as_sort_parameters(order)

data/lib/mongo/util/timeout.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+
+# --
+# Copyright (C) 2008-2011 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+module Mongo #:nodoc:
+  module TimeoutWrapper
+    extend self
+
+    def timeout_lib=(lib)
+      @@timeout_lib = lib
+    end
+
+    def timeout_lib
+      @@timeout_lib
+    end
+
+    def timeout(delay, &block)
+      if timeout_lib
+        begin
+        timeout_lib.timeout(delay, &block)
+        rescue ::Timeout::Error
+          raise Mongo::OperationTimeout
+        end
+      else
+        yield
+      end
+    end
+  end
+end

data/lib/mongo/version.rb

@@ -0,0 +1,3 @@
+module Mongo
+  VERSION = "1.4.0"
+end

data/mongo.gemspec

@@ -1,4 +1,4 @@
-require "./lib/mongo"
+require File.expand_path('../lib/mongo/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 
-  s.add_dependency(%q<bson>, [">= #{Mongo::VERSION}"])
+  s.add_dependency('bson', Mongo::VERSION)
 end

data/test/bson/binary_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/test_helper'
+require './test/bson/test_helper'
 
 class BinaryTest < Test::Unit::TestCase
   context "Inspecting" do

data/test/bson/bson_string_test.rb

@@ -0,0 +1,30 @@
+# encoding:utf-8
+require './test/bson/test_helper'
+require 'complex'
+require 'bigdecimal'
+require 'rational'
+
+class BSONTest < Test::Unit::TestCase
+
+  include BSON
+
+  def setup
+    @encoder = BSON::BSON_CODER
+  end
+
+  def assert_doc_pass(doc, options={})
+    bson = @encoder.serialize(doc)
+    if options[:debug]
+      puts "DEBUGGING DOC:"
+      p bson.to_a
+      puts "DESERIALIZES TO:"
+    end
+    assert_equal @encoder.serialize(doc).to_a, bson.to_a
+    assert_equal doc, @encoder.deserialize(bson)
+  end
+
+  def test_string
+    assert_doc_pass({:a => "hello"})
+  end
+
+end

data/test/bson/bson_test.rb

@@ -1,5 +1,6 @@
 # encoding:utf-8
-require './test/test_helper'
+require './test/bson/test_helper'
+require 'set'
 
 if RUBY_VERSION < '1.9'
   require 'complex'
@@ -436,8 +437,10 @@ class BSONTest < Test::Unit::TestCase
                                      0x00, 0x00, 0x14, 0x00,
                                      0x00, 0x00, 0x00])
 
-      assert_equal 4, result["test"][0]
-      assert_equal 20, result["test"][1]
+      silently do
+        assert_equal 4, result["test"][0]
+        assert_equal 20, result["test"][1]
+      end
     end
   end
 

data/test/bson/byte_buffer_test.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-require './test/test_helper'
+require './test/bson/test_helper'
 
 class ByteBufferTest < Test::Unit::TestCase
   include BSON

data/test/bson/hash_with_indifferent_access_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/test_helper'
+require './test/bson/test_helper'
 require './test/support/hash_with_indifferent_access'
 
 class HashWithIndifferentAccessTest < Test::Unit::TestCase

data/test/bson/json_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 require 'rubygems'
 require 'json'
 

data/test/bson/object_id_test.rb

@@ -1,12 +1,9 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 require 'rubygems'
 require 'json'
 
 class ObjectIdTest < Test::Unit::TestCase
 
-  include Mongo
-  include BSON
-
   def setup
     @o = ObjectId.new
   end
@@ -65,18 +62,6 @@ class ObjectIdTest < Test::Unit::TestCase
     assert_equal "BSON::ObjectId('#{@o.to_s}')", @o.inspect
   end
 
-  def test_save_and_restore
-    db = standard_connection.db(MONGO_TEST_DB)
-    coll = db.collection('test')
-
-    coll.remove
-    coll << {'a' => 1, '_id' => @o}
-
-    row = coll.find().collect.first
-    assert_equal 1, row['a']
-    assert_equal @o, row['_id']
-  end
-
   def test_from_string
     hex_str = @o.to_s
     o2 = ObjectId.from_string(hex_str)
@@ -134,8 +119,7 @@ class ObjectIdTest < Test::Unit::TestCase
     time = Time.now.utc
     id   = ObjectId.from_time(time, :unique => true)
 
-    mac_id = Digest::MD5.digest(Socket.gethostname)[0, 3].unpack("C3")
-    assert_equal id.to_a[4, 3], mac_id
+    assert_equal id.to_a[4, 3], ObjectId.machine_id.unpack("C3")
     assert_equal time.to_i, id.generation_time.to_i
 
     id2 = ObjectId.new(nil, time)

data/test/bson/ordered_hash_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 
 class OrderedHashTest < Test::Unit::TestCase
 
@@ -38,6 +38,7 @@ class OrderedHashTest < Test::Unit::TestCase
     same_doc = BSON::OrderedHash.new
     same_doc['_id']  = 'ab12'
     same_doc['name'] = 'test'
+
     list << doc
     list << same_doc
 
@@ -45,6 +46,23 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal 1, list.uniq.size
   end
 
+  if !(RUBY_VERSION =~ /1.8.6/)
+    def test_compatibility_with_hash
+      list = []
+      doc  = BSON::OrderedHash.new
+      doc['_id']  = 'ab12'
+      doc['name'] = 'test'
+
+      doc2 = {}
+      doc2['_id']  = 'ab12'
+      doc2['name'] = 'test'
+      list << doc
+      list << doc2
+
+      assert_equal 1, list.uniq.size
+    end
+  end
+
   def test_equality
     a = BSON::OrderedHash.new
     a['x'] = 1
@@ -76,6 +94,21 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal @ordered_keys, @oh.keys
   end
 
+  def test_replace
+    h1 = BSON::OrderedHash.new
+    h1[:a] = 1
+    h1[:b] = 2
+
+    h2 = BSON::OrderedHash.new
+    h2[:c] = 3
+    h2[:d] = 4
+    h1.replace(h2)
+
+    assert_equal [:c, :d], h1.keys
+    assert_equal [3, 4], h1.values
+    assert h1.keys.object_id != h2.keys.object_id
+  end
+
   def test_to_a_order_preserved
     assert_equal @ordered_keys, @oh.to_a.map {|m| m.first}
   end
@@ -158,8 +191,10 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal [1, 2, 3, 'foo'], noob.values
   end
 
-  def test_inspect_retains_order
-    assert_equal '{"c"=>1, "a"=>2, "z"=>3}', @oh.inspect
+  if RUBY_VERSION < "1.9.2"
+    def test_inspect_retains_order
+      assert_equal "#<BSON::OrderedHash:0x#{@oh.object_id.to_s(16)} {\"c\"=>1, \"a\"=>2, \"z\"=>3}>", @oh.inspect
+    end
   end
 
   def test_clear

data/test/bson/test_helper.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'bson')
+require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
+require 'test/unit'
+
+def silently
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  result = yield
+  $VERBOSE = warn_level
+  result
+end
+
+begin
+  require 'rubygems' if RUBY_VERSION < "1.9.0" && !ENV['C_EXT']
+  silently { require 'shoulda' }
+  silently { require 'mocha' }
+rescue LoadError
+  puts <<MSG
+
+This test suite requires shoulda and mocha.
+You can install them as follows:
+  gem install shoulda
+  gem install mocha
+
+MSG
+
+  exit
+end
+
+require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
+
+class Test::Unit::TestCase
+  include BSON
+
+  def assert_raise_error(klass, message)
+    begin
+      yield
+    rescue => e
+      assert_equal klass, e.class
+      assert e.message.include?(message), "#{e.message} does not include #{message}."
+    else
+      flunk "Expected assertion #{klass} but none was raised."
+    end
+  end
+
+end

data/test/bson/timestamp_test.rb

@@ -1,7 +1,6 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 
-class TiumestampTest < Test::Unit::TestCase
-  include Mongo
+class TimestampTest < Test::Unit::TestCase
 
   def test_timestamp_equality
     t1 = Timestamp.new(5000, 200)
@@ -9,16 +8,39 @@ class TiumestampTest < Test::Unit::TestCase
     assert_equal t2, t1
   end
 
+  def test_timestamp_range
+    t = 1;
+    while(t < 1_000_000_000 ) do
+      ts = Timestamp.new(t, 0)
+      doc = {:ts => ts}
+      bson = BSON::BSON_CODER.serialize(doc)
+      assert_equal doc[:ts], BSON::BSON_CODER.deserialize(bson)['ts']
+      t = t * 10
+    end
+  end
+
+  def test_timestamp_32bit_compatibility
+    max_32bit_fixnum = (1 << 30) - 1
+    test_val = max_32bit_fixnum + 10
+
+    ts = Timestamp.new(test_val, test_val)
+    doc = {:ts => ts}
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc[:ts], BSON::BSON_CODER.deserialize(bson)['ts']
+  end
+
   def test_implements_array_for_backward_compatibility
-    ts = Timestamp.new(5000, 200)
-    assert_equal 200, ts[0]
-    assert_equal 5000, ts[1]
+    silently do
+      ts = Timestamp.new(5000, 200)
+      assert_equal 200, ts[0]
+      assert_equal 5000, ts[1]
 
-    array = ts.map {|t| t }
-    assert_equal 2, array.length
+      array = ts.map {|t| t }
+      assert_equal 2, array.length
 
-    assert_equal 200, array[0]
-    assert_equal 5000, array[1]
+      assert_equal 200, array[0]
+      assert_equal 5000, array[1]
+    end
   end
 
 end

data/test/collection_test.rb

@@ -1,7 +1,7 @@
 require './test/test_helper'
 
 class TestCollection < Test::Unit::TestCase
-  @@connection ||= standard_connection(:op_timeout => 2)
+  @@connection ||= standard_connection(:op_timeout => 10)
   @@db   = @@connection.db(MONGO_TEST_DB)
   @@test = @@db.collection("test")
   @@version = @@connection.server_version
@@ -10,6 +10,16 @@ class TestCollection < Test::Unit::TestCase
     @@test.remove
   end
 
+  def test_capped_method
+    @@db.create_collection('normal')
+    assert !@@db['normal'].capped?
+    @@db.drop_collection('normal')
+
+    @@db.create_collection('c', :capped => true, :size => 100_000)
+    assert @@db['c'].capped?
+    @@db.drop_collection('c')
+  end
+
   def test_optional_pk_factory
     @coll_default_pk = @@db.collection('stuff')
     assert_equal BSON::ObjectId, @coll_default_pk.pk_factory
@@ -141,6 +151,35 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  def test_bulk_insert_with_continue_on_error
+    if @@version >= "2.0"
+      @@test.create_index([["foo", 1]], :unique => true)
+      docs = []
+      docs << {:foo => 1}
+      docs << {:foo => 1}
+      docs << {:foo => 2}
+      docs << {:foo => 3}
+      assert_raise OperationFailure do
+        @@test.insert(docs, :safe => true)
+      end
+      assert_equal 1, @@test.count
+      @@test.remove
+
+      docs = []
+      docs << {:foo => 1}
+      docs << {:foo => 1}
+      docs << {:foo => 2}
+      docs << {:foo => 3}
+      assert_raise OperationFailure do
+        @@test.insert(docs, :safe => true, :continue_on_error => true)
+      end
+      assert_equal 3, @@test.count
+
+      @@test.remove
+      @@test.drop_index("foo_1")
+    end
+  end
+
   def test_maximum_insert_size
     docs = []
     16.times do
@@ -275,9 +314,13 @@ class TestCollection < Test::Unit::TestCase
     @@test.drop
 
     assert_equal 0, @@test.count
-    @@test.save("x" => 1)
-    @@test.save("x" => 2)
+    @@test.save(:x => 1)
+    @@test.save(:x => 2)
     assert_equal 2, @@test.count
+
+    assert_equal 1, @@test.count(:query => {:x => 1})
+    assert_equal 1, @@test.count(:limit => 1)
+    assert_equal 0, @@test.count(:skip => 2)
   end
 
   # Note: #size is just an alias for #count.
@@ -762,6 +805,41 @@ class TestCollection < Test::Unit::TestCase
       assert_equal 1, @collection.size
     end
   end
+  
+  context "Drop index " do
+    setup do
+      @@db.drop_collection('test-collection')
+      @collection = @@db.collection('test-collection')
+    end
+
+    should "drop an index" do
+      @collection.create_index([['a', Mongo::ASCENDING]])
+      assert @collection.index_information['a_1']
+      @collection.drop_index([['a', Mongo::ASCENDING]])
+      assert_nil @collection.index_information['a_1']
+    end
+    
+    should "drop an index which was given a specific name" do
+      @collection.create_index([['a', Mongo::DESCENDING]], {:name => 'i_will_not_fear'})
+      assert @collection.index_information['i_will_not_fear']
+      @collection.drop_index([['a', Mongo::DESCENDING]])
+      assert_nil @collection.index_information['i_will_not_fear']
+    end
+  
+    should "drops an composite index" do
+      @collection.create_index([['a', Mongo::DESCENDING], ['b', Mongo::ASCENDING]])
+      assert @collection.index_information['a_-1_b_1']
+      @collection.drop_index([['a', Mongo::DESCENDING], ['b', Mongo::ASCENDING]])
+      assert_nil @collection.index_information['a_-1_b_1']
+    end
+    
+    should "drops an index with symbols" do
+      @collection.create_index([['a', Mongo::DESCENDING], [:b, Mongo::ASCENDING]])
+      assert @collection.index_information['a_-1_b_1']
+      @collection.drop_index([['a', Mongo::DESCENDING], [:b, Mongo::ASCENDING]])
+      assert_nil @collection.index_information['a_-1_b_1']
+    end
+  end
 
   context "Creating indexes " do
     setup do
@@ -809,6 +887,14 @@ class TestCollection < Test::Unit::TestCase
       assert_equal 1, @collection.find({:a => 1}).count
     end
 
+    should "drop duplicates with ensure_index and drop_dups key" do
+      @collection.insert({:a => 1})
+      @collection.insert({:a => 1})
+      assert_equal 2, @collection.find({:a => 1}).count
+      @collection.ensure_index([['a', Mongo::ASCENDING]], :unique => true, :drop_dups => true)
+      assert_equal 1, @collection.find({:a => 1}).count
+    end
+
     should "create an index in the background" do
       if @@version > '1.3.1'
         @collection.create_index([['b', Mongo::ASCENDING]], :background => true)