mongodb-mongo 0.12 → 0.13

data/lib/mongo/types/regexp_of_holding.rb

@@ -14,31 +14,27 @@
 # limitations under the License.
 # ++
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      # A Regexp that can hold on to extra options and ignore them. Mongo
-      # regexes may contain option characters beyond 'i', 'm', and 'x'. (Note
-      # that Mongo only uses those three, but that regexes coming from other
-      # languages may store different option characters.)
-      #
-      # Note that you do not have to use this class at all if you wish to
-      # store regular expressions in Mongo. The Mongo and Ruby regex option
-      # flags are the same. Storing regexes is discouraged, in any case.
-      class RegexpOfHolding < Regexp
+  # A Regexp that can hold on to extra options and ignore them. Mongo
+  # regexes may contain option characters beyond 'i', 'm', and 'x'. (Note
+  # that Mongo only uses those three, but that regexes coming from other
+  # languages may store different option characters.)
+  #
+  # Note that you do not have to use this class at all if you wish to
+  # store regular expressions in Mongo. The Mongo and Ruby regex option
+  # flags are the same. Storing regexes is discouraged, in any case.
+  class RegexpOfHolding < Regexp
 
-        attr_accessor :extra_options_str
-
-        # +str+ and +options+ are the same as Regexp. +extra_options_str+
-        # contains all the other flags that were in Mongo but we do not use or
-        # understand.
-        def initialize(str, options, extra_options_str)
-          super(str, options)
-          @extra_options_str = extra_options_str
-        end
-      end
+    attr_accessor :extra_options_str
 
+    # +str+ and +options+ are the same as Regexp. +extra_options_str+
+    # contains all the other flags that were in Mongo but we do not use or
+    # understand.
+    def initialize(str, options, extra_options_str)
+      super(str, options)
+      @extra_options_str = extra_options_str
     end
   end
+
 end

data/lib/mongo/types/undefined.rb

@@ -14,18 +14,15 @@
 # limitations under the License.
 # ++
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      # A special "undefined" type to match Mongo's storage of UNKNOWN values.
-      # "UNKNOWN" comes from JavaScript.
-      #
-      # NOTE: this class does not attempt to provide ANY of the semantics an
-      # "unknown" object might need. It isn't nil, it isn't special in any
-      # way, and there isn't any singleton value.
-      class Undefined < Object; end
+  # DEPRECATED - the ruby driver converts the BSON undefined type to nil,
+  # and saves this type as nil
+  class Undefined < Object
 
+    def initialize
+      super
+      warn "the Undefined type is deprecated and will be removed - BSON undefineds get implicitly converted to nil now"
     end
   end
 end

data/lib/mongo/util/bson.rb

@@ -26,7 +26,7 @@ require 'mongo/types/undefined'
 # A BSON seralizer/deserializer.
 class BSON
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   MINKEY = -1
   EOO = 0
@@ -135,7 +135,7 @@ class BSON
     when BINARY
       serialize_binary_element(@buf, k, v)
     when UNDEFINED
-      serialize_undefined_element(@buf, k)
+      serialize_null_element(@buf, k)
     when CODE_W_SCOPE
       serialize_code_w_scope(@buf, k, v)
     else
@@ -207,7 +207,7 @@ class BSON
           doc[key] = nil
         when UNDEFINED
           key = deserialize_cstr(@buf)
-          doc[key] = Undefined.new
+          doc[key] = nil
         when REF
           key = deserialize_cstr(@buf)
           doc[key] = deserialize_dbref_data(@buf)
@@ -385,11 +385,6 @@ class BSON
     end
   end
 
-  def serialize_undefined_element(buf, key)
-    buf.put(UNDEFINED)
-    self.class.serialize_cstr(buf, key)
-  end
-
   def serialize_boolean_element(buf, key, val)
     buf.put(BOOLEAN)
     self.class.serialize_cstr(buf, key)
@@ -543,7 +538,7 @@ class BSON
     when Symbol
       SYMBOL
     when Undefined
-      UNDEFINED
+      NULL
     else
       raise "Unknown type of object: #{o.class.name}"
     end

data/lib/mongo/util/xml_to_ruby.rb

@@ -21,7 +21,7 @@ require 'mongo'
 # an OrderedHash.
 class XMLToRuby
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def xml_to_ruby(io)
     doc = REXML::Document.new(io)
@@ -63,8 +63,6 @@ class XMLToRuby
       regex_to_ruby(e.elements)
     when 'null'
       nil
-    when 'undefined'
-      Undefined.new
     when 'doc'
       doc_to_ruby(e)
     else

data/mongo-ruby-driver.gemspec

@@ -19,6 +19,7 @@ PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
                  'examples/types.rb',
                  'lib/mongo/admin.rb',
                  'lib/mongo/collection.rb',
+                 'lib/mongo/connection.rb',
                  'lib/mongo/cursor.rb',
                  'lib/mongo/db.rb',
                  'lib/mongo/gridfs/chunk.rb',
@@ -36,7 +37,6 @@ PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
                  'lib/mongo/message/remove_message.rb',
                  'lib/mongo/message/update_message.rb',
                  'lib/mongo/message.rb',
-                 'lib/mongo/mongo.rb',
                  'lib/mongo/query.rb',
                  'lib/mongo/types/binary.rb',
                  'lib/mongo/types/code.rb',
@@ -49,40 +49,41 @@ PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
                  'lib/mongo/util/ordered_hash.rb',
                  'lib/mongo/util/xml_to_ruby.rb',
                  'lib/mongo.rb']
-TEST_FILES = ['tests/mongo-qa/_common.rb',
-              'tests/mongo-qa/admin',
-              'tests/mongo-qa/capped',
-              'tests/mongo-qa/count1',
-              'tests/mongo-qa/dbs',
-              'tests/mongo-qa/find',
-              'tests/mongo-qa/find1',
-              'tests/mongo-qa/gridfs_in',
-              'tests/mongo-qa/gridfs_out',
-              'tests/mongo-qa/indices',
-              'tests/mongo-qa/remove',
-              'tests/mongo-qa/stress1',
-              'tests/mongo-qa/test1',
-              'tests/mongo-qa/update',
-              'tests/test_admin.rb',
-              'tests/test_bson.rb',
-              'tests/test_byte_buffer.rb',
-              'tests/test_chunk.rb',
-              'tests/test_collection.rb',
-              'tests/test_cursor.rb',
-              'tests/test_db.rb',
-              'tests/test_db_api.rb',
-              'tests/test_db_connection.rb',
-              'tests/test_grid_store.rb',
-              'tests/test_message.rb',
-              'tests/test_mongo.rb',
-              'tests/test_objectid.rb',
-              'tests/test_ordered_hash.rb',
-              'tests/test_threading.rb',
-              'tests/test_round_trip.rb']
+TEST_FILES = ['test/mongo-qa/_common.rb',
+              'test/mongo-qa/admin',
+              'test/mongo-qa/capped',
+              'test/mongo-qa/count1',
+              'test/mongo-qa/dbs',
+              'test/mongo-qa/find',
+              'test/mongo-qa/find1',
+              'test/mongo-qa/gridfs_in',
+              'test/mongo-qa/gridfs_out',
+              'test/mongo-qa/indices',
+              'test/mongo-qa/remove',
+              'test/mongo-qa/stress1',
+              'test/mongo-qa/test1',
+              'test/mongo-qa/update',
+              'test/test_admin.rb',
+              'test/test_bson.rb',
+              'test/test_byte_buffer.rb',
+              'test/test_chunk.rb',
+              'test/test_collection.rb',
+              'test/test_connection.rb',
+              'test/test_cursor.rb',
+              'test/test_db.rb',
+              'test/test_db_api.rb',
+              'test/test_db_connection.rb',
+              'test/test_grid_store.rb',
+              'test/test_message.rb',
+              'test/test_objectid.rb',
+              'test/test_ordered_hash.rb',
+              'test/test_threading.rb',
+              'test/test_round_trip.rb',
+              'test/test_xgen.rb']
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.12'
+  s.version = '0.13'
   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}/mongo-qa/_common.rb

@@ -5,4 +5,4 @@ DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 27017
 DEFAULT_DB = 'driver_test_framework'
 
-include XGen::Mongo::Driver
+include Mongo

data/{tests → test}/mongo-qa/admin

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 db.collection('test').insert({'test' => 1})
 admin = db.admin

data/{tests → test}/mongo-qa/capped

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 if $DEBUG
   db.drop_collection('capped1')

