em_aws 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.3.1)
+    em_aws (0.3.2)
       aws-sdk (>= 1.9.3)
       em-http-request
       em-synchrony
@@ -12,7 +12,7 @@ GEM
   specs:
     ZenTest (4.8.4)
     addressable (2.3.4)
-    aws-sdk (1.11.2)
+    aws-sdk (1.11.3)
       json (~> 1.4)
       nokogiri (< 1.6.0)
       uuidtools (~> 2.1)
@@ -25,7 +25,7 @@ GEM
       em-socksify
       eventmachine (>= 1.0.0.beta.4)
       http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.1)
+    em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.3)
       eventmachine (>= 1.0.0.beta.1)

data/HISTORY.md

@@ -4,6 +4,9 @@ EmAws Changelog
 HEAD
 =======
 
+- check for Aws.config.logger when setting HotTub.logger [kybishop #21]
+- Clean up specs [kybishop #22]
+
 0.3.0
 =======
 

data/lib/em_aws.rb

@@ -8,5 +8,5 @@ require 'aws/core/http/em_http_handler'
 require 'hot_tub'
 
 AWS.eager_autoload! # lazy load isn't thread safe
-HotTub.logger = AWS.config.logger
+HotTub.logger = AWS.config.logger if AWS.config.logger
 module EmAws;end

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/em_http_handler_spec.rb

@@ -22,7 +22,7 @@ module AWS::Core
       end
     end
 
-    # A slow server for testing timeout, 
+    # 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
@@ -39,10 +39,9 @@ module AWS::Core
     end
 
     describe EMHttpHandler do
-
       let(:handler) { EMHttpHandler.new(default_request_options) }
 
-      let(:default_request_options) { {} }
+      let(:default_request_options) { Hash.new }
 
       let(:req) do
         r = Http::Request.new
@@ -56,50 +55,112 @@ module AWS::Core
 
       let(:em_http_options) do
         options = nil
-        EMHttpHandler.should_receive(:fetch_response).with do |url, method,opts|
+        EMHttpHandler.should_receive(:fetch_response).with do |url, _, opts|
           options = opts
           double("http response",
                  :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
-        be_an(AWS::Core::Http::EMHttpHandler)
+        AWS::Http::EMHttpHandler.new
+          .should be_an(AWS::Core::Http::EMHttpHandler)
+      end
+
+      it "should not timeout" do
+        EM.synchrony do
+          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 do
+            EventMachine::start_server request.host, request.port, SlowServer
+          end
+
+          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
+      end
+
+      it "should timeout after 0.1 seconds" do
+        EM.synchrony do
+          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 do
+            EventMachine::start_server request.host, request.port, SlowServer
+          end
+
+          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
 
       describe '#handle' do
         context 'timeouts' do
           it 'should rescue Timeout::Error' do
-            handler.stub(:fetch_response).
-              and_raise(Timeout::Error)
-            lambda { handler.handle(req, resp) }.
-              should_not raise_error
+            handler
+              .stub(:fetch_response)
+              .and_raise(Timeout::Error)
+
+            expect {
+              handler.handle(req, resp)
+            }.to_not raise_error
           end
 
           it 'should rescue Errno::ETIMEDOUT' do
-            handler.stub(:fetch_response).
-              and_raise(Errno::ETIMEDOUT)
-            lambda { handler.handle(req, resp) }.
-              should_not raise_error
+            handler
+              .stub(:fetch_response)
+              .and_raise(Errno::ETIMEDOUT)
+
+            expect {
+              handler.handle(req, resp)
+            }.to_not raise_error
           end
 
           it 'should indicate that there was a network_error' do
-            handler.stub(:fetch_response).
-              and_raise(Errno::ETIMEDOUT)
+            handler
+              .stub(:fetch_response)
+              .and_raise(Errno::ETIMEDOUT)
+
             handler.handle(req, resp)
+
             resp.network_error?.should be_true
           end
         end
 
         context 'default request options' do
           before(:each) do
-            handler.stub(:default_request_options).and_return({ :foo => "BAR",
-                                                                :private_key_file => "blarg" })
+            handler
+              .stub(:default_request_options)
+              .and_return(:foo => "BAR", :private_key_file => "blarg")
           end
 
           it 'passes extra options through to synchrony' do
@@ -115,92 +176,75 @@ module AWS::Core
 
       describe '#fetch_request_options' do
         it "should set :query and :body to request.querystring" do
-          opts = handler.send(:fetch_request_options,(req))
+          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 = 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 = 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
+          let(:io_object) { EMFooIO.new }
+
+          before(:each) do
+            req
+              .stub(:body_stream)
+              .and_return(io_object)
+          end
+
           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)
+            opts = handler.send(:fetch_request_options, req)
+            opts[:file].should eql(io_object.path)
           end
         end
-        
       end
 
       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
+
+        context "when with_pool is true" do
+          before(:each) do
+            handler
+              .stub(:with_pool?)
+              .and_return(true)
+          end
+
           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
         end
-        context "with_pool is false" do
+
+        context "when with_pool is false" do
+          before(:each) do
+            handler
+              .stub(:with_pool?)
+              .and_return(false)
+          end
+
           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
-
-      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

data/spec/patches_spec.rb

@@ -7,20 +7,20 @@ describe Mutex do
       EM.stop
     end
   end
-  
+
   it "should be a fiber safe mutex" do
     EM.synchrony do
       AWS.mutex.new.should be_kind_of(EM::Synchrony::Thread::Mutex)
       EM.stop
     end
   end
-  
+
   it "should not affect Mutex outside AWS" do
     Mutex.new.should be_kind_of(Mutex)
   end
 end
 
-describe Kernel,'#sleep' do
+describe Kernel, '#sleep' do
   it "should be a fiber safe sleep from with AWS module" do
     EM.synchrony do
       EM::Synchrony.stub(:sleep).and_return("fiber safe")
@@ -28,8 +28,8 @@ describe Kernel,'#sleep' do
       EM.stop
     end
   end
-  
+
   it "should not affect normal Kernel.sleep if not in EM" do
     Kernel.sleep(1).should eql(1)
   end
-end
+end

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hot_tub
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,29 +78,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds EM-Synchrony support to AWS-SDK gem
@@ -120,26 +133,27 @@ files:
 homepage: https://github.com/JoshMcKin/em_aws
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: em_aws
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Adds EM-Synchrony support to AWS-SDK gem
 test_files:
 - spec/em_http_handler_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 76fb6ffb745a5461bc79e96230007856e0a8fbd1
-  data.tar.gz: 8bb813a1ce07abb55da8a70710af177c47b79c79
-SHA512:
-  metadata.gz: 68fcac41420bc2411c41cc8e16cf8e6e15d796c442e4135095554f9f350554a550592e12c2d6f06e6ffd113d819a24dbd92ed0baaad1a8fbc0cf3a29714f00f5
-  data.tar.gz: 88092efaf8a1b3abf52e9c9575715d678dedc295ba68028cc35d9857a420b612b9b4b0ed8cac7b26c3149a09aa41f37a3f3c26452fde045d303a8e3c7bbeafe3