hot_tub 0.5.3 → 1.0.0

data/lib/hot_tub/version.rb

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

data/spec/helpers/moc_pool.rb

@@ -6,19 +6,39 @@ class MocPool < MocMixinPool
   attr_accessor :reaped, :lets_reap
 
   def initialize
-  	@reaped = false
-  	@lets_reap = false
+    @reaped = false
+    @lets_reap = false
   end
 
   def reap!
-	@reaped = true if @lets_reap
+    @reaped = true if @lets_reap
+    @lets_reap = false
   end
 end
 
 class MocReaperPool < MocPool
+  attr_accessor :mx, :cv, :reaped
   def initialize
-  	super
-    @reap_timeout = 1
+    super
+    @reap_timeout = 0.01
+    
+    @mx  = Mutex.new
+    @cv  =  ConditionVariable.new
+    @reaped = false
+
     @reaper = HotTub::Reaper.spawn(self)
   end
-end
+
+  def wait_for_reap
+    @mx.synchronize do
+      @cv.wait(@mx)
+    end
+  end
+
+  def reap!
+    @mx.synchronize do
+      @reaped = true
+      @cv.signal
+    end
+  end
+end

data/spec/hot_tub/integration/excon_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
-
 describe HotTub do
 
   context "blocking (size equals max_size)" do
     let(:pool) do
