Merge branch 'master' into master

Author: chris-lu

lib/opener/webservice.rb

@@ -1,6 +1,7 @@
 require 'securerandom'
 require 'json'
 
+require 'aws-sdk'
 require 'puma/cli'
 require 'slop'
 require 'sinatra/base'

opener-webservice.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opener-core', '~> 2.3'
   spec.add_dependency 'puma'
   spec.add_dependency 'slop', '~> 3.0'
-  spec.add_dependency 'aws-sdk-v1'
+  spec.add_dependency 'aws-sdk', '~> 2.0'
 
-  spec.add_dependency 'newrelic_rpm'
+  spec.add_dependency 'newrelic_rpm', '~> 3.0'
   spec.add_dependency 'rollbar', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

spec/opener/webservice/server_spec.rb

@@ -236,7 +236,7 @@ def run(input)
         'input_url'  => 'http://s3-example'
       }
 
-      s3_object = AWS::S3::S3Object.new('foo', 'bar')
+      s3_object = Aws::S3::Object.new('foo', 'bar')
 
       s3_object.should_receive(:url_for)
         .and_return(new_payload['input_url'])