simple_aws 1.0.0 → 1.1.0

data/lib/{aws → simple_aws}/s3.rb

@@ -1,6 +1,6 @@
-require 'aws/api'
+require 'simple_aws/api'
 
-module AWS
+module SimpleAWS
 
   ##
   # Amazon's Simple Storage Service
@@ -120,9 +120,9 @@ module AWS
     # @param path [String] The path of the resource at hand
     # @param options [Hash] Options as defined above
     #
-    # @return [AWS::Response] The results of the request
+    # @return [SimpleAWS::Response] The results of the request
     #
-    # @raise [AWS::UnsuccessfulResponse, AWS::UnknownErrorResponse] on response errors
+    # @raise [SimpleAWS::UnsuccessfulResponse, SimpleAWS::UnknownErrorResponse] on response errors
     ##
     def get(path, options = {})
       call :get, path, options
@@ -134,9 +134,9 @@ module AWS
     # @param path [String] The path of the resource at hand
     # @param options [Hash] Options as defined above
     #
-    # @return [AWS::Response] The results of the request
+    # @return [SimpleAWS::Response] The results of the request
     #
-    # @raise [AWS::UnsuccessfulResponse, AWS::UnknownErrorResponse] on response errors
+    # @raise [SimpleAWS::UnsuccessfulResponse, SimpleAWS::UnknownErrorResponse] on response errors
     ##
     def put(path, options = {})
       call :put, path, options
@@ -148,9 +148,9 @@ module AWS
     # @param path [String] The path of the resource at hand
     # @param options [Hash] Options as defined above
     #
-    # @return [AWS::Response] The results of the request
+    # @return [SimpleAWS::Response] The results of the request
     #
-    # @raise [AWS::UnsuccessfulResponse, AWS::UnknownErrorResponse] on response errors
+    # @raise [SimpleAWS::UnsuccessfulResponse, SimpleAWS::UnknownErrorResponse] on response errors
     ##
     def delete(path, options = {})
       call :delete, path, options
@@ -162,9 +162,9 @@ module AWS
     # @param path [String] The path of the resource at hand
     # @param options [Hash] Options as defined above
     #
-    # @return [AWS::Response] The results of the request
+    # @return [SimpleAWS::Response] The results of the request
     #
-    # @raise [AWS::UnsuccessfulResponse, AWS::UnknownErrorResponse] on response errors
+    # @raise [SimpleAWS::UnsuccessfulResponse, SimpleAWS::UnknownErrorResponse] on response errors
     ##
     def head(path, options = {})
       call :head, path, options
@@ -177,14 +177,14 @@ module AWS
     # @param path [String] The path of the resource at hand
     # @param options [Hash] Options as defined above
     #
-    # @return [AWS::Response] The results of the request
+    # @return [SimpleAWS::Response] The results of the request
     #
-    # @raise [AWS::UnsuccessfulResponse, AWS::UnknownErrorResponse] on response errors
+    # @raise [SimpleAWS::UnsuccessfulResponse, SimpleAWS::UnknownErrorResponse] on response errors
     ##
     def call(method, path, options = {})
       request = self.build_request method, path, options
 
-      connection = AWS::Connection.new
+      connection = SimpleAWS::Connection.new
       connection.call finish_and_sign_request(request)
     end
 
@@ -195,14 +195,14 @@ module AWS
     # @param path [String] The path of the resource at hand
     # @param options [Hash] Options as defined above
     #
-    # @return [AWS::Request] Completed but not yet signed request object
+    # @return [SimpleAWS::Request] Completed but not yet signed request object
     ##
     def build_request(method, path, options = {})
       if options[:bucket]
         path = "/#{options[:bucket]}/#{path}".gsub("//", "/")
       end
 
-      request = AWS::Request.new method, self.uri, path
+      request = SimpleAWS::Request.new method, self.uri, path
 
       (options[:params] || {}).each do |k, v|
         request.params[k] = v

data/lib/{aws → simple_aws}/ses.rb

@@ -1,8 +1,8 @@
-require 'aws/api'
-require 'aws/call_types/action_param'
-require 'aws/signing/version3'
+require 'simple_aws/api'
+require 'simple_aws/call_types/action_param'
+require 'simple_aws/signing/version3'
 
