moped 1.2.9 → 1.3.0

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Overview
 
+## 1.3.0
+
+### New Features
+
+* \#114 Moped now accepts connecting with a URI. (Christopher Winslett)
+
+        Moped::Session.connect("mongodb://localhost:27017/my_db")
+
+* \#79 Tailable cursors are now supported. These are just Ruby `Enumerators` that
+  keep the cursor open until the next document appears. The cursor will be closed
+  when it becomes "dead".
+
+        enumerator = session[:users].find.tailable.each
+        enumerator.next # Will stay open until next doc.
+
+* mongoid/mongoid\#2460 Moped now makes the connection timeout configurable
+  by passing a `:timeout` option to the session. This defaults to 5 seconds.
+
+        Moped::Session.new([ "node1:27017", "node2:27017" ], timeout: 5)
+
+* \#49 Support for the 2.2 aggregation framework is included. (Rodrigo Saito)
+
+        session[:users].aggregate({
+          "$group" => {
+            "_id" => "$city",
+            "totalpop" => { "$sum" => "$pop" }
+          }
+        })
+
+* \#42 Moped now supports SSL connections to MongoDB. Provide the `ssl: true`
+  option when creating a new `Session`. This is currently experimental.
+
+        Moped::Session.new([ "ssl.mongohq.com:10004" ], ssl: true)
+
+### Resolved Issues
+
+* \#110 Handle timeout errors with SSL connections gracefully and mark nodes as
+  down without failing any other queries.
+
+* \#109 Moped reauthorizes on "db assertion failures" with commands that have
+  an unauthorized assertion code in the reply.
+
 ## 1.2.9
 
 * Moped now ensures that when reading bytes from the socket that it continues

data/lib/moped.rb

@@ -11,6 +11,7 @@ require "moped/database"
 require "moped/errors"
 require "moped/indexes"
 require "moped/logging"
+require "moped/mongo_uri"
 require "moped/node"
 require "moped/protocol"
 require "moped/query"

data/lib/moped/cluster.rb

@@ -93,18 +93,20 @@ module Moped
     #   to reconnect to a down node. (30)
     # @option options :refresh_interval number of seconds to cache information
     #   about a node. (300)
+    # @option options [ Integer ] :timeout The time in seconds to wait for an
+    #   operation to timeout. (5)
     #
     # @since 1.0.0
     def initialize(hosts, options)
+      @seeds = hosts
+      @nodes = hosts.map { |host| Node.new(host, options) }
+
       @options = {
         down_interval: 30,
         max_retries: 30,
         refresh_interval: 300,
         retry_interval: 1
       }.merge(options)
-
-      @seeds = hosts
-      @nodes = hosts.map { |host| Node.new(host) }
     end
 
     # Returns the list of available nodes, refreshing 1) any nodes which were
@@ -169,7 +171,7 @@ module Moped
             refreshed_nodes << node unless refreshed_nodes.include?(node)
 
             # Now refresh any newly discovered peer nodes.
-            (node.peers - @nodes).each(&refresh_node)
+            (node.peers - @nodes).each(&refresh_node) if node.peers
           rescue Errors::ConnectionFailure
             # We couldn't connect to the node, so don't do anything with it.
           end

data/lib/moped/collection.rb

@@ -91,5 +91,28 @@ module Moped
         session.context.insert(database.name, name, documents, flags: flags || [])
       end
     end
+
+    # Call aggregate function over the collection.
+    #
+    # @example Execute an aggregation.
+    #   session[:users].aggregate({
+    #     "$group" => {
+    #       "_id" => "$city",
+    #       "totalpop" => { "$sum" => "$pop" }
+    #     }
+    #   })
+    #
+    # @param [ Hash, Array<Hash> ] documents representing the aggregate function to execute
+    #
+    # @return [ Hash ] containing the result of aggregation
+    #
+    # @since 1.3.0
+    def aggregate(pipeline)
+      pipeline = [ pipeline ] unless pipeline.is_a?(Array)
+      command = { aggregate: name.to_s, pipeline: pipeline }
+      database.session.with(consistency: :strong) do |sess|
+        sess.command(command)["result"]
+      end
+    end
   end
 end

data/lib/moped/connection.rb

@@ -1,4 +1,7 @@
 require "timeout"
+require "moped/sockets/connectable"
+require "moped/sockets/tcp"
+require "moped/sockets/ssl"
 
 module Moped
 
@@ -6,6 +9,9 @@ module Moped
   #
   # @api private
   class Connection
