em_aws 0.2.9 → 0.3.0.beta

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in em_aws.gemspec
 gemspec

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    em_aws (0.2.9)
-      aws-sdk (~> 1.8.5)
+    em_aws (0.3.0.beta)
+      aws-sdk (~> 1.9.3)
       em-http-request
       em-synchrony
       hot_tub (~> 0.2.4)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     ZenTest (4.8.4)
     addressable (2.3.4)
-    aws-sdk (1.8.5)
+    aws-sdk (1.9.3)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     builder (3.2.0)
     cookiejar (0.3.0)
-    diff-lcs (1.2.3)
+    diff-lcs (1.2.4)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
@@ -30,15 +30,11 @@ GEM
     em-synchrony (1.0.3)
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.3)
-    eventmachine (1.0.3-java)
     eventmachine_httpserver (0.2.1)
     hot_tub (0.2.5)
     http_parser.rb (0.5.3)
-    http_parser.rb (0.5.3-java)
     json (1.7.7)
-    json (1.7.7-java)
     nokogiri (1.5.9)
-    nokogiri (1.5.9-java)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -47,10 +43,9 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    uuidtools (2.1.3)
+    uuidtools (2.1.4)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/HISTORY.md

@@ -4,6 +4,17 @@ EmAws Changelog
 HEAD
 =======
 
+0.3.0.beta
+=======
+
+- 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
+
+0.2.9
+=======
+
+- AWS-SDK 1.9+ breaks EmAws 0.2, require AWS-SDK <= 1.8.5
+
 0.2.8
 =======
 

data/README.md

@@ -1,13 +1,19 @@
 # EmAws
 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:
 
     $ gem install em_aws
 
-## Rails 3 setup (no rails 2 sorry)
+### 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)
+
+## Rails 3 setup
+
 Setup [AWS-SDK-Ruby](https://github.com/aws/aws-sdk-ruby/blob/master/README.rdoc) as you would normally.
 
 Assuming you've already setup async-rails, add em_aws to your gemfile:
@@ -18,24 +24,26 @@ Then run:
     
     bundle install
 
-In your environments files add:
+Add the following to your aws.rb initializer:
 
     require 'aws-sdk'
     require 'aws/core/http/em_http_handler'
-    AWS.eager_autoload! # AWS lazyloading is not threadsafe
     AWS.config(
-      :http_handler => AWS::Http::EMHttpHandler.new(
-      :proxy => {:host => "http://myproxy.com", :port => 80}))
-      :pool_size => 0 # by default connection pooling is off
-      :async => false # if set to true all requests for this client will be asynchronous
+    :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
 
 Your done. 
 
-All requests to AWS will use EM-Synchrony's implementation of em-http-request for non-block HTTP requests and fiber management.
+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)
-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
+
+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.
     
     require 'aws-sdk'
@@ -44,16 +52,13 @@ are created lazy, so pools grow until they meet the set pool size.
       :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
-        :proxy => {:host => "http://myproxy.com",:port => 80})
+        :never_block => true) # if we run out of connections, create a new one
     )
 
 ## Streaming
-Requires [AWS-SKD-Ruby >= 1.6.3](http://aws.amazon.com/releasenotes/Ruby/5728376747252106)
-    
-    # Stream from disk
-    # You can pass an IO object in the :data option instead but the object must 
-    # respond to :path. We cannot stream from memory at this time.
+Streaming from disk,You can pass an IO object in the :data option instead but the object must 
+respond to :path. We cannot stream from memory at this time.
+
     EM.synchrony do
       s3 = AWS::S3.new 
       s3.buckets['bucket_name'].objects["foo.txt"].write(:file => "path_to_file")

data/em_aws.gemspec

@@ -8,13 +8,14 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Joshua Mckinney"]
   s.email       = ["joshmckin@gmail.com"]
-  s.homepage    = ""
+  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.rubyforge_project = "em_aws"
   
-  s.add_runtime_dependency "aws-sdk", "~> 1.8.5"
+  s.add_runtime_dependency "aws-sdk", "~> 1.9.3"
   s.add_runtime_dependency "em-synchrony"
   s.add_runtime_dependency "em-http-request"
   s.add_runtime_dependency "hot_tub", "~> 0.2.4"

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

@@ -12,17 +12,23 @@ module AWS
       # 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 you various environment files:
+      # 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 => "http://myproxy.com",
-      #   :port => 80,
-      #   :pool_size => 20, # not set by default which disables connection pooling
-      #   :async => false # if set to true all requests are handle asynchronously and initially return nil
-      #   }))
+      #     :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 = [
@@ -32,32 +38,22 @@ module AWS
           LocalJumpError, SignalException, ScriptError,
           SystemStackError, RegexpError, IndexError,
         ]
