moped 2.0.0.beta3 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaafa3e24e927991736aecf8de32a4387b676f26
-  data.tar.gz: 69bff1f57e4ab5051f18bdd29b5f4ddbe31a00be
+  metadata.gz: dcc02534c2e5692e3ec6ec5d413a84affae01928
+  data.tar.gz: 9f68b061f00712169ab5b0ff7cab3013bb70275d
 SHA512:
-  metadata.gz: ba51eaa03eaa3d0258195cbb3bd8c0e47c7f1743e7ec8a74f412cb65d12d13e52b94e8f9c09d444a5a51cddb74d4ecd571206d59faf3eb46b1bb8b00a7b04fe6
-  data.tar.gz: 2111c5001c36a1ff85cb80fd97ebfe23e595fe782eb311098ccb77558524e95cb3327360cd49dc0cb1ce12abae1a51ec408ac48c0c853a7e7fd42c96eef132b7
+  metadata.gz: c4e346563b648daf55642a42cd4df9292848bd03cc87f31edfca2f5f5661a3a884ed97fe064a0355325bbde151cac169d00a4bf24b074ad173bff2efbcf8bb1c
+  data.tar.gz: e476c83c7abc0d42e73629962457cc8403658e645ae7ee62ad2041659a69745172861793db667eeef781b45015a175a9ecea4c7d88fa5cae31321bbbbc365472

data/README.md