+
+    attr_reader :host, :port, :timeout, :options
+
     # Is the connection alive?
     #
     # @example Is the connection alive?
@@ -27,7 +33,11 @@ module Moped
     #
     # @since 1.0.0
     def connect
-      create_connection
+      @sock = if !!options[:ssl]
+        Sockets::SSL.connect(host, port, timeout)
+      else
+        Sockets::TCP.connect(host, port, timeout)
+      end
     end
 
     # Is the connection connected?
@@ -65,13 +75,14 @@ module Moped
     # @param [ String ] host The host to connect to.
     # @param [ Integer ] post The server port.
     # @param [ Integer ] timeout The connection timeout.
+    # @param [ Hash ] options Options for the connection.
+    #
+    # @option options [ Boolean ] :ssl Connect using SSL
     # @since 1.0.0
-    def initialize(host, port, timeout)
+    def initialize(host, port, timeout, options = {})
       @sock = nil
       @request_id = 0
-      @host = host
-      @port = port
-      @timeout = timeout
+      @host, @port, @timeout, @options = host, port, timeout, options
     end
 
     # Read from the connection.
@@ -148,10 +159,6 @@ module Moped
 
     private
 
-    def create_connection
-      @sock = TCPSocket.connect @host, @port, @timeout
-    end
-
     # Read data from the socket until we get back the number of bytes that we
     # are expecting.
     #
@@ -191,105 +198,8 @@ module Moped
     #
     # @since 1.3.0
     def with_connection
-      create_connection if @sock.nil? || !@sock.alive?
+      connect if @sock.nil? || !@sock.alive?
       yield @sock
     end
-
-    # This is a wrapper around a tcp socket.
-    class TCPSocket < ::TCPSocket
-      attr_reader :host, :port
-
-      # Is the socket connection alive?
-      #
-      # @example Is the socket alive?
-      #   socket.alive?
-      #
-      # @return [ true, false ] If the socket is alive.
-      #
-      # @since 1.0.0
-      def alive?
-        if Kernel::select([ self ], nil, nil, 0)
-          !eof? rescue false
-        else
-          true
-        end
-      end
-
-      # Initialize the new TCPSocket.
-      #
-      # @example Initialize the socket.
-      #   TCPSocket.new("127.0.0.1", 27017)
-      #
-      # @param [ String ] host The host.
-      # @param [ Integer ] port The port.
-      #
-      # @since 1.2.0
-      def initialize(host, port, *args)
-        @host, @port = host, port
-        handle_socket_errors { super }
-      end
-
-      # Read from the TCP socket.
-      #
-      # @param [ Integer ] length The length to read.
-      #
-      # @return [ Object ] The data.
-      #
-      # @since 1.2.0
-      def read(length)
-        handle_socket_errors { super }
-      end
-
-      # Write to the socket.
-      #
-      # @example Write to the socket.
-      #   socket.write(data)
-      #
-      # @param [ Object ] args The data to write.
-      #
-      # @return [ Integer ] The number of bytes written.
-      #
-      # @since 1.0.0
-      def write(*args)
-        raise Errors::ConnectionFailure, "Socket connection was closed by remote host" unless alive?
-        handle_socket_errors { super }
-      end
-
-      private
-
-      def handle_socket_errors
-        yield
-      rescue Timeout::Error
-        raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{host}:#{port}"
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE
-        raise Errors::ConnectionFailure, "Could not connect to Mongo on #{host}:#{port}"
-      rescue Errno::ECONNRESET
-        raise Errors::ConnectionFailure, "Connection reset to Mongo on #{host}:#{port}"
-      end
-
-      class << self
-
-        # Connect to the tcp server.
-        #
-        # @example Connect to the server.
-        #   TCPSocket.connect("127.0.0.1", 27017, 30)
-        #
-        # @param [ String ] host The host to connect to.
-        # @param [ Integer ] post The server port.
-        # @param [ Integer ] timeout The connection timeout.
-        #
-        # @return [ TCPSocket ] The socket.
-        #
-        # @since 1.0.0
-        def connect(host, port, timeout)
-          Timeout::timeout(timeout) do
-            sock = new(host, port)
-            sock.set_encoding('binary')
-            sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-            sock
-          end
-        end
-      end
-    end
   end
 end

data/lib/moped/database.rb

@@ -73,7 +73,7 @@ module Moped
     #
     # @since 1.0.0
     def command(command)
-      session.context.command name, command
+      session.context.command(name.to_s, command)
     end
 
     # Drop the database.

