mongo 2.1.0.rc0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a265ed462b59e6b5130e74d96dcd8fd03bd1cf8
-  data.tar.gz: df80f1545fc13f8cbbbaa41b7b2994a396eea58d
+  metadata.gz: d2c9b3e878a211c1145f6cbe09912ac0fa3c6463
+  data.tar.gz: d18c8e33629e8915fab3fb76edefb8cc631f65af
 SHA512:
-  metadata.gz: f8fda95db660cc8690ebb838e7bc037614b34c67e03cb8a397dc9c467acbc27d2b8b39ff9af9ec396a03d86ab4e818dd4f3a333744e2727b7e0612d7e7069f30
-  data.tar.gz: 5845e5ca349dea175a1001e696d0df2600578cb7163bd236eefa4700f9492ee247feccbd46f9c2ef5e1400e31050629738820c824da69fe25f70dff4f86b7465
+  metadata.gz: a6ded8b81178ac9561d5f9a3a8ec83edb31dec5528b8365e83f7d24b1b673e23276c1061956db19879d10feb602dacfeb34bbc7f51e5875fd4593ebfea0aa1c0
+  data.tar.gz: 9431cb7dbb2b2b6a18292f454d84835ddbcee391f2a886bd93d398d3f9190a199f9d7a0f6fc2fc27eb95d32b59d900e6fc09317c2b66ec797fc12a42dabaf87c

checksums.yaml.gz.sig