@@ -1,4 +1,4 @@
-Moped [![Build Status](https://secure.travis-ci.org/mongoid/moped.png?branch=master&.png)](http://travis-ci.org/mongoid/moped) [![Code Climate](https://codeclimate.com/github/mongoid/moped.png)](https://codeclimate.com/github/mongoid/moped) [![Coverage Status](https://coveralls.io/repos/mongoid/moped/badge.png?branch=master)](https://coveralls.io/r/mongoid/moped?branch=master)
+Moped [![Build Status](https://secure.travis-ci.org/mongoid/moped.png?branch=master)](http://travis-ci.org/mongoid/moped) [![Code Climate](https://codeclimate.com/github/mongoid/moped.png)](https://codeclimate.com/github/mongoid/moped) [![Coverage Status](https://coveralls.io/repos/mongoid/moped/badge.png?branch=master)](https://coveralls.io/r/mongoid/moped?branch=master)
 ========
 
 Moped is a MongoDB driver for Ruby, which exposes a simple, elegant, and fast

data/lib/moped/authenticatable.rb

@@ -60,14 +60,19 @@ module Moped
     # @since 2.0.0
     def login(database, username, password)
       getnonce = Protocol::Command.new(database, getnonce: 1)
-      result = Operation::Read.new(getnonce).execute(self)
-      authenticate = Protocol::Commands::Authenticate.new(database, username, password, result["nonce"])
-      connection do |conn|
-        conn.write([ authenticate ])
-        document = conn.read.documents.first
-        raise Errors::AuthenticationFailure.new(authenticate, document) unless document["ok"] == 1
-        credentials[database] = [username, password]
+      self.write([getnonce])
+      reply = self.receive_replies([getnonce]).first
+      if getnonce.failure?(reply)
+        return
       end
+      result = getnonce.results(reply)
+
+      authenticate = Protocol::Commands::Authenticate.new(database, username, password, result["nonce"])
+      self.write([ authenticate ])
+      document = self.read.documents.first
+
+      raise Errors::AuthenticationFailure.new(authenticate, document) unless document["ok"] == 1
+      credentials[database] = [username, password]
     end
 
     # Logout the user from the provided database.
@@ -82,7 +87,11 @@ module Moped
     # @since 2.0.0
     def logout(database)
       command = Protocol::Command.new(database, logout: 1)
-      Operation::Read.new(command).execute(self)
+      self.write([command])
+      reply = self.receive_replies([command]).first
+      if command.failure?(reply)
+        return
+      end
       credentials.delete(database)
     end
   end

data/lib/moped/cluster.rb

@@ -32,16 +32,32 @@ module Moped
     #   @return [ Array<Node> ] The seed nodes.
     attr_reader :options, :peers, :seeds
 
-    # Get the credentials for the cluster.
+    # Add a credential to the cluster
     #
     # @example Get the applied credentials.
     #   node.credentials
     #
-    # @return [ Hash ] The credentials.
+    # @return [ Boolean ] true
     #
     # @since 2.0.0
-    def credentials
+    def add_credential(db, username, password)
       @credentials ||= {}
+      @credentials[db] = [ username, password ]
+      apply_credentials
+    end
+
+    # Remove a credential from the cluster
+    #
+    # @example Get the applied credentials.
+    #   node.delete_credential(database_name)
+    #
+    # @return [ Boolean ] true
+    #
+    # @since 2.0.0
+    def delete_credential(db)
+      return true unless @credentials
+      @credentials.delete(db)
+      apply_credentials
     end
 
     # Disconnects all nodes in the cluster. This should only be used in cases
@@ -224,7 +240,7 @@ module Moped
       if node = nodes.find(&:primary?)
         begin
           node.ensure_primary do
-            return yield(node.apply_credentials(credentials))
+            return yield(node)
           end
         rescue Errors::ConnectionFailure, Errors::ReplicaSetReconfigured
         end
@@ -251,7 +267,7 @@ module Moped
       available_nodes = nodes.select(&:secondary?).shuffle!
       while node = available_nodes.shift
         begin
-          return yield(node.apply_credentials(credentials))
+          return yield(node)
         rescue Errors::ConnectionFailure => e
           next
         end
@@ -261,6 +277,23 @@ module Moped
 
     private
 
+    # Apply the credentials on all nodes
+    #
+    # @api private
+    #
+    # @example Apply the credentials.
+    #   cluster.apply_credentials
+    #
+    # @return [ Boolean ] True
+    #
+    # @since 2.0.0
+    def apply_credentials
+      seeds.each do |node|
+        node.credentials = @credentials || {}
+      end
+      true
+    end
+
     # Get the boundary where a node that is down would need to be refreshed.
     #
     # @api private

data/lib/moped/connection/manager.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require "connection_pool"
+
 module Moped
   class Connection
 
@@ -11,6 +13,12 @@ module Moped
       # Used for synchronization of pools access.
       MUTEX = Mutex.new
 
+      # The default max size for the connection pool.
+      POOL_SIZE = 5
+
+      # The default timeout for getting connections from the queue.
+      TIMEOUT = 0.5
+
       # Get a connection pool for the provided node.
       #
       # @example Get a connection pool for the node.
@@ -23,13 +31,38 @@ module Moped
       # @since 2.0.0
       def pool(node)
         MUTEX.synchronize do
-          pools[node.address.resolved] ||=
-            Pool.new(node.address.ip, node.address.port, node.options)
+          pools[node.address.resolved] ||= create_pool(node)
         end
       end
 
       private
 
+      # Create a new connection pool for the provided node.
+      #
+      # @api private
+      #
+      # @example Get a connection pool for the node.
+      #   Manager.create_pool(node)
+      #
+      # @param [ Node ] node The node.
+      #
+      # @return [ ConnectionPool ] A connection pool.
+      #
+      # @since 2.0.0
+      def create_pool(node)
+        ConnectionPool.new(
+          size: node.options[:pool_size] || POOL_SIZE,
+          timeout: node.options[:pool_timeout] || TIMEOUT
+        ) do
+          Connection.new(
+            node.address.ip,
+            node.address.port,
+            node.options[:timeout] || Connection::TIMEOUT,
+            node.options
+          )
+        end
+      end
+
       # Get all the connection pools. This is a cache that stores each pool
       # with lookup by it's resolved address.
       #

data/lib/moped/connection.rb

@@ -1,8 +1,5 @@
 # encoding: utf-8
 require "moped/connection/manager"
-require "moped/connection/pool"
-require "moped/connection/queue"
-require "moped/connection/reaper"
 require "moped/connection/sockets"
 
 module Moped
@@ -11,6 +8,7 @@ module Moped
   #
   # @since 2.0.0
   class Connection
+    include Authenticatable
 
     # The default connection timeout, in seconds.
     #
@@ -170,7 +168,7 @@ module Moped
           sock_read = read_data(socket, reply.length - 36)
           buffer = StringIO.new(sock_read)
           reply.documents = reply.count.times.map do
-            BSON::Document.from_bson(buffer)
+            ::BSON::Document.from_bson(buffer)
           end
         end
         reply

data/lib/moped/database.rb

@@ -112,7 +112,7 @@ module Moped
     #
     # @since 1.0.0
     def login(username, password)
-      cluster.credentials[name] = [ username, password ]
+      cluster.add_credential(name, username, password)
     end
 
     # Log out from the current database.
@@ -122,7 +122,7 @@ module Moped
     #
     # @since 1.0.0
     def logout
-      cluster.credentials.delete(name)
+      cluster.delete_credential(name)
     end
   end
 end

data/lib/moped/failover/retry.rb

@@ -26,7 +26,9 @@ module Moped
       def execute(exception, node)
         node.disconnect
         begin
-          yield if block_given?
+          node.connection do |conn|
+            yield(conn) if block_given?
+          end
         rescue Exception => e
           node.down!
           raise(e)

data/lib/moped/node.rb

@@ -13,7 +13,6 @@ module Moped
   #
   # @since 1.0.0
   class Node
-    include Authenticatable
     include Executable
     include Instrumentable
 
@@ -29,6 +28,10 @@ module Moped
     #   @return [ Time ] The last time the node did a refresh.
     attr_reader :address, :down_at, :latency, :options, :refreshed_at
 
+    # @!attribute credentials
+    #   @return [ Hash ] The credentials of the node.
+    attr_accessor :credentials
+
     # Is this node equal to another?
     #
     # @example Is the node equal to another.
@@ -87,24 +90,6 @@ module Moped
       read(Protocol::Command.new(database, cmd, options))
     end
 
-    # Connect the node on the underlying connection.
-    #
-    # @example Connect the node.
-    #   node.connect
-    #
-    # @raise [ Errors::ConnectionFailure ] If connection failed.
-    #
-    # @return [ true ] If the connection suceeded.
-    #
-    # @since 2.0.0
-    def connect
-      start = Time.now
-      connection{ |conn| conn.connect }
-      @latency = Time.now - start
-      @down_at = nil
-      true
-    end
-
     # Is the node currently connected?
     #
     # @example Is the node connected?
@@ -126,11 +111,23 @@ module Moped
     #
     # @since 2.0.0
     def connection
-      pool.with_connection do |conn|
+      pool.with do |conn|
         yield(conn)
       end
     end
 
+    # Is the node down?
+    #
+    # @example Is the node down?
+    #   node.down?
+    #
+    # @return [ Time, nil ] The time the node went down, or nil if up.
+    #
+    # @since 1.0.0
+    def down?
+      @down_at
+    end
+
     # Force the node to disconnect from the server.
     #
     # @example Disconnect the node.
@@ -140,23 +137,11 @@ module Moped
     #
     # @since 1.2.0
     def disconnect
-      credentials.clear
+      @credentials.clear
       connection{ |conn| conn.disconnect }
       true
     end
 
-    # Is the node down?
-    #
-    # @example Is the node down?
-    #   node.down?
-    #
-    # @return [ Time, nil ] The time the node went down, or nil if up.
-    #
-    # @since 1.0.0
-    def down?
-      @down_at
-    end
-
     # Mark the node as down.
     #
     # @example Mark the node as down.
@@ -168,7 +153,7 @@ module Moped
     def down!
       @down_at = Time.new
       @latency = nil
-      disconnect if connected?
+      disconnect
     end
 
     # Yields the block if a connection can be established, retrying when a
@@ -185,15 +170,23 @@ module Moped
     #
     # @since 1.0.0
     def ensure_connected(&block)
-      return yield if executing?(:connection)
-      execute(:connection) do
-        begin
-          connect unless connected?
-          yield(self)
-        rescue Exception => e
-          Failover.get(e).execute(e, self, &block)
+      unless (conn = stack(:connection)).empty?
+        return yield(conn.first)
+      end
+
+      begin
+        connection do |conn|
+          stack(:connection) << conn
+          connect(conn) unless conn.connected?
+          conn.apply_credentials(@credentials)
+          yield(conn)
         end
+      rescue Exception => e
+        Failover.get(e).execute(e, self, &block)
+      ensure
+        end_execution(:connection)
       end
+
     end
 
     # Set a flag on the node for the duration of provided block so that an
@@ -259,6 +252,7 @@ module Moped
       @latency = nil
       @primary = nil
       @secondary = nil
+      @credentials = {}
       @instrumenter = options[:instrumenter] || Instrumentable::Log
       @address = Address.new(address, timeout)
       @address.resolve(self)
@@ -523,6 +517,24 @@ module Moped
 
     private
 
+    # Connect the node on the underlying connection.
+    #
+    # @example Connect the node.
+    #   node.connect
+    #
+    # @raise [ Errors::ConnectionFailure ] If connection failed.
+    #
+    # @return [ true ] If the connection suceeded.
+    #
+    # @since 2.0.0
+    def connect(conn)
+      start = Time.now
+      conn.connect
+      @latency = Time.now - start
+      @down_at = nil
+      true
+    end
+
     # Configure the node based on the return from the ismaster command.
     #
     # @api private
@@ -554,7 +566,7 @@ module Moped
     def discover(*nodes)
       nodes.flatten.compact.each do |peer|
         node = Node.new(peer, options)
-        node.credentials.merge!(credentials)
+        node.credentials.merge!(@credentials)
         peers.push(node)
       end
     end
@@ -574,16 +586,14 @@ module Moped
     def flush(ops = queue)
       operations, callbacks = ops.transpose
       logging(operations) do
-        ensure_connected do
-          replies = nil
-          connection do |conn|
-            conn.write(operations)
-            replies = conn.receive_replies(operations)
-          end
-          replies.zip(callbacks).map do |reply, callback|
-            callback ? callback[reply] : reply
-          end.last
+        replies = nil
+        ensure_connected do |conn|
+          conn.write(operations)
+          replies = conn.receive_replies(operations)
         end
+        replies.zip(callbacks).map do |reply, callback|
+          callback ? callback[reply] : reply
+        end.last
       end
     ensure
       ops.clear

data/lib/moped/operation/read.rb

@@ -47,12 +47,7 @@ module Moped
       def execute(node)
         node.process(operation) do |reply|
           if operation.failure?(reply)
-            if reply.unauthorized? && node.credentials.has_key?(database)
-              node.login(database, *node.credentials[database])
-              return execute(node)
-            else
-              raise operation.failure_exception(reply)
-            end
+            raise operation.failure_exception(reply)
           end
           operation.results(reply)
         end

data/lib/moped/protocol/reply.rb

@@ -156,7 +156,7 @@ module Moped
       def deserialize_documents(buffer)
         documents = []
         count.times do
-          documents << BSON::Document.from_bson(buffer)
+          documents << ::BSON::Document.from_bson(buffer)
         end
         @documents = documents
       end

data/lib/moped/query.rb

@@ -77,6 +77,17 @@ module Moped
       cursor.each(*args, &blk)
     end
 
+    # Get the Moped cursor to iterate over documents
+    # on the db.
+    #
+    # @example Iterate over the matching documents.
+    #   db[:people].cursor.each do |doc|
+    #     #...
+    #   end
+    #
+    # @return [ Moped::Cursor ]
+    #
+    # @since 2.0.0
     def cursor
       Cursor.new(session, operation)
     end

data/lib/moped/session.rb

@@ -215,10 +215,15 @@ module Moped
     # @since 2.0.0
     option(:retry_interval).allow(Optionable.any(Numeric))
 
-    # Setup validation of allowed reap interval options. (Any numeric)
+    # Setup validation of allowed refresh interval options. (Any numeric)
     #
     # @since 2.0.0
-    option(:reap_interval).allow(Optionable.any(Numeric))
+    option(:refresh_interval).allow(Optionable.any(Numeric))
+
+    # Setup validation of allowed down interval options. (Any numeric)
+    #
+    # @since 2.0.0
+    option(:down_interval).allow(Optionable.any(Numeric))
 
     # Setup validation of allowed ssl options. (Any boolean)
     #
@@ -230,6 +235,11 @@ module Moped
     # @since 2.0.0
     option(:timeout).allow(Optionable.any(Numeric))
 
+    # Pass an object that responds to instrument as an instrumenter.
+    #
+    # @since 2.0.0
+    option(:instrumenter).allow(Optionable.any(Object))
+
     # Initialize a new database session.
     #
     # @example Initialize a new session.

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "2.0.0.beta3"
+  VERSION = "2.0.0.beta4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -17,28 +17,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc3
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc3
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: optionable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 description: A MongoDB driver for Ruby.
 email:
 - durran@gmail.com
@@ -51,9 +65,6 @@ files:
 - lib/moped/cluster.rb
 - lib/moped/collection.rb
 - lib/moped/connection/manager.rb
-- lib/moped/connection/pool.rb
-- lib/moped/connection/queue.rb
-- lib/moped/connection/reaper.rb
 - lib/moped/connection/socket/connectable.rb
 - lib/moped/connection/socket/ssl.rb
 - lib/moped/connection/socket/tcp.rb
@@ -128,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A MongoDB driver for Ruby.

data/lib/moped/connection/pool.rb

@@ -1,198 +0,0 @@
-# encoding: utf-8
-module Moped
-  class Connection
-
-    # This class contains behaviour of connection pools for specific addresses.
-    #
-    # @since 2.0.0
-    class Pool
-
-      # The default max size for the connection pool.
-      POOL_SIZE = 5
-
-      # The default timeout for getting connections from the queue.
-      TIMEOUT = 0.25
-
-      # @!attribute host
-      #   @return [ String ] The host the pool is for.
-      # @!attribute port
-      #   @return [ Integer ] The port on the host.
-      # @!attribute options
-      #   @return [ Hash ] The connection pool options.
-      # @!attribute reaper
-      #   @return [ Reaper ] The connection pool reaper.
-      attr_reader :host, :port, :options, :reaper
-
-      # Checkout a connection from the connection pool. If there exists a
-      # connection pinned to the current thread, then we return that first. If
-      # no connection is pinned, we will take an unpinned connection or create
-      # a new one if no unpinned exist and the pool is not saturated.
-      #
-      # @example Checkout a connection.
-      #   pool.checkout
-      #
-      # @return [ Connection ] A connection.
-      #
-      # @since 2.0.0
-      def checkout
-        mutex.synchronize do
-          connection = pinned[thread_id]
-          if connection
-            unless connection.expired?
-              raise Errors::ConnectionInUse, "The connection on thread: #{thread_id} is in use."
-            else
-              lease(connection)
-            end
-          else
-            connection = pinned[thread_id] = next_connection
-            lease(connection)
-          end
-        end
-      end
-
-      # Checkin the connection, indicating that it is finished being used. The
-      # connection will stay pinned to the current thread.
-      #
-      # @example Checkin the connection.
-      #   pool.checkin(connection)
-      #
-      # @param [ Connection ] connection The connection to checkin.
-      #
-      # @since 2.0.0
-      def checkin(connection)
-        mutex.synchronize do
-          expire(connection)
-        end
-      end
-
-      # Initialize the connection pool.
-      #
-      # @example Instantiate the connection pool.
-      #   Pool.new(max_size: 4)
-      #
-      # @param [ Hash ] options The connection pool options.
-      #
-      # @since 2.0.0
-      def initialize(host, port, options = {})
-        @host = host
-        @port = port
-        @options = options
-        @reaper = Reaper.new(options[:reap_interval] || Reaper::INTERVAL, self)
-        @mutex = Mutex.new
-        @resource = ConditionVariable.new
-        @pinned = {}
-        @unpinned = Queue.new(max_size) do
-          Connection.new(host, port, options[:timeout] || Connection::TIMEOUT, options)
-        end
-        reaper.start
-      end
-
-      # Get the max size for the connection pool.
-      #
-      # @example Get the max size.
-      #   pool.max_size
-      #
-      # @return [ Integer ] The max size of the pool.
-      #
-      # @since 2.0.0
-      def max_size
-        @max_size ||= (options[:pool_size] || POOL_SIZE)
-      end
-
-      # Reap all connections that are active and associated with dead threads.
-      #
-      # @example Reap the connections.
-      #   pool.reap([ 12351122313 ])
-      #
-      # @param [ Array<Integer> ] ids The ids of the current active threads.
-      #
-      # @return [ Pool ] The connection pool.
-      #
-      # @since 2.0.0
-      def reap(ids = active_threads)
-        pinned.each do |id, conn|
-          unless ids.include?(id)
-            conn.expire
-            unpinned.push(pinned.delete(id))
-          end
-        end and self
-      end
-
-      # Get the current size of the connection pool. Is the total of pinned
-      # plus unpinned connections.
-      #
-      # @example Get the pool's current size.
-      #   pool.size
-      #
-      # @return [ Integer ] The current size of the pool.
-      #
-      # @since 2.0.0
-      def size
-        unpinned.size + pinned.size
-      end
-
-      # Get the timeout when attempting to check out items from the pool.
-      #
-      # @example Get the checkout timeout.
-      #   pool.timeout
-      #
-      # @return [ Float ] The pool timeout.
-      #
-      # @since 2.0.0
-      def timeout
-        @timeout ||= (options[:pool_timeout] || TIMEOUT)
-      end
-
-      # Execute the block with a connection, ensuring that the checkin/checkout
-      # workflow is properly executed.
-      #
-      # @example Execute the block with a connection.
-      #   pool.with_connection do |conn|
-      #     conn.connect
-      #   end
-      #
-      # @return [ Object ] The result of the yield.
-      #
-      # @since 2.0.0
-      def with_connection
-        connection = checkout
-        begin
-          yield(connection)
-        ensure
-          checkin(connection)
-        end
-      end
-
-      private
-
-      attr_reader :mutex, :resource, :pinned, :unpinned
-
-      def expire(connection)
-        connection.expire
-        pinned[thread_id] = connection
-      end
-
-      def lease(connection)
-        connection.lease
-        connection
-      end
-
-      def next_connection
-        reap if saturated?
-        unpinned.pop(timeout)
-      end
-
-      def saturated?
-        size == max_size
-      end
-
-      def thread_id
-        Thread.current.object_id
-      end
-
-      def active_threads
-        Thread.list.select{ |thread| thread.alive? }.map{ |thread| thread.object_id }
-      end
-    end
-  end
-end

data/lib/moped/connection/queue.rb

@@ -1,93 +0,0 @@
-# encoding: utf-8
-module Moped
-  class Connection
-
-    # This class contains behaviour of a queue of unpinned connections.
-    #
-    # @since 2.0.0
-    class Queue
-
-      # Initialize a queue with the provided size.
-      #
-      # @example Instantiate the queue.
-      #   Moped::Connection::Queue.new(10)
-      #
-      # @param [ Integer ] size The number of connections in the queue.
-      #
-      # @since 2.0.0
-      def initialize(size)
-        @queue = Array.new(size) { yield }
-        @mutex = Mutex.new
-        @resource = ConditionVariable.new
-      end
-
-      # Push a connection on the queue.
-      #
-      # @example Push a connection on the queue.
-      #   queue.push(connection)
-      #
-      # @param [ Moped::Connection ] connection The connection to add.
-      #
-      # @since 2.0.0
-      def push(connection)
-        mutex.synchronize do
-          queue.push(connection)
-          resource.broadcast
-        end
-      end
-
-      # Pop the next connection off the queue.
-      #
-      # @example Pop a connection off the queue.
-      #   queue.pop(0.5)
-      #
-      # @param [ Float ] timeout The time to wait for the connection.
-      #
-      # @return [ Moped::Connection ] The next connection.
-      #
-      # @since 2.0.0
-      def pop(timeout = 0.5)
-        mutex.synchronize do
-          wait_for_next(Time.now + timeout)
-        end
-      end
-
-      # Is the queue empty?
-      #
-      # @example Is the queue empty?
-      #   queue.empty?
-      #
-      # @return [ true, false ] Is the queue empty?
-      #
-      # @since 2.0.0
-      def empty?
-        queue.empty?
-      end
-
-      # Get the current size of the queue.
-      #
-      # @example Get the size of the queue.
-      #   queue.size
-      #
-      # @return [ Integer ] The number of connections in the queue.
-      #
-      # @since 2.0.0
-      def size
-        queue.size
-      end
-
-      private
-
-      attr_reader :queue, :mutex, :resource
-
-      def wait_for_next(deadline)
-        loop do
-          return queue.pop unless queue.empty?
-          wait = deadline - Time.now
-          raise Timeout::Error, "Waited for item but none was pushed." if wait <= 0
-          resource.wait(mutex, wait)
-        end
-      end
-    end
-  end
-end

data/lib/moped/connection/reaper.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-module Moped
-  class Connection
-
-    # This object cleans up connections on dead threads at a specified time
-    # interval.
-    #
-    # @since 2.0.0
-    class Reaper
-
-      # The default interval for reaping connections.
-      #
-      # @since 2.0.0
-      INTERVAL = 5
-
-      # @!attribute interval
-      #   @return [ Float ] The reaping interval, in seconds.
-      # @!attribute pool
-      #   @return [ Pool ] The connection pool to reap.
-      attr_reader :interval, :pool
-
-      # Initialize a new connection pool reaper.
-      #
-      # @example Initialize the reaper.
-      #   Moped::Connection::Reaper.new(5, pool)
-      #
-      # @param [ Float ] interval The reaping interval.
-      # @param [ Pool ] pool The connection pool to reap.
-      #
-      # @since 2.0.0
-      def initialize(interval, pool)
-        @interval = interval
-        @pool = pool
-      end
-
-      # Start the reaper. Will execute continually on a separate thread.
-      #
-      # @example Start the reaper.
-      #   reaper.start
-      #
-      # @since 2.0.0
-      def start
-        Thread.new(interval, pool) do |i, p|
-          while (true)
-            sleep(i)
-            p.reap
-          end
-        end
-      end
-    end
-  end
-end