data/lib/moped/mongo_uri.rb

@@ -0,0 +1,149 @@
+# encoding: utf-8
+module Moped
+
+  # Parses MongoDB uri
+  #
+  # @api public
+  class MongoUri
+
+    SCHEME = /(mongodb:\/\/)/
+    USER = /([-.\w:]+)/
+    PASS = /([^@,]+)/
+    NODES = /((([-.\w]+)(?::(\w+))?,?)+)/
+    DATABASE = /(?:\/([-\w]+))?/
+    OPTIONS  = /(?:\?(.+))/
+
+    URI = /#{SCHEME}(#{USER}:#{PASS}@)?#{NODES}#{DATABASE}#{OPTIONS}?/
+
+    attr_reader :match
+
+    # Helper to determine if authentication is provided
+    #
+    # @example Boolean response if username/password given
+    #   uri.auth_provided?
+    #
+    # @return [ true, false ] If authorization is provided.
+    #
+    # @since 1.3.0
+    def auth_provided?
+      !username.nil? && !password.nil?
+    end
+
+    # Get the database provided in the URI.
+    #
+    # @example Get the database.
+    #   uri.database
+    #
+    # @return [ String ] The database.
+    #
+    # @since 1.3.0
+    def database
+      @database ||= match[9]
+    end
+
+    # Get the hosts provided in the URI.
+    #
+    # @example Get the hosts.
+    #   uri.hosts
+    #
+    # @return [ Array<String> ] The hosts.
+    #
+    # @since 1.3.0
+    def hosts
+      @hosts ||= match[5].split(",")
+    end
+
+    # Create the new uri from the provided string.
+    #
+    # @example Create the new uri.
+    #   MongoUri.new(uri)
+    #
+    # @param [ String ] string The uri string.
+    #
+    # @since 1.3.0
+    def initialize(string)
+      @match = string.match(URI)
+    end
+
+    # Get the options provided in the URI.
+    # @example Get the options
+    #   uri.options
+    #
+    # @return [ Hash ] Options hash usable by Moped
+    #
+    # @since 1.3.0
+    def options
+      options_string, options = @match[10], {database: database}
+
+      unless options_string.nil?
+        options_string.split(/\&/).each do |option_string|
+          key, value = option_string.split(/=/)
+
+          if value == "true"
+            options[key.to_sym] = true
+          elsif value == "false"
+            options[key.to_sym] = false
+          elsif value =~ /[\d]/
+            options[key.to_sym] = value.to_i
+          else
+            options[key.to_sym] = value.to_sym
+          end
+        end
+      end
+
+      options
+    end
+
+    # Get the password provided in the URI.
+    #
+    # @example Get the password.
+    #   uri.password
+    #
+    # @return [ String ] The password.
+    #
+    # @since 1.3.0
+    def password
+      @password ||= match[4]
+    end
+
+    # Get the uri as a Mongoid friendly configuration hash.
+    #
+    # @example Get the uri as a hash.
+    #   uri.to_hash
+    #
+    # @return [ Hash ] The uri as options.
+    #
+    # @since 1.3.0
+    def to_hash
+      config = { database: database, hosts: hosts }
+      if username && password
+        config.merge!(username: username, password: password)
+      end
+      config
+    end
+
+    # Create Moped usable arguments
+    #
+    # @example Get the moped args
+    #   uri.moped_arguments
+    #
+    # @return [ Array ] Array of arguments usable by Moped
+    #
+    # @since 1.3.0
+    def moped_arguments
+      [hosts, options]
+    end
+
+    # Get the username provided in the URI.
+    #
+    # @example Get the username.
+    #   uri.username
+    #
+    # @return [ String ] The username.
+    #
+    # @since 1.3.0
+    def username
+      @username ||= match[3]
+    end
+  end
+end

data/lib/moped/node.rb

@@ -12,7 +12,8 @@ module Moped
     # @attribute [r] port The connection port.
     # @attribute [r] resolved_address The host/port pair.
     # @attribute [r] timeout The connection timeout.
-    attr_reader :address, :down_at, :ip_address, :peers, :port, :resolved_address, :timeout
+    # @attribute [r] options Additional options for the node (ssl).
+    attr_reader :address, :down_at, :ip_address, :peers, :port, :resolved_address, :timeout, :options
 
     # Is this node equal to another?
     #
@@ -68,10 +69,15 @@ module Moped
       operation = Protocol::Command.new(database, cmd, options)
 
       process(operation) do |reply|
