em_aws 0.2.4 → 0.2.5

data/Gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-  gem 'ZenTest', '4.8.2'
+  gem 'ZenTest', '~> 4.8.2'
+  gem 'eventmachine_httpserver', :require => 'evma_httpserver'
 end

data/Gemfile.lock

@@ -9,15 +9,15 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.8.2)
-    addressable (2.3.2)
-    aws-sdk (1.8.1.2)
+    ZenTest (4.8.4)
+    addressable (2.3.3)
+    aws-sdk (1.8.3.1)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    builder (3.1.4)
+    builder (3.2.0)
     cookiejar (0.3.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
@@ -30,20 +30,21 @@ GEM
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0)
     eventmachine (1.0.0-java)
+    eventmachine_httpserver (0.2.1)
     http_parser.rb (0.5.3)
     http_parser.rb (0.5.3-java)
-    json (1.7.6)
-    json (1.7.6-java)
+    json (1.7.7)
+    json (1.7.7-java)
     nokogiri (1.5.6)
     nokogiri (1.5.6-java)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     uuidtools (2.1.3)
 
 PLATFORMS
@@ -51,7 +52,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest (= 4.8.2)
+  ZenTest (~> 4.8.2)
   builder
   em_aws!
+  eventmachine_httpserver
   rspec

data/HISTORY.md

@@ -0,0 +1,11 @@
+EmAws Changelog
+=====================
+
+HEAD
+=======
+
+0.2.5
+=======
+
+- For non-pooled request set em-http-request inactivity_timeout from aws request.read_timeout object. Remove retries based on status 0 [joshmckin, michalf, #13]
+- Fetch port from request object [michalf, #13]

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

@@ -33,7 +33,6 @@ module AWS
         ]
         # @return [Hash] The default options to send to EM-Synchrony on each request.
         attr_reader :default_request_options
-        attr_accessor :status_0_retries  
         
         # Constructs a new HTTP handler using EM-Synchrony.
         # @param [Hash] options Default options to send to EM-Synchrony on
@@ -46,7 +45,6 @@ module AWS
         def initialize options = {}
           @default_request_options = options
           @pool = EMConnectionPool.new(options) if options[:pool_size].to_i > 0
-          @status_0_retries = 2 # set to 0 for no retries
         end 
     
         def handle(request,response,&read_block)
@@ -86,13 +84,7 @@ module AWS
         private
         
         def fetch_url(request)
-          url = nil
-          if request.use_ssl?
-            url = "https://#{request.host}:443"
-          else
-            url = "http://#{request.host}"
-          end
-          url
+          "#{(request.use_ssl? ? "https" : "http")}://#{request.host}:#{request.port}"
         end
                    
         def fetch_headers(request)
@@ -135,7 +127,9 @@ module AWS
           opts
         end
         
-        def fetch_response(url,method,opts={},&read_block)
+        def fetch_response(request,opts={},&read_block)
+          method = "a#{request.http_method}".downcase.to_sym  # aget, apost, aput, adelete, ahead
+          url = fetch_url(request)
           if @pool
             @pool.run(url) do |connection|
               req = connection.send(method, {:keepalive => true}.merge(opts))
@@ -143,7 +137,8 @@ module AWS
               return  EM::Synchrony.sync req unless opts[:async]
             end
           else
-            req = EM::HttpRequest.new(url).send(method,opts)
+            req = EM::HttpRequest.new(url, 
+              :inactivity_timeout => request.read_timeout).send(method,opts)
             req.stream &read_block if block_given?
             return  EM::Synchrony.sync req unless opts[:async]
           end
@@ -167,28 +162,19 @@ module AWS
         end
         
         # Builds and attempts the request. Occasionally under load em-http-request
-        # returns a status of 0 with nil for header and body, in such situations
-        # we retry as many times as status_0_retries is set. If our retries exceed
-        # status_0_retries we assume there is a network error
-        def process_request(request,response,async=false,retries=0,&read_block)      
-          method = "a#{request.http_method}".downcase.to_sym  # aget, apost, aput, adelete, ahead
+        # em-http-request returns a status of 0 for various http timeouts, see:
+        # https://github.com/igrigorik/em-http-request/issues/76
+        # https://github.com/eventmachine/eventmachine/issues/175
+        def process_request(request,response,async=false,&read_block)      
           opts = fetch_request_options(request)
           opts[:async] = (async || opts[:async])
-          url = fetch_url(request)
           begin
-            http_response = fetch_response(url,method,opts,&read_block) 
+            http_response = fetch_response(request,opts,&read_block) 
             unless opts[:async]
               response.status = http_response.response_header.status.to_i
-              if response.status == 0
-                if retries <= status_0_retries.to_i
-                  process_request(request,response,(retries + 1),&read_block)
-                else
-                  response.network_error = true  
-                end
-              else
-                response.headers = fetch_response_headers(http_response)
-                response.body = http_response.response
-              end
+              raise Timeout::Error if response.status == 0
+              response.headers = fetch_response_headers(http_response)
+              response.body = http_response.response
             end
           rescue Timeout::Error => error
             response.network_error = error

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/em_http_handler_spec.rb

@@ -12,6 +12,8 @@
 # language governing permissions and limitations under the License.
 
 require 'spec_helper'
+require 'eventmachine'
+require 'evma_httpserver'
 module AWS::Core
   module Http
     class EMFooIO
@@ -19,8 +21,25 @@ module AWS::Core
         "/my_path/test.text"
       end
     end
+
+    # A slow server for testing timeout, 
+    # borrowed from: http://www.igvita.com/2008/05/27/ruby-eventmachine-the-speed-demon/
+    class SlowServer < EventMachine::Connection
+      include EventMachine::HttpServer
+
+      def process_http_request
+        resp = EventMachine::DelegatedHttpResponse.new( self )
+
+        sleep 2 # Simulate a long running request
+
+        resp.status = 200
+        resp.content = "Hello World!"
+        resp.send_response
+      end
+    end
+
     describe EMHttpHandler do
-    
+
       let(:handler) { EMHttpHandler.new(default_request_options) }
 
       let(:default_request_options) { {} }
@@ -40,16 +59,16 @@ module AWS::Core
         EMHttpHandler.should_receive(:fetch_response).with do |url, method,opts|
           options = opts
           double("http response",
-            :response => "<foo/>",
-            :code => 200,
-            :to_hash => {})
+                 :response => "<foo/>",
+                 :code => 200,
+                 :to_hash => {})
         end
         handler.handle(req, resp)
         options
       end
