hot_tub 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f245ec552fdece7dd116f7e0969cd88aebb956e1
-  data.tar.gz: f5bc9530fb1ff42c167bb05f0ab72b6265f16a63
+  metadata.gz: af5ab22d571fb050b860aa00c6272f9d3e1ca564
+  data.tar.gz: 7aab55538f57d844feca8b389285d705707de8d3
 SHA512:
-  metadata.gz: 03dbfae650c78a6adbc7835d2c41f26a1162b84ff9a15bb06985353383f58814eb7fd60804396a83d028d92cee19a7f605fb24db00d10251fec1b1202335d650
-  data.tar.gz: 1749e5b189cb802fde7c795d5f79b7c06fb9c5853b65241ae066b3eef1667bdd02574d58309778ee3b9dfcff80c8f0d1dca1f610eb5a16e12ce8ba66a8118df8
+  metadata.gz: 62623f8ff72d0f9fa386e37aab4a023401be235f91478ed9e0e78f4d329787d05bf72baaf8670e5bba6a9a6203f7f2c52e3659bfcb97fe8e002fa6bd4dfae580
+  data.tar.gz: 8ca0674fa6a19f4bb228f083d968ee2067503dc513e4658753af06427c43a8da2b6ba095c6f71808daa596b07298b8d01cd94fb080be1ed5bfb160b92861e7f6

data/.rspec

@@ -1 +1,4 @@
---color
+--color
+--warnings
+--format documentation
+--profile

data/HISTORY.md

@@ -3,6 +3,14 @@ HotTub Changelog
 
 Head
 =======
+- None yet
+
+0.5.3
+=======
+- For Sessions, rename #add to #get_or_set for clarity, and alias with #add
+- Fix Ruby warnings
+- Prevent possible deadlock waiting for reaper to shutdown
+- No need to reset reaper
 
 0.5.2
 =======

data/README.md

@@ -70,7 +70,7 @@ A global Sessions object is available from the HotTub module and has several hel
     # Once load dies down our pool will be reaped back down to 12 connections
 
     URL = "https://google.com"
-    pool = HotTub.add(URL, { :size => 12 }) do 
+    pool = HotTub.get_or_set(URL, { :size => 12 }) do 
       uri = URI.parse(URL)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = false
@@ -80,16 +80,15 @@ A global Sessions object is available from the HotTub module and has several hel
 
     # A separate HotTub::Pool of Excon connections.
 
-    HotTub.add('yahoo', { :size => 5 }) { Excon.new("https://yahoo.com") }
+    HotTub.get_or_set('yahoo', { :size => 5 }) { Excon.new("https://yahoo.com") }
 
     # Lets add Redis too. HotTub.add returns the pool created for that key so we
     # can store that in an constant for easy access.
     # We don't want too many connections so we set our :max_size. Under load our pool
     # can grow to 30 connections. Once load dies down our pool can be reaped back down to 5
 
-    REDIS = HotTub.add("redis", :size => 5, :max_size => 30) { Redis.new } 
+    REDIS = HotTub.get_or_set("redis", :size => 5, :max_size => 30) { Redis.new } 
       
-   
     # Now we can call any of our pools using the key we set any where in our code.
 
     HotTub.run(url) do |clnt|    

data/benchmarks/block_passing.rb

@@ -43,54 +43,54 @@ Benchmark.bmbm do |x|
   end
   x.report("block to yield") do
     n.times do
-      BlockTest.block_yield { "foo" }
+      BlockTest.block_to_yield { "foo" }
     end
   end
   x.report("block to call") do
     n.times do
-      BlockTest.block_call { "foo" }
+      BlockTest.block_to_call { "foo" }
     end
   end
 end
 
 # ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
 # Rehearsal --------------------------------------------------
-# block yield      0.160000   0.000000   0.160000 (  0.166351)
-# block call       0.690000   0.000000   0.690000 (  0.684485)
-# block to yield   0.160000   0.000000   0.160000 (  0.166744)
-# block to call    0.680000   0.000000   0.680000 (  0.677085)
-# ----------------------------------------- total: 1.690000sec
+# block yield      0.170000   0.000000   0.170000 (  0.169354)
+# block call       0.670000   0.010000   0.680000 (  0.670445)
+# block to yield   0.650000   0.000000   0.650000 (  0.645591)
+# block to call    0.750000   0.000000   0.750000 (  0.753102)
+# ----------------------------------------- total: 2.250000sec
 
 #                      user     system      total        real
