mongo 1.8.4 → 1.8.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MThmZWQ1YmJmNDFkNDNhMjY3MTcxZTQxNjRjZjI2YjYzMWE4MDRiOQ==
-  data.tar.gz: !binary |-
-    Njk3M2NhNmI2MWM1ZDE1ZGQ0MTZiYjNiYTgyNzRjYmZmM2E5MWExMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjYyM2MxZDQ3ZjRiMzliMjM3NDdhZmFmYTZmMTEwNjgwNzFiZmVmOTIwNzVh
-    MDkxZWQ2ZmNiNDUxZjA1NWQzOGNmMDNkMjRkZThhM2RhMzZiNTRlOTA4ODQ0
-    ZDAxMjg1ZmZlYWZhNzcyZTU0OWQ5M2RlZmMyMWNkMjgzMmU5NmM=
-  data.tar.gz: !binary |-
-    MDU0ZTI3MjA2MzVlYjc2MDFiZGM1MjUxZjRlZDFmNDE5ZTc0NzMyNzBhMDI2
-    NjM5ZGE1NDYxYmY2MjM3NmQyMTg1ZmMxMjFlYWU1M2ExZDgyYTU2NjRkZjk4
-    MjIxYTliNDRmNWIyODA5YmRmYTYxMWJmYzAwNTVkOTRkYTczMzg=
+SHA1:
+  metadata.gz: b8b721f436d16c55388789c19bd0c03b99812702
+  data.tar.gz: b43de3ec9c986727abd9d4bf181e038ce3ddbe02
+SHA512:
+  metadata.gz: d0c55e5a9968be883c92acb53676b6ae8d08a77578dbaaec4cca2d71bf1c535d981d63f4f1377712819bae39733f6bde8781f8af860f5469e172bf4c2a14acb6
+  data.tar.gz: 241ccee8c30eadb597252c4fea0a599b920551c4f77dea15fbf747eea2abf7e0270788f496d6df657f8d88cb98728fae20a956977a285086c7f25a161bc8c89b

data/README.md

@@ -241,6 +241,8 @@ for the first time.
 
 ### Strict mode
 
+_**NOTE:** Support for strict mode has been deprecated and will be removed in version 2.0 of the driver._
+
 Each database has an optional strict mode. If strict mode is on, then asking
 for a collection that does not exist will raise an error, as will asking to
 create a collection that already exists. Note that both these operations are

data/VERSION

@@ -1 +1 @@
-1.8.4
+1.8.5

data/lib/mongo.rb

@@ -6,17 +6,19 @@ module Mongo
   GEOHAYSTACK = 'geoHaystack'
   TEXT        = 'text'
   HASHED      = 'hashed'
-  INDEX_TYPES = [ ASCENDING,
-                  DESCENDING,
-                  GEO2D,
-                  GEO2DSPHERE,
-                  GEOHAYSTACK,
-                  TEXT,
-                  HASHED
-                ]
+
+  INDEX_TYPES = {
+    'ASCENDING'   => ASCENDING,
+    'DESCENDING'  => DESCENDING,
+    'GEO2D'       => GEO2D,
+    'GEO2DSPHERE' => GEO2DSPHERE,
+    'GEOHAYSTACK' => GEOHAYSTACK,
+    'TEXT'        => TEXT,
+    'HASHED'      => HASHED
+  }
 
   DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024
-  DEFAULT_MAX_MESSAGE_SIZE = DEFAULT_MAX_BSON_SIZE * 2
+  MESSAGE_SIZE_FACTOR = 2
 
   module Constants
     OP_REPLY        = 1

data/lib/mongo/collection.rb

@@ -505,12 +505,15 @@ module Mongo
     # @option opts [Integer] :min (nil) specify the minimum longitude and latitude for a geo index.
     # @option opts [Integer] :max (nil) specify the maximum longitude and latitude for a geo index.
     #
-    # @example Creating a compound index using a hash: (Ruby 1.9 and above)
+    # @example Creating a compound index using a hash: (Ruby 1.9+ Syntax)
     #   @posts.create_index({'subject' => Mongo::ASCENDING, 'created_at' => Mongo::DESCENDING})
     #
     # @example Creating a compound index:
     #   @posts.create_index([['subject', Mongo::ASCENDING], ['created_at', Mongo::DESCENDING]])
     #
+    # @example Creating a geospatial index using a hash: (Ruby 1.9+ Syntax)
+    #   @restaurants.create_index(:location => Mongo::GEO2D)
+    #
     # @example Creating a geospatial index:
     #   @restaurants.create_index([['location', Mongo::GEO2D]])
     #
@@ -542,13 +545,13 @@ module Mongo
     #
     # The parameters and options for this methods are the same as those for Collection#create_index.
     #