-        
+
       it 'should be accessible from AWS as well as AWS::Core' do
-        AWS::Http::EMHttpHandler.new.should 
+        AWS::Http::EMHttpHandler.new.should
         be_an(AWS::Core::Http::EMHttpHandler)
       end
 
@@ -80,7 +99,7 @@ module AWS::Core
         context 'default request options' do
           before(:each) do
             handler.stub(:default_request_options).and_return({ :foo => "BAR",
-                :private_key_file => "blarg" })
+                                                                :private_key_file => "blarg" })
           end
 
           it 'passes extra options through to synchrony' do
@@ -90,32 +109,20 @@ module AWS::Core
           it 'uses the default when the request option is not set' do
             #puts handler.default_request_options
             handler.default_request_options[:private_key_file].should == "blarg"
-          end         
-        end   
-      end
-      describe '#process_request' do
-        context 'too many retries' do
-          it "should have network error" do
-            EM.synchrony do
-              resp.stub(:status).and_return(0)
-              handler.send(:process_request,(req),(resp),false,3)
-              resp.network_error?.should be_true
-              EM.stop
-            end
           end
         end
       end
+
       describe '#fetch_request_options' do
-        
         it "should set :query and :body to request.querystring" do
           opts = handler.send(:fetch_request_options,(req))
           opts[:query].should eql(req.querystring)
         end
-        
+
         it "should set :path to request.path" do
           opts = handler.send(:fetch_request_options,(req))
           opts[:path].should eql(req.path)
-        end  
+        end
         context "request.body_stream is a StringIO" do
           it "should set :body to request.body_stream" do
             opts = handler.send(:fetch_request_options,(req))
@@ -139,7 +146,7 @@ module AWS::Core
             handler.send(:fetch_proxy,(req))[:proxy][:port].should == 443
           end
         end
-        
+
         describe '#fetch_ssl' do
           it 'prefers the request option when set' do
             req.use_ssl = true
@@ -148,7 +155,7 @@ module AWS::Core
             handler.send(:fetch_ssl,(req))[:private_key_file].should == "something"
             handler.send(:fetch_ssl,(req))[:cert_chain_file].should == "something"
           end
-           
+
           context 'CA cert path' do
             context 'use_ssl? is true' do
 
@@ -164,7 +171,7 @@ module AWS::Core
                 it 'should use the ssl_ca_file attribute of the request' do
                   handler.send(:fetch_ssl,(req))[:private_key_file].should == "foobar.txt"
                 end
-                  
+
                 it 'should use the ssl_ca_file attribute of the request' do
                   handler.send(:fetch_ssl,(req))[:cert_chain_file].should == "foobar.txt"
                 end
@@ -179,8 +186,47 @@ module AWS::Core
               handler.send(:fetch_ssl,(req)).should_not include(:private_key_file)
             end
           end
-        end      
-      end    
+        end
+      end
+
+      it "should not timeout" do
+        EM.synchrony {
+          response = Http::Response.new
+          request = Http::Request.new
+          request.host = "127.0.0.1"
+          request.port = "8081"
+          request.uri = "/"
+          request.body_stream = StringIO.new("myStringIO")
+          # turn on our test server
+          EventMachine::run {
+            EventMachine::start_server request.host, request.port, SlowServer
+          }
+          handler.stub(:fetch_url).and_return("http://127.0.0.1:8081")
+          handler.handle(request,response)
+          response.network_error.should be_nil
+          EM.stop
+        }
+      end
+      it "should timeout after 0.1 seconds" do
+        EM.synchrony {
+          response = Http::Response.new
+          request = Http::Request.new
+          request.host = "127.0.0.1"
+          request.port = "8081"
+          request.uri = "/"
+          request.body_stream = StringIO.new("myStringIO")
+          # turn on our test server
+          EventMachine::run {
+            EventMachine::start_server request.host, request.port, SlowServer
+          }
+          handler.stub(:fetch_url).and_return("http://127.0.0.1:8081")
+          request.stub(:read_timeout).and_return(0.01)
+          handler.stub(:connect_timeout).and_return(1) #just to speed up the test
+          handler.handle(request,response)
+          response.network_error.should be_a(Timeout::Error)
+          EM.stop
+        }
+      end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -5,8 +5,7 @@ require 'aws/core/http/em_http_handler'
 require 'rspec'
 require 'bundler/setup'
 require 'logger'
-
-
+require 'em-http'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -17,8 +16,6 @@ class StubLogger
   end
 end
 AWS.config(:logger => StubLogger.new)
-RSpec.configure do |config|
-
-
-end
 
+RSpec.configure do |config|
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -102,6 +102,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile