em_aws 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.1.4)
+    em_aws (0.1.5)
       aws-sdk
       em-http-request
       em-synchrony
@@ -10,7 +10,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
-    aws-sdk (1.5.2)
+    aws-sdk (1.5.4)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -39,8 +39,8 @@ GEM
     json (1.7.3-java)
     multi_json (1.3.6)
     multi_xml (0.5.1)
-    nokogiri (1.5.3)
-    nokogiri (1.5.3-java)
+    nokogiri (1.5.4)
+    nokogiri (1.5.4-java)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)

data/README.md

@@ -1,8 +1,5 @@
-# em_aws
-An EM-Synchrony handler for Ruby [AWS-SDK](https://github.com/JoshMcKin/aws-sdk-for-ruby)
-
-This code has be submitted to AWS-SKD see: [pull request](https://github.com/amazonwebservices/aws-sdk-for-ruby/pull/14). 
-Until approval (or if it is declined) I created this gem.
+# EmAws
+An EM-Synchrony handler for Ruby [AWS-SDK](https://github.com/amazonwebservices/aws-sdk-for-ruby/)
 
 ## Installation
 
@@ -25,6 +22,7 @@ In your environments files add:
 
     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}

data/lib/em_aws.rb

@@ -1,3 +1,4 @@
+require 'em_aws/patches'
 require 'aws-sdk'
 require 'em_aws/version'
 require 'em-http'
@@ -6,22 +7,4 @@ require 'em-synchrony/em-http'
 require 'aws/core/autoloader'
 
 AWS.eager_autoload! # lazy load isn't thread safe
-module AWS
-  module Core
-    module Http
-      AWS.register_autoloads(self) do
-        autoload :EMHttpHandler,   'em_http_handler'
-      end
-    end
-  end
-
-  # the http party handler should still be accessible from its old namespace
-  module Http
-    AWS.register_autoloads(self, 'aws/core/http') do
-      autoload :HTTPartyHandler, 'httparty_handler'
-    end
-  end
-end
-
-# Load monkey patch after loading aws
-require 'em_aws/core/session_signer'
+module EmAws;end

data/lib/em_aws/patches.rb

@@ -0,0 +1,22 @@
+require 'em-synchrony'
+require 'em-synchrony/thread'
+module AWS
+  # Use EM::Synchrony.sleep for all Kernel.sleep in AWS
+  DupKernel = Kernel
+  
+  class PatchKernel
+    class << self
+      def sleep(count)
+        EM::Synchrony.sleep(count)
+      end
+      def method_missing(method,*args,&block)
+        DupKernel.send(method, *args, &block)
+      end
+    end
+  end
+  
+  Kernel = PatchKernel
+  
+  # Use a fiber safe mutex for Mutex in AWS
+  Mutex = EM::Synchrony::Thread::Mutex  
+end

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/em_http_handler_spec.rb

@@ -12,7 +12,6 @@
 # language governing permissions and limitations under the License.
 
 require 'spec_helper'
-
 module AWS::Core
   module Http
     describe EMHttpHandler do

data/spec/patches_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'aws'
+describe AWS::Mutex do
+  it "should be a fiber safe mutex" do
+    AWS::Mutex.new.should be_kind_of(EM::Synchrony::Thread::Mutex)
+  end
+  
+  it "should be a fiber mutex when called within AWS module" do
+    AWS.module_eval <<-STR
+    def self.mutex_new
+      Mutex.new
+    end
+    STR
+
+    AWS.mutex_new.should be_kind_of(EM::Synchrony::Thread::Mutex)
+  end
+  
+  it "should not affect Mutex outside AWS" do
+    Mutex.new.should be_kind_of(Mutex)
+  end
+end
+
+describe AWS::Kernel,'#sleep' do
+  it "should be a fiber safe sleep from with AWS module" do
+    EM::Synchrony.stub(:sleep).and_return("fiber safe")
+    AWS::Kernel.sleep(1).should eql("fiber safe")
+  end
+  
+  it "should not affect normal Kernel.sleep " do
+    EM::Synchrony.stub(:sleep).and_return("fiber safe")
+    Kernel.sleep(1).should eql(1)
+  end
+  
+  it "should be a fiber mutex when called within AWS module" do
+    AWS.module_eval <<-STR
+    def self.sleep(time)
+      Kernel.sleep(time)
+    end
+    STR
+    EM::Synchrony.stub(:sleep).and_return("fiber safe")
+    AWS.sleep(0.01).should eql("fiber safe")
+  end 
+  
+  it "should not interfer with other Kernel methods" do     
+    lambda {AWS::Kernel.rand}.should_not raise_error
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 #$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 #$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'em_aws'
+require 'aws/core/http/em_http_handler'
 require 'rspec'
 require 'bundler/setup'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000Z
+date: 2012-06-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70341995956080 !ruby/object:Gem::Requirement
+  requirement: &70322481988020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341995956080
+  version_requirements: *70322481988020
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70341995955620 !ruby/object:Gem::Requirement
+  requirement: &70322481987600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341995955620
+  version_requirements: *70322481987600
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70341995955200 !ruby/object:Gem::Requirement
+  requirement: &70322481987160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341995955200
+  version_requirements: *70322481987160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70341995954780 !ruby/object:Gem::Requirement
+  requirement: &70322481986740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341995954780
+  version_requirements: *70322481986740
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70341995954240 !ruby/object:Gem::Requirement
+  requirement: &70322481986320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341995954240
+  version_requirements: *70322481986320
 description: Adds EM-Synchrony support to AWS-SDK gem
 email:
 - joshmckin@gmail.com
@@ -83,10 +83,10 @@ files:
 - em_aws.gemspec
 - lib/aws/core/http/em_http_handler.rb
 - lib/em_aws.rb
-- lib/em_aws/core/session_signer.rb
+- lib/em_aws/patches.rb
 - lib/em_aws/version.rb
 - spec/em_http_handler_spec.rb
-- spec/session_signer_spec.rb
+- spec/patches_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -114,5 +114,5 @@ specification_version: 3
 summary: Adds EM-Synchrony support to AWS-SDK gem
 test_files:
 - spec/em_http_handler_spec.rb
-- spec/session_signer_spec.rb
+- spec/patches_spec.rb
 - spec/spec_helper.rb

data/lib/em_aws/core/session_signer.rb

@@ -1,14 +0,0 @@
-require 'em-synchrony/thread'
-module AWS
-  module Core
-    class SessionSigner
-      @create_mutex = EM::Synchrony::Thread::Mutex.new
-
-      # Monkey patch to use EM::Synchrony::Thread::Mutex instead of ::Mutex
-      def initialize config
-        @config = config
-        @session_mutex = EM::Synchrony::Thread::Mutex.new
-      end
-    end
-  end
-end

data/spec/session_signer_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe AWS::Core::SessionSigner do
-  context '@create_mutex' do
-    it "should be a fiber safe mutex" do
-      AWS::Core::SessionSigner.instance_variable_get(:@create_mutex).should be_kind_of(EM::Synchrony::Thread::Mutex)
-    end
-  end
-
-  context '@session_mutex' do
-    let(:config) { double("config").as_null_object }
-    it "should be a fiber safe mutex" do
-      session_signer = AWS::Core::SessionSigner.new(config)
-      session_signer.instance_variable_get(:@session_mutex).should be_kind_of(EM::Synchrony::Thread::Mutex)
-    end
-  end
-end