-        result = reply.documents[0]
-        raise Errors::OperationFailure.new(
-          operation, result
-        ) if result["ok"] != 1 || result["err"] || result["errmsg"]
+        result = reply.documents.first
+        if reply.command_failure?
+          if reply.unauthorized? && auth.has_key?(database)
+            login(database, *auth[database])
+            command(database, cmd, options)
+          else
+            raise Errors::OperationFailure.new(operation, result)
+          end
+        end
         result
       end
     end
@@ -222,11 +228,13 @@ module Moped
     #   Node.new("127.0.0.1:27017")
     #
     # @param [ String ] address The location of the server node.
+    # @param [ Hash ] options Additional options for the node (ssl)
     #
     # @since 1.0.0
-    def initialize(address)
+    def initialize(address, options = {})
       @address = address
-      @timeout = 5
+      @options = options
+      @timeout = options[:timeout] || 5
       @down_at = nil
       @refreshed_at = nil
       @primary = nil
@@ -387,25 +395,30 @@ module Moped
     # @since 1.0.0
     def refresh
       if resolve_address
-        info = command("admin", ismaster: 1)
+        begin
+          info = command("admin", ismaster: 1)
 
-        @refreshed_at = Time.now
-        primary = true if info["ismaster"]
-        secondary = true if info["secondary"]
+          @refreshed_at = Time.now
+          primary = true if info["ismaster"]
+          secondary = true if info["secondary"]
 
-        peers = []
-        peers.push(info["primary"]) if info["primary"]
-        peers.concat(info["hosts"]) if info["hosts"]
-        peers.concat(info["passives"]) if info["passives"]
-        peers.concat(info["arbiters"]) if info["arbiters"]
+          peers = []
+          peers.push(info["primary"]) if info["primary"]
+          peers.concat(info["hosts"]) if info["hosts"]
+          peers.concat(info["passives"]) if info["passives"]
+          peers.concat(info["arbiters"]) if info["arbiters"]
 
-        @peers = peers.map { |peer| Node.new(peer) }
-        @primary, @secondary = primary, secondary
-        @arbiter = info["arbiterOnly"]
-        @passive = info["passive"]
+          @peers = peers.map { |peer| Node.new(peer, options) }
+          @primary, @secondary = primary, secondary
+          @arbiter = info["arbiterOnly"]
+          @passive = info["passive"]
 
-        if !primary && Threaded.executing?(:ensure_primary)
-          raise Errors::ReplicaSetReconfigured, "#{inspect} is no longer the primary node."
+          if !primary && Threaded.executing?(:ensure_primary)
+            raise Errors::ReplicaSetReconfigured, "#{inspect} is no longer the primary node."
+          end
+        rescue Timeout::Error
+          @peers = []
+          down!
         end
       end
     end
@@ -496,7 +509,7 @@ module Moped
     end
 
     def connection
-      @connection ||= Connection.new(ip_address, port, timeout)
+      @connection ||= Connection.new(ip_address, port, timeout, options)
     end
 
     def connected?

data/lib/moped/protocol/reply.rb

@@ -55,16 +55,60 @@ module Moped
 
       finalize
 
+      # Is the reply the result of a command failure?
+      #
+      # @example Did the command fail?
+      #   reply.command_failure?
+      #
+      # @note This is when ok is not 1, or "err" or "errmsg" are present.
+      #
+      # @return [ true, false ] If the command failed.
+      #
+      # @since 1.2.10
+      def command_failure?
+        result = documents[0]
+        result["ok"] != 1 || result["err"] || result["errmsg"]
+      end
+
+      # Was the provided cursor id not found on the server?
+      #
+      # @example Is the cursor not on the server?
+      #   reply.cursor_not_found?
+      #
+      # @return [ true, false ] If the cursor went missing.
+      #
+      # @since 1.2.0
       def cursor_not_found?
         flags.include?(:cursor_not_found)
       end
 
+      # Did the query fail on the server?
+      #
+      # @example Did the query fail?
+      #   reply.query_failed?
+      #
+      # @return [ true, false ] If the query failed.
+      #
+      # @since 1.2.0
       def query_failed?
         flags.include?(:query_failure)
       end
 
+      # Is the reply an error message that we are not authorized for the query
+      # or command?
+      #
+      # @example Was the query unauthorized.
+      #   reply.unauthorized?
+      #
+      # @note So far this can be a "code" of 10057 in the error message or an
+      #   "assertionCode" of 10057.
+      #
+      # @return [ true, false ] If we had an authorization error.
+      #
+      # @since 1.2.10
       def unauthorized?