-    # @example Call sequence:
-    #   Time t: @posts.ensure_index([['subject', Mongo::ASCENDING])  -- calls create_index and
+    # @example Call sequence (Ruby 1.9+ Syntax):
+    #   Time t: @posts.ensure_index(:subject => Mongo::ASCENDING) -- calls create_index and
     #     sets the 5 minute cache
-    #   Time t+2min : @posts.ensure_index([['subject', Mongo::ASCENDING])  -- doesn't do anything
-    #   Time t+3min : @posts.ensure_index([['something_else', Mongo::ASCENDING])  -- calls create_index
+    #   Time t+2min : @posts.ensure_index(:subject => Mongo::ASCENDING) -- doesn't do anything
+    #   Time t+3min : @posts.ensure_index(:something_else => Mongo::ASCENDING) -- calls create_index
     #     and sets 5 minute cache
-    #   Time t+10min : @posts.ensure_index([['subject', Mongo::ASCENDING])  -- calls create_index and
+    #   Time t+10min : @posts.ensure_index(:subject => Mongo::ASCENDING) -- calls create_index and
     #     resets the 5 minute counter
     #
     # @return [String] the name of the index.
@@ -1013,21 +1016,15 @@ module Mongo
       if spec.is_a?(String) || spec.is_a?(Symbol)
         field_spec[spec.to_s] = 1
       elsif spec.is_a?(Hash)
-          if RUBY_VERSION < '1.9' && !spec.is_a?(BSON::OrderedHash)
-              raise MongoArgumentError, "Must use OrderedHash in Ruby < 1.9.0"
-          else
-              field_spec = spec.is_a?(BSON::OrderedHash) ? spec : BSON::OrderedHash.try_convert(spec)
-          end
+        if RUBY_VERSION < '1.9' && !spec.is_a?(BSON::OrderedHash)
+          raise MongoArgumentError, "Must use OrderedHash in Ruby < 1.9.0"
+        end
+        validate_index_types(spec.values)
+        field_spec = spec.is_a?(BSON::OrderedHash) ? spec : BSON::OrderedHash.try_convert(spec)
       elsif spec.is_a?(Array) && spec.all? {|field| field.is_a?(Array) }
         spec.each do |f|
-          if Mongo::INDEX_TYPES.include?(f[1])
-            field_spec[f[0].to_s] = f[1]
-          else
-            raise MongoArgumentError, "Invalid index field #{f[1].inspect}; " +
-              "should be one of Mongo::ASCENDING (#{Mongo::ASCENDING}), Mongo::DESCENDING (#{Mongo::DESCENDING}), " +
-              "Mongo::GEOHAYSTACK ('#{Mongo::GEOHAYSTACK}'), Mongo::GEO2DSPHERE ('#{Mongo::GEO2DSPHERE}'), " +
-              "Mongo::TEXT ('#{Mongo::TEXT}'), or Mongo::HASHED ('#{Mongo::HASHED}')"
-          end
+          validate_index_types(f[1])
+          field_spec[f[0].to_s] = f[1]
         end
       else
         raise MongoArgumentError, "Invalid index specification #{spec.inspect}; " +
@@ -1036,6 +1033,16 @@ module Mongo
       field_spec
     end
 
+    def validate_index_types(*types)
+      types.flatten!
+      types.each do |t|
+        unless Mongo::INDEX_TYPES.values.include?(t)
+          raise MongoArgumentError, "Invalid index field #{t.inspect}; " +
+                "should be one of " + Mongo::INDEX_TYPES.map {|k,v| "Mongo::#{k} (#{v})"}.join(', ')
+        end
+      end
+    end
+
     def generate_indexes(field_spec, name, opts)
       selector = {
         :name   => name,

data/lib/mongo/cursor.rb

@@ -472,6 +472,7 @@ module Mongo
             nil, @options & OP_QUERY_EXHAUST != 0)
         rescue ConnectionFailure => ex
           socket.close if socket
+          @pool = nil
           @connection.unpin_pool
           @connection.refresh
           if tries < 3 && !@socket && (!@command || Mongo::Support::secondary_ok?(@selector))
@@ -584,16 +585,20 @@ module Mongo
       spec['$returnKey']   = true if @return_key
       spec['$showDiskLoc'] = true if @show_disk_loc
       spec['$comment']  = @comment if @comment
-      if @connection.mongos? && @read != :primary
+      if needs_read_pref?
         read_pref = Mongo::ReadPreference::mongos(@read, @tag_sets)
         spec['$readPreference'] = read_pref if read_pref
       end
       spec
     end
 
+    def needs_read_pref?
+      @connection.mongos? && @read != :primary
+    end
+
     def query_contains_special_fields?
       @order || @explain || @hint || @snapshot || @show_disk_loc ||
