hot_tub 0.2.3 → 0.2.4

data/lib/hot_tub/pool.rb

@@ -2,7 +2,7 @@ module HotTub
   class Pool
     include HotTub::KnownClients
     attr_reader :current_size, :fetching_client, :last_activity
-    
+
     # Thread-safe lazy connection pool
     #
     # == Example EM-Http-Request
@@ -11,8 +11,8 @@ module HotTub
     #
     # HotTub::Pool defaults never_block to true, which means if we run out of
     # connections simply create a new client to continue operations.
-    # The pool will grow and extra connections will be resued until activity dies down. 
-    # If you would like to block and possibly throw an exception rather than temporarily 
+    # The pool will grow and extra connections will be resued until activity dies down.
+    # If you would like to block and possibly throw an exception rather than temporarily
     # grow the set :size, set :never_block to false; blocking_timeout defaults to 10 seconds.
     #
     # == Example without #never_block (will BlockingTimeout exception)
@@ -37,7 +37,7 @@ module HotTub
       }.merge(options)
       @pool = []
       @current_size = 0
-      @mutex = (HotTub.em_synchrony? ? EM::Synchrony::Thread::Mutex.new : Mutex.new)
+      @mutex = (fiber_mutex? ? EM::Synchrony::Thread::Mutex.new : Mutex.new)
       @last_activity = Time.now
       @fetching_client = false
     end
@@ -70,6 +70,14 @@ module HotTub
 
     private
 
+    def fiber_mutex?
+      begin
+        (HotTub.em_synchrony? && @client_block.call.is_a?(EventMachine::HttpConnection))
+      rescue
+        false
+      end
+    end
+
     # Returns an instance of the client for this pool.
     def client
       clnt = nil
@@ -110,7 +118,7 @@ module HotTub
         @fetching_client = false
         clnt
       end
-    ensure 
+    ensure
       reap_pool if reap_pool?
     end
 

data/lib/hot_tub/session.rb

@@ -37,7 +37,7 @@ module HotTub
       @options = options || {}
       @client_block = client_block
       @sessions = Hash.new
-      @mutex = (HotTub.em_synchrony? ? EM::Synchrony::Thread::Mutex.new : Mutex.new)
+      @mutex = (fiber_mutex? ? EM::Synchrony::Thread::Mutex.new : Mutex.new)
     end
 
     # Synchronizes initialization of our sessions
@@ -81,6 +81,14 @@ module HotTub
 
     private
 
+    def fiber_mutex?
+      begin
+        (HotTub.em_synchrony? && @client_block.call("http://moc").is_a?(EventMachine::HttpConnection))
+      rescue
+        false
+      end
+    end
+
     def to_key(url)
       if url.is_a?(String)
         uri = URI(url)

data/lib/hot_tub/version.rb

@@ -1,3 +1,3 @@
 module HotTub
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/pool_spec.rb

@@ -261,6 +261,32 @@ describe HotTub::Pool do
   end
 
   unless HotTub.jruby?
+    describe "fiber_mutex?" do
+        context 'EM::HttpRequest as client' do
+          before(:each) do
+            @pool = HotTub::Pool.new { EM::HttpRequest.new(HotTub::Server.url) }
+          end
+          context "EM::Synchrony is present" do
+            it "should be true" do
+              HotTub.stub(:em_synchrony?).and_return(true)
+              @pool.send(:fiber_mutex?).should be_true
+            end
+          end
+          context "EM::Synchrony is not present" do
+            it "should be false" do
+              HotTub.stub(:em_synchrony?).and_return(false)
+              @pool.send(:fiber_mutex?).should be_false
+            end
+          end
+        end
+        context 'client is not EM::HttpRequest' do
+          it "should be false" do
+            pool = HotTub::Pool.new {|url| MocClient.new}
+            pool.send(:fiber_mutex?).should be_false
+          end
+        end
+      end
+
     context 'EM:HTTPRequest' do
       before(:each) do
         @url = HotTub::Server.url
@@ -269,7 +295,7 @@ describe HotTub::Pool do
       it "should work" do
         EM.synchrony do
           status = []
-          c = HotTub::Pool.new {EM::HttpRequest.new(@url)}
+          c = HotTub::Pool.new(:fiber_mutex => true) {EM::HttpRequest.new(@url)}
           c.run { |conn| status << conn.head(:keepalive => true).response_header.status}
           c.run { |conn| status << conn.ahead(:keepalive => true).response_header.status}
           c.run { |conn| status << conn.head(:keepalive => true).response_header.status}
@@ -282,15 +308,15 @@ describe HotTub::Pool do
       context 'fibers' do
         it "should work" do
           EM.synchrony do
-            pool = HotTub::Pool.new({:size => 5}) {EM::HttpRequest.new(@url)}
+            pool = HotTub::Pool.new({:size => 5, :fiber_mutex => true}) {EM::HttpRequest.new(@url)}
             failed = false
             fibers = []
             lambda {
               10.times.each do
                 fibers << Fiber.new do
-                  pool.run{|connection| 
+                  pool.run{|connection|
                     s = connection.head(:keepalive => true).response_header.status
-                    failed = true unless s == 200}
+                  failed = true unless s == 200}
                 end
               end
               fibers.each do |f|

data/spec/session_spec.rb

@@ -145,10 +145,38 @@ describe HotTub::Session do
     end
 
     unless HotTub.jruby?
+
+      describe "fiber_mutex?" do
+
+        context 'EM::HttpRequest as client' do
+          before(:each) do
+            @session = HotTub::Session.new {|url| EM::HttpRequest.new(url)}
+          end
+          context "EM::Synchrony is present" do
+            it "should be true" do
+              HotTub.stub(:em_synchrony?).and_return(true)
+              @session.send(:fiber_mutex?).should be_true
+            end
+          end
+          context "EM::Synchrony is not present" do
+            it "should be false" do
+              HotTub.stub(:em_synchrony?).and_return(false)
+              @session.send(:fiber_mutex?).should be_false
+            end
+          end
+        end
+        context 'client is not EM::HttpRequest' do
+          it "should be false" do
+            session = HotTub::Session.new {|url| MocClient.new}
+            session.send(:fiber_mutex?).should be_false
+          end
+        end
+      end
+
       context 'fibers' do
         it "should work" do
           EM.synchrony do
-            sessions = HotTub::Session.new {|url| HotTub::Pool.new({:size => 5}) {EM::HttpRequest.new(url)}}
+            sessions = HotTub::Session.new(:with_pool => true) {|url| EM::HttpRequest.new(url)}
             failed = false
             fibers = []
             lambda {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_tub
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1539670545928436962
+      hash: -3003548188710174576
 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: 1539670545928436962
+      hash: -3003548188710174576
 requirements: []
 rubyforge_project: hot_tub
 rubygems_version: 1.8.25