em_aws 0.3.2 → 1.0.0

data/spec/{patches_spec.rb → em-aws/patches_spec.rb}

@@ -1,35 +1,36 @@
 require 'spec_helper'
-require 'aws'
 describe Mutex do
-  it "should be a fiber safe mutex" do
+  around(:each) do |example|
     EM.synchrony do
-      AWS::Mutex.new.should be_kind_of(EM::Synchrony::Thread::Mutex)
+      example.run
       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
+    expect(AWS::Mutex.new).to be_kind_of(EM::Synchrony::Thread::Mutex)
+  end
+
+  it "should be a fiber safe mutex" do
+    expect(AWS.mutex.new).to be_kind_of(EM::Synchrony::Thread::Mutex)
   end
 
   it "should not affect Mutex outside AWS" do
-    Mutex.new.should be_kind_of(Mutex)
+    expect(Mutex.new).to be_kind_of(Mutex)
   end
 end
 
 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")
-      Kernel.sleep(1).should eql("fiber safe")
+      expect(Kernel.sleep(1)).to eql("fiber safe")
       EM.stop
     end
   end
 
   it "should not affect normal Kernel.sleep if not in EM" do
-    Kernel.sleep(1).should eql(1)
+    expect(Kernel.sleep(1)).to eql(1)
   end
 end

data/spec/integration/dynamo_db_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'aws-sdk-v1'
+require 'aws/core/http/em_http_handler'
+
+describe AWS::DynamoDB do
+  if ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY']
+
+    around(:each) do |example|
+      EM.synchrony do
+        example.run
+        EM.stop
+      end
+    end
+
+    it "should work" do
+      begin
+        AWS.config( :http_handler => AWS::Http::EMHttpHandler.new(:pool_size => 20))
+        dynamo_db = AWS::DynamoDB.new
+        dynamo_db.tables['mytable'].delete if dynamo_db.tables['mytable'].exists?
+
+        # Create table
+        dynamo_db.tables.create('mytable', 10, 5) unless dynamo_db.tables['mytable'].exists?
+        table = dynamo_db.tables['mytable']
+
+        sleep 1 while table.status == :creating
+
+        expect(table).to be_exists
+
+        # Concurrent writes
+        fibers = []
+        5.times.each do |i|
+          fiber = Fiber.new do
+            table.batch_put([{ :id => "id#{i}"}])
+          end
+          fiber.resume
+          fibers << fiber
+        end
+
+        # Wait until work is done
+        while fibers.detect(&:alive?)
+          EM::Synchrony.sleep(0.01)       
+        end
+
+        # Read our results
+        items = %w(id0 id1 id2 id3 id4)
+        expect(table.batch_get('id',items).to_a.collect{ |h| h['id']}.sort).to eql(['id0','id1','id2','id3','id4'])
+      ensure
+        table.delete if table && table.status != :deleting && table.exists? #clean up
+      end
+    end
+  end
+
+end

data/spec/integration/s3_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'aws-sdk-v1'
+require 'aws/core/http/em_http_handler'
+
+describe AWS::S3 do
+  if ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY']
+
+    around(:each) do |example|
+      EM.synchrony do
+        example.run
+        EM.stop
+      end
+    end
+
+    it "should work" do
+      begin
+        AWS.config( :http_handler => AWS::Http::EMHttpHandler.new )
+        s3 = AWS::S3.new
+
+        # Create bucket
+        s3.buckets.create('em_test_bucket')
+        bucket = s3.buckets['em_test_bucket']
+        expect(bucket).to be_exists
+
+        # Concurrent writes
+        filler = '1'*1048576
+
+        fibers = []
+        5.times.each do |i|
+          fiber = Fiber.new do
+            bucket.objects["test#{i}"].write(filler)
+          end
+          fiber.resume
+          fibers << fiber
+        end
+
+        # Wait until work is done
+        while fibers.detect(&:alive?)
+          EM::Synchrony.sleep(0.01)       
+        end
+
+        # Streaming/Read
+        streamed = []
+        bucket.objects["test1"].read do |chunk|
+          streamed << chunk
+        end
+        expect(streamed.length).to be > 1 # make sure streaming took place
+        expect(streamed.join).to eql(filler)
+      ensure
+        bucket.delete! if bucket # clean up
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 #$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 'em-aws'
 require 'rspec'
 require 'bundler/setup'
 require 'logger'
-require 'em-http'
+
+begin
+  require 'byebug'
+rescue LoadError
+end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -15,7 +18,13 @@ class StubLogger
     #we don't care
   end
 end
+
+
 AWS.config(:logger => StubLogger.new)
 
+# EM::HotTub.logger = Logger.new(STDOUT)
+# EM::HotTub.trace = true
+
 RSpec.configure do |config|
+	
 end

metadata

@@ -1,121 +1,138 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: '0'
 - !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
+  name: em-hot_tub
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '1.7'
 - !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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-autotest
+  requirement: !ruby/object:Gem::Requirement
+    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
+  name: autotest
   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
+description: An em-http-request handler for the aws-sdk for Fiber based asynchronous
+  ruby application using EM-Synchrony
 email:
 - joshmckin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - HISTORY.md
@@ -124,38 +141,43 @@ files:
 - Rakefile
 - em_aws.gemspec
 - lib/aws/core/http/em_http_handler.rb
+- lib/em-aws.rb
+- lib/em-aws/http_handler.rb
+- lib/em-aws/patches.rb
+- lib/em-aws/version.rb
 - lib/em_aws.rb
-- lib/em_aws/patches.rb
-- lib/em_aws/version.rb
-- spec/em_http_handler_spec.rb
-- spec/patches_spec.rb
+- spec/em-aws/http_handler_spec.rb
+- spec/em-aws/patches_spec.rb
+- spec/integration/dynamo_db_spec.rb
+- spec/integration/s3_spec.rb
 - spec/spec_helper.rb
 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: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds EM-Synchrony support to AWS-SDK gem
 test_files:
-- spec/em_http_handler_spec.rb
-- spec/patches_spec.rb
+- spec/em-aws/http_handler_spec.rb
+- spec/em-aws/patches_spec.rb
+- spec/integration/dynamo_db_spec.rb
+- spec/integration/s3_spec.rb
 - spec/spec_helper.rb

data/lib/em_aws/version.rb

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

data/spec/em_http_handler_spec.rb

@@ -1,250 +0,0 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-
-require 'spec_helper'
-require 'eventmachine'
-require 'evma_httpserver'
-module AWS::Core
-  module Http
-    class EMFooIO
-      def path
-        "/my_path/test.text"
-      end
-    end
-
-    # 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
-
-      def process_http_request
-        resp = EventMachine::DelegatedHttpResponse.new( self )
-
-        sleep 2 # Simulate a long running request
-
-        resp.status = 200
-        resp.content = "Hello World!"
-        resp.send_response
-      end
-    end
-
-    describe EMHttpHandler do
-      let(:handler) { EMHttpHandler.new(default_request_options) }
-
-      let(:default_request_options) { Hash.new }
-
-      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
-
-      let(:resp) { Http::Response.new }
-
-      let(:em_http_options) do
-        options = nil
-        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)
-      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)
-
-            expect {
-              handler.handle(req, resp)
-            }.to_not raise_error
-          end
-
-          it 'should rescue Errno::ETIMEDOUT' do
-            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.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")
-          end
-
-          it 'passes extra options through to synchrony' do
-            handler.default_request_options[:foo].should == "BAR"
-          end
-
-          it 'uses the default when the request option is not set' do
-            #puts handler.default_request_options
-            handler.default_request_options[:private_key_file].should == "blarg"
-          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
-          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
-            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 "when with_pool is true" do
-          before(:each) do
-            handler
-              .stub(:with_pool?)
-              .and_return(true)
-          end
-
-          it "should set keepalive as true" do
-            opts = handler.send(:fetch_client_options)
-
-            opts[:keepalive].should be_true
-          end
-        end
-
-        context "when with_pool is false" do
-          before(:each) do
-            handler
-              .stub(:with_pool?)
-              .and_return(false)
-          end
-
-          it "should keepalive be false" do
-            opts = handler.send(:fetch_client_options)
-
-            opts[:keepalive].should_not be_true
-          end
-        end
-      end
-    end
-  end
-end