-      HotTub.new(:size => 4, :max_size => 4) {
+      HotTub::Pool.new(:size => 4, :max_size => 4) {
         Excon.new(HotTub::Server.url, :thread_safe_sockets => false)
       }
     end
@@ -33,7 +32,7 @@ describe HotTub do
 
   context "with larger max" do
     let(:pool) do
-      HotTub.new(:size => 4, :max_size => 8) {
+      HotTub::Pool.new(:size => 4, :max_size => 8) {
         Excon.new(HotTub::Server.url, :thread_safe_sockets => false)
       }
     end
@@ -52,7 +51,7 @@ describe HotTub do
 
     it "should reap" do
       pool.reap!
-      expect(pool.current_size).to be <= 4 
+      expect(pool.current_size).to be <= 4
     end
 
     it "should work" do
@@ -64,7 +63,7 @@ describe HotTub do
 
   context "sized without max" do
     let(:pool) do
-      HotTub.new(:size => 4) {
+      HotTub::Pool.new(:size => 4) {
         Excon.new(HotTub::Server.url, :thread_safe_sockets => false)
       }
     end
@@ -90,34 +89,6 @@ describe HotTub do
       expect(results.uniq).to eql([200])
     end
   end
-
-  context "shutdown with slow client" do
-    let(:pool) do
-      HotTub.new(:size => 1) {
-        Excon.new(HotTub::Server.slow_url, :thread_safe_sockets => false, :read_timeout => 2)
-      }
-    end
-
-    it "should work" do
-      begin
-        th = Thread.new do
-          uri = URI.parse(HotTub::Server.slow_url)
-          pool.run do |connection|
-            connection.get(:path => uri.path).status
-          end
-        end
-        sleep(0.01)
-        pool.shutdown!
-        th.join
-      rescue => e
-        puts e.message
-      end
-
-      expect(pool.shutdown).to eql(true)
-      expect(pool.current_size).to eql(0)
-    end
-  end
-
 end
 
 def excon_thread_work(pool,thread_count=0, threads=[])

data/spec/hot_tub/integration/net_http_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe HotTub do
   context "blocking (size equals max_size)" do
     let(:pool) do
-      HotTub.new(:size => 4, :max_size => 4) {
+      HotTub::Pool.new(:size => 4, :max_size => 4) {
         uri = URI.parse(HotTub::Server.url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = false
@@ -36,7 +36,7 @@ describe HotTub do
 
   context "with larger max" do
     let(:pool) do
-      HotTub.new(:size => 4, :max_size => 8) {
+      HotTub::Pool.new(:size => 4, :max_size => 8) {
         uri = URI.parse(HotTub::Server.url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = false
@@ -64,7 +64,7 @@ describe HotTub do
 
   context "sized without max" do
     let(:pool) do
-      HotTub.new(:size => 4) {
+      HotTub::Pool.new(:size => 4) {
         uri = URI.parse(HotTub::Server.url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = false

data/spec/hot_tub/pool_spec.rb

@@ -21,7 +21,7 @@ describe HotTub::Pool do
     end
 
     it "should have a HotTub::Reaper" do
-      expect(pool.reaper).to be_a(Thread)
+      expect(pool.reaper).to be_a(HotTub::Reaper)
     end
   end
 
@@ -210,14 +210,12 @@ describe HotTub::Pool do
   context 'thread safety' do
     it "should grow" do
       pool = HotTub::Pool.new({:size => 4}) { MocClient.new }
-      failed = false
       threads = []
       20.times.each do
         threads << Thread.new do
-          pool.run{|connection| connection.get }
+          pool.run { |connection| connection.get }
         end
       end
-      sleep(0.01)
       threads.each do |t|
         t.join
       end

data/spec/hot_tub/reaper_spec.rb

@@ -1,27 +1,21 @@
 require 'spec_helper'
 
 describe HotTub::Reaper do
-  
-  let(:pool) { MocReaperPool.new }
-  let(:reaper) { pool.reaper }
+
+  let(:pool)    { MocReaperPool.new }
+  let(:reaper)  { pool.reaper }
 
   it "should be a HotTub::Reaper Thread" do
-    expect(reaper).to be_a(Thread)
+    expect(reaper.thread).to be_a(Thread)
   end
 
   it "should reap!" do
-    expect(pool.reaped).to eql(false)
-    pool.lets_reap = true
-    reaper.wakeup
-    sleep(0.01)
+    pool.wait_for_reap
     expect(pool.reaped).to eql(true)
   end
 
-  it "should sleep after reap!" do
-    expect(pool.reaped).to eql(false)
-    pool.lets_reap = true
-    reaper.wakeup
-    sleep(0.01)
-    expect(reaper.status).to eql('sleep')
+  it "should still be alive" do
+    pool.wait_for_reap
+    expect(reaper).to be_alive
   end
 end

data/spec/hot_tub/sessions_spec.rb

@@ -2,23 +2,53 @@ require 'spec_helper'
 require 'hot_tub/sessions'
 require 'uri'
 require 'time'
-describe HotTub::Sessions do
-
 
-  context 'initialized with a block' do
+describe HotTub::Sessions do
 
+  describe '#stage' do
     let(:key) { "https://www.somewebsite.com" }
 
     let(:sessions) { HotTub::Sessions.new }
 
-    describe '#sessions' do
-      context 'HotTub::Pool as client' do
-        it "should add a new client for the key" do
-          sessions = HotTub::Sessions.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)}
+    it { expect(sessions.stage(key) { MocClient.new }).to be_nil }
+
+    it "should lazy load pool" do
+      sessions.stage(key) { MocClient.new }
+      expect(sessions.fetch(key)).to be_a(HotTub::Pool)
+    end
+  end
+
+
+  describe '#get_or_set' do
+
+    context "with &default_client" do
+      let(:key) { "https://www.somewebsite.com" }
+
+      let(:sessions) do
+        sns = HotTub::Sessions.new #{ MocClient.new }
+        sns.default_client = lambda { |url| MocClient.new(url) }
+        sns
+      end
+
+      it "should add a new pool for the key" do
+        pool = sessions.get_or_set(key)
+        expect(pool).to be_a(HotTub::Pool)
+        pool.run do |clnt|
+          expect(clnt).to be_a(MocClient)
+        end
+      end
+    end
+
+    context "with &client_block" do
+      let(:key) { "https://www.somewebsite.com" }
+
+      let(:sessions) { HotTub::Sessions.new }
+
+      it "should add a new client for the key" do
+        pool = sessions.get_or_set(key) { MocClient.new }
+        expect(pool).to be_a(HotTub::Pool)
+        pool.run do |clnt|
+          expect(clnt).to be_a(MocClient)
         end
       end
     end
@@ -31,14 +61,14 @@ describe HotTub::Sessions do
 
     it "should start reaper after add" do
       expect(sessions.reaper).to be_nil
-      sessions.get_or_set("https://www.somewebsite.com") { MocClient.new } 
-      expect(sessions.reaper).to be_a(Thread)
+      sessions.get_or_set("https://www.somewebsite.com") { MocClient.new }
+      expect(sessions.reaper).to be_a(HotTub::Reaper)
     end
 
     it "should disable pool based reaper" do
-      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 } 
+      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 eql(false)}
     end

data/spec/hot_tub_spec.rb

@@ -4,7 +4,7 @@ describe HotTub do
   context "helpers" do
     describe '#new' do
       it "should return a HotTub::Pool" do
-        expect(HotTub.new { |url| MocClient.new(url) }).to be_a(HotTub::Pool)
+        expect(HotTub::Pool.new { |url| MocClient.new(url) }).to be_a(HotTub::Pool)
       end
     end
 

data/spec/spec_helper.rb

@@ -8,6 +8,11 @@ require 'helpers/moc_client'
 require 'helpers/server'
 require 'net/https'
 
+begin
+  require 'byebug'
+rescue LoadError
+end
+
 unless HotTub.jruby? || HotTub.rbx?
   require 'coveralls'
   Coveralls.wear!

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec-autotest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-autotest
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: autotest
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: sinatra
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: puma
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: excon
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -110,6 +110,8 @@ files:
 - README.md
 - Rakefile
 - benchmarks/block_passing.rb
+- benchmarks/compare_concurrent.rb
+- benchmarks/compare_serial.rb
 - benchmarks/hot_tub.rb
 - hot_tub.gemspec
 - lib/hot_tub.rb