-# block yield      0.160000   0.000000   0.160000 (  0.165289)
-# block call       0.690000   0.010000   0.700000 (  0.699424)
-# block to yield   0.180000   0.000000   0.180000 (  0.172781)
-# block to call    0.700000   0.010000   0.710000 (  0.702157)
+# block yield      0.170000   0.000000   0.170000 (  0.166196)
+# block call       0.670000   0.000000   0.670000 (  0.663034)
+# block to yield   0.640000   0.000000   0.640000 (  0.644746)
+# block to call    0.740000   0.000000   0.740000 (  0.747084)
 
 # rubinius 2.5.8 (2.1.0 bef51ae3 2015-07-14 3.5.1 JI) [x86_64-darwin14.4.0]
 # Rehearsal --------------------------------------------------
-# block yield      0.164459   0.009985   0.174444 (  0.136798)
-# block call       0.396599   0.001442   0.398041 (  0.374256)
-# block to yield   0.095014   0.000532   0.095546 (  0.068005)
-# block to call    0.386417   0.001135   0.387552 (  0.370419)
-# ----------------------------------------- total: 1.055583sec
+# block yield      0.153971   0.007521   0.161492 (  0.123423)
+# block call       0.482452   0.001687   0.484139 (  0.404527)
+# block to yield   0.421112   0.001725   0.422837 (  0.317573)
+# block to call    0.515777   0.001130   0.516907 (  0.454804)
+# ----------------------------------------- total: 1.585375sec
 
 #                      user     system      total        real
-# block yield      0.050738   0.000172   0.050910 (  0.050869)
-# block call       0.359893   0.000935   0.360828 (  0.360429)
-# block to yield   0.050676   0.000181   0.050857 (  0.050787)
-# block to call    0.360640   0.001018   0.361658 (  0.361311)
+# block yield      0.054358   0.000111   0.054469 (  0.054250)
+# block call       0.368271   0.000868   0.369139 (  0.368516)
+# block to yield   0.281076   0.000553   0.281629 (  0.281446)
+# block to call    0.428372   0.000901   0.429273 (  0.428916)
 
 # jruby 9.0.3.0 (2.2.2) 2015-10-21 633c9aa Java HotSpot(TM) 64-Bit Server VM 23.5-b02 on 1.7.0_09-b05 +jit [darwin-x86_64]
 # Rehearsal --------------------------------------------------
-# block yield      0.410000   0.010000   0.420000 (  0.260548)
-# block call       0.420000   0.000000   0.420000 (  0.356582)
-# block to yield   0.220000   0.000000   0.220000 (  0.189081)
-# block to call    0.360000   0.010000   0.370000 (  0.266201)
-# ----------------------------------------- total: 1.430000sec
+# block yield      0.400000   0.010000   0.410000 (  0.265343)
+# block call       0.370000   0.000000   0.370000 (  0.300598)
+# block to yield   0.280000   0.010000   0.290000 (  0.238879)
+# block to call    0.400000   0.000000   0.400000 (  0.288711)
+# ----------------------------------------- total: 1.470000sec
 
 #                      user     system      total        real
-# block yield      0.170000   0.000000   0.170000 (  0.173698)
-# block call       0.220000   0.000000   0.220000 (  0.222841)
-# block to yield   0.180000   0.000000   0.180000 (  0.172968)
-# block to call    0.220000   0.000000   0.220000 (  0.224151)
+# block yield      0.190000   0.000000   0.190000 (  0.185705)
+# block call       0.230000   0.000000   0.230000 (  0.227818)
+# block to yield   0.200000   0.000000   0.200000 (  0.206645)
+# block to call    0.250000   0.000000   0.250000 (  0.244579)

data/benchmarks/hot_tub.rb

@@ -9,6 +9,11 @@ class MocClient
   def get
     sleep(0.01)
   end
+
+  def clean
+    @clean = true
+  end
+
 end
 
 puts `ruby -v`
@@ -16,7 +21,7 @@ puts `ruby -v`
 Benchmark.bmbm do |b|
 
   b.report("single thread") do
-    hot_tub = HotTub.new(:size => 1, :max_size => 1) { MocClient.new }
+    hot_tub = HotTub.new(:size => 1, :max_size => 1, :clean => lambda {|clnt| clnt.clean}) { MocClient.new }
     1000.times.each  do
       hot_tub.run do |conn|
         conn.get
@@ -25,7 +30,7 @@ Benchmark.bmbm do |b|
   end
 
   b.report("threaded size 5") do
-    hot_tub = HotTub.new(:size => 5, :max_size => 5) { MocClient.new }
+    hot_tub = HotTub.new(:size => 5, :max_size => 5, :clean => lambda {|clnt| clnt.clean}) { MocClient.new }
     threads = []
     50.times.each do
       threads << Thread.new do
@@ -42,7 +47,7 @@ Benchmark.bmbm do |b|
   end
 
   b.report("threaded size 5, max 10") do
-    hot_tub = HotTub.new(:size => 5, :max_size => 10) { MocClient.new }
+    hot_tub = HotTub.new(:size => 5, :max_size => 10, :clean => lambda {|clnt| clnt.clean}) { MocClient.new }
     threads = []
     50.times.each do
       threads << Thread.new do
@@ -59,7 +64,7 @@ Benchmark.bmbm do |b|
   end
 
   b.report("threaded, size 5, no max") do
-    hot_tub = HotTub.new(:size => 5) { MocClient.new }
+    hot_tub = HotTub.new(:size => 5, :clean => lambda {|clnt| clnt.clean}) { MocClient.new }
     threads = []
     50.times.each do
       threads << Thread.new do
@@ -79,7 +84,7 @@ Benchmark.bmbm do |b|
   b.report("threaded, HotTub.run ") do
     urls = ['http://foo.com','http://bar.com','http://zap.com']
     urls.each do |url|
-      HotTub.add(url) { MocClient.new }
+      HotTub.add(url, {:clean => lambda {|clnt| clnt.clean}}) { MocClient.new }
     end
     threads = []
     50.times.each do
@@ -102,50 +107,50 @@ end
 
 # ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
 # Rehearsal ------------------------------------------------------------
-# single thread              0.070000   0.040000   0.110000 ( 10.859963)
-# threaded size 5            0.080000   0.090000   0.170000 (  2.288797)
-# threaded size 5, max 10    0.060000   0.060000   0.120000 (  1.197574)
-# threaded, size 5, no max   0.030000   0.030000   0.060000 (  0.222523)
-# threaded, HotTub.run       0.090000   0.090000   0.180000 (  0.659862)
-# --------------------------------------------------- total: 0.640000sec
+# single thread              0.090000   0.050000   0.140000 ( 11.056805)
+# threaded size 5            0.110000   0.130000   0.240000 (  2.323854)
+# threaded size 5, max 10    0.080000   0.100000   0.180000 (  1.162047)
+# threaded, size 5, no max   0.030000   0.040000   0.070000 (  0.229230)
+# threaded, HotTub.run       0.130000   0.120000   0.250000 (  0.673286)
+# --------------------------------------------------- total: 0.880000sec
 
 #                                user     system      total        real
-# single thread              0.080000   0.030000   0.110000 ( 10.871813)
-# threaded size 5            0.080000   0.090000   0.170000 (  2.228075)
-# threaded size 5, max 10    0.060000   0.070000   0.130000 (  1.204607)
-# threaded, size 5, no max   0.030000   0.020000   0.050000 (  0.220836)
-# threaded, HotTub.run       0.090000   0.080000   0.170000 (  0.670364)
+# single thread              0.080000   0.040000   0.120000 ( 10.908496)
+# threaded size 5            0.110000   0.130000   0.240000 (  2.314875)
+# threaded size 5, max 10    0.080000   0.100000   0.180000 (  1.202064)
+# threaded, size 5, no max   0.040000   0.040000   0.080000 (  0.224133)
+# threaded, HotTub.run       0.120000   0.120000   0.240000 (  0.670526)
 
 
 # rubinius 2.5.8 (2.1.0 bef51ae3 2015-07-14 3.5.1 JI) [x86_64-darwin14.4.0]
 # Rehearsal ------------------------------------------------------------
