hot_tub 0.0.4 → 0.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70279127174460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +37,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279127174460
-description: A very simple ruby pool gem
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A simple thread-safe http connection pooling gem. Http client options
+  include HTTPClient and EM-Http-Request
 email:
 - joshmckin@gmail.com
 executables: []
@@ -37,20 +59,15 @@ files:
 - Rakefile
 - http_hot_tub.gemspec
 - lib/hot_tub.rb
-- lib/hot_tub/clients/client.rb
-- lib/hot_tub/clients/em_synchrony_client.rb
-- lib/hot_tub/clients/excon_client.rb
-- lib/hot_tub/clients/http_client_client.rb
+- lib/hot_tub/pool.rb
 - lib/hot_tub/session.rb
 - lib/hot_tub/version.rb
-- spec/em_synchrony_client_spec.rb
-- spec/excon_client_spec.rb
-- spec/http_client_client_spec.rb
+- spec/pool_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
-- spec/test_helper_methods.rb
 homepage: https://github.com/JoshMcKin/hot_tub
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -69,14 +86,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: hot_tub
-rubygems_version: 1.8.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A very simple ruby pool gem
+summary: A simple thread-safe http connection pooling gem.
 test_files:
-- spec/em_synchrony_client_spec.rb
-- spec/excon_client_spec.rb
-- spec/http_client_client_spec.rb
+- spec/pool_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
-- spec/test_helper_methods.rb

data/lib/hot_tub/clients/client.rb

@@ -1,37 +0,0 @@
-require "hot_tub"
-require 'thread'
-module HotTub
-  # Super class for all HotTub clients
-  # provides the 4 required methods to ensure compatibility
-  class Client
-    
-    def client
-      @client
-    end
-    
-    def method_missing(method, *args, &blk)
-      @client.send(method,*args,&blk)
-    end
-    
-    # Override this method to perform the necessary action for ensure a client
-    # is clean for use.
-    def clean
-      @client
-    end
-    
-    def close
-      @client
-    end
-    
-    def dup
-      self.class.new(@url,@options)
-    end
-    
-    class << self
-      def mutex
-        Mutex.new
-      end
-    end
-  end
-end
-

data/lib/hot_tub/clients/em_synchrony_client.rb

@@ -1,41 +0,0 @@
-require "hot_tub"
-require "hot_tub/clients/client"
-module HotTub
-  class EmSynchronyClient < HotTub::Client 
-  
-    def initialize(url,options={})
-      @url = url
-      @options = {:inactivity_timeout => 0}.merge(options)     
-      @client = EM::HttpRequest.new(url,options)
-    end
-    
-    def clean   
-      if @client.conn && @client.conn.error?
-        HotTub.logger.info "Sanitizing connection : #{EventMachine::report_connection_error_status(@client.conn.instance_variable_get(:@signature))}"
-        @client.conn.close_connection
-        @client.instance_variable_set(:@deferred, true)
-      end
-      @client
-    end
-    
-    def close
-      @client.conn.close_connection if @client.conn
-    end
-    
-    # Default keepalive true for HTTP requests
-    [:get,:head,:delete,:put,:post].each do |m|
-      define_method m do |options={},&blk|
-        options ={} if options.nil?
-        options[:keepalive] = true
-        @client.send(m,options,&blk)
-      end
-    end
-    
-    class << self
-      # Use a fiber safe mutex
-      def mutex
-        EM::Synchrony::Thread::Mutex.new
-      end
-    end
-  end
-end

data/lib/hot_tub/clients/excon_client.rb

@@ -1,24 +0,0 @@
-require "hot_tub"
-require "hot_tub/clients/client"
-require "excon"
-module HotTub
-  class ExconClient < HotTub::Client 
-  
-    def initialize(url,options={})
-      @url = url
-      #make sure we turn on keep-alive
-      @options = {:headers => {"Connection" => "keep-alive"}}.merge(options)
-      @client = Excon.new(url,options)
-    end
-    
-    # pretty sure Excon handles this internally
-    def clean
-      @client
-    end
-    
-    def close
-      @client.socket.close
-    end
-
-  end
-end

data/lib/hot_tub/clients/http_client_client.rb