-module AWS
+module SimpleAWS
 
   ##
   # Amazon's Simple Email Service
@@ -11,8 +11,8 @@ module AWS
   #
   # All requests are POST and always through HTTPS.
   #
-  # @see AWS::CallTypes::ActionParam Calling rules
-  # @see AWS::Response Response handling
+  # @see SimpleAWS::CallTypes::ActionParam Calling rules
+  # @see SimpleAWS::Response Response handling
   ##
   class SES < API
     endpoint "email"

data/lib/{aws → simple_aws}/signing/version2.rb

@@ -1,7 +1,7 @@
 require 'uri'
 require 'openssl'
 
-module AWS
+module SimpleAWS
   module Signing
     ##
     # Implementation of "Signature Version 2" signing

data/lib/{aws → simple_aws}/signing/version3.rb

@@ -1,6 +1,6 @@
 require 'openssl'
 
-module AWS
+module SimpleAWS
   module Signing
     ##
     # Implementation of "Signature Version 3" signing, the X-Amzn-Authorization header

data/lib/{aws → simple_aws}/sns.rb

@@ -1,8 +1,8 @@
-require 'aws/api'
-require 'aws/call_types/action_param'
-require 'aws/signing/version2'
+require 'simple_aws/api'
+require 'simple_aws/call_types/action_param'
+require 'simple_aws/signing/version2'
 
-module AWS
+module SimpleAWS
 
   ##
   # Amazon's Simple Notification Service
@@ -12,8 +12,8 @@ module AWS
   # All requests are POST and always through HTTPS. Use the third parameter to
   # #initialize if you need to talk to a region other than us-east-1.
   #
-  # @see AWS::CallTypes::ActionParam Calling rules
-  # @see AWS::Response Response handling
+  # @see SimpleAWS::CallTypes::ActionParam Calling rules
+  # @see SimpleAWS::Response Response handling
   ##
   class SNS < API
     endpoint "sns"

data/lib/{aws → simple_aws}/sqs.rb

@@ -1,8 +1,8 @@
-require 'aws/api'
-require 'aws/call_types/action_param'
-require 'aws/signing/version2'
+require 'simple_aws/api'
+require 'simple_aws/call_types/action_param'
+require 'simple_aws/signing/version2'
 
-module AWS
+module SimpleAWS
 
   ##
   # Amazon's Simple Queue Service
@@ -20,8 +20,8 @@ module AWS
   # In accordance with the AWS documentation, SimpleAWS does not try to reconstruct
   # queue urls, use ListQueues or GetQueueUrl to get the correct queue url when needed.
   #
-  # @see AWS::CallTypes::ActionParam Calling rules
-  # @see AWS::Response Response handling
+  # @see SimpleAWS::CallTypes::ActionParam Calling rules
+  # @see SimpleAWS::Response Response handling
   ##
   class SQS < API
     endpoint "sqs"
@@ -45,8 +45,8 @@ module AWS
 
       uri = URI.parse(request_uri)
 
-      request = AWS::Request.new :post, "#{uri.scheme}://#{uri.host}", uri.path
-      request.params["Action"] = AWS::Util.camelcase(name.to_s)
+      request = SimpleAWS::Request.new :post, "#{uri.scheme}://#{uri.host}", uri.path
+      request.params["Action"] = SimpleAWS::Util.camelcase(name.to_s)
 
       if params.is_a?(Hash)
         insert_params_from request, params

data/samples/cloud_front.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/cloud_front'
+require 'simple_aws/cloud_front'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -9,7 +9,7 @@ require 'aws/cloud_front'
 # export AWS_SECRET="SECRET"
 ##
 
-cloud_front = AWS::CloudFront.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+cloud_front = SimpleAWS::CloudFront.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 puts "First ten distribution items:", ""
 

data/samples/ec2.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/ec2'
+require 'simple_aws/ec2'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -9,7 +9,7 @@ require 'aws/ec2'
 # export AWS_SECRET="SECRET"
 ##
 
-ec2 = AWS::EC2.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+ec2 = SimpleAWS::EC2.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 puts "", "Standard Only Addresses", ""
 

data/samples/elb.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/elb'
+require 'simple_aws/elb'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -9,7 +9,7 @@ require 'aws/elb'
 # export AWS_SECRET="SECRET"
 ##
 
