em_aws 0.2.1 → 0.2.2

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in em_aws.gemspec
 gemspec
+
+group :test do
+  gem 'ZenTest', '4.8.2'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.2.0)
+    em_aws (0.2.2)
       aws-sdk
       em-http-request
       em-synchrony
@@ -9,6 +9,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.8.2)
     addressable (2.3.2)
     aws-sdk (1.8.0)
       httparty (~> 0.7)
@@ -26,15 +27,15 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
-    em-synchrony (1.0.2)
+    em-synchrony (1.0.3)
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0)
     eventmachine (1.0.0-java)
     http_parser.rb (0.5.3)
     http_parser.rb (0.5.3-java)
-    httparty (0.10.0)
+    httparty (0.10.2)
       multi_json (~> 1.0)
-      multi_xml
+      multi_xml (>= 0.5.2)
     json (1.7.6)
     json (1.7.6-java)
     multi_json (1.5.0)
@@ -48,7 +49,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     uuidtools (2.1.3)
 
 PLATFORMS
@@ -56,6 +57,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest (= 4.8.2)
   builder
   em_aws!
   rspec

data/lib/aws/core/http/em_connection_pool.rb

@@ -33,12 +33,14 @@ module AWS
         # Run the block on the retrieved connection. Then return the connection
         # back to the pool.
         def run(url, &block)
-          connection = santize_connection(fetch_connection(url))
+          url = url.to_s.split("?")[0].to_s.gsub(/\/$/, "") # homogenize
+          connection = santize_connection(connection(url))
           block.call(connection)
         ensure
           return_connection(url,connection) 
         end
         
+        private
         # Returns a pool for the associated url
         def available_pools(url)
           add_connection(url) if add_connection?(url)
@@ -77,36 +79,41 @@ module AWS
           end
           connection
         end
-        
+              
         # Fetch an available connection or raise an error
-        def fetch_connection(url)         
+        def connection(url)         
           alarm = (Time.now + @pool_timeout)       
           # block until we get an available connection or Timeout::Error   
-          @fibered_mutex.synchronize do
-            loop do
-              if alarm <= Time.now
-                message = "Could not fetch a free connection in time. Consider increasing your connection pool for em_aws or setting :never_block to true."
-                AWS.config.logger.error message
-                raise Timeout::Error, message
-              end
-              connection = available_pools(url).shift
-              if connection.nil? && (@never_block)
-                AWS.config.logger.info "Adding AWS connection to #{url} for never_block, will not be returned to pool."
-                connection = new_connection(url)
-              end
-              return connection if connection
+          loop do
+            if alarm <= Time.now
+              message = "Could not fetch a free connection in time. Consider increasing your connection pool for em_aws or setting :never_block to true."
+              AWS.config.logger.error message
+              raise Timeout::Error, message
             end
+            connection = fetch_connection(url)
+            if connection.nil? && (@never_block)
+              AWS.config.logger.info "Adding AWS connection to #{url} for never_block, will not be returned to pool."
+              connection = new_connection(url)
+            end
+            return connection if connection
+          end
+        end
+        
+        # Fetch an available connection
+        # We pop the last connection increase our chances of getting a live connection
+        def fetch_connection(url)         
+          @fibered_mutex.synchronize do
+            available_pools(url).pop
           end
         end
         
-        # Return connections to pool if allowed, otherwise closes connection
-        # We return connections to the front of the pool to keep them active.
+        # If allowed, returns connections to pool end of pool; otherwise closes connection
         def return_connection(url,connection)
           @fibered_mutex.synchronize do
             if (@pools[url].nil? || (@pools[url].length == @pool_size))
               connection.conn.close_connection if connection.conn
             else
-              @pools[url].insert(0,connection)
+              @pools[url] << connection
             end
             @pools[url]
           end
@@ -114,4 +121,4 @@ module AWS
       end
     end
   end
-end
+end

data/lib/em_aws/version.rb

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

data/spec/em_connection_pool_spec.rb

@@ -28,47 +28,59 @@ module AWS
         
         describe '#add_connection?' do
           it "should be true if @pool_data does not have data for the url"do
-            @em_connection_pool.add_connection?("http://www.testurl123.com/").should be_true 
+            @em_connection_pool.send(:add_connection?,"http://www.testurl123.com/").should be_true 
           end
       
           it "should be true if @pool_data has data but the number of connnections has not reached the pool_size" do
             @em_connection_pool.instance_variable_set(:@pools,{"http://www.testurl123.com/" => ["connection"]})
-            @em_connection_pool.add_connection?("http://www.testurl123.com/").should be_true 
+            @em_connection_pool.send(:add_connection?,"http://www.testurl123.com/").should be_true 
           end
           
           it "should be false pool has reached pool_size" do
             @em_connection_pool.instance_variable_set(:@pools,
               {"http://www.testurl123.com/" => ["connection","connection","connection","connection","connection"]})
-            @em_connection_pool.add_connection?("http://www.testurl123.com/").should be_true 
+            @em_connection_pool.send(:add_connection?,"http://www.testurl123.com/").should be_true 
           end
         end
         
         describe '#add_connection' do
           it "should add connections for supplied url"do
-            @em_connection_pool.add_connection("http://www.testurl123.com/") 
+            @em_connection_pool.send(:add_connection,"http://www.testurl123.com/") 
             @em_connection_pool.instance_variable_get(:@pools)["http://www.testurl123.com/"].should_not be_nil
           end
         end   
         
-        describe '#fetch_connection' do
+        describe '#connection' do
           it "should raise Timeout::Error if an available is not found in time"do
             @em_connection_pool.stub(:available_pools).and_return([])
             @em_connection_pool.instance_variable_set(:@never_block, false)
-            lambda { @em_connection_pool.fetch_connection('http://some_url.com')}.should raise_error(Timeout::Error)
+            lambda { @em_connection_pool.send(:connection,'http://some_url.com')}.should raise_error(Timeout::Error)
+          end
+        end
+        
+        describe '#run' do
+          it "should homogenize url as much as possible by remove params and trailing '/'" do
+            url = "http://www.testurl123.com/?foo=bar"
+            @em_connection_pool.run(url) do {
+                #stuff
+              }
+            end
+            @em_connection_pool.instance_variable_get(:@pools)["http://www.testurl123.com"].should_not be_nil
           end
         end
 
         context 'integration test with parallel requests' do
           # 10 parallel requests
           
-          it "should work" do             
+          it "should work" do  
+            url = "http://www.testurl123.com"
             @requests_made = []
             EM.synchrony do 
               @em_connection_pool.instance_variable_set(:@never_block, true)
               fibers = []  
               10.times do 
                 fibers << Fiber.new do                           
-                @em_connection_pool.run "http://www.testurl123.com/" do |connection|                 
+                @em_connection_pool.run url do |connection|                 
                   @requests_made << connection.get(:keepalive => true).response_header.status    
                   end  
                 end  
@@ -91,7 +103,7 @@ module AWS
               end
     
               @requests_made.length.should eql(10)
-              @em_connection_pool.instance_variable_get(:@pools)["http://www.testurl123.com/"].length.should eql(@em_connection_pool.instance_variable_get(:@pool_size))              
+              @em_connection_pool.instance_variable_get(:@pools)[url].length.should eql(@em_connection_pool.instance_variable_get(:@pool_size))              
 
               EM.stop
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 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-01-17 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk