mongodb-mongo 0.5.3 → 0.6.1

data/examples/types.rb

@@ -0,0 +1,40 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'pp'
+
+include XGen::Mongo::Driver
+
+host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+port = ENV['MONGO_RUBY_DRIVER_PORT'] || XGen::Mongo::Driver::Mongo::DEFAULT_PORT
+
+puts "Connecting to #{host}:#{port}"
+db = Mongo.new(host, port).db('ruby-mongo-examples')
+coll = db.collection('test')
+
+# Remove all records, if any
+coll.clear
+
+# Insert record with all sorts of values
+coll.insert('array' => [1, 2, 3],
+            'string' => 'hello',
+            'hash' => {'a' => 1, 'b' => 2},
+            'date' => Time.now, # milliseconds only; microseconds are not stored
+            'oid' => ObjectID.new,
+            'binary' => Binary.new([1, 2, 3]),
+            'int' => 42,
+            'float' => 33.33333,
+            'regex' => /foobar/i,
+            'boolean' => true,
+            '$where' => 'this.x == 3', # special case of string
+            'dbref' => DBRef.new(nil, 'dbref', db, coll.name, ObjectID.new),
+
+# NOTE: the undefined type is not saved to the database properly. This is a
+# Mongo bug. However, the undefined type may go away completely.
+#             'undef' => Undefined.new,
+
+            'null' => nil,
+            'symbol' => :zildjian)
+
+pp coll.find().next_object
+
+coll.clear

data/lib/mongo/collection.rb

@@ -26,8 +26,8 @@ module XGen
         attr_reader :db, :name, :hint
 
         def initialize(db, name)
-          @db = db
-          @name = name
+          @db, @name = db, name
+          @hint = nil
         end
 
         # Set hint fields to use and return +self+. hint may be a single field
@@ -65,6 +65,14 @@ module XGen
           @db.query(self, Query.new(selector, fields, offset, limit, sort, hint))
         end
 
+        # Find the first record that matches +selector+. See #find.
+        def find_first(selector={}, options={})
+          h = options.dup
+          h[:limit] = 1
+          cursor = find(selector, h)
+          cursor.next_object    # don't need to explicitly close b/c of limit 
+        end
+
         # Insert +objects+, which are hashes. "<<" is aliased to this method.
         # Returns either the single inserted object or a new array containing
         # +objects+. The object(s) may have been modified by the database's PK

data/lib/mongo/cursor.rb

@@ -38,6 +38,7 @@ module XGen
           @closed = false
           @can_call_to_a = true
           @query_run = false
+          @rows = nil
         end
 
         def closed?; @closed; end
@@ -133,6 +134,10 @@ module XGen
         end
 
         # Close the cursor.
+        #
+        # Note: if a cursor is read until exhausted (read until OP_QUERY or
+        # OP_GETMORE returns zero for the cursor id), there is no need to
+        # close it by calling this method.
         def close
           @db.send_to_db(KillCursorsMessage.new(@cursor_id)) if @cursor_id
           @cache = []

data/lib/mongo/db.rb

@@ -122,6 +122,7 @@ module XGen
           @auto_reconnect = options[:auto_reconnect]
           @semaphore = Object.new
           @semaphore.extend Mutex_m
+          @socket = nil
           connect_to_master
         end
 
@@ -132,6 +133,7 @@ module XGen
             @host, @port = *hp
             begin
               @socket = TCPSocket.new(@host, @port)
+              @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
               # Check for master. Can't call master? because it uses mutex,
               # which may already be in use during this call.

data/lib/mongo/gridfs/chunk.rb

@@ -8,8 +8,6 @@ module XGen
     module GridFS
 
       # A chunk stores a portion of GridStore data.
-      #
-      # TODO: user-defined chunk size
       class Chunk
 
         DEFAULT_CHUNK_SIZE = 1024 * 256

data/lib/mongo/gridfs/grid_store.rb

@@ -201,13 +201,13 @@ module XGen
 
         def gets(separator=$/)
           str = ''
-          byte = getc
+          byte = self.getc
           return nil if byte == nil # EOF
           while byte != nil
             s = byte.chr
             str << s
             break if s == separator
-            byte = getc
+            byte = self.getc
           end
           @lineno += 1
           str
@@ -215,17 +215,17 @@ module XGen
 
         def read(len=nil, buf=nil)
           buf ||= ''
-          byte = getc
+          byte = self.getc
           while byte != nil && (len == nil || len > 0)
             buf << byte.chr
             len -= 1 if len