-        @max_scan || @return_key || @comment || @connection.mongos?
+        @max_scan || @return_key || @comment || needs_read_pref?
     end
 
     def close_cursor_if_query_complete

data/lib/mongo/db.rb

@@ -123,7 +123,7 @@ module Mongo
       end
 
       begin
-        socket = @connection.checkout_reader(:primary_preferred)
+        socket = @connection.checkout_reader(:mode => :primary_preferred)
         issue_authentication(username, password, save_auth, :socket => socket)
       ensure
         socket.checkin if socket

data/lib/mongo/mongo_client.rb

@@ -520,7 +520,7 @@ module Mongo
     end
 
     def max_message_size
-      @max_message_size || DEFAULT_MAX_MESSAGE_SIZE
+      @max_message_size || max_bson_size * MESSAGE_SIZE_FACTOR
     end
 
     # Checkout a socket for reading (i.e., a secondary node).

data/lib/mongo/mongo_replica_set_client.rb

@@ -105,8 +105,7 @@ module Mongo
           warn "Please specify hosts as an array of 'host:port' strings; the old format will be removed in v2.0"
           node
         elsif node.is_a?(String)
-          host, port = node.split(":")
-          [ host, port.to_i ]
+          Support.normalize_seeds(node)
         else
           raise MongoArgumentError "Bad seed format!"
         end
@@ -432,7 +431,7 @@ module Mongo
 
     def max_message_size
       return local_manager.max_message_size if local_manager
-      DEFAULT_MAX_MESSAGE_SIZE
+      max_bson_size * MESSAGE_SIZE_FACTOR
     end
 
     private

data/lib/mongo/mongo_sharded_client.rb

@@ -25,8 +25,7 @@ module Mongo
       end
 
       @seeds = nodes.map do |host_port|
-        host, port = host_port.split(":")
-        [ host, port.to_i ]
+        Support.normalize_seeds(host_port)
       end
 
       # TODO: add a method for replacing this list of node.

data/lib/mongo/util/node.rb

@@ -5,7 +5,8 @@ module Mongo
 
     def initialize(client, host_port)
       @client = client
-      @host, @port = split_node(host_port)
+      @manager = @client.local_manager
+      @host, @port = Support.normalize_seeds(host_port)
       @address = "#{@host}:#{@port}"
       @config = nil
       @socket = nil
@@ -19,7 +20,7 @@ module Mongo
 
     def =~(other)
       if other.is_a?(String)
-        h, p = split_node(other)
+        h, p = Support.normalize_seeds(other)
         h == @host && p == @port
       else
         false
@@ -105,6 +106,7 @@ module Mongo
           close
         end
       end
+      @manager.update_max_sizes
     end
 
     # Return a list of replica set nodes from the config.
@@ -119,9 +121,8 @@ module Mongo
 
     def arbiters
       return [] unless config['arbiters']
-
       config['arbiters'].map do |arbiter|
-        split_node(arbiter)
+        Support.normalize_seeds(arbiter)
       end
     end
 
@@ -149,19 +150,16 @@ module Mongo
       connected? && config
     end
 
-    protected
-
-    def split_node(host_port)
-      if host_port.is_a?(String)
-        host_port = host_port.split(":")
-      end
-
-      host = host_port[0]
-      port = host_port[1].nil? ? MongoClient::DEFAULT_PORT : host_port[1].to_i
+    def max_bson_size
+      max = config['maxBsonObjectSize'] || DEFAULT_MAX_BSON_SIZE
+    end
 
-      [host, port]
+    def max_message_size
+      max = config['maxMessageSizeBytes'] || max_bson_size * MESSAGE_SIZE_FACTOR
     end
 
+    protected
+
     # Ensure that this node is a healthy member of a replica set.
     def check_set_membership(config)
       if !config.has_key?('hosts')

data/lib/mongo/util/pool.rb

@@ -165,8 +165,8 @@ module Mongo
         socket.pool = self
       rescue => ex
         socket.close if socket
-        raise ConnectionFailure, "Failed to connect to host #{@host} and port #{@port}: #{ex}"
         @node.close if @node
+        raise ConnectionFailure, "Failed to connect to host #{@host} and port #{@port}: #{ex}"
       end
 
       # If any saved authentications exist, we want to apply those

data/lib/mongo/util/pool_manager.rb

@@ -12,7 +12,9 @@ module Mongo
                 :nodes,
                 :members,
                 :seeds,
-                :pools
+                :pools,
+                :max_bson_size,
+                :max_message_size
 
     # Create a new set of connection pools.
     #
@@ -33,6 +35,8 @@ module Mongo
       @hosts                = Set.new
       @members              = Set.new
       @refresh_required     = false
