hot_tub 0.2.6 → 0.3.0

data/spec/reaper_mixin_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+describe HotTub::Reaper::Mixin do
+  before(:each) do
+    @pool = MocMixinPool.new
+  end
+  describe '#reaper' do
+    it "should be defined" do
+      @pool.should respond_to(:reaper)
+    end
+  end
+  describe '#reap_timeout' do
+    it "should be defined" do
+      @pool.should respond_to(:reap_timeout)
+    end
+  end
+  describe '#shutdown' do
+    it "should be defined" do
+      @pool.should respond_to(:shutdown)
+    end
+  end
+  describe '#reap!' do
+    it "should be defined" do
+      @pool.should respond_to(:reap!)
+    end
+    it "should raise NoMethodError if called" do
+      lambda {@pool.reap!}.should raise_error(NoMethodError)
+    end
+  end
+end

data/spec/reaper_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe HotTub::Reaper do
+  before(:each) do
+    @pool = MocReaperPool.new
+    @reaper = @pool.reaper
+  end
+  it "should be a HotTub::Reaper Thread" do
+  	@reaper.should be_a(HotTub::Reaper)
+    @reaper.should be_a(Thread)
+  end
+
+  it "should reap!" do
+  	@pool.reaped.should be_false
+  	@pool.lets_reap = true
+  	@reaper.wakeup
+  	sleep(0.01)
+  	@pool.reaped.should be_true
+  end
+
+  it "should sleep after reap!" do
+  	@pool.reaped.should be_false
+  	@pool.lets_reap = true
+  	@reaper.wakeup
+  	sleep(0.01)
+  	@reaper.status.should eql('sleep')
+  end
+end

data/spec/sessions_spec.rb

@@ -0,0 +1,223 @@
+require 'spec_helper'
+require 'hot_tub/sessions'
+require 'uri'
+require 'time'
+describe HotTub::Sessions do
+
+  context 'initialized without a block' do
+    it "should raise error if block is not supplied" do
+      lambda {HotTub::Sessions.new}.should raise_error(ArgumentError)
+    end
+  end
+  context 'initialized with a block' do
+    before(:each) do
+      @url = "https://www.somewebsite.com"
+      @uri = URI(@url)
+      @sessions = HotTub::Sessions.new { |url| MocClient.new(url) }
+    end
+
+    describe '#to_url' do
+      context "passed URL string" do
+        it "should return key with URI scheme-domain" do
+          @sessions.send(:to_key,@url).should eql("#{@uri.scheme}://#{@uri.host}:#{@uri.port}")
+        end
+      end
+
+      context "passed URI" do
+        it "should return key with URI scheme-domain" do
+          @sessions.send(:to_key,@uri).should eql("#{@uri.scheme}://#{@uri.host}:#{@uri.port}")
+        end
+      end
+
+      context "invalid argument" do
+        it "should raise an ArgumentError" do
+          lambda { @sessions.send(:to_key, nil) }.should raise_error(ArgumentError)
+        end
+        it  "should raise URI::InvalidURIError with bad url" do
+          lambda { @sessions.send(:to_key,"bad url") }.should raise_error(URI::InvalidURIError)
+        end
+      end
+    end
+
+    describe '#sessions' do
+      context 'HotTub::Pool as client' do
+        it "should add a new client for the url" do
+          with_pool_options = HotTub::Sessions.new { |url| HotTub::Pool.new(:size => 13) { MocClient.new(url) } }
+          with_pool_options.sessions(@url)
+          sessions = with_pool_options.instance_variable_get(:@sessions)
+          sessions.size.should eql(1)
+          sessions.each_value {|v| v.should be_a( HotTub::Pool)}
+        end
+      end
+
+      context 'other clients' do
+        it "should add a new client for the url" do
+          no_pool = HotTub::Sessions.new { |url| Excon.new(url) }
+          no_pool.sessions(@url)
+          sessions = no_pool.instance_variable_get(:@sessions)
+          sessions.size.should eql(1)
+          sessions.each_value {|v| v.should be_a(Excon::Connection)}
+        end
+      end
+
+      context "passed URL string" do
+        it "should set key with URI scheme-domain" do
+          @sessions.sessions(@url)
+          sessions = @sessions.instance_variable_get(:@sessions)
+          sessions["#{@uri.scheme}://#{@uri.host}:#{@uri.port}"].should be_a(MocClient)
+        end
+      end
+      context "passed URI" do
+        it "should set key with URI scheme-domain" do
+          @sessions.sessions(@uri)
+          sessions = @sessions.instance_variable_get(:@sessions)
+          sessions["#{@uri.scheme}://#{@uri.host}:#{@uri.port}"].should be_a(MocClient)
+        end
+      end
+
+      context "with_pool" do
+        it "should initialize a new HotTub::Pool" do
+          session_with_pool = HotTub::Sessions.new({:with_pool => true})  { |url| MocClient.new(url) }
+          pool = session_with_pool.sessions(@url)
+          pool.should be_a(HotTub::Pool)
+        end
+      end
+    end
+
+    describe '#run' do
+      it "should work" do
+        url = HotTub::Server.url
+        sessions = HotTub::Sessions.new { |url| Excon.new(url) }
+        result = nil
+        sessions.run(url) do |conn|
+          result = conn.get.status
+        end
+        result.should eql(200)
+      end
+
+      context "with_pool" do
+        it "should pass run to pool" do
+          url = HotTub::Server.url
+          session_with_pool = HotTub::Sessions.new({:with_pool => true})  { |url|
+            uri = URI.parse(url)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = false
+            http.start
+            http
+          }
+          result = nil
+          session_with_pool.run(url) do |conn|
+            uri = URI.parse(url)
+            result = conn.get(uri.path).code
+          end
+          result.should eql('200')
+        end
+      end
+    end
+
+    describe '#clean!' do
+      it "should clean all sessions" do
+        sessions = HotTub::Sessions.new(:clean => lambda { |clnt| clnt.clean}) { |url| MocClient.new(url) }
+        sessions.sessions('foo')
+        sessions.sessions('bar')
+        sessions.clean!
+        sessions.instance_variable_get(:@sessions).each_pair do |k,v|
+          v.cleaned?.should be_true
+        end
+      end
+      context "with_pool" do
+        it "should clean all pools in sessions" do
+          sessions = HotTub::Sessions.new(:with_pool => true, :clean => lambda { |clnt| clnt.clean}) { |url| MocClient.new(url) }
+          sessions.sessions('foo')
+          sessions.sessions('bar')
+          sessions.clean!
+          sessions.instance_variable_get(:@sessions).each_pair do |k,v|
+            v.instance_variable_get(:@pool).each do |c|
+              c.cleaned?.should be_true
+            end
+          end
+        end
+      end
+    end
+
+    describe '#drain!' do
+      it "should drain all sessions" do
+        sessions = HotTub::Sessions.new { |url| MocClient.new(url) }
+        sessions.sessions('foo')
+        sessions.sessions('bar')
+        sessions.drain!
+        sessions.instance_variable_get(:@sessions).empty?.should be_true
+      end
+      context "with_pool" do
+        it "should drain all pools in sessions" do
+          sessions = HotTub::Sessions.new(:with_pool => true) { |url| MocClient.new(url) }
+          sessions.sessions('foo')
+          sessions.sessions('bar')
+          sessions.drain!
+          sessions.instance_variable_get(:@sessions).empty?.should be_true
+        end
+      end
+    end
+
+    describe '#reap!' do
+      it "should clean all sessions" do
+        sessions = HotTub::Sessions.new(:reap => lambda { |clnt| clnt.reap}) { |url| MocClient.new(url) }
+        sessions.sessions('foo')
+        sessions.sessions('bar')
+        sessions.reap!
+        sessions.instance_variable_get(:@sessions).each_pair do |k,v|
+          v.reaped?.should be_true
+        end
+      end
+      context "with_pool" do
+        it "should clean all pools in sessions" do
+          sessions = HotTub::Sessions.new(:with_pool => true, :reap => lambda { |clnt| clnt.reap}) { |url| MocClient.new(url) }
+          sessions.sessions('foo')
+          sessions.sessions('bar')
+          sessions.reap!
+          sessions.instance_variable_get(:@sessions).each_pair do |k,v|
+            v.instance_variable_get(:@pool).each do |c|
+              c.reaped?.should be_true
+            end
+          end
+        end
+      end
+    end
+    context 'integration tests' do
+      context 'threads' do
+        it "should work" do
+          url = HotTub::Server.url
+          url2 = HotTub::Server2.url
+          session = HotTub::Sessions.new(:with_pool => true) { |url|
+            uri = URI.parse(url)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = false
+            http.start
+            http
+          }
+          failed = false
+          start_time = Time.now
+          stop_time = nil
+          threads = []
+          lambda {
+            10.times.each do
+              threads << Thread.new do
+                session.run(url)  { |clnt| Thread.current[:result] = clnt.get(URI.parse(url).path).code }
+                session.run(url2) { |clnt| Thread.current[:result] = clnt.get(URI.parse(url).path).code }
+              end
+            end
+            threads.each do |t|
+              t.join
+            end
+            stop_time = Time.now
+          }.should_not raise_error # make sure we're thread safe
+          # Some extra checks just to make sure...
+          results = threads.collect{ |t| t[:result]}
+          results.length.should eql(10) # make sure all threads are present
+          results.uniq.should eql([results.first]) # make sure we got the same results
+          session.instance_variable_get(:@sessions).keys.length.should eql(2) # make sure sessions were created
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'rspec'
 require 'bundler/setup'
 require 'logger'
 require 'excon'
