em_aws 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.1.0)
+    em_aws (0.1.1)
       aws-sdk
       em-http-request
       em-synchrony

data/README.md

@@ -27,7 +27,6 @@ In your environments files add:
     require 'aws/core/http/em_http_handler'
     AWS.config(
       :http_handler => AWS::Http::EMHttpHandler.new(
-      :pool_size => 5,
       :proxy => {:host => "http://myproxy.com", :port => 80}
        ))
 
@@ -35,25 +34,6 @@ Your done.
 
 All requests to AWS will use EM-Synchrony's implementation of em-http-request for non-block HTTP request and fiber management.
 
-## Connection Pools
-v0.1+ implement connections EventMachine::Synchrony::ConnectionPool. The default pool_size is 5 but it can be
-increased by in the AWS.config options. Connection pools were problematic for S3 calls that required the :path option for
-em-http-request and would return AWS::S3::SignatureDoesNotMatch errors; so for now S3 calls with paths do not make use of the connection pools.
-
-## Heroku Gotcha
-When deploying to Heroku, if you get "NameError: uninitialized constant Syck::Syck", you need to vendorize em_aws
-    
-From your apps root directory run:
-
-    gem unpack em_aws --target vendor/gems
-
-Update you gemfile:
-
-    gem 'em_aws', :path => "vendor/gems/em_aws-0.0.3"
-
-Finally, run bundler and make sure you check-in your new Gemfile.lock. 
-I'm pretty sure the Syck error is do to an outdated version of rubygems and bundler on Heroku, but as of yet have not been able to reproduce it locally.
-
 ## References
 
   [aws-sdk](https://github.com/amazonwebservices/aws-sdk-for-ruby)

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

@@ -18,7 +18,6 @@ module AWS
       # require 'aws/core/http/em_http_handler'
       # AWS.config(
       # :http_handler => AWS::Http::EMHttpHandler.new(
-      # :pool_size => 20,
       # :proxy => {:host => "http://myproxy.com",:port => 80}
       # )
       # )
@@ -27,14 +26,6 @@ module AWS
         # @return [Hash] The default options to send to EM-Synchrony on each
         # request.
         attr_reader :default_request_options
-        @@pools = {}
-      
-        def self.fetch_connection(url,pool_size)
-          @@pools[url] ||= EventMachine::Synchrony::ConnectionPool.new(size: pool_size) do
-            EM::HttpRequest.new(url)
-          end
-          @@pools[url]
-        end
              
         # Constructs a new HTTP handler using EM-Synchrony.
         #
@@ -48,16 +39,15 @@ module AWS
         # Defaults pool_size to 5
         def initialize options = {}
           #puts "Using EM-Synchrony for AWS requests"
-          options[:pool_size] ||= 5
           @default_request_options = options
         end
         
         def fetch_url(request)
           url = nil
           if request.use_ssl?
-            url = "https://#{request.host}:443"
+            url = "https://#{request.host}:443#{request.uri}"
           else
-            url = "http://#{request.host}"
+            url = "http://#{request.host}#{request.uri}"
           end
           url
         end
@@ -101,25 +91,15 @@ module AWS
         # We get AWS::S3::SignatureDoesNotMatch when path is used to fetch an s3 object
         # so for now we won't use the pool for requests where the path is more than just '/'
         def fetch_response(url,method,opts={})
-          return EM::HttpRequest.new("#{url}#{opts[:path]}").send(method, opts) if (@default_request_options[:pool_size] == 0 || opts[:path].to_s.length > 1)
-          self.class.fetch_connection(url,@default_request_options[:pool_size]).send(method, opts)
-        end
-
-        # Add thread safety.
-        def _fibered_mutex
-          @fibered_mutex ||= EM::Synchrony::Thread::Mutex.new
+          return EM::HttpRequest.new("#{url}").send(method, opts)     
         end
-        
+    
         def handle(request,response)
-          if EM::reactor_running?
-            _fibered_mutex.synchronize do
-              handle_it(request, response)
-            end       
+          if EM::reactor_running? 
+            handle_it(request, response)    
           else
             EM.synchrony do
-              _fibered_mutex.synchronize do
-                handle_it(request, response)
-              end
+              handle_it(request, response)
               EM.stop
             end
           end
@@ -127,14 +107,19 @@ module AWS
                 
         def handle_it(request, response)
           #puts "Using EM!!!!"
-          opts = default_request_options.merge({
-              :body => request.body,
-              :path => request.uri,
-              
-            }).merge(request_options(request))
-          url = fetch_url(request)
           # get, post, put, delete, head
-          method = request.http_method.downcase
+          method = request.http_method.downcase.to_sym
+          
+          opts = default_request_options.
+            merge(request_options(request))
+          if (method == :get)
+            opts[:query] = request.body
+          else
+            opts[:body] = request.body
+          end
+          
+          url = fetch_url(request)
+          
           begin
             http_response = fetch_response(url,method,opts)         
           rescue Timeout::Error, Errno::ETIMEDOUT => e

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/em_http_handler_spec.rb

@@ -48,17 +48,10 @@ module AWS::Core
       end
 
       describe '#initialize' do
-
         it 'should set the default request options' do
           described_class.new(:foo => "BAR").default_request_options.
-            should == { :foo => "BAR", :pool_size => 5 }
-        end
-        
-        it 'should not override supplied pool_size' do
-          described_class.new(:pool_size => 20).default_request_options.
-            should == { :pool_size => 20 }
+            should == { :foo => "BAR" }
         end
-
       end
 
       describe '#handle' do
@@ -160,4 +153,4 @@ module AWS::Core
       end    
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70247639340500 !ruby/object:Gem::Requirement
+  requirement: &70103158270460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247639340500
+  version_requirements: *70103158270460
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70247639339960 !ruby/object:Gem::Requirement
+  requirement: &70103158269980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247639339960
+  version_requirements: *70103158269980
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70247639339420 !ruby/object:Gem::Requirement
+  requirement: &70103158269520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247639339420
+  version_requirements: *70103158269520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247639338880 !ruby/object:Gem::Requirement
+  requirement: &70103158269100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247639338880
+  version_requirements: *70103158269100
 description: Adds EM-Synchrony support to AWS-SDK gem
 email:
 - joshmckin@gmail.com