+      @max_bson_size        = DEFAULT_MAX_BSON_SIZE
+      @max_message_size     = @max_bson_size * MESSAGE_SIZE_FACTOR
     end
 
     def inspect
@@ -44,7 +48,7 @@ module Mongo
       disconnect_old_members
       connect_to_members
       initialize_pools(@members)
-      cache_discovered_seeds
+      @seeds = discovered_seeds
     end
 
     def refresh!(additional_seeds)
@@ -113,12 +117,11 @@ module Mongo
       read_pool.host_port
     end
 
-    def max_bson_size
-      @max_bson_size ||= config_min('maxBsonObjectSize', DEFAULT_MAX_BSON_SIZE)
-    end
-
-    def max_message_size
-      @max_message_size ||= config_min('maxMessageSizeBytes', DEFAULT_MAX_MESSAGE_SIZE)
+    def update_max_sizes
+      unless @members.size == 0
+        @max_bson_size = @members.map(&:max_bson_size).min
+        @max_message_size = @members.map(&:max_message_size).min
+      end
     end
 
     private
@@ -192,11 +195,6 @@ module Mongo
       @arbiters = members.first.arbiters
     end
 
-    def config_min(attribute, default)
-      @members.reject {|m| !m.config[attribute]}
-      @members.map {|m| m.config[attribute]}.min || default
-    end
-
     def assign_primary(member)
       member.last_state = :primary
       @primary = member.host_port
@@ -246,8 +244,8 @@ module Mongo
 
     private
 
-    def cache_discovered_seeds
-      @seeds = @members.map &:host_port
+    def discovered_seeds
+      @members.map(&:host_port)
     end
 
   end

data/lib/mongo/util/sharding_pool_manager.rb

@@ -16,6 +16,7 @@ module Mongo
       disconnect_old_members
       connect_to_members
       initialize_pools best(@members)
+      @seeds = discovered_seeds
     end
 
     # We want to refresh to the member with the fastest ping time
@@ -25,8 +26,10 @@ module Mongo
     # The config.mongos find can't be part of the connect call chain due to infinite recursion
     def check_connection_health
       begin
-        seeds = @client['config']['mongos'].find.to_a.map{|doc| doc['_id']}
-        if @seeds != seeds
+        seeds = @client['config']['mongos'].find.map do |mongos|
+                  Support.normalize_seeds(mongos['_id'])
+                end
+        if discovered_seeds != seeds
           @seeds = seeds
           @refresh_required = true
         end

data/lib/mongo/util/support.rb

@@ -82,6 +82,20 @@ module Mongo
       end
     end
 
+    def normalize_seeds(seeds)
+      pairs = Array(seeds)
+      pairs = [ seeds ] if pairs.last.is_a?(Fixnum)
+      pairs = pairs.collect do |hostport|
+        if hostport.is_a?(String)
+          host, port = hostport.split(':')
+          [ host, port && port.to_i || MongoClient::DEFAULT_PORT ]
+        else
+          hostport
+        end
+      end
+      pairs.length > 1 ? pairs : pairs.first
+    end
+
     def is_i?(value)
       return !!(value =~ /^\d+$/)
     end

data/mongo.gemspec

@@ -11,14 +11,18 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'mongo'
   s.license           = 'Apache License Version 2.0'
 
-  s.signing_key       = 'gem-private_key.pem'
-  s.cert_chain        = ['gem-public_cert.pem']
+  if File.exists?('gem-private_key.pem')
+    s.signing_key = 'gem-private_key.pem'
+    s.cert_chain  = ['gem-public_cert.pem']
+  else
+    warn 'Warning: No private key present, creating unsigned gem.'
+  end
 
   s.files             = ['mongo.gemspec', 'LICENSE', 'VERSION']
   s.files             += ['README.md', 'Rakefile', 'bin/mongo_console']
   s.files             += ['lib/mongo.rb'] + Dir['lib/mongo/**/*.rb']
 
-  s.test_files        = Dir['test/**/*.rb']
+  s.test_files        = Dir['test/**/*.rb'] - Dir['test/bson/*']
   s.executables       = ['mongo_console']
   s.require_paths     = ['lib']
   s.has_rdoc          = 'yard'

data/test/functional/authentication_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+require 'shared/authentication'
+
+class AuthenticationTest < Test::Unit::TestCase
+  include Mongo
+  include AuthenticationTests
+
+  def setup
+    @client = MongoClient.new
+    @db     = @client[MONGO_TEST_DB]
+  end
+
+  def teardown
+    @db['system.users'].remove
+  end
+
+  def test_authenticate_with_connection_uri
+    @db.add_user('eunice', 'uritest')
+    assert MongoClient.from_uri("mongodb://eunice:uritest@#{host_port}/#{@db.name}")
+  end
+end