data/{tests → test}/mongo-qa/count1

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 if $DEBUG
   3.times { |i| db.drop_collection("test#{i+1}") }
@@ -13,6 +13,6 @@ end
 
 puts db.collection('test1').count
 puts db.collection('test2').count
-puts db.collection('test3').count('i' => 'a')
-puts db.collection('test3').count('i' => 3)
-puts db.collection('test3').count({'i' => {'$gte' => 67}})
+puts db.collection('test3').find('i' => 'a').count
+puts db.collection('test3').find('i' => 3).count
+puts db.collection('test3').find({'i' => {'$gte' => 67}}).count

data/{tests → test}/mongo-qa/dbs

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 if $DEBUG
   3.times { |i| db.drop_collection("dbs_#{i+1}") }

data/{tests → test}/mongo-qa/find

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 if $DEBUG
   db.drop_collection('test')

data/{tests → test}/mongo-qa/find1

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 if $DEBUG
   db.drop_collection('c')

data/{tests → test}/mongo-qa/gridfs_in

@@ -3,9 +3,9 @@
 require File.join(File.dirname(__FILE__), '_common.rb')
 
 require 'mongo/gridfs'
-include XGen::Mongo::GridFS
+include GridFS
 
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 input_file = ARGV[0]
 

data/{tests → test}/mongo-qa/gridfs_out

@@ -3,9 +3,9 @@
 require File.join(File.dirname(__FILE__), '_common.rb')
 
 require 'mongo/gridfs'
-include XGen::Mongo::GridFS
+include GridFS
 
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 input_file = ARGV[0]
 output_file = ARGV[1]

data/{tests → test}/mongo-qa/indices

@@ -2,9 +2,9 @@
 
 require File.join(File.dirname(__FILE__), '_common.rb')
 
-include XGen::Mongo
+include Mongo
 
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 x = db.collection('x')
 y = db.collection('y')
 

data/{tests → test}/mongo-qa/remove

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
 if $DEBUG
   c = db.collection('remove1')

data/{tests → test}/mongo-qa/stress1

@@ -3,7 +3,7 @@
 LONG_STRING = "lksjhasoh1298alshasoidiohaskjasiouashoasasiugoas" * 6
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 c = db.collection('stress1')
 
 n1 = 50_000

data/{tests → test}/mongo-qa/test1

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 coll = db.collection('part1')
 
 if $DEBUG

data/{tests → test}/mongo-qa/update

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 foo = db.collection('foo')
 
 if $DEBUG

data/{tests → test}/test_admin.rb

@@ -5,10 +5,10 @@ require 'test/unit'
 # NOTE: assumes Mongo is running
 class AdminTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
-  @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                   ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-test')
+  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
   @@coll = @@db.collection('test')
 
   def setup

data/{tests → test}/test_bson.rb

@@ -5,7 +5,7 @@ require 'test/unit'
 
 class BSONTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def setup
     # We don't pass a DB to the constructor, even though we are about to test
@@ -85,7 +85,7 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, doc2
 
     r = doc2['doc']
-    assert_kind_of XGen::Mongo::Driver::RegexpOfHolding, r
+    assert_kind_of RegexpOfHolding, r
     assert_equal '', r.extra_options_str
 
     r.extra_options_str << 'zywcab'
@@ -99,7 +99,7 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, doc2
 
     r = doc2['doc']
-    assert_kind_of XGen::Mongo::Driver::RegexpOfHolding, r
+    assert_kind_of RegexpOfHolding, r
     assert_equal 'abcwyz', r.extra_options_str # must be sorted
   end
 
@@ -183,7 +183,7 @@ class BSONTest < Test::Unit::TestCase
     doc = {'undef' => Undefined.new}
     @b.serialize(doc)
     doc2 = @b.deserialize
-    assert_kind_of Undefined, doc2['undef']
+    assert_equal nil, doc2['undef']
   end
 
   def test_put_id_first

data/{tests → test}/test_chunk.rb

@@ -5,11 +5,11 @@ require 'mongo/gridfs'
 
 class ChunkTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
-  include XGen::Mongo::GridFS
+  include Mongo
+  include GridFS
 
-  @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                   ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-utils-test')
+  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-utils-test')
   @@files = @@db.collection('gridfs.files')
   @@chunks = @@db.collection('gridfs.chunks')