@@ -1,38 +0,0 @@
-require "hot_tub"
-require "hot_tub/clients/client"
-require 'uri'
-require 'http_client'
-module HotTub
-  
-  class HttpClientClient < HotTub::Client 
-  
-    def initialize(options={})
-      options[:default_host] = options[:url] if (options[:url] && options[:default_host].nil?)
-      @options = options
-      @client = HTTP::Client.new(options)
-    end
-    
-    # pretty sure HttpClient handles this internally
-    def clean
-      @client
-    end
-    
-    def close
-      @client.shutdown
-    end
-    # HttpClient has different initialization attributes so we need a custom dup
-    def dup
-      self.class.new(@options)
-    end  
-  end
-end
-
-module HTTP
-  class Client
-    def read_response(request)
-      r = execute(request)
-      r.body
-      r
-    end
-  end
-end

data/spec/em_synchrony_client_spec.rb

@@ -1,47 +0,0 @@
-unless RUBY_VERSION < '1.9' or (defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE)
-  require "em-synchrony"
-  require "em-synchrony/em-http"
-  require "em-synchrony/fiber_iterator"
-  require "hot_tub/clients/em_synchrony_client"
-  require 'test_helper_methods'
-  include TestHelperMethods
-
-  describe HotTub::EmSynchronyClient do
-    before(:each) do
-      @url = "https://www.google.com" 
-    end
-
-    it "Keep alive should work" do
-      EM.synchrony do   
-        keep_alive_test HotTub::EmSynchronyClient.new(@url) do |connection| 
-          connection.get.response_header.status
-        end
-        EM.stop
-      end
-    end
-#    context 'integration test with parallel requests' do
-#      # 10 parallel requests
-#      it "should work" do
-#        @connection_pool = HotTub::Session.new(:client_options => 
-#            {:url => "https://www.google.com"},
-#          :never_block => true,
-#          :client => HotTub::EmSynchronyClient)
-#        EM.synchrony do       
-#          concurrency = 10
-#          options = (0..19).to_a
-#          results = []
-#            
-#          EM::Synchrony::FiberIterator.new(options, concurrency).each do |count|
-#            resp =  @connection_pool.get
-#            results.push resp.response_header.status 
-#          end
-#            
-#          results.length.should eql(20)
-#          results.include?(200).should be_true
-#          @connection_pool.instance_variable_get(:@pool).length.should eql(@connection_pool.instance_variable_get(:@options)[:size])                
-#          EM.stop
-#        end
-#      end         
-#    end
-  end
-end

data/spec/excon_client_spec.rb

@@ -1,18 +0,0 @@
-unless (RUBY_VERSION < '1.9' or (defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE))
-  require "hot_tub/clients/excon_client"
-  require 'test_helper_methods'
-  require 'excon'
-  include TestHelperMethods
-  describe HotTub::ExconClient do
-    before(:each) do
-      @url = "https://www.google.com"
-    end
-  
-    it "Keep alive should work" do
-      keep_alive_test HotTub::ExconClient.new(@url) do |client| 
-        client.get.status
-      end
-    end
-  end
-end
-

data/spec/http_client_client_spec.rb

@@ -1,16 +0,0 @@
-if RUBY_VERSION < '1.9' or (defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE)
-  require "hot_tub/clients/http_client_client"
-  require 'test_helper_methods'
-  include TestHelperMethods
-  describe HotTub::HttpClientClient do
-    before(:each) do
-      @url = "https://www.google.com"
-    end 
-    it "Keep alive should work" do
-      keep_alive_test HotTub::HttpClientClient.new(:url => @url) do |client| 
-        c = client.get('')
-        c.status_code
-      end
-    end
-  end
-end

data/spec/test_helper_methods.rb

@@ -1,33 +0,0 @@
-module TestHelperMethods
-  def keep_alive_test(client,&get_status_blk)
-    responses = []
-    start = Time.now
-    
-    50.times.each do
-      c = client.dup # want a new client everytime
-      responses.push get_status_blk.call(c)
-    end
-    
-    normal = Time.now - start
-    
-    # we want a whole new pool to make sure we don't cheat
-    connection_pool = HotTub::Session.new(client)
-    
-    start = Time.now
-    50.times.each do
-      #responses.push get_status_blk.call(connection_pool.get)    
-      connection_pool.run do |c|
-        responses.push get_status_blk.call(c)
-      end
-      
-    end
-    
-    keep_alive = Time.now - start
-    
-   
-    puts "#{client.class.name} keep-alive: #{keep_alive}; normal: #{normal};"
-    #puts responses.join(", ")
-    (keep_alive < normal).should be_true
-  end
-
-end