-            byte = getc if (len == nil || len > 0)
+            byte = self.getc if (len == nil || len > 0)
           end
           buf
         end
 
         def readchar
-          byte = getc
+          byte = self.getc
           raise EOFError.new if byte == nil
           byte
         end
@@ -250,10 +250,10 @@ module XGen
         alias_method :each_line, :each
 
         def each_byte
-          byte = getc
+          byte = self.getc
           while byte
             yield byte
-            byte = getc
+            byte = self.getc
           end
         end
 
@@ -280,14 +280,14 @@ module XGen
           objs = [$_] if objs == nil || objs.empty?
           objs.each { |obj|
             str = obj.to_s
-            str.each_byte { |byte| putc(byte) }
+            str.each_byte { |byte| self.putc(byte) }
           }
           nil
         end
 
         def puts(*objs)
           if objs == nil || objs.empty?
-            putc(10)
+            self.putc(10)
           else
             print(*objs.collect{ |obj|
                     str = obj.to_s
@@ -307,7 +307,7 @@ module XGen
           raise "#@filename not opened for write" unless @mode[0] == ?w
           count = 0
           string.each_byte { |byte|
-            putc byte
+            self.putc byte
             count += 1
           }
           count

data/lib/mongo/message/query_message.rb

@@ -16,7 +16,7 @@ module XGen
           write_int(0)
           write_string("#{db_name}.#{collection_name}")
           write_int(query.number_to_skip)
-          write_int(query.number_to_return)
+          write_int(-query.number_to_return) # Negative means hard limit
           sel = query.selector
           if query.contains_special_fields
             sel = OrderedHash.new

data/lib/mongo/query.rb

@@ -65,6 +65,7 @@ module XGen
         def initialize(sel={}, return_fields=nil, number_to_skip=0, number_to_return=0, order_by=nil, hint=nil)
           @number_to_skip, @number_to_return, @order_by, @hint =
             number_to_skip, number_to_return, order_by, hint
+          @explain = nil
           self.selector = sel
           self.fields = return_fields
         end

data/lib/mongo/types/objectid.rb

@@ -64,7 +64,7 @@ module XGen
         # Given a string representation of an ObjectID, return a new ObjectID
         # with that value.
         def self.from_string(str)
-          raise "illegal ObjectID format" unless legal_oid_string(str)
+          raise "illegal ObjectID format" unless legal?(str)
           data = []
           BYTE_ORDER.each_with_index { |string_position, data_index|
             data[data_index] = str[string_position * 2, 2].to_i(16)
@@ -72,7 +72,7 @@ module XGen
           self.new(data)
         end
 
-        def self.legal_oid_string(str)
+        def self.legal?(str)
           len = BYTE_ORDER.length * 2
           str =~ /([0-9a-f]+)/i
           match = $1

data/lib/mongo/util/bson.rb

@@ -54,7 +54,7 @@ class BSON
     end
   else
     def self.to_utf8(str)
-      str                       # TODO punt for now
+      str                       # TODO Ruby 1.8 punt for now
     end
   end
 
@@ -117,7 +117,7 @@ class BSON
       when UNDEFINED
         serialize_undefined_element(@buf, k)
       when CODE_W_SCOPE
-        # TODO
+        # TODO CODE_W_SCOPE unimplemented; may be removed
         raise "unimplemented type #{type}"
       else
         raise "unhandled type #{type}"
@@ -177,7 +177,7 @@ class BSON
         key = deserialize_cstr(@buf)
         doc[key] = deserialize_binary_data(@buf)
       when CODE_W_SCOPE
-        # TODO
+        # TODO CODE_W_SCOPE unimplemented; may be removed
         raise "unimplemented type #{type}"
       when EOO
         break
@@ -393,7 +393,7 @@ class BSON
 
   def deserialize_cstr(buf)
     chars = ""
-    while 1
+    while true
       b = buf.get
       break if b == 0
       chars << b.chr

data/mongo-ruby-driver.gemspec

@@ -1,69 +1,88 @@
+PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
+                 'bin/mongo_console',
+                 'bin/run_test_script',
+                 'bin/standard_benchmark',
+                 'examples/admin.rb',
+                 'examples/benchmarks.rb',
+                 'examples/blog.rb',
+                 'examples/capped.rb',
+                 'examples/cursor.rb',
+                 'examples/gridfs.rb',
+                 'examples/index_test.rb',
+                 'examples/info.rb',
+                 'examples/queries.rb',
+                 'examples/simple.rb',
+                 'examples/strict.rb',
+                 'examples/types.rb',
+                 'lib/mongo/admin.rb',
+                 'lib/mongo/collection.rb',
+                 'lib/mongo/cursor.rb',
+                 'lib/mongo/db.rb',
+                 'lib/mongo/gridfs/chunk.rb',
+                 'lib/mongo/gridfs/grid_store.rb',
+                 'lib/mongo/gridfs.rb',
+                 'lib/mongo/message/get_more_message.rb',
+                 'lib/mongo/message/insert_message.rb',
+                 'lib/mongo/message/kill_cursors_message.rb',
+                 'lib/mongo/message/message.rb',
+                 'lib/mongo/message/message_header.rb',
+                 'lib/mongo/message/msg_message.rb',
+                 'lib/mongo/message/opcodes.rb',
+                 'lib/mongo/message/query_message.rb',
+                 '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/dbref.rb',
+                 'lib/mongo/types/objectid.rb',
+                 'lib/mongo/types/regexp_of_holding.rb',
+                 'lib/mongo/types/undefined.rb',
+                 'lib/mongo/util/bson.rb',
+                 'lib/mongo/util/byte_buffer.rb',
+                 '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/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_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_round_trip.rb']
+
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.5.3'
+  s.version = '0.6.2'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Simple pure-Ruby driver for the 10gen Mongo DB'
   s.description = 'A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'
 
   s.require_paths = ['lib']
   
-  s.files = ['bin/mongo_console', 'bin/run_test_script',
-             'examples/benchmarks.rb',
-             'examples/blog.rb',
-             'examples/index_test.rb',
-             'examples/simple.rb',
-             'lib/mongo.rb',
-             'lib/mongo/admin.rb',
-             'lib/mongo/collection.rb',
-             'lib/mongo/cursor.rb',
-             'lib/mongo/db.rb',
-             'lib/mongo/gridfs/chunk.rb',
-             'lib/mongo/gridfs/grid_store.rb',
-             'lib/mongo/gridfs.rb',
-             'lib/mongo/message/get_more_message.rb',
-             'lib/mongo/message/insert_message.rb',
-             'lib/mongo/message/kill_cursors_message.rb',
-             'lib/mongo/message/message.rb',
-             'lib/mongo/message/message_header.rb',
-             'lib/mongo/message/msg_message.rb',
-             'lib/mongo/message/opcodes.rb',
-             'lib/mongo/message/query_message.rb',
-             '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/dbref.rb',
-             'lib/mongo/types/objectid.rb',
-             'lib/mongo/types/regexp_of_holding.rb',
-             'lib/mongo/types/undefined.rb',
-             'lib/mongo/util/bson.rb',
-             'lib/mongo/util/byte_buffer.rb',
-             'lib/mongo/util/ordered_hash.rb',
-             'lib/mongo/util/xml_to_ruby.rb',
-             'README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec']
-  s.test_files = ['tests/mongo-qa/_common.rb',
-                  'tests/mongo-qa/capped',
-                  'tests/mongo-qa/circular',
-                  'tests/mongo-qa/count1',
-                  'tests/mongo-qa/find',
-                  'tests/mongo-qa/remove',
-                  'tests/mongo-qa/test1',
-                  'tests/test_admin.rb',
-                  'tests/test_bson.rb',
-                  'tests/test_byte_buffer.rb',
-                  'tests/test_chunk.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_round_trip.rb']
+  s.files = PACKAGE_FILES
+  s.test_files = TEST_FILES
   
   s.has_rdoc = true
   s.rdoc_options = ['--main', 'README.rdoc', '--inline-source']

data/tests/mongo-qa/admin

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+
+db.collection('test').insert({'test' => 1})
+admin = db.admin
+
+if $DEBUG
+  db.drop_collection('tester')
+  admin.profiling_level = :slow_only
+end
+
+['test', 'pdlskwmf', '$'].each { |name|
+  begin
+    admin.validate_collection(name)
+    puts 'true'
+  rescue => ex
+    puts 'false'
+  end
+}
+
+level_xlation = {:off => 'off', :all => 'all', :slow_only => 'slowOnly'}
+puts level_xlation[admin.profiling_level]
+admin.profiling_level = :off
+puts level_xlation[admin.profiling_level]

data/tests/mongo-qa/capped

@@ -3,6 +3,11 @@
 require File.join(File.dirname(__FILE__), '_common.rb')
 db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
+if $DEBUG
+  db.drop_collection('capped1')
+  db.drop_collection('capped2')
+end
+
 db.create_collection('capped1', :capped => true, :size => 500)
 coll = db.collection('capped1')
 coll.insert('x' => 1)