mongo 0.15.1 → 0.16

data/test/test_threading.rb

@@ -12,7 +12,7 @@ class TestThreading < Test::Unit::TestCase
   @@coll = @@db.collection('thread-test-collection')
 
   def test_threading
-    @@coll.clear
+    @@coll.remove
 
     1000.times do |i|
       @@coll.insert("x" => i)

data/test/unit/cursor_test.rb

@@ -0,0 +1,122 @@
+require 'test/test_helper'
+
+class TestCursor < Test::Unit::TestCase
+
+  context "Cursor options" do 
+    setup do 
+      @db         = stub(:name => "testing", :slave_ok? => false)    
+      @collection = stub(:db => @db, :name => "items")
+      @cursor     = Cursor.new(@collection)
+    end
+
+    should "set admin to false" do 
+      assert_equal false, @cursor.admin
+
+      @cursor = Cursor.new(@collection, :admin => true)
+      assert_equal true, @cursor.admin
+    end
+
+    should "set selector" do
+      assert @cursor.selector == {}
+
+      @cursor = Cursor.new(@collection, :selector => {:name => "Jones"})
+      assert @cursor.selector == {:name => "Jones"}
+    end
+
+    should "set fields" do
+      assert_nil @cursor.fields
+
+      @cursor = Cursor.new(@collection, :fields => [:name, :date])
+      assert @cursor.fields == {:name => 1, :date => 1}
+    end
+
+    should "set limit" do
+      assert_equal 0, @cursor.limit
+
+      @cursor = Cursor.new(@collection, :limit => 10)
+      assert_equal 10, @cursor.limit
+    end
+
+
+    should "set skip" do
+      assert_equal 0, @cursor.skip
+
+      @cursor = Cursor.new(@collection, :skip => 5)
+      assert_equal 5, @cursor.skip
+    end
+
+    should "set sort order" do
+      assert_nil @cursor.order
+
+      @cursor = Cursor.new(@collection, :order => "last_name")
+      assert_equal "last_name", @cursor.order
+    end
+
+    should "set hint" do
+      assert_nil @cursor.hint
+
+      @cursor = Cursor.new(@collection, :hint => "name")
+      assert_equal "name", @cursor.hint
+    end
+
+    should "cache full collection name" do 
+      assert_equal "testing.items", @cursor.full_collection_name
+    end
+  end
+
+  context "Query options" do 
+    should "test timeout true and slave_ok false" do 
+      @db = stub(:slave_ok? => false, :name => "testing")
+      @collection = stub(:db => @db, :name => "items")
+      @cursor     = Cursor.new(@collection, :timeout => true)
+      assert_equal 0, @cursor.query_opts
+    end
+
+    should "test timeout false and slave_ok false" do 
+      @db = stub(:slave_ok? => false, :name => "testing")
+      @collection = stub(:db => @db, :name => "items")
+      @cursor     = Cursor.new(@collection, :timeout => false)
+      assert_equal 16, @cursor.query_opts
+    end
+
+    should "set timeout true and slave_ok true" do 
+      @db = stub(:slave_ok? => true, :name => "testing")
+      @collection = stub(:db => @db, :name => "items")
+      @cursor = Cursor.new(@collection, :timeout => true)
+      assert_equal 4, @cursor.query_opts
+    end
+
+    should "set timeout false and slave_ok true" do 
+      @db = stub(:slave_ok? => true, :name => "testing")
+      @collection = stub(:db => @db, :name => "items")
+      @cursor = Cursor.new(@collection, :timeout => false)
+      assert_equal 20, @cursor.query_opts
+    end
+  end
+
+  context "Query fields" do 
+    setup do 
+      @db = stub(:slave_ok? => true, :name => "testing")
+      @collection = stub(:db => @db, :name => "items")
+    end
+
+    should "when an array should return a hash with each key" do 
+      @cursor = Cursor.new(@collection, :fields => [:name, :age])
+      result  = @cursor.fields
+      assert_equal result.keys.sort{|a,b| a.to_s <=> b.to_s}, [:age, :name].sort{|a,b| a.to_s <=> b.to_s}
+      assert result.values.all? {|v| v == 1}
+    end
+
+    should "when a string, return a hash with just the key" do 
+      @cursor = Cursor.new(@collection, :fields => "name")
+      result  = @cursor.fields 
+      assert_equal result.keys.sort, ["name"]
+      assert result.values.all? {|v| v == 1}
+    end
+
+    should "return nil when neither hash nor string nor symbol" do 
+      @cursor = Cursor.new(@collection, :fields => 1234567)
+      assert_nil @cursor.fields 
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 0.15.1
+  version: "0.16"
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -04:00
+date: 2009-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -26,43 +26,17 @@ files:
 - README.rdoc
 - Rakefile
 - mongo-ruby-driver.gemspec
