mongodb-mongo 0.10.1 → 0.11

data/lib/mongo/collection.rb

@@ -26,6 +26,24 @@ module XGen
         attr_reader :db, :name, :hint
 
         def initialize(db, name)
+          case name
+          when Symbol, String
+          else
+            raise RuntimeError, "new_name must be a string or symbol"
+          end
+
+          name = name.to_s
+
+          if name.empty? or name.include? ".."
+            raise RuntimeError, "collection names cannot be empty"
+          end
+          if name.include? "$" and not name.match(/^\$cmd/)
+            raise RuntimeError, "collection names must not contain '$'"
+          end
+          if name.match(/^\./) or name.match(/\.$/)
+            raise RuntimeError, "collection names must not start or end with '.'"
+          end
+
           @db, @name = db, name
           @hint = nil
         end
@@ -192,6 +210,35 @@ EOS
                                    }))["result"]
         end
 
+        # Rename this collection.
+        #
+        # If operating in auth mode, client must be authorized as an admin to
+        # perform this operation. Raises an error if +new_name+ is an invalid
+        # collection name.
+        #
+        # :new_name :: new name for this collection
+        def rename(new_name)
+          case new_name
+          when Symbol, String
+          else
+            raise RuntimeError, "new_name must be a string or symbol"
+          end
+
+          new_name = new_name.to_s
+
+          if new_name.empty? or new_name.include? ".."
+            raise RuntimeError, "collection names cannot be empty"
+          end
+          if new_name.include? "$"
+            raise RuntimeError, "collection names must not contain '$'"
+          end
+          if new_name.match(/^\./) or new_name.match(/\.$/)
+            raise RuntimeError, "collection names must not start or end with '.'"
+          end
+
+          @db.rename_collection(@name, new_name)
+        end
+
         # Get information on the indexes for the collection +collection_name+.
         # Returns a hash where the keys are index names (as returned by
         # Collection#create_index and the values are lists of [key, direction]

data/lib/mongo/cursor.rb

@@ -31,8 +31,8 @@ module XGen
 
         attr_reader :db, :collection, :query
 
-        def initialize(db, collection, query)
-          @db, @collection, @query = db, collection, query
+        def initialize(db, collection, query, admin=false)
+          @db, @collection, @query, @admin = db, collection, query, admin
           @num_to_return = @query.number_to_return || 0
           @cache = []
           @closed = false
@@ -194,8 +194,10 @@ module XGen
         def refill_via_get_more
           send_query_if_needed
           return if @cursor_id == 0
-          @db.send_to_db(GetMoreMessage.new(@db.name, @collection.name, @cursor_id))
-          read_all
+          @db._synchronize {
+            @db.send_to_db(GetMoreMessage.new(@admin ? 'admin' : @db.name, @collection.name, @cursor_id))
+            read_all
+          }
         end
 
         def object_from_stream
@@ -212,9 +214,11 @@ module XGen
         def send_query_if_needed
           # Run query first time we request an object from the wire
           unless @query_run
-            @db.send_query_message(QueryMessage.new(@db.name, @collection.name, @query))
-            @query_run = true
-            read_all
+            @db._synchronize {
+              @db.send_query_message(QueryMessage.new(@admin ? 'admin' : @db.name, @collection.name, @query))
+              @query_run = true
+              read_all
+            }
           end
         end
 

data/lib/mongo/db.rb

@@ -173,12 +173,11 @@ module XGen
           raise "error logging out: #{doc.inspect}" unless ok?(doc)
         end
 
-        # Returns an array of collection names. Each name is of the form
-        # "database_name.collection_name".
+        # Returns an array of collection names in this database.
         def collection_names
           names = collections_info.collect { |doc| doc['name'] || '' }
-          names.delete('')
-          names
+          names = names.delete_if {|name| name.index(@name).nil? || name.index('$')}
+          names.map {|name| name.sub(@name + '.', '')}
         end
 
         # Returns a cursor over query result hashes. Each hash contains a
@@ -205,7 +204,7 @@ module XGen
         # :max :: Max number of records in a capped collection. Optional.
         def create_collection(name, options={})
           # First check existence
-          if collection_names.include?(full_coll_name(name))
+          if collection_names.include?(name)
             if strict?
               raise "Collection #{name} already exists. Currently in strict mode."
             else
@@ -230,14 +229,14 @@ module XGen
         # new collection. If +strict+ is true, will raise an error if
         # collection +name+ does not already exists.
         def collection(name)