-# single thread              0.152422   0.059901   0.212323 ( 11.104594)
-# threaded size 5            0.204700   0.192881   0.397581 (  2.273955)
-# threaded size 5, max 10    0.166915   0.155789   0.322704 (  1.161038)
-# threaded, size 5, no max   0.143544   0.055138   0.198682 (  0.233619)
-# threaded, HotTub.run       0.184800   0.143068   0.327868 (  0.699002)
-# --------------------------------------------------- total: 1.459158sec
+# single thread              0.427639   0.053404   0.481043 ( 11.049242)
+# threaded size 5            0.214155   0.201618   0.415773 (  2.255010)
+# threaded size 5, max 10    0.170088   0.158815   0.328903 (  1.159579)
+# threaded, size 5, no max   0.132440   0.046240   0.178680 (  0.240322)
+# threaded, HotTub.run       0.169417   0.123085   0.292502 (  0.676492)
+# --------------------------------------------------- total: 1.696901sec
 
 #                                user     system      total        real
-# single thread              0.146872   0.053339   0.200211 ( 11.129070)
-# threaded size 5            0.206160   0.199475   0.405635 (  2.270780)
-# threaded size 5, max 10    0.201255   0.163359   0.364614 (  1.205708)
-# threaded, size 5, no max   0.066599   0.067142   0.133741 (  0.237895)
-# threaded, HotTub.run       0.533596   0.093450   0.627046 (  0.670178)
+# single thread              0.155789   0.054654   0.210443 ( 11.052989)
+# threaded size 5            0.253045   0.209961   0.463006 (  2.276732)
+# threaded size 5, max 10    0.149159   0.138857   0.288016 (  1.171204)
+# threaded, size 5, no max   0.216853   0.033597   0.250450 (  0.224729)
+# threaded, HotTub.run       0.626503   0.080910   0.707413 (  0.664893)
 
 
 # jruby 9.0.3.0 (2.2.2) 2015-10-21 633c9aa Java HotSpot(TM) 64-Bit Server VM 23.5-b02 on 1.7.0_09-b05 +jit [darwin-x86_64]
 # Rehearsal ------------------------------------------------------------
-# single thread              0.760000   0.050000   0.810000 ( 11.191212)
-# threaded size 5            0.790000   0.120000   0.910000 (  2.262856)
-# threaded size 5, max 10    0.600000   0.080000   0.680000 (  1.160630)
-# threaded, size 5, no max   0.360000   0.040000   0.400000 (  0.228086)
-# threaded, HotTub.run       0.860000   0.100000   0.960000 (  0.673639)
-# --------------------------------------------------- total: 3.760000sec
+# single thread              0.890000   0.070000   0.960000 ( 11.343993)
+# threaded size 5            0.850000   0.130000   0.980000 (  2.324202)
+# threaded size 5, max 10    0.710000   0.110000   0.820000 (  1.178593)
+# threaded, size 5, no max   0.320000   0.050000   0.370000 (  0.233405)
+# threaded, HotTub.run       1.190000   0.100000   1.290000 (  0.683554)
+# --------------------------------------------------- total: 4.420000sec
 
 #                                user     system      total        real
-# single thread              0.520000   0.060000   0.580000 ( 11.079422)
-# threaded size 5            0.390000   0.100000   0.490000 (  2.235107)
-# threaded size 5, max 10    0.290000   0.080000   0.370000 (  1.171805)
-# threaded, size 5, no max   0.300000   0.030000   0.330000 (  0.265258)
-# threaded, HotTub.run       0.580000   0.090000   0.670000 (  0.672435)
+# single thread              0.350000   0.060000   0.410000 ( 11.156489)
+# threaded size 5            0.540000   0.130000   0.670000 (  2.251505)
+# threaded size 5, max 10    0.300000   0.100000   0.400000 (  1.153055)
+# threaded, size 5, no max   0.270000   0.050000   0.320000 (  0.230043)
+# threaded, HotTub.run       0.360000   0.110000   0.470000 (  0.674920)

data/lib/hot_tub.rb

@@ -59,9 +59,13 @@ module HotTub
     GLOBAL_SESSIONS.shutdown!
   end
 
-  # Adds a new Pool to the global sessions
+  # Gets or sets a new Pool in the global sessions
+  def self.get_or_set(url,opts={}, &client_block)
+    GLOBAL_SESSIONS.get_or_set(url, opts, &client_block)
+  end
+  
   def self.add(url,opts={}, &client_block)
-    GLOBAL_SESSIONS.add(url, opts, &client_block)
+    self.get_or_set(url,opts, &client_block)
   end
 
   def self.run(url ,&run_block)

data/lib/hot_tub/known_clients.rb