-        # @return [Hash] The default options to send to EM-Synchrony on each request.
-        attr_reader :default_request_options
+
+        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, you should use the
-        # +:ssl_ca_file+ option to {AWS.config} or
-        # {AWS::Configuration} instead.
+        # 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_request_options = options
-          @client_options = {
-            :inactivity_timeout => (options[:inactivity_timeout] || 0),
-            :connect_timeout => (options[:connect_timeout] || 10)
-          }
-          @pool_options = {
-            :with_pool => true,
-            :size => ((options[:pool_size].to_i || 5)),
-            :never_block => (options[:never_block].nil? ? true : options[:never_block]),
-            :blocking_timeout => (options[:pool_timeout] || 10)
-          }
-          if @pool_options[:size] > 0
-            @pool = HotTub::Session.new(@pool_options) { |url| EM::HttpRequest.new(url,@client_options)}
-          end
+          @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)
@@ -66,7 +62,7 @@ module AWS
           else
             EM.synchrony do
               process_request(request,response,&read_block)
-              @pool.close_all if @pool
+              pool.close_all if pool
               EM.stop
             end
           end
@@ -90,14 +86,38 @@ module AWS
           else
             EM.synchrony do
               process_request(request,response,true,&read_block)
-              @pool.close_all if @pool
+              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
@@ -110,29 +130,9 @@ module AWS
           {:head => headers}
         end
 
-        def fetch_proxy(request)
-          opts={}
-          if request.proxy_uri
-            opts[:proxy] = {:host => request.proxy_uri.host,:port => request.proxy_uri.port}
-          end
-          opts
-        end
-
-        def fetch_ssl(request)
-          opts = {}
-          if request.use_ssl? && request.ssl_verify_peer?
-            opts[:private_key_file] = request.ssl_ca_file
-            opts[:cert_chain_file]= request.ssl_ca_file
-          end
-          opts
-        end
-
         def fetch_request_options(request)
-          opts = default_request_options.
-            merge(fetch_headers(request).
-                  merge(fetch_proxy(request)).
-                  merge(fetch_ssl(request)))
-            opts[:query] = request.querystring
+          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
@@ -145,14 +145,14 @@ module AWS
         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))
+          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)
+            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]

data/lib/em_aws.rb

@@ -4,7 +4,6 @@ require 'em_aws/version'
 require 'em-http'
 require 'em-synchrony'
 require 'em-synchrony/em-http'
-require 'aws/core/autoloader'
 require 'aws/core/http/em_http_handler'
 
 AWS.eager_autoload! # lazy load isn't thread safe

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.2.9"
+  VERSION = "0.3.0.beta"
 end

data/spec/em_http_handler_spec.rb

@@ -137,54 +137,28 @@ module AWS::Core
             opts[:file].should eql(my_io.path)
           end
         end
+        
       end
-      describe '#fetch_proxy' do
-        context ':proxy_uri' do
-          it 'passes proxy address and port from the request' do
-            req.proxy_uri = URI.parse('https://user:pass@proxy.com:443/path?query')
-            handler.send(:fetch_proxy,(req))[:proxy][:host].should == 'proxy.com'
-            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
-            req.ssl_verify_peer = true
-            req.ssl_ca_file = "something"
-            handler.send(:fetch_ssl,(req))[:private_key_file].should == "something"
-            handler.send(:fetch_ssl,(req))[:cert_chain_file].should == "something"
+      describe '#fetch_client_options' do
+        it "should remove pool related options" do
+          opts = handler.send(:fetch_client_options)
+          opts.has_key?(:size).should be_false
+          opts.has_key?(:never_block).should be_false
+          opts.has_key?(:blocking_timeout).should be_false
+        end
+        context "with_pool is true" do
+          it "should set keepalive as true" do
+            handler.stub(:with_pool?).and_return(true)
+            opts = handler.send(:fetch_client_options)
+            opts[:keepalive].should be_true
           end
-
-          context 'CA cert path' do
-            context 'use_ssl? is true' do
-
-              before(:each) { req.use_ssl = true }
-
-              context 'ssl_verify_peer? is true' do
-
-                before(:each) do
-                  req.ssl_verify_peer = true
-                  req.ssl_ca_file = "foobar.txt"
-                end
-
-                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
-              end
-
-              it 'should not set the ssl_ca_file option without ssl_verify_peer?' do
-                handler.send(:fetch_ssl,(req)).should_not include(:private_key_file)
-              end
-            end
-
-            it 'should not set the ssl_ca_file option without use_ssl?' do
-              handler.send(:fetch_ssl,(req)).should_not include(:private_key_file)
-            end
+        end
+        context "with_pool is false" do
+          it "should keepalive be false" do
+            handler.stub(:with_pool?).and_return(false)
+            opts = handler.send(:fetch_client_options)
+            opts[:keepalive].should_not be_true
           end
         end
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.2.9
-  prerelease: 
+  version: 0.3.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +130,9 @@ files:
 - spec/em_http_handler_spec.rb
 - spec/patches_spec.rb
 - spec/spec_helper.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/JoshMcKin/em_aws
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -145,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: em_aws
 rubygems_version: 1.8.25