em_aws 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.2.2)
+    em_aws (0.2.3)
       aws-sdk
       em-http-request
       em-synchrony
@@ -11,8 +11,7 @@ GEM
   specs:
     ZenTest (4.8.2)
     addressable (2.3.2)
-    aws-sdk (1.8.0)
-      httparty (~> 0.7)
+    aws-sdk (1.8.1.1)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
@@ -30,18 +29,9 @@ GEM
     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.2)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
     json (1.7.6)
-    json (1.7.6-java)
-    multi_json (1.5.0)
-    multi_xml (0.5.2)
     nokogiri (1.5.6)
-    nokogiri (1.5.6-java)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)

data/README.md

@@ -50,11 +50,22 @@ are created lazy, so pools grow until they meet the set pool size.
 
 ## 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.
+    EM.synchrony do
+      s3 = AWS::S3.new 
+      s3.buckets['bucket_name'].objects["foo.txt"].write(:file => "path_to_file")
+      EM.stop
+    end
 
+    # Stream from AWS
     EM.synchrony do
       s3 = AWS::S3.new 
-      file = File.open("path_to_file")
-      s3.buckets['bucket_name'].objects["foo.txt"].write(file)
+      s3.buckets['bucket_name'].objects["foo.txt"].read do |chunk|
+        puts chunk
+      end
       EM.stop
     end
 

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

@@ -33,7 +33,6 @@ module AWS
         # Run the block on the retrieved connection. Then return the connection
         # back to the pool.
         def run(url, &block)
-          url = url.to_s.split("?")[0].to_s.gsub(/\/$/, "") # homogenize
           connection = santize_connection(connection(url))
           block.call(connection)
         ensure

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

@@ -24,6 +24,13 @@ module AWS
       #   }))
       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,
+        ]
         # @return [Hash] The default options to send to EM-Synchrony on each request.
         attr_reader :default_request_options
         attr_accessor :status_0_retries  
@@ -81,9 +88,9 @@ module AWS
         def fetch_url(request)
           url = nil
           if request.use_ssl?
-            url = "https://#{request.host}:443#{request.uri}"
+            url = "https://#{request.host}:443"
           else
-            url = "http://#{request.host}#{request.uri}"
+            url = "http://#{request.host}"
           end
           url
         end
@@ -113,16 +120,18 @@ module AWS
           opts
         end
         
-        def fetch_request_options(request,method)
+        def fetch_request_options(request)
           opts = default_request_options.
             merge(fetch_headers(request).
               merge(fetch_proxy(request)).
-              merge(fetch_ssl(request)))  
-          if (method == :get)
-            opts[:query] = request.body
+              merge(fetch_ssl(request))) 
+          opts[:query] = request.querystring
+          if request.body_stream.respond_to?(:path)
+            opts[:file] = request.body_stream.path
           else
-            opts[:body] = request.body
+            opts[:body] = request.body.to_s
           end
+          opts[:path] = request.path if request.path
           opts
         end
         
@@ -140,7 +149,7 @@ module AWS
           end
           nil
         end
-        
+            
         # AWS needs all headers downcased, and for some reason x-amz-expiration and
         # x-amz-restore need to be arrays
         def fetch_response_headers(response)
@@ -163,13 +172,13 @@ module AWS
         # 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
-          opts = fetch_request_options(request,method)
+          opts = fetch_request_options(request)
           opts[:async] = (async || opts[:async])
           url = fetch_url(request)
           begin
             http_response = fetch_response(url,method,opts,&read_block) 
             unless opts[:async]
-               response.status = http_response.response_header.status.to_i
+              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)
@@ -181,9 +190,14 @@ module AWS
                 response.body = http_response.response
               end
             end
-          rescue *AWS::Core::Http::NetHttpHandler::NETWORK_ERRORS
-            response.network_error = true  
+          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
       end
     end

data/lib/em_aws/version.rb

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

data/spec/em_connection_pool_spec.rb

@@ -57,17 +57,6 @@ module AWS
             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

data/spec/em_http_handler_spec.rb

@@ -14,6 +14,11 @@
 require 'spec_helper'
 module AWS::Core
   module Http
+    class EMFooIO
+      def path
+        "/my_path/test.text"
+      end
+    end
     describe EMHttpHandler do
     
       let(:handler) { EMHttpHandler.new(default_request_options) }
@@ -23,6 +28,8 @@ module AWS::Core
       let(:req) do
         r = Http::Request.new
         r.host = "foo.bar.com"
+        r.uri = "/my_path/?foo=bar"
+        r.body_stream = StringIO.new("myStringIO")
         r
       end
 
@@ -84,7 +91,7 @@ module AWS::Core
             #puts handler.default_request_options
             handler.default_request_options[:private_key_file].should == "blarg"
           end         
-        end 
+        end   
       end
       describe '#process_request' do
         context 'too many retries' do
@@ -98,6 +105,32 @@ module AWS::Core
           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  
+        context "request.body_stream is a StringIO" do
+          it "should set :body to request.body_stream" do
+            opts = handler.send(:fetch_request_options,(req))
+            opts[:body].should eql("myStringIO")
+          end
+        end
+        context "request.body_stream is an object that responds to :path" do
+          it "should set :file to object.path " do
+            my_io = EMFooIO.new
+            req.stub(:body_stream).and_return(my_io)
+            opts = handler.send(:fetch_request_options,(req))
+            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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: em_aws
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Adds EM-Synchrony support to AWS-SDK gem