@@ -2,7 +2,7 @@ module HotTub
   module KnownClients
     KNOWN_CLIENTS = {
       "Excon::Connection" => {
-        :close => lambda { |clnt| clnt.reset }
+        :close => :reset
       },
       "Net::HTTP" => {
         :close => lambda { |clnt|
@@ -20,11 +20,7 @@ module HotTub
     def clean_client(clnt)
       if @clean_client
         begin
-          if @clean_client.is_a?(Proc)
-            preform_client_block(clnt,&@clean_client)
-          else
-            preform_client_method(clnt,@clean_client)
-          end
+          perform_action(clnt,@clean_client)
         rescue => e
           HotTub.logger.error "[HotTub] There was an error cleaning one of your #{self.class.name} clients: #{e}" if HotTub.logger
         end
@@ -35,14 +31,10 @@ module HotTub
     # Attempts to close the provided client, checking the options first for a close block
     # then checking the known clients
     def close_client(clnt)
-      @close_action = (@close_client || known_client_action(clnt,:close) || false) if @close_action.nil?
-      if @close_action
+      @close_client = (known_client_action(clnt,:close) || false) if @close_client.nil?
+      if @close_client
         begin
-          if @close_action.is_a?(Proc)
-            preform_client_block(clnt,&@close_action)
-          else
-            preform_client_method(clnt,@close_action)
-          end
+          perform_action(clnt,@close_client)
         rescue => e
           HotTub.logger.error "[HotTub] There was an error closing one of your #{self.class.name} clients: #{e}" if HotTub.logger
         end
@@ -55,11 +47,7 @@ module HotTub
       rc = false
       if @reap_client
         begin
-          if @reap_client.is_a?(Proc)
-            rc = preform_client_block(clnt,&@reap_client)
-          else
-            rc = preform_client_method(clnt,@reap_client)
-          end
+          rc = perform_action(clnt,@reap_client)
         rescue => e
           HotTub.logger.error "[HotTub] There was an error reaping one of your #{self.class.name} clients: #{e}" if HotTub.logger
         end
@@ -73,12 +61,18 @@ module HotTub
       (KNOWN_CLIENTS[clnt.class.name] && KNOWN_CLIENTS[clnt.class.name][key])
     end
 
-    def preform_client_block(clnt,action=nil)
-      yield clnt
+    def perform_action(clnt,action)
+      if action.is_a?(Proc)
+        yield_action(clnt,&action)
+      else
+        clnt.__send__(action)
+      end
     end
 
-    def preform_client_method(clnt,action=nil)
-      clnt.send(action)
+    # This is ever so slightly faster in MRI,
+    #  more so on Rubinius and Jruby
+    def yield_action(clnt)
+      yield clnt
     end
   end
 end

data/lib/hot_tub/pool.rb

@@ -4,7 +4,6 @@ module HotTub
     include HotTub::Reaper::Mixin
 
     attr_accessor :name
-    attr_reader :current_size, :last_activity
 
     # Thread-safe lazy connection pool
     #
@@ -92,14 +91,14 @@ module HotTub
     def initialize(opts={},&client_block)
       raise ArgumentError, 'a block that initializes a new client is required' unless block_given?
       @name             = (opts[:name] || self.class.name)
-      @size             = (opts[:size] || 5)                # in seconds
-      @wait_timeout     = (opts[:wait_timeout] || 10)       # in seconds
-      @reap_timeout     = (opts[:reap_timeout] || 600)      # the interval to reap connections in seconds
-      @max_size         = (opts[:max_size] || 0)            # maximum size of pool when non-blocking, 0 means no limit
+      @size             = (opts[:size] || 5)            # in seconds
+      @wait_timeout     = (opts[:wait_timeout] || 10)   # in seconds
+      @reap_timeout     = (opts[:reap_timeout] || 600)  # the interval to reap connections in seconds
+      @max_size         = (opts[:max_size] || 0)        # maximum size of pool when non-blocking, 0 means no limit
 
-      @close_client     = opts[:close]                    # => lambda {|clnt| clnt.close} or :close
-      @clean_client     = opts[:clean]                    # => lambda {|clnt| clnt.clean} or :clean
-      @reap_client      = opts[:reap?]                    # => lambda {|clnt| clnt.reap?} or :reap? # should return boolean
+      @close_client     = opts[:close]                  # => lambda {|clnt| clnt.close} or :close
+      @clean_client     = opts[:clean]                  # => lambda {|clnt| clnt.clean} or :clean
+      @reap_client      = opts[:reap?]                  # => lambda {|clnt| clnt.reap?} or :reap? # should return boolean
       @client_block     = client_block
 
       @_pool            = []    # stores available clients
@@ -112,7 +111,7 @@ module HotTub
 
       @shutdown         = false
       @blocking_reap    = (opts[:reaper] == false && !opts[:sessions])
-      @reaper           = spawn_reaper unless (opts[:sessions] || (opts[:reaper] == false))
+      @reaper           = ((opts[:sessions] || (opts[:reaper] == false)) ? false : spawn_reaper)
 
       @never_block      = (@max_size == 0)
 
@@ -159,7 +158,7 @@ module HotTub
     end
     alias :close! :drain!
 
-    # Reset the pool and re-spawn reaper.
+    # Reset the pool.
     # or if shutdown allow threads to quickly finish their work
     # Clients from the previous pool will not return to pool.
     def reset!
@@ -169,10 +168,6 @@ module HotTub
           while clnt = @_pool.pop
             close_client(clnt)
           end
-          if @reaper
-            kill_reaper
-            @reaper = spawn_reaper
-          end
         ensure
           @_out.clear
           @_pool.clear
@@ -186,12 +181,12 @@ module HotTub
     def shutdown!
       HotTub.logger.info "[HotTub] Shutting down pool #{@name}!" if HotTub.logger
       @shutdown = true
+      kill_reaper if @reaper
       @mutex.synchronize do
         begin
           while clnt = @_pool.pop
             close_client(clnt)
           end
-          kill_reaper if @reaper
         ensure
           @_out.clear
           @_pool.clear
@@ -254,7 +249,7 @@ module HotTub
           begin
             if !@shutdown && @_out.delete(clnt)
               @_pool << clnt
-            else 
+            else
               close_client(clnt)
               HotTub.logger.info "[HotTub] An orphaned client attempted to return to #{@name}." if HotTub.log_trace?
             end
@@ -286,7 +281,7 @@ module HotTub
         end
         break if clnt
       end
-      clean_client(clnt) if dirty && clnt 
+      clean_client(clnt) if dirty && clnt
       clnt
     end
 
@@ -306,7 +301,7 @@ module HotTub
       if (@never_block || (_total_current_size < @max_size))
         nc = yield
         HotTub.logger.info "[HotTub] Adding client: #{nc.class.name} to #{@name}." if HotTub.log_trace?
-        nc         
+        nc
       end
     end
 

data/lib/hot_tub/reaper.rb

@@ -11,8 +11,8 @@ module HotTub
       th = Thread.new {
         loop do
           begin
-            obj.reap!
             break if obj.shutdown
+            obj.reap!
             sleep(obj.reap_timeout || 600)
           rescue Exception => e
             HotTub.logger.error "[HotTub] Reaper for #{obj.class.name} terminated with exception: #{e.message}" if HotTub.logger
@@ -50,7 +50,7 @@ module HotTub
         if @reaper
           @reaper.kill
           @reaper.join
-          @reaper = nil
+          @reaper = nil if @shutdown
         end
       end
 

data/lib/hot_tub/sessions.rb

@@ -57,7 +57,7 @@ module HotTub
 
     # Adds a new HotTub::Pool for the given key unless
     # one already exists.
-    def add(key, pool_options={}, &client_block)
+    def get_or_set(key, pool_options={}, &client_block)
       raise ArgumentError, 'a block that initializes a new client is required.' unless block_given?
       pool = nil
       return pool if pool = @_sessions[key]
@@ -69,6 +69,7 @@ module HotTub
       end
       pool
     end
+    alias :add :get_or_set
 
     # Deletes and shutdowns the pool if its found.
     def delete(key)

data/lib/hot_tub/version.rb

@@ -1,3 +1,3 @@
 module HotTub
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/hot_tub/pool_spec.rb

@@ -148,7 +148,6 @@ describe HotTub::Pool do
 
     it "should kill reaper" do
       pool.shutdown!
-      sleep(0.01)
       expect(pool.instance_variable_get(:@reaper)).to be_nil
     end
 

data/spec/hot_tub/sessions_spec.rb

@@ -15,7 +15,7 @@ describe HotTub::Sessions do
       context 'HotTub::Pool as client' do
         it "should add a new client for the key" do
           sessions = HotTub::Sessions.new
-          sessions.add(key) { MocClient.new } 
+          sessions.get_or_set(key) { MocClient.new } 
           sns = sessions.instance_variable_get(:@_sessions)
           expect(sns.size).to eql(1)
           sns.each_value {|v| expect(v).to be_a( HotTub::Pool)}
@@ -31,16 +31,16 @@ describe HotTub::Sessions do
 
     it "should start reaper after add" do
       expect(sessions.reaper).to be_nil
-      sessions.add("https://www.somewebsite.com") { MocClient.new } 
+      sessions.get_or_set("https://www.somewebsite.com") { MocClient.new } 
       expect(sessions.reaper).to be_a(Thread)
     end
 
     it "should disable pool based reaper" do
-      sessions.add("https://www.somewebsite.com") { MocClient.new } 
-      sessions.add("https://www.someOtherwebsite.com") { MocClient.new } 
-      sessions.add("https://www.someOtherwebsiteToo.com") { MocClient.new } 
+      sessions.get_or_set("https://www.somewebsite.com") { MocClient.new } 
+      sessions.get_or_set("https://www.someOtherwebsite.com") { MocClient.new } 
+      sessions.get_or_set("https://www.someOtherwebsiteToo.com") { MocClient.new } 
       session = sessions.instance_variable_get(:@_sessions)
-      session.each_value {|v| expect(v.reaper).to be_nil}
+      session.each_value {|v| expect(v.reaper).to eql(false)}
     end
 
   end
@@ -49,7 +49,7 @@ describe HotTub::Sessions do
     it "should pass run to pool" do
       url = HotTub::Server.url
       sessions = HotTub::Sessions.new
-      sessions.add(url) do
+      sessions.get_or_set(url) do
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = false
@@ -68,8 +68,8 @@ describe HotTub::Sessions do
   describe '#clean!' do
     it "should clean all pools in sessions" do
       sessions = HotTub::Sessions.new
-      sessions.add('foo') { |url| MocClient.new(url) }
-      sessions.add('bar') { |url| MocClient.new(url) }
+      sessions.get_or_set('foo') { |url| MocClient.new(url) }
+      sessions.get_or_set('bar') { |url| MocClient.new(url) }
       sessions.clean!
       sessions.instance_variable_get(:@_sessions).each_pair do |k,v|
         v.instance_variable_get(:@_pool).each do |c|
@@ -82,8 +82,8 @@ describe HotTub::Sessions do
   describe '#drain!' do
     it "should drain all pools in sessions" do
       sessions = HotTub::Sessions.new
-      sessions.add('foo') { |url| MocClient.new(url) }
-      sessions.add('bar') { |url| MocClient.new(url) }
+      sessions.get_or_set('foo') { |url| MocClient.new(url) }
+      sessions.get_or_set('bar') { |url| MocClient.new(url) }
       sessions.drain!
       expect(sessions.instance_variable_get(:@_sessions)).to_not be_empty
     end
@@ -92,8 +92,8 @@ describe HotTub::Sessions do
   describe '#reap!' do
     it "should clean all pools in sessions" do
       sessions = HotTub::Sessions.new
-      sessions.add('foo') { |url| MocClient.new(url) }
-      sessions.add('bar') { |url| MocClient.new(url) }
+      sessions.get_or_set('foo') { |url| MocClient.new(url) }
+      sessions.get_or_set('bar') { |url| MocClient.new(url) }
       sessions.reap!
       sessions.instance_variable_get(:@_sessions).each_pair do |k,v|
         v.instance_variable_get(:@_pool).each do |c|
@@ -106,8 +106,8 @@ describe HotTub::Sessions do
   describe '#reset!' do
     it "should reset all pools in sessions" do
       sessions = HotTub::Sessions.new
-      sessions.add('foo') { |url| MocClient.new(url) }
-      sessions.add('bar') { |url| MocClient.new(url) }
+      sessions.get_or_set('foo') { |url| MocClient.new(url) }
+      sessions.get_or_set('bar') { |url| MocClient.new(url) }
       sessions.reset!
       sessions.instance_variable_get(:@_sessions).each_pair do |k,v|
         expect(v.instance_variable_get(:@_pool)).to be_empty

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-autotest
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec-autotest
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: autotest
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: sinatra
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+  name: puma
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: excon
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version