-- bin/bson_benchmark.rb
-- 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
+- LICENSE.txt
 - lib/mongo/admin.rb
 - lib/mongo/collection.rb
 - lib/mongo/connection.rb
+- lib/mongo/constants.rb
 - lib/mongo/cursor.rb
 - lib/mongo/db.rb
+- lib/mongo/errors.rb
 - lib/mongo/gridfs/chunk.rb
 - lib/mongo/gridfs/grid_store.rb
 - lib/mongo/gridfs.rb
-- lib/mongo/errors.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/query.rb
 - lib/mongo/types/binary.rb
 - lib/mongo/types/code.rb
 - lib/mongo/types/dbref.rb
@@ -72,8 +46,25 @@ files:
 - lib/mongo/util/byte_buffer.rb
 - lib/mongo/util/conversions.rb
 - lib/mongo/util/ordered_hash.rb
+- lib/mongo/util/server_version.rb
+- lib/mongo/util/support.rb
 - lib/mongo/util/xml_to_ruby.rb
 - lib/mongo.rb
+- 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
+- bin/autoreconnect.rb
+- bin/bson_benchmark.rb
+- bin/fail_if_no_c.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -106,19 +97,6 @@ specification_version: 3
 summary: Ruby driver for the MongoDB
 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
@@ -131,8 +109,10 @@ test_files:
 - test/test_db_api.rb
 - test/test_db_connection.rb
 - test/test_grid_store.rb
-- test/test_message.rb
+- test/test_helper.rb
 - test/test_objectid.rb
 - test/test_ordered_hash.rb
-- test/test_threading.rb
 - test/test_round_trip.rb
+- test/test_slave_connection.rb
+- test/test_threading.rb
+- test/unit/cursor_test.rb

data/bin/mongo_console

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-org_argv = ARGV.dup
-ARGV.clear
-
-require 'irb'
-
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-
-include Mongo
-
-host = org_argv[0] || ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-port = org_argv[1] || ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-dbnm = org_argv[2] || ENV['MONGO_RUBY_DRIVER_DB']   || 'ruby-mongo-console'
-
-puts "Connecting to #{host}:#{port} (CONN) on with database #{dbnm} (DB)"
-CONN = Connection.new(host, port)
-DB = CONN.db(dbnm)
-
-puts "Starting IRB session..."
-IRB.start(__FILE__)

data/bin/run_test_script

@@ -1,19 +0,0 @@
-#!/bin/bash
-# usage: run_test_script test_name output_file
-#
-# See http://mongodb.onconfluence.com/display/DOCS/Using+the+Framework+(for+Driver+Developers)
-
-HERE=`dirname $0`
-
-if [ ! -f $HERE/../test/mongo-qa/$1 ] ; then
-    exit 0
-fi
-
-begintime=`date`
-ruby $HERE/../test/mongo-qa/$1 $3 $4 >> $2
-exitval=$?
-endtime=`date`
-
-echo "begintime:$begintime" >> $2
-echo "endtime:$endtime" >> $2
-echo "exit_code:$exitval" >> $2

data/bin/standard_benchmark

@@ -1,109 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Note: Ruby 1.9 is faster than 1.8, as expected.
-
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-
-include Mongo
-
-TRIALS = 2
-PER_TRIAL = 5000
-BATCH_SIZE = 100
-
-SMALL = {}
-MEDIUM = {
-  'integer' => 5,
-  'number' => 5.05,
-  'boolean' => false,
-  'array' => ['test', 'benchmark']
-}
-LARGE = {
-  'base_url' => 'http://www.example.com/test-me',
-  'total_word_count' => 6743,
-  'access_time' => Time.now,
-  'meta_tags' => {
-    'description' => 'i am a long description string',
-    'author' => 'Holly Man',
-    'dynamically_created_meta_tag' => 'who know\n what'
-  },
-  'page_structure' => {
-    'counted_tags' => 3450,
-    'no_of_js_attached' => 10,
-    'no_of_images' => 6
-  },
-  'harvested_words' => ['10gen','web','open','source','application','paas',
-                        'platform-as-a-service','technology','helps',
-                        'developers','focus','building','mongodb','mongo'] * 20
-}
-
-def report(str, t)
-  printf("%s%d\n", str.ljust(60, '.'), PER_TRIAL / t)
-end
-
-def benchmark(str, proc, n, db, coll_name, object, setup=nil)
-  coll = db.collection(coll_name)
-  setup.call(coll, object) if setup
-  t0 = Time.new
-  n.times { |i| proc.call(coll, object, i) }
-  report(str, Time.new.to_f - t0.to_f)
-end
-
-host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-
-connection = Connection.new(host, port)
-connection.drop_database("benchmark")
-db = connection.db('benchmark')
-
-insert = Proc.new { |coll, object, i|
-  object['x'] = i
-  coll.insert(object)
-}
-benchmark('insert (small, no index)', insert, PER_TRIAL, db, 'small_none', SMALL)
-benchmark('insert (medium, no index)', insert, PER_TRIAL, db, 'medium_none', MEDIUM)
-benchmark('insert (large, no index)', insert, PER_TRIAL, db, 'large_none', LARGE)
-
-index_on_x = Proc.new { |coll, object|
-  coll.create_index('x')
-}
-benchmark('insert (small, indexed)', insert, PER_TRIAL, db, 'small_index', SMALL, index_on_x)
-benchmark('insert (medium, indexed)', insert, PER_TRIAL, db, 'medium_index', MEDIUM, index_on_x)
-benchmark('insert (large, indexed)', insert, PER_TRIAL, db, 'large_index', LARGE, index_on_x)
-
-insert_batch = Proc.new { |coll, object, i|
-  object['x'] = i
-  coll.insert([object] * BATCH_SIZE)
-}
-benchmark('batch insert (small, no index)', insert_batch, PER_TRIAL/BATCH_SIZE, db, 'small_bulk', SMALL)
-benchmark('batch insert (medium, no index)', insert_batch, PER_TRIAL/BATCH_SIZE, db, 'medium_bulk', MEDIUM)
-benchmark('batch insert (large, no index)', insert_batch, PER_TRIAL/BATCH_SIZE, db, 'large_bulk', LARGE)
-
-find_one = Proc.new { |coll, x, i|
-  coll.find_one('x' => x)
-}
-benchmark('find_one (small, no index)', find_one, PER_TRIAL, db, 'small_none', PER_TRIAL / 2)
-benchmark('find_one (medium, no index)', find_one, PER_TRIAL, db, 'medium_none', PER_TRIAL / 2)
-benchmark('find_one (large, no index)', find_one, PER_TRIAL, db, 'large_none', PER_TRIAL / 2)
-
-benchmark('find_one (small, indexed)', find_one, PER_TRIAL, db, 'small_index', PER_TRIAL / 2)
-benchmark('find_one (medium, indexed)', find_one, PER_TRIAL, db, 'medium_index', PER_TRIAL / 2)
-benchmark('find_one (large, indexed)', find_one, PER_TRIAL, db, 'large_index', PER_TRIAL / 2)
-
-find = Proc.new { |coll, x, i|
-  coll.find('x' => x).each {}
-}
-benchmark('find (small, no index)', find, PER_TRIAL, db, 'small_none', PER_TRIAL / 2)
-benchmark('find (medium, no index)', find, PER_TRIAL, db, 'medium_none', PER_TRIAL / 2)
-benchmark('find (large, no index)', find, PER_TRIAL, db, 'large_none', PER_TRIAL / 2)
-
-benchmark('find (small, indexed)', find, PER_TRIAL, db, 'small_index', PER_TRIAL / 2)
-benchmark('find (medium, indexed)', find, PER_TRIAL, db, 'medium_index', PER_TRIAL / 2)
-benchmark('find (large, indexed)', find, PER_TRIAL, db, 'large_index', PER_TRIAL / 2)
-
-benchmark('find range (small, indexed)', find, PER_TRIAL, db, 'small_index',
-          {"$gt" => PER_TRIAL / 2, "$lt" => PER_TRIAL / 2 + BATCH_SIZE})
-benchmark('find range (medium, indexed)', find, PER_TRIAL, db, 'medium_index',
-          {"$gt" => PER_TRIAL / 2, "$lt" => PER_TRIAL / 2 + BATCH_SIZE})
-benchmark('find range (large, indexed)', find, PER_TRIAL, db, 'large_index',
-          {"$gt" => PER_TRIAL / 2, "$lt" => PER_TRIAL / 2 + BATCH_SIZE})

data/lib/mongo/message/get_more_message.rb

@@ -1,32 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ++
-
-require 'mongo/message/message'
-require 'mongo/message/opcodes'
-
-module Mongo
-
-  class GetMoreMessage < Message
-
-    def initialize(db_name, collection_name, cursor)
-      super(OP_GET_MORE)
-      write_int(0)
-      write_string("#{db_name}.#{collection_name}")
-      write_int(0)              # num to return; leave it up to the db for now
-      write_long(cursor)
-    end
-  end
-end

data/lib/mongo/message/insert_message.rb

@@ -1,37 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ++
-
-require 'mongo/message/message'
-require 'mongo/message/opcodes'
-
-module Mongo
-
-  class InsertMessage < Message
-
-    def initialize(db_name, collection_name, check_keys=true, *objs)
-      @collection_name = collection_name
-      @objs = objs
-      super(OP_INSERT)
-      write_int(0)
-      write_string("#{db_name}.#{collection_name}")
-      objs.each { |o| write_doc(o, check_keys) }
-    end
-
-    def to_s
-      "db.#{@collection_name}.insert(#{@objs.inspect})"
-    end
-  end
-end