hot_tub 0.2.1 → 0.2.2

data/.travis.yml

@@ -5,7 +5,4 @@ rvm:
   - jruby-19mode
   - rbx-19mode
   - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: 1.9.2
+  - jruby-head

data/README.md

@@ -13,7 +13,7 @@ There are a couple Ruby connection pooling libraries out there but HotTub differ
 * Set to expand pool under load that is eventually reaped back down to set size (never_block), can be disabled
 * Attempts to close clients/connections at_exit
 
-### HotTub::Sessions
+### HotTub::Session
 * Thread safe
 * The same api as HotTub::Pool
 * Can be used with HotTub::Pool or any client library 
@@ -61,7 +61,7 @@ Close and clean can be defined at initialization with lambdas, if they are not d
     pool = HotTub::Pool.new({:size => 10, :close => lambda {|clnt| clnt.close}}) { MyHttpLib.new }
     pool.run { |clnt| clnt.get(@@url,query).body }
  
-## HotTub::Sessions Usage 
+## HotTub::Session Usage 
 HotTub::Sessions are a synchronized hash of clients/pools and are implemented similar HotTub::Pool. 
 For example, Excon is thread safe but you set a single url at the client level so sessions 
 are handy if you need to access multiple urls but would prefer a single object.
@@ -69,7 +69,7 @@ are handy if you need to access multiple urls but would prefer a single object.
     require 'hot_tub'
     require 'excon'
     # Our client block must accept the url argument
-    sessions = HotTub::Sessions.new {|url| Excon.new(url) }
+    sessions = HotTub::Session.new {|url| Excon.new(url) }
 
     sessions.run("http://somewebservice.com") do |clnt|    
       puts clnt.get(:query => {:some => 'stuff'}).response_header.status
@@ -81,16 +81,17 @@ are handy if you need to access multiple urls but would prefer a single object.
       puts clnt.get.response_header.status
     end
 
-### HotTub::Sessions with HotTub::Pool
+### HotTub::Session with HotTub::Pool
 Suppose you have a client that is not thread safe, you can use HotTub::Pool with HotTub::Sessions to get what you need.
     
     require 'hot_tub'
     require "em-synchrony"
     require "em-synchrony/em-http"
-    # Our client block must accept the url argument
 
+    # We ust tell HotTub::Session to use HotTub::Pool, pass any pool options in our 
+    # options has, and our client block must accept the url argument
     EM.synchrony do {
-      sessions = HotTub::Sessions.new {|url| HotTub::Pool.new(:size => 12) { EM::HttpRequest.new(url, :inactivity_timeout => 0) }}
+      sessions = HotTub::Session.new(:with_pool => true, :size => 12) {|url| EM::HttpRequest.new(url, :inactivity_timeout => 0) }
 
       sessions.run("http://somewebservice.com") do |clnt|    
         puts clnt.get(:query => results).response_header.status

data/hot_tub.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "rspec"
   s.add_development_dependency "sinatra"
-  s.add_development_dependency "puma"
+  s.add_development_dependency "puma", "~> 2.0.0.b7"
   s.add_development_dependency "excon"
   
   s.files         = `git ls-files`.split("\n")

data/lib/hot_tub/session.rb

@@ -19,8 +19,8 @@ module HotTub
     #   end
     #
     # Example with Pool:
-    #
-    #   sessions = HotTub::Pool.new(:size => 12) { EM::HttpRequest.new("http://somewebservice.com") }
+    # You can initialize a HotTub::Pool with each client by passing :with_pool as true and any pool options
+    #   sessions = HotTub::Session.new(:with_pool => true, :size => 12) { EM::HttpRequest.new("http://somewebservice.com") }
     #
     #   sessions.run("http://wwww.yahoo.com") do |conn|
     #     p conn.head.response_header.status
@@ -30,6 +30,7 @@ module HotTub
     #     p conn.head.response_header.status
     #   end
     #
+    #
     def initialize(options={},&client_block)
       raise ArgumentError, "HotTub::Sessions requre a block on initialization that accepts a single argument" unless block_given?
       at_exit { close_all } # close connections at exit
@@ -45,7 +46,11 @@ module HotTub
       key = to_key(url)
       return @sessions[key] if @sessions[key]
       @mutex.synchronize do
-        @sessions[key] = @client_block.call(url) if @sessions[key].nil?
+        if @options[:with_pool]
+          @sessions[key] = HotTub::Pool.new(@options) { @client_block.call(url) }
+        else
+          @sessions[key] = @client_block.call(url) if @sessions[key].nil?
+        end
         @sessions[key]
       end
     end
@@ -84,7 +89,7 @@ module HotTub
       else
         raise ArgumentError, "you must pass a string or a URI object"
       end
-      "#{uri.scheme}-#{uri.host}"
+      "#{uri.scheme}://#{uri.host}:#{uri.port}"
     end
   end
 end

data/lib/hot_tub/version.rb

@@ -1,3 +1,3 @@
 module HotTub
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/helpers/server.rb

@@ -35,4 +35,32 @@ module HotTub
       'http://127.0.0.1:9595' << path
     end
   end
+
+  class Server2 < Sinatra::Base
+
+    def self.run
+      @events = Puma::Events.new STDOUT, STDERR
+      @server = Puma::Server.new HotTub::Server.new, @events
+      @server.min_threads = 0
+      @server.max_threads = 20
+      @server.add_tcp_listener '127.0.0.1', 9393
+      @server.run
+    end
+
+    set :server, 'puma'
+    set :port, 9393
+
+
+    get '/quick' do
+      (Random.new.rand(0..999999).to_s)
+    end
+
+    def self.teardown
+      @server.stop(true) if @server
+    end
+
+    def self.url
+      'http://127.0.0.1:9393/quick' 
+    end
+  end
 end

data/spec/pool_spec.rb

@@ -144,7 +144,7 @@ describe HotTub::Pool do
             pool.run{|connection| connection.get }
           end
         end
-        sleep(0.01)
+        sleep(1)
         threads.each do |t|
           t.join
         end
@@ -155,12 +155,12 @@ describe HotTub::Pool do
       it "should not add connections to pool beyond specified size" do
         pool = HotTub::Pool.new({:size => 1, :never_block => false, :blocking_timeout => 10}) { MocClient.new }
         threads = []
-        3.times.each do
+        2.times.each do
           threads << Thread.new do
             pool.run{|connection| connection.get }
           end
         end
-        sleep(0.01)
+        sleep(1)
         threads.each do |t|
           t.join
         end

data/spec/session_spec.rb

@@ -23,13 +23,13 @@ describe HotTub::Session do
     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}")
