mongo 1.0 → 1.1.5

data/lib/mongo/util/uri_parser.rb

@@ -0,0 +1,71 @@
+# encoding: UTF-8
+
+# --
+# Copyright (C) 2008-2010 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.
+# ++
+
+module Mongo
+  module URIParser
+
+    DEFAULT_PORT = 27017
+    MONGODB_URI_MATCHER = /(([-_.\w\d]+):([-_\w\d]+)@)?([-.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
+    MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]"
+
+    extend self
+
+    # Parse a MongoDB URI. This method is used by Connection.from_uri.
+    # Returns an array of nodes and an array of db authorizations, if applicable.
+    #
+    # @private
+    def parse(string)
+      if string =~ /^mongodb:\/\//
+        string = string[10..-1]
+      else
+        raise MongoArgumentError, "MongoDB URI must match this spec: #{MONGODB_URI_SPEC}"
+      end
+
+      nodes = []
+      auths = []
+      specs = string.split(',')
+      specs.each do |spec|
+        matches  = MONGODB_URI_MATCHER.match(spec)
+        if !matches
+          raise MongoArgumentError, "MongoDB URI must match this spec: #{MONGODB_URI_SPEC}"
+        end
+
+        uname = matches[2]
+        pwd   = matches[3]
+        host  = matches[4]
+        port  = matches[6] || DEFAULT_PORT
+        if !(port.to_s =~ /^\d+$/)
+          raise MongoArgumentError, "Invalid port #{port}; port must be specified as digits."
+        end
+        port  = port.to_i
+        db    = matches[8]
+
+        if uname && pwd && db
+          auths << {'db_name' => db, 'username' => uname, 'password' => pwd}
+        elsif uname || pwd || db
+          raise MongoArgumentError, "MongoDB URI must include all three of username, password, " +
+            "and db if any one of these is specified."
+        end
+
+        nodes << [host, port]
+      end
+
+      [nodes, auths]
+    end
+  end
+end

data/lib/mongo.rb

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0"
+  VERSION = "1.1.5"
 end
 
 module Mongo
@@ -19,13 +21,18 @@ module Mongo
     OP_DELETE       = 2006
     OP_KILL_CURSORS = 2007
 
-    OP_QUERY_TAILABLE          = 2
-    OP_QUERY_SLAVE_OK          = 4
-    OP_QUERY_NO_CURSOR_TIMEOUT = 16
-
-    DEFAULT_BATCH_SIZE = 100
+    OP_QUERY_TAILABLE          = 2 ** 1
+    OP_QUERY_SLAVE_OK          = 2 ** 2
+    OP_QUERY_OPLOG_REPLAY      = 2 ** 3
+    OP_QUERY_NO_CURSOR_TIMEOUT = 2 ** 4
+    OP_QUERY_AWAIT_DATA        = 2 ** 5
+    OP_QUERY_EXHAUST           = 2 ** 6
+
+    REPLY_CURSOR_NOT_FOUND     = 2 ** 0
+    REPLY_QUERY_FAILURE        = 2 ** 1
+    REPLY_SHARD_CONFIG_STALE   = 2 ** 2
+    REPLY_AWAIT_CAPABLE        = 2 ** 3
   end
-
 end
 
 require 'bson'
@@ -33,13 +40,22 @@ require 'bson'
 require 'mongo/util/conversions'
 require 'mongo/util/support'
 require 'mongo/util/core_ext'
+require 'mongo/util/pool'
 require 'mongo/util/server_version'
+require 'mongo/util/uri_parser'
 
 require 'mongo/collection'
 require 'mongo/connection'
+require 'mongo/repl_set_connection'
 require 'mongo/cursor'
 require 'mongo/db'
 require 'mongo/exceptions'
+require 'mongo/gridfs/grid_ext'
 require 'mongo/gridfs/grid'
 require 'mongo/gridfs/grid_io'
+if RUBY_PLATFORM =~ /java/
+  require 'mongo/gridfs/grid_io_fix'
+end
 require 'mongo/gridfs/grid_file_system'
+
+

data/{mongo-ruby-driver.gemspec → mongo.gemspec}

@@ -1,4 +1,4 @@
-require "lib/mongo"
+require "./lib/mongo"
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
@@ -11,22 +11,24 @@ Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
 
-  s.files  = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec', 'LICENSE.txt']
+  s.files  = ['README.md', 'Rakefile', 'mongo.gemspec', 'LICENSE.txt']
   s.files += ['lib/mongo.rb'] + Dir['lib/mongo/**/*.rb']
-  s.files += Dir['examples/**/*.rb'] + Dir['bin/**/*.rb']
+  s.files += Dir['docs/**/*.md'] + Dir['examples/**/*.rb'] + Dir['bin/**/*.rb']
+  s.files += Dir['bin/mongo_console']
   s.test_files = Dir['test/**/*.rb']
 
+  s.executables = ['mongo_console']
+
   s.has_rdoc = true
   s.test_files = Dir['test/**/*.rb']
-  s.test_files -= Dir['test/mongo_bson/*.rb'] # remove these files from the manifest
 
   s.has_rdoc = true
-  s.rdoc_options = ['--main', 'README.rdoc', '--inline-source']
-  s.extra_rdoc_files = ['README.rdoc']
+  s.rdoc_options = ['--main', 'README.md', '--inline-source']
+  s.extra_rdoc_files = ['README.md']
 
   s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker']
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 
-  s.add_dependency(%q<bson>, ["= #{Mongo::VERSION}"])
+  s.add_dependency(%q<bson>, [">= #{Mongo::VERSION}"])
 end

data/test/auxillary/1.4_features.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # Demonstrate features in MongoDB 1.4
 class Features14Test < Test::Unit::TestCase
@@ -150,7 +150,7 @@ class Features14Test < Test::Unit::TestCase
       end
 
       should "use geoNear command to return distances from a point" do
-        cmd = OrderedHash.new
+        cmd = BSON::OrderedHash.new
         cmd['geoNear'] = 'places'
         cmd['near']    = @empire_state
         cmd['num']     = 6

data/test/auxillary/authentication_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test requires bouncing the server.
 # It also requires that a user exists on the admin database.

data/test/auxillary/autoreconnect_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test requires bouncing the server
 class AutoreconnectTest < Test::Unit::TestCase

data/test/{slave_connection_test.rb → auxillary/slave_connection_test.rb}

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: these tests are run only if we can connect to a single MongoDB in slave mode.
 class SlaveConnectionTest < Test::Unit::TestCase
@@ -8,22 +8,22 @@ class SlaveConnectionTest < Test::Unit::TestCase
     @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
     @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
     conn = Connection.new(@@host, @@port, :slave_ok => true)
-    cmd = conn['admin'].command(:ismaster => 1)
-    cmd['ok'] == 1 && cmd['ismaster'] != 1
+    response = conn['admin'].command(:ismaster => 1)
+    Mongo::Support.ok?(response) && response['ismaster'] != 1
   end
 
   if self.connect_to_slave
     puts "Connected to slave; running slave tests."
 
     def test_connect_to_slave
-      assert_raise Mongo::ConfigurationError do 
+      assert_raise Mongo::ConnectionFailure do
         @db = Connection.new(@@host, @@port, :slave_ok => false).db('ruby-mongo-demo')
       end
     end
 
     def test_slave_ok_sent_to_queries
-      @db   = Connection.new(@@host, @@port, :slave_ok => true).db('ruby-mongo-demo')
-      assert_equal true, @db.slave_ok?
+      @con = Connection.new(@@host, @@port, :slave_ok => true)
+      assert_equal true, @con.slave_ok?
     end
   else
     puts "Not connected to slave; skipping slave connection tests."

data/test/bson/binary_test.rb

@@ -0,0 +1,15 @@
+# encoding:utf-8
+require './test/test_helper'
+
+class BinaryTest < Test::Unit::TestCase
+  context "Inspecting" do
+    setup do
+      @data = ("THIS IS BINARY " * 50).unpack("c*")
+    end
+
+    should "not display actual data" do
+      binary = BSON::Binary.new(@data)
+      assert_equal "<BSON::Binary:#{binary.object_id}>", binary.inspect
+    end
+  end
+end