em_aws 0.3.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 49361cc87da75f49666ef20b60d0d82d36355a07
+  data.tar.gz: 920d28d847758295a211b65ce4ed0b673d6e8672
+SHA512:
+  metadata.gz: f60b1eb1b144e118c1abe09efbd7a79f31a11296886a3b85ab8f0affb401ad5ff503df971504340fd005583aeef844b10a711717c176d394270960435d09a779
+  data.tar.gz: 3a39e0d232ae95e67fe6085f9df28de7985b0d651c71d3546f088a3395c94d0b8cfed2ecece1c8425fe6243dedbc79a448b053cddb3796ce6763bf12d92d4a84

data/.rspec

@@ -1 +1,3 @@
---color
+--color
+--format documentation
+--profile

data/.travis.yml

@@ -0,0 +1,14 @@
+sudo: false
+cache: bundler
+language: ruby
+rvm:
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+  - 2.0.0-p648
+  - ruby-head
+  - rbx-2
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head

data/Gemfile

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

data/Gemfile.lock

@@ -1,56 +1,73 @@
 PATH
   remote: .
   specs:
-    em_aws (0.3.2)
-      aws-sdk (>= 1.9.3)
+    em_aws (0.4.0.beta)
+      aws-sdk-v1
+      em-hot_tub (~> 1.1.0)
       em-http-request
       em-synchrony
-      hot_tub (~> 0.2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ZenTest (4.8.4)
-    addressable (2.3.4)
-    aws-sdk (1.11.3)
+    ZenTest (4.11.0)
+    addressable (2.4.0)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    aws-sdk-v1 (1.66.0)
       json (~> 1.4)
-      nokogiri (< 1.6.0)
-      uuidtools (~> 2.1)
-    builder (3.2.2)
+      nokogiri (>= 1.4.4)
     cookiejar (0.3.0)
-    diff-lcs (1.2.4)
-    em-http-request (1.0.3)
-      addressable (>= 2.2.3)
-      cookiejar
-      em-socksify
-      eventmachine (>= 1.0.0.beta.4)
-      http_parser.rb (>= 0.5.3)
-    em-socksify (0.3.0)
+    diff-lcs (1.2.5)
+    em-hot_tub (1.1.0)
+      em-synchrony
+      hot_tub (~> 1.0.0)
+    em-http-request (1.1.3)
+      addressable (>= 2.3.4)
+      cookiejar (<= 0.3.0)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
-    em-synchrony (1.0.3)
+    em-synchrony (1.0.4)
       eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.3)
+    eventmachine (1.0.8)
     eventmachine_httpserver (0.2.1)
-    hot_tub (0.2.6)
-    http_parser.rb (0.5.3)
-    json (1.8.0)
-    nokogiri (1.5.10)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    uuidtools (2.1.4)
+    hot_tub (1.0.0)
+    http_parser.rb (0.6.0)
+    json (1.8.3)
+    mini_portile2 (2.0.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    rake (10.4.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-autotest (1.0.0)
+      rspec-core (>= 2.99.0.beta1, < 4.0.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest (~> 4.8.2)
-  builder
+  autotest
+  bundler (~> 1.7)
   em_aws!
   eventmachine_httpserver
+  rake
   rspec
+  rspec-autotest
+
+BUNDLED WITH
+   1.11.2

data/HISTORY.md

@@ -4,14 +4,29 @@ EmAws Changelog
 HEAD
 =======
 
+- None yet!
+
+1.0.0
+=======
+
+- Update to aws-skd-v1
+- Update specs
+- Use em-hot_tub
+- Add integration tests
+- EM style name space: require "em-aws"
+- Support verify_response_body_content_length
+
+0.3.2
+=======
+
 - check for Aws.config.logger when setting HotTub.logger [kybishop #21]
 - Clean up specs [kybishop #22]
 
 0.3.0
 =======
 
-- requires AWS-SDK 1.9.3 for thread saftey issues in 1.9.0-1.9.2
-- refactors client API to expose EM-Http-Request client options directly
+- requires AWS-SDK 1.9.3 for thread safety issues in 1.9.0-1.9.2
+- refactor client API to expose EM-Http-Request client options directly
 
 0.2.9
 =======

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Joshua T. Mckinney
+Copyright (c) 2010-2015 Joshua T. McKinney
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,20 +1,18 @@
-# EmAws
+# EM::AWS [![Build Status](https://travis-ci.org/JoshMcKin/em_aws.svg)](https://travis-ci.org/JoshMcKin/em_aws)
 An EM-Synchrony handler for Ruby [AWS-SDK-Ruby](https://github.com/aws/aws-sdk-ruby)
 ## Installation
 
-em_aws is available through [Rubygems](https://rubygems.org/gems/em_aws) and can be installed via:
+EM::AWS is available through [Rubygems](https://rubygems.org/gems/em_aws) and can be installed via:
 
     $ gem install em_aws
 
 ### Requirements
 
-  * EmAws 0.3.x requires AWS-SDK-Ruby ~> 1.9.3
-  * EmAws 0.2.x is available for those using AWS-SDK-Ruby <= 1.8.5
-  * AWS-SDK-Ruby 1.9.0 to 1.9.2 are not compatible with any version of EmAws; see [here](https://github.com/aws/aws-sdk-ruby/issues/237)
+  * EmAws 0.4.x requires [AWS-SDK-v1](https://github.com/aws/aws-sdk-ruby/blob/aws-sdk-v1)
 
 ## Rails 3 setup
 
-Setup [AWS-SDK-Ruby](https://github.com/aws/aws-sdk-ruby/blob/master/README.rdoc) as you would normally.
+Setup [AWS-SDK-Ruby](https://github.com/aws/aws-sdk-ruby/blob/aws-sdk-v1/README.md) as you would normally.
 
 Assuming you've already setup async-rails, add em_aws to your gemfile:
     
@@ -26,33 +24,21 @@ Then run:
 
 Add the following to your aws.rb initializer:
 
-    require 'aws-sdk'
-    require 'aws/core/http/em_http_handler'
-    AWS.config(
-    :http_handler => AWS::Http::EMHttpHandler.new(
-         :proxy => { :host => '127.0.0.1',  # proxy address
-            :port => 9000,                  # proxy port
-            :type => :socks5 },
-       :pool_size => 20,   # Default is 0, set to > 0 to enable pooling
-       :async => false))   # If set to true all requests are handle asynchronously 
-                           # and initially return nil
+    require 'em-aws'
+    AWS.config( :http_handler => EM::AWS::HttpHandler.new ) 
 
 You are done. 
 
 All requests to AWS will use EM-Synchrony's implementation of em-http-request for non-block HTTP requests and fiber management. See [EM-HTTP-Request](https://github.com/igrigorik/em-http-request/wiki/Issuing-Requests#available-connection--request-parameters) for all client options
 
-## Connection Pooling (keep-alive)
+## Connection Pooling (w/keep-alive)
 
-We use [HotTub](https://github.com/JoshMcKin/hot_tub) to manage connection pooling. To enable connection pooling set the :pool_size to anything greater than 0. By default :inactivity_timeout is set to 0 which will leave the connection open for as long as the client allows. Connects
-are created lazy, so pools grow until they meet the set pool size.
+We use [EM-HotTub](https://github.com/JoshMcKin/em-hot_tub) to manage connection pooling. To enable connection pooling set the :pool_size to anything greater than 1, default is 5. By default :inactivity_timeout is set to 0 which will leave the connection open for as long as the AWS allows. Connections are created lazy, so pools grows to meet concurrency. If we need to limit our total number of connections we can set :max_size. HotTub will reap connections down to :pool_size when load dies.
     
-    require 'aws-sdk'
-    require 'aws/core/http/em_http_handler'
+    require 'em-aws'
     AWS.config(
-      :http_handler => AWS::Http::EMHttpHandler.new({
-        :pool_size => 20,
-        :inactivity_timeout => 0, # number of seconds to timeout stale connections in the pool,
-        :never_block => true) # if we run out of connections, create a new one
+      :http_handler => EM::AWS::HttpHandler.new({
+        :pool_size => 20, # default is 5, setting to 1 disables pool
     )
 
 ## Streaming

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new

data/em_aws.gemspec

@@ -1,26 +1,28 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "em_aws/version"
+require "em-aws/version"
 
 Gem::Specification.new do |s|
   s.name        = "em_aws"
-  s.version     = EmAws::VERSION
+  s.version     = EventMachine::AWS::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Joshua Mckinney"]
   s.email       = ["joshmckin@gmail.com"]
   s.homepage    = "https://github.com/JoshMcKin/em_aws"
   s.license     = "MIT"
   s.summary     = %q{Adds EM-Synchrony support to AWS-SDK gem}
-  s.description = %q{Adds EM-Synchrony support to AWS-SDK gem}
+  s.description = %q{An em-http-request handler for the aws-sdk for Fiber based asynchronous ruby application using EM-Synchrony}
 
   s.rubyforge_project = "em_aws"
   
-  s.add_runtime_dependency "aws-sdk", ">= 1.9.3"
+  s.add_runtime_dependency 'aws-sdk-v1'
   s.add_runtime_dependency "em-synchrony"
   s.add_runtime_dependency "em-http-request"
-  s.add_runtime_dependency "hot_tub", "~> 0.2.4"
+  s.add_runtime_dependency "em-hot_tub", "~> 1.1.0"
+  s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "builder"
+  s.add_development_dependency "rspec-autotest"
+  s.add_development_dependency "autotest"
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -1,205 +1,8 @@
-# http://docs.amazonwebservices.com/AWSRubySDK/latest/
-require 'hot_tub'
-require 'em-synchrony'
-require 'em-synchrony/em-http'
-require 'em-synchrony/thread'
+require 'em-aws'
 module AWS
   module Core
     module Http
-
-      # An EM-Synchrony implementation for Fiber based asynchronous ruby application.
-      # See https://github.com/igrigorik/async-rails and
-      # http://www.mikeperham.com/2010/04/03/introducing-phat-an-asynchronous-rails-app/
-      # for examples of Aync-Rails application
-      #
-      # In Rails add the following to your aws.rb initializer
-      #
-      # require 'aws-sdk'
-      # require 'aws/core/http/em_http_handler'
-      # AWS.config(
-      #   :http_handler => AWS::Http::EMHttpHandler.new(
-      #     :proxy => {:host => '127.0.0.1',    # proxy address
-      #        :port => 9000,                 # proxy port
-      #        :type => :socks5},
-      #   :pool_size => 20,   # Default is 0, set to > 0 to enable pooling
-      #   :async => false))   # If set to true all requests are handle asynchronously
-      #                       # and initially return nil
-      #
-      # EM-AWS exposes all connections options for EM-Http-Request at initialization
-      # For more information on available options see https://github.com/igrigorik/em-http-request/wiki/Issuing-Requests#available-connection--request-parameters
-      # If Options from the request section of the above link are present, they
-      # set on every request but may be over written by the request object
-      class EMHttpHandler
-
-        EM_PASS_THROUGH_ERRORS = [
-          NoMethodError, FloatDomainError, TypeError, NotImplementedError,
-          SystemExit, Interrupt, SyntaxError, RangeError, NoMemoryError,
-          ArgumentError, ZeroDivisionError, LoadError, NameError,
-          LocalJumpError, SignalException, ScriptError,
-          SystemStackError, RegexpError, IndexError,
-        ]
-
-        attr_reader :default_options, :client_options, :pool_options, :pool
-
-        # Constructs a new HTTP handler using EM-Synchrony.
-        # @param [Hash] options Default options to send to EM-Synchrony on
-        # each request. These options will be sent to +get+, +post+,
-        # +head+, +put+, or +delete+ when a request is made. Note
-        # that +:body+, +:head+, +:parser+, and +:ssl_ca_file+ are
-        # ignored. If you need to set the CA file see:
-        # https://github.com/igrigorik/em-http-request/wiki/Issuing-Requests#available-connection--request-parameters
-        def initialize options = {}
-          @default_options = options
-          @client_options = fetch_client_options
-          @pool_options = fetch_pool_options
-          @pool = HotTub::Session.new(pool_options) { |url|
-            EM::HttpRequest.new(url,client_options)} if with_pool?
-        end
-
-        def handle(request,response,&read_block)
-          if EM::reactor_running?
-            process_request(request,response,&read_block)
-          else
-            EM.synchrony do
-              process_request(request,response,&read_block)
-              pool.close_all if pool
-              EM.stop
-            end
-          end
-        end
-
-        # If the request option :async are set to true that request will  handled
-        # asynchronously returning nil initially and processing in the background
-        # managed by EM-Synchrony. If the client option :async all requests will
-        # be handled asynchronously.
-        # EX:
-        #     EM.synchrony do
-        #       s3 = AWS::S3.new
-        #       s3.obj.write('test', :async => true) => nil
-        #       EM::Synchrony.sleep(2)
-        #       s3.obj.read => # 'test'
-        #       EM.stop
-        #     end
-        def handle_async(request,response,handle,&read_block)
-          if EM::reactor_running?
-            process_request(request,response,true,&read_block)
-          else
-            EM.synchrony do
-              process_request(request,response,true,&read_block)
-              pool.close_all if @pool
-              EM.stop
-            end
-          end
-        end
-
-        def with_pool?
-          (default_options[:pool_size].to_i > 0)
-        end
-
-        private
-
-        def fetch_client_options
-          co = ({} || default_options.dup)
-          co.delete(:pool_size)
-          co.delete(:never_block)
-          co.delete(:blocking_timeout)
-          co[:inactivity_timeout] ||= 0
-          co[:connect_timeout] ||= 10
-          co[:keepalive] = true if with_pool?
-          co
-        end
-
-        def fetch_pool_options
-          {
-            :with_pool => true,
-            :size => ((default_options[:pool_size].to_i || 5)),
-            :never_block => (default_options[:never_block].nil? ? true : default_options[:never_block]),
-            :blocking_timeout => (default_options[:blocking_timeout] || 10)
-          }
-        end
-
-        def fetch_url(request)
-          "#{(request.use_ssl? ? "https" : "http")}://#{request.host}:#{request.port}"
-        end
-
-        def fetch_headers(request)
-          headers = { 'content-type' => '' }
-          request.headers.each_pair do |key,value|
-            headers[key] = value.to_s
-          end
-          {:head => headers}
-        end
-
-        def fetch_request_options(request)
-          opts = client_options.merge(fetch_headers(request))
-          opts[:query] = request.querystring
-          if request.body_stream.respond_to?(:path)
-            opts[:file] = request.body_stream.path
-          else
-            opts[:body] = request.body.to_s
-          end
-          opts[:path] = request.path if request.path
-          opts
-        end
-
-        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, opts)
-              req.stream &read_block if block_given?
-              return  EM::Synchrony.sync req unless opts[:async]
-            end
-          else
-            clnt_opts = client_options.merge(:inactivity_timeout => request.read_timeout)
-            req = EM::HttpRequest.new(url,clnt_opts).send(method,opts)
-            req.stream &read_block if block_given?
-            return  EM::Synchrony.sync req unless opts[:async]
-          end
-          nil
-        end
-
-        # AWS needs all header keys downcased and values need to be arrays
-        def fetch_response_headers(response)
-          response_headers = response.response_header.raw.to_hash
-          aws_headers = {}
-          response_headers.each_pair do  |k,v|
-            key = k.downcase
-            #['x-amz-crc32', 'x-amz-expiration','x-amz-restore','x-amzn-errortype']
-            if v.is_a?(Array)
-              aws_headers[key] = v
-            else
-              aws_headers[key] = [v]
-            end
-          end
-          response_headers.merge(aws_headers)
-        end
-
-        # Builds and attempts the request. Occasionally under load em-http-request
-        # 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])
-          begin
-            http_response = fetch_response(request,opts,&read_block)
-            unless opts[:async]
-              response.status = http_response.response_header.status.to_i
-              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
-          rescue *EM_PASS_THROUGH_ERRORS => error
-            raise error
-          rescue Exception => error
-            response.network_error = error
-          end
-          nil
-        end
+      class EMHttpHandler < EM::AWS::HttpHandler
       end
     end
   end