-          return Collection.new(self, name) if !strict? || collection_names.include?(full_coll_name(name))
+          return Collection.new(self, name) if !strict? || collection_names.include?(name)
           raise "Collection #{name} doesn't exist. Currently in strict mode."
         end
 
         # Drop collection +name+. Returns +true+ on success or if the
         # collection does not exist, +false+ otherwise.
         def drop_collection(name)
-          return true unless collection_names.include?(full_coll_name(name))
+          return true unless collection_names.include?(name)
 
           ok?(db_command(:drop => name))
         end
@@ -340,21 +339,19 @@ module XGen
         # Note that the query gets sent lazily; the cursor calls
         # #send_query_message when needed. If the caller never requests an
         # object from the cursor, the query never gets sent.
-        def query(collection, query)
-          Cursor.new(self, collection, query)
+        def query(collection, query, admin=false)
+          Cursor.new(self, collection, query, admin)
         end
 
         # Used by a Cursor to lazily send the query to the database.
         def send_query_message(query_message)
-          @semaphore.synchronize {
-            send_to_db(query_message)
-          }
+          send_to_db(query_message)
         end
 
         # Remove the records that match +selector+ from +collection_name+.
         # Normally called by Collection#remove or Collection#clear.
         def remove_from_db(collection_name, selector)
-          @semaphore.synchronize {
+          _synchronize {
             send_to_db(RemoveMessage.new(@name, collection_name, selector))
           }
         end
@@ -362,7 +359,7 @@ module XGen
         # Update records in +collection_name+ that match +selector+ by
         # applying +obj+ as an update. Normally called by Collection#replace.
         def replace_in_db(collection_name, selector, obj)
-          @semaphore.synchronize {
+          _synchronize {
             send_to_db(UpdateMessage.new(@name, collection_name, selector, obj, false))
           }
         end
@@ -374,7 +371,7 @@ module XGen
         # applying +obj+ as an update. If no match, inserts (???). Normally
         # called by Collection#repsert.
         def repsert_in_db(collection_name, selector, obj)
-          @semaphore.synchronize {
+          _synchronize {
             obj = @pk_factory.create_pk(obj) if @pk_factory
             send_to_db(UpdateMessage.new(@name, collection_name, selector, obj, true))
             obj
@@ -416,6 +413,16 @@ module XGen
           raise "Error with eval command: #{doc.inspect}"
         end
 
+        # Rename collection +from+ to +to+. Meant to be called by
+        # Collection#rename.
+        def rename_collection(from, to)
+          oh = OrderedHash.new
+          oh[:renameCollection] = "#{@name}.#{from}"
+          oh[:to] = "#{@name}.#{to}"
+          doc = db_command(oh, true)
+          raise "Error renaming collection: #{doc.inspect}" unless ok?(doc)
+        end
+
         # Drop index +name+ from +collection_name+. Normally called from
         # Collection#drop_index or Collection#drop_indexes.
         def drop_index(collection_name, name)
@@ -460,7 +467,7 @@ module XGen
             :key => field_h,
             :unique => unique
           }
-          @semaphore.synchronize {
+          _synchronize {
             send_to_db(InsertMessage.new(@name, SYSTEM_INDEX_COLLECTION, false, sel))
           }
           name
@@ -470,7 +477,7 @@ module XGen
         # Collection#insert. Returns a new array containing +objects+,
         # possibly modified by @pk_factory.
         def insert_into_db(collection_name, objects)
-          @semaphore.synchronize {
+          _synchronize {
             if @pk_factory
               objects.collect! { |o|
                 @pk_factory.create_pk(o)
@@ -511,7 +518,7 @@ module XGen
         # that the "command" key be first.
         #
         # Do not call this. Intended for driver use only.
-        def db_command(selector)
+        def db_command(selector, use_admin_db=false)
           if !selector.kind_of?(OrderedHash)
             if !selector.kind_of?(Hash) || selector.keys.length > 1
               raise "db_command must be given an OrderedHash when there is more than one key"
@@ -520,7 +527,11 @@ module XGen
 
           q = Query.new(selector)
           q.number_to_return = 1
-          query(Collection.new(self, SYSTEM_COMMAND_COLLECTION), q).next_object
+          query(Collection.new(self, SYSTEM_COMMAND_COLLECTION), q, use_admin_db).next_object
+        end
+
+        def _synchronize &block
+          @semaphore.synchronize &block
         end
 
         private

data/lib/mongo/util/bson.rb

@@ -47,6 +47,7 @@ class BSON
   CODE_W_SCOPE = 15
   NUMBER_INT = 16
   TIMESTAMP = 17
+  NUMBER_LONG = 18
   MAXKEY = 127
 
   if RUBY_VERSION >= '1.9'
@@ -180,6 +181,9 @@ class BSON
         when NUMBER_INT
           key = deserialize_cstr(@buf)
           doc[key] = deserialize_number_int_data(@buf)
+        when NUMBER_LONG
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_number_long_data(@buf)
         when OID
           key = deserialize_cstr(@buf)
           doc[key] = deserialize_oid_data(@buf)
@@ -263,6 +267,12 @@ class BSON
     unsigned >= 2**32 / 2 ? unsigned - 2**32 : unsigned
   end
 
+  def deserialize_number_long_data(buf)
+    # same note as above applies here...
+    unsigned = buf.get_long
+    unsigned >= 2 ** 64 / 2 ? unsigned - 2**64 : unsigned
+  end
+
   def deserialize_object_data(buf)
     size = buf.get_int
     buf.position -= 4
@@ -394,15 +404,23 @@ class BSON
   end
 
   def serialize_number_element(buf, key, val, type)
-    buf.put(type)
-    self.class.serialize_cstr(buf, key)
     if type == NUMBER
+      buf.put(type)
+      self.class.serialize_cstr(buf, key)
       buf.put_double(val)
     else
+      if val > 2**64 / 2 - 1 or val < -2**64 / 2
+        raise RangeError.new("MongoDB can only handle 8-byte ints")
+      end
       if val > 2**32 / 2 - 1 or val < -2**32 / 2
-        raise RangeError.new("MongoDB can only handle 4-byte ints - try converting to a double before saving")
+        buf.put(NUMBER_LONG)
+        self.class.serialize_cstr(buf, key)
+        buf.put_long(val)
+      else
+        buf.put(type)
+        self.class.serialize_cstr(buf, key)
+        buf.put_int(val)
       end
-      buf.put_int(val)
     end
   end
 

data/mongo-ruby-driver.gemspec

@@ -75,11 +75,12 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
               'tests/test_mongo.rb',
               'tests/test_objectid.rb',
               'tests/test_ordered_hash.rb',
+              'tests/test_threading.rb',
               'tests/test_round_trip.rb']
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.10.1'
+  s.version = '0.11'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby driver for the 10gen Mongo DB'
   s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_bson.rb

@@ -215,18 +215,32 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_overflow
-    doc = {"x" => 2**45}
+    doc = {"x" => 2**75}
     assert_raise RangeError do
       @b.serialize(doc)
     end
 
-    doc = {"x" => 2147483647}
+    doc = {"x" => 9223372036854775}
+    assert_equal doc, @b.deserialize(@b.serialize(doc).to_a)
+
+    doc = {"x" => 9223372036854775807}
     assert_equal doc, @b.deserialize(@b.serialize(doc).to_a)
 
     doc["x"] = doc["x"] + 1
     assert_raise RangeError do
       @b.serialize(doc)
     end
+
+    doc = {"x" => -9223372036854775}
+    assert_equal doc, @b.deserialize(@b.serialize(doc).to_a)
+
+    doc = {"x" => -9223372036854775808}
+    assert_equal doc, @b.deserialize(@b.serialize(doc).to_a)
+
+    doc["x"] = doc["x"] - 1
+    assert_raise RangeError do
+      @b.serialize(doc)
+    end
   end
 
   def test_do_not_change_original_object

data/tests/test_db.rb

@@ -51,6 +51,18 @@ class DBTest < Test::Unit::TestCase
     assert_equal 'ruby-mongo-test.test', @@db.full_coll_name(coll.name)
   end
 
+  def test_collection_names
+    @@db.collection("test").insert("foo" => 5)
+    @@db.collection("test.mike").insert("bar" => 0)
+
+    colls = @@db.collection_names()
+    assert colls.include?("test")
+    assert colls.include?("test.mike")
+    colls.each { |name|
+      assert !name.include?("$")
+    }
+  end
+
   def test_pair
     @@db.close
     @@users = nil

data/tests/test_db_api.rb

@@ -241,25 +241,25 @@ class DBAPITest < Test::Unit::TestCase
 
   def test_drop_collection
     assert @@db.drop_collection(@@coll.name), "drop of collection #{@@coll.name} failed"
-    assert !@@db.collection_names.include?(@@coll_full_name)
+    assert !@@db.collection_names.include?(@@coll.name)
   end
 
   def test_other_drop
-    assert @@db.collection_names.include?(@@coll_full_name)
+    assert @@db.collection_names.include?(@@coll.name)
     @@coll.drop
-    assert !@@db.collection_names.include?(@@coll_full_name)
+    assert !@@db.collection_names.include?(@@coll.name)
   end
 
   def test_collection_names
     names = @@db.collection_names
     assert names.length >= 1
-    assert names.include?(@@coll_full_name)
+    assert names.include?(@@coll.name)
 
     coll2 = @@db.collection('test2')
     coll2.insert('a' => 1)      # collection not created until it's used
     names = @@db.collection_names
     assert names.length >= 2
-    assert names.include?(@@coll_full_name)
+    assert names.include?(@@coll.name)
     assert names.include?('ruby-mongo-test.test2')
   ensure
     @@db.drop_collection('test2')
@@ -639,6 +639,28 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 2, @@coll.count
   end
 
+  def test_save_long
+    @@coll.clear
+    @@coll.insert("x" => 9223372036854775807)
+    assert_equal 9223372036854775807, @@coll.find_first()["x"]
+  end
+
+  def test_find_by_oid
+    @@coll.clear
+
+    @@coll.save("hello" => "mike")
+    id = @@coll.save("hello" => "world")
+    assert_kind_of ObjectID, id
+
+    assert_equal "world", @@coll.find_first(:_id => id)["hello"]
+    @@coll.find(:_id => id).to_a.each do |doc|
+      assert_equal "world", doc["hello"]
+    end
+
+    id = ObjectID.from_string(id.to_s)
+    assert_equal "world", @@coll.find_first(:_id => id)["hello"]
+  end
+
   def test_save_with_object_that_has_id_but_does_not_actually_exist_in_collection
     @@coll.clear
 
@@ -691,6 +713,74 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.modify({"hello" => "world"}, {"$inc" => "hello"})
   end
 
+  def test_collection_names
+    assert_raise RuntimeError do
+      @@db.collection(5)
+    end
+    assert_raise RuntimeError do
+      @@db.collection("")
+    end
+    assert_raise RuntimeError do
+      @@db.collection("te$t")
+    end
+    assert_raise RuntimeError do
+      @@db.collection(".test")
+    end
+    assert_raise RuntimeError do
+      @@db.collection("test.")
+    end
+    assert_raise RuntimeError do
+      @@db.collection("tes..t")
+    end
+  end
+
+  def test_rename_collection
+    @@db.drop_collection("foo")
+    @@db.drop_collection("bar")
+    a = @@db.collection("foo")
+    b = @@db.collection("bar")
+
+    assert_raise RuntimeError do
+      a.rename(5)
+    end
+    assert_raise RuntimeError do
+      a.rename("")
+    end
+    assert_raise RuntimeError do
+      a.rename("te$t")
+    end
+    assert_raise RuntimeError do
+      a.rename(".test")
+    end
+    assert_raise RuntimeError do
+      a.rename("test.")
+    end
+    assert_raise RuntimeError do
+      a.rename("tes..t")
+    end
+
+    assert_equal 0, a.count()
+    assert_equal 0, b.count()
+
+    a.insert("x" => 1)
+    a.insert("x" => 2)
+
+    assert_equal 2, a.count()
+
+    a.rename("bar")
+
+    assert_equal 0, a.count()
+    assert_equal 2, b.count()
+
+    assert_equal 1, b.find().to_a()[0]["x"]
+    assert_equal 2, b.find().to_a()[1]["x"]
+
+    b.rename(:foo)
+
+    assert_equal 2, a.count()
+    assert_equal 0, b.count()
+  end
+
 # TODO this test fails with error message "Undefed Before end of object"
 # That is a database error. The undefined type may go away.
 

data/tests/test_threading.rb

@@ -0,0 +1,37 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+class TestThreading < Test::Unit::TestCase
+
+  include XGen::Mongo::Driver
+
+  @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
+  @@db = Mongo.new(@@host, @@port).db('ruby-mongo-test')
+  @@coll = @@db.collection('thread-test-collection')
+
+  def test_threading
+    @@coll.clear
+
+    1000.times do |i|
+      @@coll.insert("x" => i)
+    end
+
+    threads = []
+
+    10.times do |i|
+      threads[i] = Thread.new{
+        sum = 0
+        @@coll.find().each { |document|
+          sum += document["x"]
+        }
+        assert_equal 499500, sum
+      }
+    end
+
+    10.times do |i|
+      threads[i].join
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: "0.11"
 platform: ruby
 authors: 
 - Jim Menard
@@ -130,4 +130,5 @@ test_files:
 - tests/test_mongo.rb
 - tests/test_objectid.rb
 - tests/test_ordered_hash.rb
+- tests/test_threading.rb
 - tests/test_round_trip.rb