mongodb-mongo 0.5.1 → 0.5.2

data/README.rdoc

@@ -11,7 +11,8 @@ Start by reading the XGen::Mongo::Driver::Mongo and XGen::Mongo::Driver::DB
 documentation, then move on to XGen::Mongo::Driver::Collection and
 XGen::Mongo::Driver::Cursor.
 
-A quick code sample:
+Here is a quick code sample. See the files in the "examples" subdirectory for
+many more.
 
   require 'mongo'
 
@@ -49,17 +50,22 @@ you can install it as a gem from the source by typing
   $ rake gem:install
 
 
-= Demo
+= Examples
 
-You can see and run the examples if you've downloaded the source. Mongo must
-be running, of course.
+There are many examples in the "examples" subdirectory. Samples include using
+the driver and using the GridFS class GridStore. Mongo must be running for
+these examples to work, of course.
 
+Here's how to start mongo and run the "simple.rb" example:
+
+  $ cd path/to/mongo
+  $ ./mongod run
+  ... then in another window ...
+  $ cd path/to/mongo-ruby-driver
   $ ruby examples/simple.rb
 
 See also the test code, especially tests/test_db_api.rb.
 
-For the GridFS class GridStore, see the tests.
-
 
 = The Driver
 
@@ -211,6 +217,18 @@ object or call the :strict= method:
 
 The method DB#strict? returns the current value of that flag.
 
+== Cursors
+
+Random cursor fun facts:
+
+- Cursors are enumerable.
+
+- The query doesn't get run until you actually attempt to retrieve data from a
+  cursor.
+
+- Cursors have a to_a method.
+
+
 
 = Testing
 

data/examples/benchmarks.rb

@@ -8,7 +8,7 @@ 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 = XGen::Mongo::Driver::Mongo.new(host, port).db('ruby-mongo-examples-complex')
+db = XGen::Mongo::Driver::Mongo.new(host, port).db('ruby-mongo-examples')
 coll = db.collection('test')
 coll.clear
 

data/examples/index_test.rb

@@ -1,6 +1,3 @@
-require "rubygems"
-require "benchwarmer"
-
 class Exception
   def errmsg
     "%s: %s\n%s" % [self.class, message, (backtrace || []).join("\n") << "\n"]
@@ -38,7 +35,7 @@ OBJS_COUNT = 100
 
 puts ">> Generating test data"
 msgs = %w{hola hello aloha ciao}
-arr = OBJS_COUNT.times.map {|x| { :number => x, :rndm => (rand(5)+1), :msg => msgs[rand(4)] }}
+arr = (0...OBJS_COUNT).collect {|x| { :number => x, :rndm => (rand(5)+1), :msg => msgs[rand(4)] }}
 puts "generated"
 
 puts ">> Inserting data (#{arr.size})"

data/examples/simple.rb

@@ -7,11 +7,17 @@ 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-simple')
+db = Mongo.new(host, port).db('ruby-mongo-examples')
 coll = db.collection('test')
+
+# Erase all records from collection, if any
 coll.clear
 
+# Insert 3 records
 3.times { |i| coll.insert({'a' => i+1}) }
 
 puts "There are #{coll.count()} records in the test collection. Here they are:"
 coll.find().each { |doc| puts doc.inspect }
+
+# Destroy the collection
+coll.drop

data/lib/mongo/admin.rb

@@ -70,14 +70,15 @@ module XGen
         end
 
         # Validate a named collection by raising an exception if there is a
-        # problem or returning +true+ if all is well.
+        # problem or returning an interesting hash (see especially the
+        # 'result' string value) if all is well.
         def validate_collection(name)
           doc = @db.db_command(:validate => name)
           raise "Error with validate command: #{doc.inspect}" unless @db.ok?(doc)
           result = doc['result']
           raise "Error with validation data: #{doc.inspect}" unless result.kind_of?(String)
           raise "Error: invalid collection #{name}: #{doc.inspect}" if result =~ /\b(exception|corrupt)\b/i
-          true
+          doc
         end
 
       end

data/lib/mongo/cursor.rb

@@ -42,13 +42,15 @@ module XGen
 
         def closed?; @closed; end
 
-        # Return +true+ if there are more records to retrieve. We do not check
-        # @num_to_return; #each is responsible for doing that.
+        # Internal method, not for general use. Return +true+ if there are
+        # more records to retrieve. We do not check @num_to_return; #each is
+        # responsible for doing that.
         def more?
           num_remaining > 0
         end
 
-        # Return the next object. Raises an error if necessary.
+        # Return the next object or nil if there are no more. Raises an error
+        # if necessary.
         def next_object
           refill_via_get_more if num_remaining == 0
           o = @cache.shift

data/lib/mongo/db.rb

@@ -288,8 +288,11 @@ module XGen
 
         # Close the connection to the database.
         def close
-          @socket.close if @socket
-          @socket = nil
+          if @socket
+            s = @socket
+            @socket = nil
+            s.close
+          end
         end
 
         def connected?
@@ -426,6 +429,7 @@ module XGen
           connect_to_master if !connected? && @auto_reconnect
           begin
             @socket.print(message.buf.to_s)
+            @socket.flush
           rescue => ex
             close
             raise ex

data/mongo-ruby-driver.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.5.1'
+  s.version = '0.5.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.'

data/tests/test_admin.rb

@@ -54,7 +54,11 @@ class AdminTest < Test::Unit::TestCase
   end
 
   def test_validate_collection
-    assert @admin.validate_collection(@coll.name)
+    doc = @admin.validate_collection(@coll.name)
+    assert_not_nil doc
+    result = doc['result']
+    assert_not_nil result
+    assert_match /firstExtent/, result
   end
 
 end

data/tests/test_db_api.rb

@@ -405,4 +405,17 @@ class DBAPITest < Test::Unit::TestCase
     end
   end
 
+# TODO this test fails with error message "Undefed Before end of object"
+# That is a database error. The undefined type may go away.
+
+#   def test_insert_undefined
+#     doc = {'undef' => Undefined.new}
+#     @coll.clear
+#     @coll.insert(doc)
+#     p @db.error                 # DEBUG
+#     assert_equal 1, @coll.count
+#     row = @coll.find().next_object
+#     assert_not_nil row
+#   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jim Menard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: []