+require 'helpers/moc_pool'
 require 'helpers/moc_client'
 require 'helpers/server'
 require 'net/https'

metadata

@@ -1,20 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  version: 0.2.6
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,13 +76,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A simple thread-safe http connection pooling gem. Out-of-the-box support
-  for Excon and EM-Http-Request
+description: A dynamic thread-safe pooling gem, when you need more than a standard
+  static pool.
 email:
 - joshmckin@gmail.com
 executables: []
@@ -95,47 +100,49 @@ files:
 - lib/hot_tub.rb
 - lib/hot_tub/known_clients.rb
 - lib/hot_tub/pool.rb
-- lib/hot_tub/session.rb
+- lib/hot_tub/reaper.rb
+- lib/hot_tub/sessions.rb
 - lib/hot_tub/version.rb
 - spec/helpers/moc_client.rb
+- spec/helpers/moc_pool.rb
 - spec/helpers/server.rb
+- spec/hot_tub_spec.rb
 - spec/pool_spec.rb
-- spec/session_spec.rb
+- spec/reaper_mixin_spec.rb
+- spec/reaper_spec.rb
+- spec/sessions_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/JoshMcKin/hot_tub
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3131859420697003965
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3131859420697003965
 requirements: []
 rubyforge_project: hot_tub
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: A simple thread-safe http connection pooling gem.
+specification_version: 4
+summary: A dynamic thread-safe pooling gem.
 test_files:
 - spec/helpers/moc_client.rb
+- spec/helpers/moc_pool.rb
 - spec/helpers/server.rb
+- spec/hot_tub_spec.rb
 - spec/pool_spec.rb
-- spec/session_spec.rb
+- spec/reaper_mixin_spec.rb
+- spec/reaper_spec.rb
+- spec/sessions_spec.rb
 - spec/spec_helper.rb