-$elb = AWS::ELB.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+$elb = SimpleAWS::ELB.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 puts "", "Your Load Balancers", ""
 

data/samples/iam.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/iam'
+require 'simple_aws/iam'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -9,7 +9,7 @@ require 'aws/iam'
 # export AWS_SECRET="SECRET"
 ##
 
-$iam = AWS::IAM.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+$iam = SimpleAWS::IAM.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 puts "", "You are", ""
 

data/samples/s3.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/s3'
+require 'simple_aws/s3'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -21,7 +21,7 @@ def bad_usage
   exit 1
 end
 
-s3 = AWS::S3.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+s3 = SimpleAWS::S3.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 bucket_name = ARGV[0]
 file_name = ARGV[1]

data/samples/s3_batch_download.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/s3'
+require 'simple_aws/s3'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -22,7 +22,7 @@ def bad_usage
   exit 1
 end
 
-s3 = AWS::S3.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+s3 = SimpleAWS::S3.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 s3_resource = ARGV[0]
 save_to = ARGV[1]

data/samples/sqs.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/sqs'
+require 'simple_aws/sqs'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -9,7 +9,7 @@ require 'aws/sqs'
 # export AWS_SECRET="SECRET"
 ##
 
-sqs = AWS::SQS.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
+sqs = SimpleAWS::SQS.new ENV["AWS_KEY"], ENV["AWS_SECRET"]
 
 queue_name = "SimpleAWSTest"
 

data/samples/turk.rb

@@ -1,6 +1,6 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'aws/mechanical_turk'
+require 'simple_aws/mechanical_turk'
 
 ##
 # Expects your Amazon keys to be in the environment, something like
@@ -9,6 +9,6 @@ require 'aws/mechanical_turk'
 # export AWS_SECRET="SECRET"
 ##
 
-turk = AWS::MechanicalTurk.new ENV["AWS_KEY"], ENV["AWS_SECRET"], true
+turk = SimpleAWS::MechanicalTurk.new ENV["AWS_KEY"], ENV["AWS_SECRET"], true
 
 p turk.SearchHITs

data/simple_aws.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "simple_aws"
-  s.version  = "1.0.0"
+  s.version  = "1.1.0"
   s.platform = Gem::Platform::RUBY
   s.authors  = ["Jason Roelofs"]
   s.email    = ["jameskilton@gmail.com"]

data/test/{aws → simple_aws}/api_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
-require 'aws/api'
+require 'simple_aws/api'
 
-describe AWS::API do
+describe SimpleAWS::API do
 
-  class TestAPI < AWS::API
+  class TestAPI < SimpleAWS::API
   end
 
   describe ".endpoint" do

data/test/{aws → simple_aws}/auto_scaling_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'aws/auto_scaling'
+require 'simple_aws/auto_scaling'
 
-describe AWS::AutoScaling do
+describe SimpleAWS::AutoScaling do
 
   before do
-    @api = AWS::AutoScaling.new "key", "secret"
+    @api = SimpleAWS::AutoScaling.new "key", "secret"
   end
 
   it "points to the endpoint" do
@@ -18,7 +18,7 @@ describe AWS::AutoScaling do
   describe "API calls" do
 
     it "builds and signs calls with ActionParam rules" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         params = request.params
         params.wont_be_nil
 
@@ -28,7 +28,7 @@ describe AWS::AutoScaling do
         true
       end
 
-      obj = AWS::AutoScaling.new "key", "secret"
+      obj = SimpleAWS::AutoScaling.new "key", "secret"
       obj.execute_policy
     end
 

data/test/{aws → simple_aws}/call_types/action_param_test.rb

@@ -1,15 +1,15 @@
 require 'test_helper'
-require 'aws/api'
-require 'aws/call_types/action_param'
+require 'simple_aws/api'
+require 'simple_aws/call_types/action_param'
 
-describe AWS::CallTypes::ActionParam do
+describe SimpleAWS::CallTypes::ActionParam do
 
-  class ActionParamTesting < AWS::API
+  class ActionParamTesting < SimpleAWS::API
     endpoint "aptest"
     version "2011-01-01"
     use_https true
 
