mongodb-mongo 0.6.5 → 0.6.6

data/README.rdoc

@@ -48,6 +48,19 @@ you can install it as a gem from the source by typing
 Note: when you install the gem this way it is called "mongo", not
 "mongodb-mongo". In either case, you "require 'mongo'" in your source code.
 
+=== Optional C Extension
+
+There is a separate gem containing optional C extensions that will increase the
+performance of the driver. To use the optional extensions just install the gem
+by typing
+
+  $ sudo gem install mongodb-mongo_ext
+
+To install from source type this instead
+
+  $ rake gem:install_extensions
+
+That's all there is to it!
 
 = Examples
 

data/Rakefile

@@ -11,6 +11,9 @@ end
 require 'rbconfig'
 include Config
 
+gem_command = "gem"
+gem_command = "gem1.9" if CONFIG["MAJOR"] == "1" && CONFIG["MINOR"] == "9"
+
 # NOTE: some of the tests assume Mongo is running
 Rake::TestTask.new do |t|
   t.test_files = FileList['tests/test*.rb']
@@ -18,8 +21,10 @@ end
 
 desc "Generate documentation"
 task :rdoc do
-  FileUtils.rm_rf('html')
-  system "rdoc --main README.rdoc --op html --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
+  version = eval(File.read("mongo-ruby-driver.gemspec")).version
+  out = File.join('html', version.to_s)
+  FileUtils.rm_rf(out)
+  system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
 end
 
 desc "Publish documentation to mongo.rubyforge.org"
@@ -33,8 +38,8 @@ namespace :gem do
   desc "Install the gem locally"
   task :install do
     sh <<EOS
-gem build mongo-ruby-driver.gemspec &&
-    sudo gem install mongo-*.gem &&
+#{gem_command} build mongo-ruby-driver.gemspec &&
+    sudo #{gem_command} install mongo-*.gem &&
     rm mongo-*.gem
 EOS
   end
@@ -42,8 +47,8 @@ EOS
   desc "Install the optional c extensions"
   task :install_extensions do
     sh <<EOS
-gem build mongo-extensions.gemspec &&
-    sudo gem install mongo_ext-*.gem &&
+#{gem_command} build mongo-extensions.gemspec &&
+    sudo #{gem_command} install mongo_ext-*.gem &&
     rm mongo_ext-*.gem
 EOS
   end

data/bin/standard_benchmark

@@ -52,8 +52,9 @@ end
 host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
 port = ENV['MONGO_RUBY_DRIVER_PORT'] || XGen::Mongo::Driver::Mongo::DEFAULT_PORT
 
-db = Mongo.new(host, port).db('ruby-benchmark')
-db.drop_collection('benchmark')
+connection = Mongo.new(host, port)
+connection.drop_database("benchmark")
+db = connection.db('benchmark')
 
 insert = Proc.new { |coll, object, i|
   object['x'] = i

data/lib/mongo/collection.rb

@@ -117,8 +117,10 @@ module XGen
         # should be either a single field name or a Array of [field name,
         # direction] pairs. Directions should be specified as
         # XGen::Mongo::ASCENDING or XGen::Mongo::DESCENDING.
-        def create_index(field_or_spec)
-          @db.create_index(@name, field_or_spec)
+        # +unique+ is an optional boolean indicating whether this index
+        # should enforce a uniqueness constraint.
+        def create_index(field_or_spec, unique=false)
+          @db.create_index(@name, field_or_spec, unique)
         end
 
         # Drop index +name+.

data/lib/mongo/db.rb

@@ -239,8 +239,6 @@ module XGen
         def drop_collection(name)
           return true unless collection_names.include?(full_coll_name(name))
 
-          coll = collection(name)
-          coll.drop_indexes     # Mongo requires that we drop indexes manually
           ok?(db_command(:drop => name))
         end
 
@@ -432,8 +430,9 @@ module XGen
         # should be either a single field name or a Array of [field name,
         # direction] pairs. Directions should be specified as
         # XGen::Mongo::ASCENDING or XGen::Mongo::DESCENDING. Normally called
-        # by Collection#create_index.
-        def create_index(collection_name, field_or_spec)
+        # by Collection#create_index. If +unique+ is true the index will
+        # enforce a uniqueness constraint.
+        def create_index(collection_name, field_or_spec, unique=false)
           field_h = OrderedHash.new
           if field_or_spec.is_a? String
             field_h[field_or_spec] = 1
@@ -444,7 +443,8 @@ module XGen
           sel = {
             :name => name,
             :ns => full_coll_name(collection_name),
-            :key => field_h
+            :key => field_h,
+            :unique => unique
           }
           @semaphore.synchronize {
             send_to_db(InsertMessage.new(@name, SYSTEM_INDEX_COLLECTION, sel))

data/lib/mongo/util/bson.rb

@@ -46,6 +46,7 @@ class BSON
   SYMBOL = 14
   CODE_W_SCOPE = 15
   NUMBER_INT = 16
+  TIMESTAMP = 17
   MAXKEY = 127
 
   if RUBY_VERSION >= '1.9'
@@ -199,6 +200,10 @@ class BSON
         when CODE_W_SCOPE
           key = deserialize_cstr(@buf)
           doc[key] = deserialize_code_w_scope_data(@buf)
+        when TIMESTAMP
+          key = deserialize_cstr(@buf)
+          doc[key] = [deserialize_number_int_data(@buf),
+                      deserialize_number_int_data(@buf)]
         when EOO
           break
         else

data/lib/mongo/util/ordered_hash.rb

@@ -20,6 +20,12 @@
 # Hash already keeps its keys ordered by order of insertion.
 class OrderedHash < Hash
 
+  def ==(other)
+    !other.nil? &&
+      keys == other.keys &&
+      values == other.values
+  end
+
   # We only need the body of this class if the RUBY_VERSION is before 1.9
   if RUBY_VERSION < '1.9'
 
@@ -35,12 +41,6 @@ class OrderedHash < Hash
     super(key, value)
   end
 
-  def ==(other)
-    !other.nil? &&
-      keys == other.keys &&
-      values == other.values
-  end
-
   def each
     @ordered_keys ||= []
     @ordered_keys.each { |k| yield k, self[k] }

data/mongo-ruby-driver.gemspec

@@ -79,7 +79,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.6.5'
+  s.version = '0.6.6'
   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

@@ -181,6 +181,15 @@ class BSONTest < Test::Unit::TestCase
     assert_equal '_id', roundtrip.keys.first
   end
 
+  def test_timestamp
+    val = {"test" => [4, 20]}
+    assert_equal val, @b.deserialize([0x13, 0x00, 0x00, 0x00,
+                                      0x11, 0x74, 0x65, 0x73,
+                                      0x74, 0x00, 0x04, 0x00,
+                                      0x00, 0x00, 0x14, 0x00,
+                                      0x00, 0x00, 0x00])
+  end
+
   def test_do_not_change_original_object
     val = OrderedHash.new
     val['not_id'] = 1

data/tests/test_db_api.rb

@@ -285,9 +285,9 @@ class DBAPITest < Test::Unit::TestCase
     name = @@db.create_index(@@coll.name, 'a')
     list = @@db.index_information(@@coll.name)
     assert_equal @@coll.index_information, list
-    assert_equal 1, list.length
+    assert_equal 2, list.length
 
-    info = list[0]
+    info = list[1]
     assert_equal name, 'a_1'
     assert_equal name, info[:name]
     assert_equal 1, info[:keys]['a']
@@ -298,9 +298,9 @@ class DBAPITest < Test::Unit::TestCase
   def test_multiple_index_cols
     name = @@db.create_index(@@coll.name, [['a', DESCENDING], ['b', ASCENDING], ['c', DESCENDING]])
     list = @@db.index_information(@@coll.name)
-    assert_equal 1, list.length
+    assert_equal 2, list.length
 
-    info = list[0]
+    info = list[1]
     assert_equal name, 'a_-1_b_1_c_-1'
     assert_equal name, info[:name]
     keys = info[:keys].keys
@@ -309,6 +309,28 @@ class DBAPITest < Test::Unit::TestCase
     @@db.drop_index(@@coll.name, name)
   end
 
+  def test_unique_index
+    @@db.drop_collection("blah")
+    test = @@db.collection("blah")
+    test.create_index("hello")
+
+    test.insert("hello" => "world")
+    test.insert("hello" => "mike")
+    test.insert("hello" => "world")
+    assert !@@db.error?
+
+    @@db.drop_collection("blah")
+    test = @@db.collection("blah")
+    test.create_index("hello", unique=true)
+
+    test.insert("hello" => "world")
+    test.insert("hello" => "mike")
+    test.insert("hello" => "world")
+    assert @@db.error?
+
+    @@db.drop_collection("blah")
+  end
+
   def test_array
     @@coll << {'b' => [1, 2, 3]}
     rows = @@coll.find({}, {:fields => ['b']}).to_a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: []