-        documents.first["code"] == UNAUTHORIZED
+        result = documents[0]
+        result["code"] == UNAUTHORIZED || result["assertionCode"] == UNAUTHORIZED
       end
 
       class << self

data/lib/moped/query.rb

@@ -79,6 +79,7 @@ module Moped
       end if block_given?
       enum
     end
+    alias :cursor :each
 
     # Explain the current query.
     #
@@ -211,7 +212,7 @@ module Moped
       end
 
       # Keeping moped compatibility with mongodb >= 2.2.0-rc0
-      options[:upsert] && !result ? [] : result
+      options[:upsert] && !result ? {} : result
     end
 
     # Remove a single document matching the query's selector.
@@ -296,6 +297,19 @@ module Moped
       self
     end
 
+    # Tell the query to create a tailable cursor.
+    #
+    # @example Tell the query the cursor is tailable.
+    #   db[:people].find.tailable
+    #
+    # @return [ Query ] The query.
+    #
+    # @since 1.3.0
+    def tailable
+      operation.flags.push(:tailable)
+      self
+    end
+
     # Update a single document matching the query's selector.
     #
     # @example Update the first matching document.

data/lib/moped/session.rb

@@ -177,14 +177,17 @@ module Moped
     #   specified safety level e.g., "fsync: true", or "w: 2, wtimeout: 5".
     # @option options [ Symbol, String ] :database The database to use.
     # @option options [ :strong, :eventual ] :consistency (:eventual).
+    # @option options [ Boolean ] :ssl Connect using SSL.
     # @option options [ Integer ] :max_retries The maximum number of attempts
     #   to retry an operation. (30)
     # @option options [ Integer ] :retry_interval The time in seconds to retry
     #   connections to a secondary or primary after a failure. (1)
+    # @option options [ Integer ] :timeout The time in seconds to wait for an
+    #   operation to timeout. (5)
     #
     # @since 1.0.0
     def initialize(seeds, options = {})
-      @cluster = Cluster.new(seeds, {})
+      @cluster = Cluster.new(seeds, options)
       @context = Context.new(self)
       @options = options
       @options[:consistency] ||= :eventual
@@ -312,6 +315,26 @@ module Moped
       end
     end
 
+    class << self
+
+      # Create a new session from a URI.
+      #
+      # @example Initialize a new session.
+      #   Session.connect("mongodb://localhost:27017/my_db")
+      #
+      # @param [ String ] MongoDB URI formatted string.
+      #
+      # @return [ Session ] The new session.
+      #
+      # @since 3.0.0
+      def connect(uri)
+        uri = MongoUri.new(uri)
+        session = new(*uri.moped_arguments)
+        session.login(uri.username, uri.password) if uri.auth_provided?
+        session
+      end
+    end
+
     private
 
     def current_database

data/lib/moped/sockets/connectable.rb

@@ -0,0 +1,114 @@
+module Moped
+  module Sockets
+    module Connectable
+
+      attr_reader :host, :port
+
+      # Is the socket connection alive?
+      #
+      # @example Is the socket alive?
+      #   socket.alive?
+      #
+      # @return [ true, false ] If the socket is alive.
+      #
+      # @since 1.0.0
+      def alive?
+        if Kernel::select([ self ], nil, nil, 0)
+          !eof? rescue false
+        else
+          true
+        end
+      rescue IOError
+        false
+      end
+
+      # Bring in the class methods when included.
+      #
+      # @example Extend the class methods.
+      #   Connectable.included(class)
+      #
+      # @param [ Class ] klass The class including the module.
+      #
+      # @since 1.3.0
+      def self.included(klass)
+        klass.send(:extend, ClassMethods)
+      end
+
+      # Read from the TCP socket.
+      #
+      # @param [ Integer ] length The length to read.
+      #
+      # @return [ Object ] The data.
+      #
+      # @since 1.2.0
+      def read(length)
+        handle_socket_errors { super }
+      end
+
+      # Write to the socket.
+      #
+      # @example Write to the socket.
+      #   socket.write(data)
+      #
+      # @param [ Object ] args The data to write.
+      #
+      # @return [ Integer ] The number of bytes written.
+      #
+      # @since 1.0.0
+      def write(*args)
+        raise Errors::ConnectionFailure, "Socket connection was closed by remote host" unless alive?
+        handle_socket_errors { super }
+      end
+
+      private
+
+      # Handle the potential socket errors that can occur.
+      #
+      # @api private
+      #
+      # @example Handle the socket errors while executing the block.
+      #   handle_socket_errors do
+      #     #...
+      #   end
+      #
+      # @return [ Object ] The result of the yield.
+      #
+      # @since 1.0.0
+      def handle_socket_errors
+        yield
+      rescue Timeout::Error
+        raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{host}:#{port}"
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE
+        raise Errors::ConnectionFailure, "Could not connect to Mongo on #{host}:#{port}"
+      rescue Errno::ECONNRESET
+        raise Errors::ConnectionFailure, "Connection reset to Mongo on #{host}:#{port}"
+      rescue OpenSSL::SSL::SSLError => e
+        raise Errors::ConnectionFailure, "SSL Error '#{e.to_s}' for connection to Mongo on #{host}:#{port}"
+      end
+
+      module ClassMethods
+
+        # Connect to the tcp server.
+        #
+        # @example Connect to the server.
+        #   TCPSocket.connect("127.0.0.1", 27017, 30)
+        #
+        # @param [ String ] host The host to connect to.
+        # @param [ Integer ] post The server port.
+        # @param [ Integer ] timeout The connection timeout.
+        #
+        # @return [ TCPSocket ] The socket.
+        #
+        # @since 1.0.0
+        def connect(host, port, timeout)
+          Timeout::timeout(timeout) do
+            sock = new(host, port)
+            sock.set_encoding('binary')
+            sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+            sock
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moped/sockets/ssl.rb

