multithink 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTVkZmE4MTA0MTQxMTUzYzQ1YmQ0ZDFjMWYxZTZkYjU2OWM5Njc5MQ==
-  data.tar.gz: !binary |-
-    ZDFjY2U1NzlhMTdiYjZiMjQxYmU1ZDI3YjM4ZGQzMTE2MDMzZGJmMA==
+SHA1:
+  metadata.gz: 0c2def018fb68647faadf57e4fcc8cbb4924fcfc
+  data.tar.gz: 22e026d85d74eded90bf1f1b6c2539dd4643efed
 SHA512:
-  metadata.gz: !binary |-
-    OTAyNGRiZGVjNDA5YWNiY2U3NTZhN2ExYTg1Mzg0N2EyNWNlNjYxYTIzNmE2
-    Yzk4ZDIwZTQ4MThhMWFhOTFkZGNhYjIwNjA0ZTJlOWY0MDA3YmQ2MzI0NGNl
-    NGNjYWM3MmUxOGIyOGJjMjEyYjIwNzRhNTM2NTY3NWY2M2QwMjQ=
-  data.tar.gz: !binary |-
-    OWJkNmY0NTA2NDYxNmU4MDMyNGM0MDEwNTRhOGUyZDUyMzg2NTdlMGQ4Nzll
-    MmNjMjE2NTcyNWFkOTRkMWVjZDk4N2JhOTg4OWUzNmQ4NWQ1MGQ1MTMwZGQ3
-    NTNlMTRmMjE4MWUyYWFiOTk5ZTBlMzVhMzVjYTM4NDE2ZDk3MTQ=
+  metadata.gz: 7821b26d404b269f2865266e0c0bf4f778c88b35e0d0772754c1bb0e4dce2bff5fb9dc9c8cfa51519ecb5b94482887bf44f91e3a8b27ac1f1a0ee4892eb89b4e
+  data.tar.gz: d1e89d6bb6e1a9561fae053f0bbed317269311ce0df1c549b4060e91db51945ed09573ee1c446aa47bae7968b5926987a59524d975104f5434fa24ae603362a1

data/lib/multithink.rb

@@ -2,16 +2,28 @@ require 'multithink/version'
 require 'multithink/timed_stack'
 
 class MultiThink
-  DEFAULTS = {size: 5, timeout: 5, servers: [{host: '127.0.0.1', port: 28015}]}
+  DEFAULTS = {
+    size: 5,
+    timeout: 5,
+    servers: [
+      {
+        host: '127.0.0.1',
+        port: 28015
+      }
+    ],
+    conn_options: {}
+  }
 
   def initialize(options = {})
     options = DEFAULTS.merge(options)
 
     @size = options.fetch(:size)
     @timeout = options.fetch(:timeout)
-    @servers = options.fetch(:servers)
+    servers = options.fetch(:servers)
+    conn_options = options.fetch(:conn_options)
+    conn_options[:servers] = servers
 
-    @available = TimedStack.new(@size, @servers)
+    @available = TimedStack.new(@size, conn_options)
     @key = :"current-#{@available.object_id}"
   end
 

data/lib/multithink/connection.rb

@@ -6,12 +6,18 @@ include RethinkDB::Shortcuts
 
 class MultiThink::Connection
 
-  DEFAULTS = {retries: 10}
+  DEFAULTS = {
+    retries: 10,
+    retry_interval: 1,
+    conn_timeout: 1
+  }
 
-  def initialize(servers, options = {})
-    @servers = servers
+  def initialize(options = {})
     options = DEFAULTS.merge(options)
+    @servers = options.fetch(:servers)
     @retries = options.fetch(:retries)
+    @retry_interval = options.fetch(:retry_interval)
+    @conn_timeout = options.fetch(:conn_timeout)
     connect
   end
 
@@ -21,12 +27,12 @@ class MultiThink::Connection
       @servers.each do |server|
         begin
           #TODO(jpg) make timeout configurable
-          Timeout::timeout(1) do
+          Timeout::timeout(@conn_timeout) do
             @conn = r.connect(server)
           end
           return true
         rescue
-          sleep 1
+          sleep @retry_interval
         end
         @tried += 1
       end

data/lib/multithink/timed_stack.rb

@@ -6,8 +6,11 @@ class MultiThink::PoolShuttingDownError < RuntimeError; end
 
 class MultiThink::TimedStack
 
-  def initialize(size = 0, servers)
-    @que = Array.new(size) {|s| MultiThink::Connection.new(servers)}
+  def initialize(size = 0, options)
+    @size = size
+    @options = options
+    @que = []
+    @checked_out = []
     @mutex = Mutex.new
     @resource = ConditionVariable.new
     @shutdown_block = nil
@@ -19,6 +22,7 @@ class MultiThink::TimedStack
         @shutdown_block.call(obj)
       else
         @que.push obj
+        @checked_out.delete obj
       end
 
       @resource.broadcast
@@ -26,12 +30,21 @@ class MultiThink::TimedStack
   end
   alias_method :<<, :push
 
+  def available?
+    @que.count + @checked_out.count < @size
+  end
+
   def pop(timeout=0.5)
     deadline = Time.now + timeout
     @mutex.synchronize do
       loop do
-        raise MultiThink::PoolShuttingDownError if @shutdown_block
+        raise PoolShuttingDownError if @shutdown_block
         return @que.pop unless @que.empty?
+        if available?
+          new_conn = MultiThink::Connection.new(@options)
+          @checked_out << new_conn
+          return new_conn
+        end
         to_wait = deadline - Time.now
         raise Timeout::Error, "Waited #{timeout} sec" if to_wait <= 0
         @resource.wait(@mutex, to_wait)

data/lib/multithink/version.rb

@@ -1,3 +1,3 @@
 class MultiThink
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/multithink.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
   s.license = "MIT"
   s.add_runtime_dependency 'rethinkdb', '>= 1.10.0'
   s.add_development_dependency 'minitest', '>= 5.0.0'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: multithink
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joseph Glanville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple RethinkDB connection pool.
@@ -79,19 +93,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple RethinkDB connection pool.
 test_files: []
-has_rdoc: