hot_tub 0.0.1 → 0.0.2

data/README.md

@@ -10,7 +10,7 @@ HotTub is available through [Rubygems](https://rubygems.org/gems/hot_tub) and ca
 
 ## Setup 
     class MyClass
-      @@pool = HotTub::Session.new({:size => 2 :client => HotTub::Client::EmSynchronyClient.new('https://google.com'), :never_block => true})
+      @@pool = HotTub::Session.new({:size => 2 :client => HotTub::EmSynchronyClient.new('https://google.com'), :never_block => true})
 
       def self.fetch_results(query)
         @@pool.get(:query => query) # keepalive has be defaulted to true in the client

data/lib/hot_tub/session.rb

@@ -1,6 +1,5 @@
 module HotTub
   class Session
-    AVAILABLE_CLIENTS = ["NetHttpClient","EmSynchronyClient"]
    
     # OPTIONS
     # * :size - number of connections for each pool
@@ -12,22 +11,25 @@ module HotTub
     # instead of raising this number
     # :never_block - if set to true, a connection will always be returned, but 
     # these extra connections are not added to the pool when the request is completed
-    def initialize(options={})
+    def initialize(options={})     
       @options = {
         :size => 5,
         :never_block => false,
-        :blocking_timeout => 0.5,
-        :client_options => {}
-      }.merge(options)
-      @pool = []
-      @pool_data = {:current_size => 0}   
-      @client = @options[:client]
-      @mutex = (@client.respond_to?(:mutex) ? @client.mutex : Client.mutex)
+        :blocking_timeout => 0.5
+      }.merge(options || {})
+      if @options[:client]
+        @pool = []
+        @pool_data = {:current_size => 0}   
+        @client = @options[:client]
+        @mutex = (@client.respond_to?(:mutex) ? @client.mutex : Mutex.new)
+      else
+        raise ArgumentError, "The option :client is required for HotTub::Session.new"
+      end
     end
             
     def pool
       @mutex.synchronize do
-        add if add?
+        add_client if add_client?
         @pool
       end
     end
@@ -102,12 +104,12 @@ module HotTub
     end
     
     private
-  
-    def add?
+    
+    def add_client?
       (@pool.empty? && (@pool_data[:current_size] < @options[:size]))
     end
         
-    def add
+    def add_client
       HotTub.logger.info "Adding HotTub client: #{@client.class.name} to pool"
       @pool_data[:current_size] += 1
       @pool << new_client         

data/lib/hot_tub/version.rb

@@ -1,3 +1,3 @@
 module HotTub
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/session_spec.rb

@@ -9,12 +9,19 @@ require 'spec_helper'
   end
 
 describe HotTub::Session do
+  
+  describe '#initialize' do
+     it "should raise ArgumentError if :client option is nil" do
+      lambda { HotTub::Session.new}.should raise_error(ArgumentError)
+    end
+  end
   before(:each) do
     @url = "http://www.testurl123.com/"
     @tub = HotTub::Session.new(:client => MocClient.new(@url)) 
   end
 
   context 'default configuration' do
+   
     it "should have @pool_size of 5" do
       @tub.instance_variable_get(:@options)[:size].should eql(5)
     end
@@ -24,24 +31,24 @@ describe HotTub::Session do
     end
   end
         
-  describe '#add_connection?' do
+  describe '#add_client?' do
     it "should be true if @pool_data[:length] is less than desired pool size and 
     the pool is empty?"do
       @tub.instance_variable_set(:@pool_data,{:current_size => 1})
-      @tub.send(:add?).should be_true 
+      @tub.send(:add_client?).should be_true 
     end
           
     it "should be false pool has reached pool_size" do
       @tub.instance_variable_set(:@pool_data,{:current_size => 5})
       @tub.instance_variable_set(:@pool,
         ["connection","connection","connection","connection","connection"])
-      @tub.send(:add?).should be_false
+      @tub.send(:add_client?).should be_false
     end
   end
         
-  describe '#add_connection' do
+  describe '#add_client' do
     it "should add connections for supplied url"do
-      @tub.send(:add)
+      @tub.send(:add_client)
       @tub.instance_variable_get(:@pool).should_not be_nil
     end
   end   

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Joshua Mckinney
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000Z
+date: 2012-06-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  requirement: &70155079255920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2056
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70155079255920
 description: A very simple ruby pool gem
 email:
 - joshmckin@gmail.com
@@ -51,26 +51,26 @@ files:
 - spec/test_helper_methods.rb
 homepage: https://github.com/JoshMcKin/hot_tub
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: hot_tub
-rubygems_version: 1.8.15
-signing_key:
+rubygems_version: 1.8.6
+signing_key: 
 specification_version: 3
 summary: A very simple ruby pool gem
 test_files:
@@ -80,4 +80,3 @@ test_files:
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/test_helper_methods.rb
-...