-    include AWS::CallTypes::ActionParam
+    include SimpleAWS::CallTypes::ActionParam
 
     #noop
     def finish_and_sign_request(request)
@@ -18,7 +18,7 @@ describe AWS::CallTypes::ActionParam do
   end
 
   it "takes an unknown method call and turns it into a request" do
-    AWS::Connection.any_instance.expects(:call).with do |request|
+    SimpleAWS::Connection.any_instance.expects(:call).with do |request|
       params = request.params
       params["Action"].must_equal "DescribeInstances"
 
@@ -30,7 +30,7 @@ describe AWS::CallTypes::ActionParam do
   end
 
   it "takes a hash parameter and gives it to the request" do
-    AWS::Connection.any_instance.expects(:call).with do |request|
+    SimpleAWS::Connection.any_instance.expects(:call).with do |request|
 
       params = request.params
       params["ParamA"].must_equal 1

data/test/{aws → simple_aws}/cloud_formation_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'aws/cloud_formation'
+require 'simple_aws/cloud_formation'
 
-describe AWS::CloudFormation do
+describe SimpleAWS::CloudFormation do
 
   before do
-    @api = AWS::CloudFormation.new "key", "secret"
+    @api = SimpleAWS::CloudFormation.new "key", "secret"
   end
 
   it "points to endpoint, default to us-east-1" do
@@ -18,7 +18,7 @@ describe AWS::CloudFormation do
   describe "API calls" do
 
     it "builds and signs calls with ActionParam rules" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         params = request.params
         params.wont_be_nil
 
@@ -28,7 +28,7 @@ describe AWS::CloudFormation do
         true
       end
 
-      obj = AWS::CloudFormation.new "key", "secret"
+      obj = SimpleAWS::CloudFormation.new "key", "secret"
       obj.describe_stacks
     end
 

data/test/{aws → simple_aws}/cloud_front_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'aws/cloud_front'
+require 'simple_aws/cloud_front'
 
-describe AWS::CloudFront do
+describe SimpleAWS::CloudFront do
 
   before do
-    @api = AWS::CloudFront.new "key", "secret"
+    @api = SimpleAWS::CloudFront.new "key", "secret"
   end
 
   it "points to the endpoint" do
@@ -13,7 +13,7 @@ describe AWS::CloudFront do
 
   it "does not support region selection" do
     lambda {
-      AWS::CloudFront.new "key", "secret", "us-east-1"
+      SimpleAWS::CloudFront.new "key", "secret", "us-east-1"
     }.must_raise ArgumentError
   end
 
@@ -25,7 +25,7 @@ describe AWS::CloudFront do
 
     [:get, :post, :put, :delete].each do |method|
       it "supports the #{method} HTTP method" do
-        AWS::Connection.any_instance.expects(:call).with do |request|
+        SimpleAWS::Connection.any_instance.expects(:call).with do |request|
           request.method.must_equal method
           true
         end
@@ -35,7 +35,7 @@ describe AWS::CloudFront do
     end
 
     it "pre-pends the version to the path for every request" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         request.path.must_equal "/2010-11-01/"
         true
       end
@@ -44,7 +44,7 @@ describe AWS::CloudFront do
     end
 
     it "takes parameters" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         request.params["Parameter1"].must_equal "Value2"
         true
       end
@@ -53,7 +53,7 @@ describe AWS::CloudFront do
     end
 
     it "takes a raw body" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         request.body.must_equal "This is a body of text"
         true
       end
