em_aws 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.1.3)
+    em_aws (0.1.4)
       aws-sdk
       em-http-request
       em-synchrony
@@ -15,6 +15,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    builder (3.0.0)
     cookiejar (0.3.0)
     diff-lcs (1.1.3)
     em-http-request (1.0.2)
@@ -28,27 +29,33 @@ GEM
     em-synchrony (1.0.1)
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0.beta.4)
+    eventmachine (1.0.0.beta.4-java)
     http_parser.rb (0.5.3)
+    http_parser.rb (0.5.3-java)
     httparty (0.8.3)
       multi_json (~> 1.0)
       multi_xml
     json (1.7.3)
-    multi_json (1.3.5)
+    json (1.7.3-java)
+    multi_json (1.3.6)
     multi_xml (0.5.1)
-    nokogiri (1.5.2)
+    nokogiri (1.5.3)
+    nokogiri (1.5.3-java)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
       rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
+    rspec-core (2.10.1)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
     uuidtools (2.1.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  builder
   em_aws!
   rspec

data/em_aws.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "em-synchrony"
   s.add_runtime_dependency "em-http-request"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "builder"
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -88,8 +88,6 @@ module AWS
             merge(fetch_ssl(request))
         end
         
-        # 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}").send(method, opts)     
         end
@@ -110,8 +108,8 @@ module AWS
           # get, post, put, delete, head
           method = request.http_method.downcase.to_sym
           
-          opts = default_request_options.
-            merge(request_options(request))
+          opts = default_request_options.merge(request_options(request))
+          
           if (method == :get)
             opts[:query] = request.body
           else

data/lib/em_aws.rb

@@ -22,3 +22,6 @@ module AWS
     end
   end
 end
+
+# Load monkey patch after loading aws
+require 'em_aws/core/session_signer'

data/lib/em_aws/core/session_signer.rb

@@ -0,0 +1,14 @@
+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/lib/em_aws/version.rb

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

data/spec/session_signer_spec.rb

@@ -6,5 +6,12 @@ describe AWS::Core::SessionSigner do
       AWS::Core::SessionSigner.instance_variable_get(:@create_mutex).should be_kind_of(EM::Synchrony::Thread::Mutex)
     end
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000Z
+date: 2012-06-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70246363093540 !ruby/object:Gem::Requirement
+  requirement: &70341995956080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246363093540
+  version_requirements: *70341995956080
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70246363093020 !ruby/object:Gem::Requirement
+  requirement: &70341995955620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246363093020
+  version_requirements: *70341995955620
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70246363092500 !ruby/object:Gem::Requirement
+  requirement: &70341995955200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246363092500
+  version_requirements: *70341995955200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70246363091940 !ruby/object:Gem::Requirement
+  requirement: &70341995954780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246363091940
+  version_requirements: *70341995954780
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70341995954240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70341995954240
 description: Adds EM-Synchrony support to AWS-SDK gem
 email:
 - joshmckin@gmail.com
@@ -71,8 +82,8 @@ files:
 - Rakefile
 - em_aws.gemspec
 - lib/aws/core/http/em_http_handler.rb
-- lib/aws/core/session_signer.rb
 - lib/em_aws.rb
+- lib/em_aws/core/session_signer.rb
 - lib/em_aws/version.rb
 - spec/em_http_handler_spec.rb
 - spec/session_signer_spec.rb

data/lib/aws/core/session_signer.rb

@@ -1,8 +0,0 @@
-require 'em-synchrony/thread'
-module AWS
-  module Core
-    class SessionSigner
-      @create_mutex = EM::Synchrony::Thread::Mutex.new
-    end
-  end
-end