@@ -0,0 +1,50 @@
+require 'openssl'
+
+module Moped
+  module Sockets
+
+    # This is a wrapper around a tcp socket.
+    class SSL < OpenSSL::SSL::SSLSocket
+      include Connectable
+
+      attr_reader :socket
+
+      # Initialize the new TCPSocket with SSL.
+      #
+      # @example Initialize the socket.
+      #   SSL.new("127.0.0.1", 27017)
+      #
+      # @param [ String ] host The host.
+      # @param [ Integer ] port The port.
+      #
+      # @since 1.2.0
+      def initialize(host, port)
+        @host, @port = host, port
+        handle_socket_errors do
+          @socket = TCPSocket.new(host, port)
+          super(socket)
+          self.sync_close = true
+          connect
+        end
+      end
+
+      # Set the encoding of the underlying socket.
+      #
+      # @param [ String ] string The encoding.
+      #
+      # @since 1.3.0
+      def set_encoding(string)
+        socket.set_encoding(string)
+      end
+
+      # Set a socket option on the underlying socket.
+      #
+      # @param [ Array<Object> ] args The option arguments.
+      #
+      # @since 1.3.0
+      def setsockopt(*args)
+        socket.setsockopt(*args)
+      end
+    end
+  end
+end

data/lib/moped/sockets/tcp.rb

@@ -0,0 +1,23 @@
+module Moped
+  module Sockets
+
+    # This is a wrapper around a tcp socket.
+    class TCP < ::TCPSocket
+      include Connectable
+
+      # Initialize the new TCPSocket.
+      #
+      # @example Initialize the socket.
+      #   TCPSocket.new("127.0.0.1", 27017)
+      #
+      # @param [ String ] host The host.
+      # @param [ Integer ] port The port.
+      #
+      # @since 1.2.0
+      def initialize(host, port)
+        @host, @port = host, port
+        handle_socket_errors { super }
+      end
+    end
+  end
+end

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "1.2.9"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email:
@@ -49,6 +49,7 @@ files:
 - lib/moped/errors.rb
 - lib/moped/indexes.rb
 - lib/moped/logging.rb
+- lib/moped/mongo_uri.rb
 - lib/moped/node.rb
 - lib/moped/protocol/command.rb
 - lib/moped/protocol/commands/authenticate.rb
@@ -65,13 +66,16 @@ files:
 - lib/moped/query.rb
 - lib/moped/session/context.rb
 - lib/moped/session.rb
+- lib/moped/sockets/connectable.rb
+- lib/moped/sockets/ssl.rb
+- lib/moped/sockets/tcp.rb
 - lib/moped/threaded.rb
 - lib/moped/version.rb
 - lib/moped.rb
 - CHANGELOG.md
 - LICENSE
 - README.md
-homepage: http://mongoid.org/moped
+homepage: http://mongoid.org/en/moped
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -85,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 450437274289811416
+      hash: 2772381747018055837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 450437274289811416
+      hash: 2772381747018055837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24