@@ -62,7 +62,7 @@ describe AWS::CloudFront do
     end
 
     it "uses :xml to take a hash and build XML from it" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         request.headers["Content-Type"].must_equal "text/xml"
         request.body.must_match(/amazonaws\.com\/doc\//)
         request.body.must_match(/<InnerNode>/)
@@ -81,7 +81,7 @@ describe AWS::CloudFront do
     end
 
     it "takes extra headers" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         request.headers["Header14"].must_equal "Out to Lunch"
         true
       end
@@ -90,7 +90,7 @@ describe AWS::CloudFront do
     end
 
     it "signs the given request according to Version 3 rules" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         request.headers["Authorization"].wont_be_nil
         header = request.headers["Authorization"]
         parts = header.split(":")

data/test/{aws → simple_aws}/cloud_watch_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'aws/cloud_watch'
+require 'simple_aws/cloud_watch'
 
-describe AWS::CloudWatch do
+describe SimpleAWS::CloudWatch do
 
   before do
-    @api = AWS::CloudWatch.new "key", "secret"
+    @api = SimpleAWS::CloudWatch.new "key", "secret"
   end
 
   it "points to endpoint, default to us-east-1" do
@@ -18,7 +18,7 @@ describe AWS::CloudWatch do
   describe "API calls" do
 
     it "builds and signs calls with ActionParam rules" do
-      AWS::Connection.any_instance.expects(:call).with do |request|
+      SimpleAWS::Connection.any_instance.expects(:call).with do |request|
         params = request.params
         params.wont_be_nil
 
@@ -28,7 +28,7 @@ describe AWS::CloudWatch do
         true
       end
 
-      obj = AWS::CloudWatch.new "key", "secret"
+      obj = SimpleAWS::CloudWatch.new "key", "secret"
       obj.list_metrics
     end
 

data/test/{aws → simple_aws}/core/connection_test.rb

@@ -1,21 +1,21 @@
 require 'test_helper'
-require 'aws/core/request'
-require 'aws/core/response'
-require 'aws/core/connection'
+require 'simple_aws/core/request'
+require 'simple_aws/core/response'
+require 'simple_aws/core/connection'
 
-describe AWS::Connection do
+describe SimpleAWS::Connection do
 
   describe "#call" do
 
     before do
-      @connection = AWS::Connection.new
+      @connection = SimpleAWS::Connection.new
       @http_response = stub_everything(:success? => true, :parsed_response => {"value" => {}})
     end
 
     it "takes a basic request and runs it" do
-      request = AWS::Request.new(:get, "host.com", "/")
+      request = SimpleAWS::Request.new(:get, "host.com", "/")
 
-      AWS::HTTP.expects(:get).with {|uri, options|
+      SimpleAWS::HTTP.expects(:get).with {|uri, options|
         uri.must_equal "host.com/"
       }.returns(@http_response)
 
@@ -23,20 +23,20 @@ describe AWS::Connection do
     end
 
     it "returns the response wrapped in our Response object" do
-      request = AWS::Request.new(:get, "host.com", "/")
+      request = SimpleAWS::Request.new(:get, "host.com", "/")
 
-      AWS::HTTP.expects(:get).returns(@http_response)
+      SimpleAWS::HTTP.expects(:get).returns(@http_response)
 
       response = @connection.call request
-      response.must_be_kind_of AWS::Response
+      response.must_be_kind_of SimpleAWS::Response
       response.body.must_equal "value" => {}
     end
 
     it "pulls parameters into the request" do
-      request = AWS::Request.new(:get, "host.com", "/")
+      request = SimpleAWS::Request.new(:get, "host.com", "/")
       request.params["Param1"] = "Something"
 
-      AWS::HTTP.expects(:get).with {|uri, options|
+      SimpleAWS::HTTP.expects(:get).with {|uri, options|
         options[:query].wont_be_nil
         options[:query]["Param1"].must_equal "Something"
       }.returns(@http_response)
@@ -45,10 +45,10 @@ describe AWS::Connection do
     end
 
     it "adds any headers from the Request object" do
-      request = AWS::Request.new(:get, "host.com", "/")
+      request = SimpleAWS::Request.new(:get, "host.com", "/")
       request.headers["Header"] = "Awesome"
 
-      AWS::HTTP.expects(:get).with {|uri, options|
+      SimpleAWS::HTTP.expects(:get).with {|uri, options|
         options[:query].wont_be_nil
         options[:headers].must_equal "Header" => "Awesome"
       }.returns(@http_response)
@@ -57,10 +57,10 @@ describe AWS::Connection do
     end
 
     it "passes through any body on the Request" do
-      request = AWS::Request.new(:get, "host.com", "/")
+      request = SimpleAWS::Request.new(:get, "host.com", "/")
       request.body = "This is some body text"
 
-      AWS::HTTP.expects(:get).with {|uri, options|
+      SimpleAWS::HTTP.expects(:get).with {|uri, options|
         options[:query].wont_be_nil
         options[:body].must_equal "This is some body text"
       }.returns(@http_response)