@@ -1,2 +1,5 @@
-c9*>@N�ZwL0b�����N;�l;.
-v^���I*�y�����6�&n�������(���gP�T����H~�i�}ɉB ���$�}/SP#����W���I�HdJ\͗[<C=��q�E[j[���q)0f�ln�������n�{,OuS����ǁ2k,r5c��wFY �?}n����r��(�.�/���8jӏ!���6��6|�d�X�P�i���ېmC��N�v�>���6�B�3޲��7��0�qJ5E�
+�"W5c��a�A��S��
+� !~���G	�7U`A��K�$�
+pno�c��)o��u�� �$��
++
++I#W�
��l5���̿�:F��D;��#QnG��*OP:b�[Hٲ+�4�}�V�o}�).�kͯDjݦ�U�|)_�P@<a2*��'���N��!��)��ڴ8�dH>

data/Rakefile

@@ -29,8 +29,8 @@ namespace :spec do
 end
 
 task :release => :spec do
-  #system "git tag -a #{Mongo::VERSION} -m 'Tagging release: #{Mongo::VERSION}'"
-  #system "git push --tags"
+  system "git tag -a #{Mongo::VERSION} -m 'Tagging release: #{Mongo::VERSION}'"
+  system "git push --tags"
   system "gem build mongo.gemspec"
   system "gem push mongo-#{Mongo::VERSION}.gem"
   system "rm mongo-#{Mongo::VERSION}.gem"

data/lib/mongo.rb

@@ -15,9 +15,11 @@
 require 'forwardable'
 require 'bson'
 require 'openssl'
+require 'mongo/options'
 require 'mongo/loggable'
 require 'mongo/monitoring'
 require 'mongo/logger'
+require 'mongo/retryable'
 require 'mongo/operation'
 require 'mongo/error'
 require 'mongo/event'
@@ -31,7 +33,6 @@ require 'mongo/database'
 require 'mongo/dbref'
 require 'mongo/grid'
 require 'mongo/index'
-require 'mongo/options'
 require 'mongo/protocol'
 require 'mongo/server'
 require 'mongo/server_selector'

data/lib/mongo/address.rb

@@ -28,10 +28,16 @@ module Mongo
     # Mapping from socket family to resolver class.
     #
     # @since 2.0.0
-    FAMILY_MAP = { ::Socket::PF_UNIX => Unix,
-                   ::Socket::AF_INET6 => IPv6,
-                   ::Socket::AF_INET => IPv4
-                 }
+    FAMILY_MAP = {
+      ::Socket::PF_UNIX => Unix,
+      ::Socket::AF_INET6 => IPv6,
+      ::Socket::AF_INET => IPv4
+    }.freeze
+
+    # The localhost constant.
+    #
+    # @since 2.1.0
+    LOCALHOST = 'localhost'.freeze
 
     # @return [ String ] seed The seed address.
     attr_reader :seed
@@ -146,7 +152,7 @@ module Mongo
     def initialize_resolver!(timeout, ssl_options)
       return Unix.new(seed.downcase) if seed.downcase =~ Unix::MATCH
 
-      family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+      family = (host == LOCALHOST) ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
       error = nil
       ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).each do |info|
         begin

data/lib/mongo/address/ipv4.rb

@@ -35,6 +35,11 @@ module Mongo
       # @since 2.0.0
       MATCH = Regexp.new('/\./').freeze
 
+      # Split value constant.
+      #
+      # @since 2.1.0
+      SPLIT = ':'.freeze
+
       # Parse an IPv4 address into its host and port.
       #
       # @example Parse the address.
@@ -46,7 +51,7 @@ module Mongo
       #
       # @since 2.0.0
       def self.parse(address)
-        parts = address.split(':')
+        parts = address.split(SPLIT)
         host = parts[0]
         port = (parts[1] || 27017).to_i
         [ host, port ]

data/lib/mongo/auth/cr/conversation.rb

@@ -111,7 +111,7 @@ module Mongo
         private
 
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0]['ok'] != 1
+          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
           @nonce = reply.documents[0][Auth::NONCE]
           @reply = reply
         end

data/lib/mongo/auth/ldap/conversation.rb

@@ -87,7 +87,7 @@ module Mongo
         end
 
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0]['ok'] != 1
+          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
           @reply = reply
         end
       end

data/lib/mongo/auth/scram/conversation.rb

@@ -448,7 +448,7 @@ module Mongo
         end
 
         def validate!(reply)
-          raise Unauthorized.new(user) unless reply.documents[0]['ok'] == 1
+          raise Unauthorized.new(user) unless reply.documents[0][Operation::Result::OK] == 1
           @reply = reply
         end
       end

data/lib/mongo/auth/user/view.rb

@@ -90,8 +90,8 @@ module Mongo
         def update(user_or_name, options = {})
           user = generate(user_or_name, options)
           Operation::Write::UpdateUser.new(
-              user: user,
-              db_name: database.name
+            user: user,
+            db_name: database.name
           ).execute(next_primary.context)
         end
 

data/lib/mongo/auth/x509/conversation.rb

@@ -83,7 +83,7 @@ module Mongo
         private
 
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0]['ok'] != 1
+          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
           @reply = reply
         end
       end

data/lib/mongo/bulk_write.rb

@@ -23,6 +23,7 @@ require 'mongo/bulk_write/result_combiner'
 module Mongo
   class BulkWrite
     extend Forwardable
+    include Retryable
 
     # @return [ Mongo::Collection ] collection The collection.
     attr_reader :collection
@@ -45,17 +46,19 @@ module Mongo
     #
     # @since 2.1.0
     def execute
-      server = next_primary
       operation_id = Monitoring.next_operation_id
       result_combiner = ResultCombiner.new
-      operations.each do |operation|
-        execute_operation(
-          operation.keys.first,
-          operation.values.first,
-          server,
-          operation_id,
-          result_combiner
-        )
+      write_with_retry do
+        server = next_primary
+        operations.each do |operation|
+          execute_operation(
+            operation.keys.first,
+            operation.values.first,
+            server,
+            operation_id,
+            result_combiner
+          )
+        end
       end
       result_combiner.result
     end

data/lib/mongo/bulk_write/transformable.rb

@@ -56,14 +56,14 @@ module Mongo
       #
       # @since 2.1.0
       DELETE_MANY_TRANSFORM = ->(doc){
-        { q: doc[:filter], limit: 0 }
+        { Operation::Q => doc[:filter], Operation::LIMIT => 0 }
       }
 
       # Proc to transform delete one ops.
       #
       # @since 2.1.0
       DELETE_ONE_TRANSFORM = ->(doc){
-        { q: doc[:filter], limit: 1 }
+        { Operation::Q => doc[:filter], Operation::LIMIT => 1 }
       }
 
       # Proc to transform insert one ops.
@@ -77,21 +77,36 @@ module Mongo
       #
       # @since 2.1.0
       REPLACE_ONE_TRANSFORM = ->(doc){
-        { q: doc[:filter], u: doc[:replacement], multi: false, upsert: doc.fetch(:upsert, false) }
+        {
+          Operation::Q => doc[:filter],
+          Operation::U => doc[:replacement],
+          Operation::MULTI => false,
+          Operation::UPSERT => doc.fetch(:upsert, false)
+        }
       }
 
       # Proc to transform update many ops.
       #
       # @since 2.1.0
       UPDATE_MANY_TRANSFORM = ->(doc){
-        { q: doc[:filter], u: doc[:update], multi: true, upsert: doc.fetch(:upsert, false) }
+        {
+          Operation::Q => doc[:filter],
+          Operation::U => doc[:update],
+          Operation::MULTI => true,
+          Operation::UPSERT => doc.fetch(:upsert, false)
+        }
       }
 
       # Proc to transform update one ops.
       #
       # @since 2.1.0
       UPDATE_ONE_TRANSFORM = ->(doc){
-        { q: doc[:filter], u: doc[:update], multi: false, upsert: doc.fetch(:upsert, false) }
+        {
+          Operation::Q => doc[:filter],
+          Operation::U => doc[:update],
+          Operation::MULTI => false,
+          Operation::UPSERT => doc.fetch(:upsert, false)
+        }
       }
 
       # Document mappers from the bulk api input into proper commands.

data/lib/mongo/client.rb

@@ -153,7 +153,7 @@ module Mongo
     #   logs at the default 250 characters.
     #
     # @since 2.0.0
-    def initialize(addresses_or_uri, options = {})
+    def initialize(addresses_or_uri, options = Options::Redacted.new)
       @monitoring = Monitoring.new(options)
       if addresses_or_uri.is_a?(::String)
         create_from_uri(addresses_or_uri, options)
@@ -185,7 +185,7 @@ module Mongo
     #
     # @since 2.0.0
     def read_preference
-      @read_preference ||= ServerSelector.get((options[:read] || {}).merge(options))
+      @read_preference ||= ServerSelector.get(Options::Redacted.new(options[:read] || {}).merge(options))
     end
 
     # Use the database with the provided name. This will switch the current
@@ -215,9 +215,9 @@ module Mongo
     # @return [ Mongo::Client ] A new client instance.
     #
     # @since 2.0.0
-    def with(new_options = {})
+    def with(new_options = Options::Redacted.new)
       clone.tap do |client|
-        opts = new_options || {}
+        opts = Options::Redacted.new(new_options) || Options::Redacted.new
         client.options.update(opts)
         Database.create(client)
         # We can't use the same cluster if some options that would affect it
@@ -274,7 +274,7 @@ module Mongo
     #
     # @since 2.0.5
     def database_names
-      list_databases.collect{ |info| info['name'] }
+      list_databases.collect{ |info| info[Database::NAME] }
     end
 
     # Get info for each database.
@@ -286,20 +286,20 @@ module Mongo
     #
     # @since 2.0.5
     def list_databases
-      use(Database::ADMIN).command(listDatabases: 1).first['databases']
+      use(Database::ADMIN).command(listDatabases: 1).first[Database::DATABASES]
     end
 
     private
 
-    def create_from_addresses(addresses, opts = {})
-      @options = Database::DEFAULT_OPTIONS.merge(opts).freeze
+    def create_from_addresses(addresses, opts = Options::Redacted.new)
+      @options = Options::Redacted.new(Database::DEFAULT_OPTIONS.merge(opts)).freeze
       @cluster = Cluster.new(addresses, @monitoring, options)
       @database = Database.new(self, options[:database], options)
     end
 
-    def create_from_uri(connection_string, opts = {})
+    def create_from_uri(connection_string, opts = Options::Redacted.new)
       uri = URI.new(connection_string, opts)
-      @options = Database::DEFAULT_OPTIONS.merge(uri.client_options.merge(opts)).freeze
+      @options = Options::Redacted.new(Database::DEFAULT_OPTIONS.merge(uri.client_options.merge(opts))).freeze
       @cluster = Cluster.new(uri.servers, @monitoring, options)
       @database = Database.new(self, options[:database], options)
     end
@@ -314,7 +314,7 @@ module Mongo
 
     def cluster_modifying?(new_options)
       cluster_options = new_options.reject do |name|
-        CRUD_OPTIONS.include?(name)
+        CRUD_OPTIONS.include?(name.to_sym)
       end
       cluster_options.any? do |name, value|
         options[name] != value

data/lib/mongo/cluster.rb

@@ -88,7 +88,7 @@ module Mongo
     # @param [ Hash ] options The options.
     #
     # @since 2.0.0
-    def initialize(seeds, monitoring, options = {})
+    def initialize(seeds, monitoring, options = Options::Redacted.new)
       @addresses = []
       @servers = []
       @monitoring = monitoring
@@ -125,7 +125,7 @@ module Mongo
     #
     # @since 2.0.0
     def next_primary
-      ServerSelector.get({ mode: :primary }.merge(options)).select_server(self)
+      ServerSelector.get(ServerSelector::PRIMARY.merge(options)).select_server(self)
     end
 
     # Elect a primary server from the description that has just changed to a

data/lib/mongo/collection.rb

@@ -23,6 +23,17 @@ module Mongo
   # @since 2.0.0
   class Collection
     extend Forwardable
+    include Retryable
+
+    # The capped option.
+    #
+    # @since 2.1.0
+    CAPPED = 'capped'.freeze
+
+    # The ns field constant.
+    #
+    # @since 2.1.0
+    NS = 'ns'.freeze
 
     # @return [ Mongo::Database ] The database the collection resides in.
     attr_reader :database
@@ -136,7 +147,7 @@ module Mongo
     #
     # @since 2.0.0
     def capped?
-      database.command(:collstats => name).documents[0]['capped']
+      database.command(:collstats => name).documents[0][CAPPED]
     end
 
     # Force the collection to be created in the database.
@@ -309,13 +320,15 @@ module Mongo
     #
     # @since 2.0.0
     def insert_one(document, options = {})
-      Operation::Write::Insert.new(
-        :documents => [ document ],
-        :db_name => database.name,
-        :coll_name => name,
-        :write_concern => write_concern,
-        :options => options
-      ).execute(next_primary.context)
+      write_with_retry do
+        Operation::Write::Insert.new(
+          :documents => [ document ],
+          :db_name => database.name,
+          :coll_name => name,
+          :write_concern => write_concern,
+          :options => options
+        ).execute(next_primary.context)
+      end
     end
 
     # Insert the provided documents into the collection.

data/lib/mongo/collection/view.rb

@@ -44,6 +44,7 @@ module Mongo
       include Immutable
       include Iterable
       include Readable
+      include Retryable
       include Explainable
       include Writable
 

data/lib/mongo/collection/view/aggregation.rb

@@ -26,6 +26,7 @@ module Mongo
         include Iterable
         include Explainable
         include Loggable
+        include Retryable
 
         # @return [ View ] view The collection view.
         attr_reader :view
@@ -42,10 +43,15 @@ module Mongo
         #
         # @since 2.1.0
         OPTIONS_MAP = {
-                       :allow_disk_use => :allowDiskUse,
-                       :max_time_ms => :maxTimeMS,
-                       :explain => :explain
-                      }
+          :allow_disk_use => :allowDiskUse,
+          :max_time_ms => :maxTimeMS,
+          :explain => :explain
+        }.freeze
+
+        # The reroute message.
+        #
+        # @since 2.1.0
+        REROUTE = 'Rerouting the Aggregation operation to the primary server.'.freeze
 
         # Set to true if disk usage is allowed during the aggregation.
         #
@@ -143,7 +149,7 @@ module Mongo
 
         def send_initial_query(server)
           unless valid_server?(server)
-            log_warn('Rerouting the Aggregation operation to the primary server.')
+            log_warn(REROUTE)
             server = cluster.next_primary
           end
           initial_query_op.execute(server.context)

data/lib/mongo/collection/view/iterable.rb

@@ -35,8 +35,12 @@ module Mongo
         #
         # @yieldparam [ Hash ] Each matching document.
         def each
-          server = read.select_server(cluster)
-          @cursor = Cursor.new(view, send_initial_query(server), server)
+          @cursor = nil
+          read_with_retry do
+            server = read.select_server(cluster)
+            result = send_initial_query(server)
+            @cursor = Cursor.new(view, result, server)
+          end
           @cursor.each do |doc|
             yield doc
           end if block_given?