+          @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}")
+          @sessions.send(:to_key,@uri).should eql("#{@uri.scheme}://#{@uri.host}:#{@uri.port}")
         end
       end
 
@@ -68,35 +68,55 @@ describe HotTub::Session do
         it "should set key with URI scheme-domain" do
           @sessions.sessions(@url)
           sessions = @sessions.instance_variable_get(:@sessions)
-          sessions["#{@uri.scheme}-#{@uri.host}"].should be_a(MocClient)
+          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}"].should be_a(MocClient)
+          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::Session.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 = "https://www.somewebsite.com"
-        @sessions = HotTub::Session.new { |url| MocClient.new(url) }
+        url = HotTub::Server.url
+        sessions = HotTub::Session.new { |url| Excon.new(url) }
         result = nil
-        @sessions.run(@url) do |conn|
-          result = conn.get
+        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::Session.new({:with_pool => true})  { |url| Excon.new(url) }
+          result = nil
+          session_with_pool.run(url) do |conn|
+            result = conn.get.status
+          end
+          result.should eql(200)
         end
-        result.should_not be_nil
       end
     end
 
     context 'threads' do
       it "should work" do
         url = HotTub::Server.url
-        url2 = "http://www.yahoo.com/"
-        session = HotTub::Session.new { |url| Excon.new(url)}
+        url2 = HotTub::Server2.url
+        session = HotTub::Session.new(:with_pool => true) { |url| Excon.new(url)}
         failed = false
         start_time = Time.now
         stop_time = nil
@@ -106,8 +126,8 @@ describe HotTub::Session do
           10.times.each do
             threads << Thread.new do
               # MocClient is not thread safe so lets initialize a new instance for each
-              session.run(url)  { |clnt| Thread.current[:result] = MocClient.new(url).get }
-              session.run(url2) { |clnt| Thread.current[:result] = MocClient.new(url2).get }
+              session.run(url)  { |clnt| Thread.current[:result] = clnt.get.status }
+              session.run(url2) { |clnt| Thread.current[:result] = clnt.get.status }
             end
           end
           threads.each do |t|

data/spec/spec_helper.rb

@@ -15,8 +15,10 @@ HotTub.logger.level = Logger::ERROR
 RSpec.configure do |config|
  config.before(:suite) do
   HotTub::Server.run
+  HotTub::Server2.run
  end
  config.after(:suite) do
   HotTub::Server.teardown
+  HotTub::Server2.teardown
  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.b7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.b7
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1949508601036359576
+      hash: -4288862352751305264
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1949508601036359576
+      hash: -4288862352751305264
 requirements: []
 rubyforge_project: hot_tub
 rubygems_version: 1.8.25