amazon-ec2 0.4.8 → 0.5.0

data/ChangeLog

@@ -1,3 +1,6 @@
+=== 0.5.0 2009-08-11
+ * Major re-factor by Kris Rasmussen (krisr) to add support for the AWS Elastic Load Balancer API. Kudos Kris!
+
 === 0.4.0 2009-06-06
  * Using technicalpickles/jeweler to manage gem now.  See : http://github.com/technicalpickles/jeweler/tree/master
 
@@ -23,13 +26,13 @@
 
 === 0.3.2 2008-12-11
  * Updated API version to 2008-12-01
- * Note : The new European EC2 zone should just work if you specify ':server => "eu-west-1.ec2.amazonaws.com"' when initializing EC2::Base.new().  Please report any issues you have with using this new service.
+ * Note : The new European EC2 zone should just work if you specify ':server => "eu-west-1.ec2.amazonaws.com"' when initializing AWS::EC2::Base.new().  Please report any issues you have with using this new service.
 
 === 0.3.1 2008-09-18
  * Added basic custom kernel id support to run_instances.  Thanks to Keith Hudgins for the patch.
 
 === 0.3.0 2008-08-24
- * Changed response object from AmazonEC2::Response to Hash (patch from Yan Pritzker 'skwp') Thanks!
+ * Changed response object from AmazonAWS::Response to Hash (patch from Yan Pritzker 'skwp') Thanks!
  * Added support for Elastic Block Storage (patch from Yann Klis 'yannski') Thanks!
  * Bumped AWS EC2 API version to 2008-05-05
  * Bumped gem version number
@@ -105,7 +108,7 @@
  * MAJOR refactoring of how responses are returned to users.  No longer do you have to call the
  .parse method, and no longer are you getting back simple arrays of information.  Responses
  now come in the form of OpenStruct objects that contain all of the data for an object in
- Enumerable form so you can use iterators (.each, .each_pair, etc).  All methods return an EC2::Response object
+ Enumerable form so you can use iterators (.each, .each_pair, etc).  All methods return an AWS::Response object
  which inherits from OpenStruct.  The return data from EC2, which is in XML form, is parsed
  with XmlSimple and is used to directly construct the return data structure.  This allows us
  to know with some confidence that the data structure returned from AWS will always be consistent
@@ -116,7 +119,7 @@
  that match those handed to us by Amazon EC2.  ArgumentError exceptions will also
  be thrown if you are making calls we know to be illegal or malformed.  You should rescue
  these exceptions in your application instead of parsing text responses.  All exceptions
- descend from EC2::Error.  You can see them all in exceptions.rb in the gem install.
+ descend from AWS::Error.  You can see them all in exceptions.rb in the gem install.
 
  * Added a full suite of test/spec unit tests which currently cover 100% of the public methods
  in this library.  We have abot 92% code coverage according to rcov.  This has greatly enhanced

data/README.rdoc

@@ -57,9 +57,9 @@ The following gems should be installed automatically as part of your install of
 
 == Using amazon-ec2
 
-The library exposes one main interface class EC2::Base.  It is through an instance of this class that you will perform all the operations for using the EC2 service including query string header signing.
+The library exposes one main interface class AWS::EC2::Base.  It is through an instance of this class that you will perform all the operations for using the EC2 service including query string header signing.
 
-The public methods on EC2::Base closely mirror the EC2 Query API, and as such the Query API Reference in the EC2 Developer Guide ( http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=84 ) will prove helpful.
+The public methods on AWS::EC2::Base closely mirror the EC2 Query API, and as such the Query API Reference in the EC2 Developer Guide ( http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=84 ) will prove helpful.
 
 
 === Setting up
@@ -90,11 +90,11 @@ You can verify that this setup is complete by running the 'set' in a command win
 
 The library exposes one main interface module
 
-  EC2::Base
+  AWS::EC2::Base
 
 This method requires arguments which include your AWS credentials and it will return an object that you can use to make method calls directly against EC2. All the operations for using the EC2 service, including query string header signing, are handled automatically for you. The connection string will look something like this:
 
-  @ec2 = EC2::Base.new(:access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
+  @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
 
 I've tried to keep the public methods on 'amazon-ec2' as close as possible to the AWS EC2 Query API. This similarity allows you to reference the Query API Reference in the EC2 Developer Guide and be able to get started right away. In most cases the methods names only differ in how they are presented. e.g. 'DescribeImages' becomes '#describe_images()' in Ruby. Feel free to browse the full RDoc documentation for all classes and methods of 'amazon-ec2' if you want more details.
 
@@ -144,28 +144,28 @@ If you're not in front of a terminal shell now (perhaps you're browsing this sit
         returns : a string representation of ALL images
         >> @ec2.describe_images.to_s
 
-        returns : an Array of EC2::Response objects, each an EC2 image and its data
+        returns : an Array of AWS::Response objects, each an EC2 image and its data
         >> @ec2.describe_images.imagesSet.item
         >> @ec2.describe_images.imagesSet.item[0] (a hash representing a single item in that array)
         >> @ec2.describe_images.imagesSet.item[0].to_s (a String representation of that item)
 
   >> @ec2.describe_images.imagesSet.item[0].to_s
-  => "#<EC2::Response:0x100A465B4 imageId=\"ami-018e6b68\" imageLocation=\"rbuilder-online/phonehome-1.5.6-x86_10132.img.manifest.xml\" imageOwnerId=\"099034111737\" imageState=\"available\" isPublic=\"true\" parent=#<EC2::Response:0x100A469A6 ...>>"
+  => "#<AWS::Response:0x100A465B4 imageId=\"ami-018e6b68\" imageLocation=\"rbuilder-online/phonehome-1.5.6-x86_10132.img.manifest.xml\" imageOwnerId=\"099034111737\" imageState=\"available\" isPublic=\"true\" parent=#<AWS::Response:0x100A469A6 ...>>"
 
 
 === Ruby script usage example:
 
-Try out the following bit of code. This should walk through each image returned by a call to #describe_images and print out its key data. Note in the example below that you cannot walk through the results of the #describe_images call with the '.each' iterator (You'll get errors if you try). You need to instead walk through the Array of items which are in the 'imagesSet' embedded in the response. This reflects exactly the XML hierarchy of data returned from EC2 which we parse to Ruby OpenStruct objects (EC2::Response).
+Try out the following bit of code. This should walk through each image returned by a call to #describe_images and print out its key data. Note in the example below that you cannot walk through the results of the #describe_images call with the '.each' iterator (You'll get errors if you try). You need to instead walk through the Array of items which are in the 'imagesSet' embedded in the response. This reflects exactly the XML hierarchy of data returned from EC2 which we parse to Ruby OpenStruct objects (AWS::Response).
 
   #!/usr/bin/env ruby
 
   require 'rubygems'
-  require 'EC2'
+  require 'AWS'
 
   ACCESS_KEY_ID = '--YOUR AWS ACCESS KEY ID--'
   SECRET_ACCESS_KEY = '--YOUR AWS SECRET ACCESS KEY--'
 
-  ec2 = EC2::Base.new(:access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
+  ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY)
 
   puts "----- listing images owned by 'amazon' -----"
   ec2.describe_images(:owner_id => "amazon").imagesSet.item.each do |image|
@@ -191,7 +191,7 @@ Try out the following bit of code. This should walk through each image returned
 
   [some controller code ...]
 
-  ec2 = EC2::Base.new(:access_key_id => "YOUR_AWS_ACCESS_KEY_ID", :secret_access_key => "YOUR_AWS_SECRET_ACCESS_KEY")
+  ec2 = AWS::EC2::Base.new(:access_key_id => "YOUR_AWS_ACCESS_KEY_ID", :secret_access_key => "YOUR_AWS_SECRET_ACCESS_KEY")
 
   # get ALL public images
   @ec2_images = ec2.describe_images().imagesSet.item
@@ -244,7 +244,7 @@ Try out the following bit of code. This should walk through each image returned
   <% end %>
 
 
-=== Important notes regarding the structure of EC2::Response Objects
+=== Important notes regarding the structure of AWS::Response Objects
 
 One of the key benefits of this new version of the library is that all responses from EC2 are bundled up in a real data structure and no longer require parsing of text. The hash returned is populated directly from the XML given to us by EC2 in response to any command we issue. This means that future changes to the API and what is returned by EC2 will be handled transparently by the gem. This is a huge benefit. What this means though, is that you may have to do a little homework on what actually gets returned by EC2 as XML. For example, when you make a #describe_images call in 'ec2sh' what AWS returns behind the scenes looks like:
 
@@ -303,7 +303,7 @@ So, for example, if you wanted to get the image ID of the third image listed in
   >> puts @ec2.describe_images(:owner_id => 'amazon').imagesSet.item[2].imageId
   ami-23b6534a
 
-EC2 will typically return sets of things (imagesSet, reservationSet, etc.) which we map to ruby Arrays (.imagesSet.item in the example above). If you want to iterate over a response set you will need to iterate over this array. The Arrays will typically contain additional EC2::Response objects that represent each individual item. You'll find that you can use the 'ec2sh' to help you understand the structure more completely if you try issuing commands there as a way to practice seeing what will be returned and making sure you get exactly what you want.
+EC2 will typically return sets of things (imagesSet, reservationSet, etc.) which we map to ruby Arrays (.imagesSet.item in the example above). If you want to iterate over a response set you will need to iterate over this array. The Arrays will typically contain additional AWS::Response objects that represent each individual item. You'll find that you can use the 'ec2sh' to help you understand the structure more completely if you try issuing commands there as a way to practice seeing what will be returned and making sure you get exactly what you want.
 
 
 == Additional Resources

data/README_dev.rdoc

@@ -0,0 +1,6 @@
+= Dev Docs
+
+Publishing the gem using Jeweler:
+
+  rake version:bump:patch release rubyforge:release rubyforge:release:docs
+

data/Rakefile

@@ -5,7 +5,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "amazon-ec2"
   gem.summary = %Q{Amazon EC2 Ruby Gem}
-  gem.description = %Q{An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers.}
+  gem.description = %Q{A Ruby library for accessing the Amazon Web Services Elastic Compute Cloud (EC2) and Elastic Load Balancer (ELB) API's.}
   gem.email = "glenn@rempe.us"
   gem.homepage = "http://github.com/grempe/amazon-ec2"
   gem.authors = ["Glenn Rempe"]
@@ -36,6 +36,7 @@ begin
     test.libs << 'test'
     test.pattern = 'test/**/test_*.rb'
     test.verbose = true
+    test.rcov_opts << "--exclude /gems/,/Library/,spec"
   end
 rescue LoadError
   task :rcov do

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.5.0

data/amazon-ec2.gemspec

@@ -5,24 +5,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.4.8"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2009-08-09}
-  s.description = %q{An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers.}
+  s.date = %q{2009-08-11}
+  s.description = %q{A Ruby library for accessing the Amazon Web Services Elastic Compute Cloud (EC2) and Elastic Load Balancer (ELB) API's.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]
   s.extra_rdoc_files = [
     "ChangeLog",
      "LICENSE",
-     "README.rdoc"
+     "README.rdoc",
+     "README_dev.rdoc"
   ]
   s.files = [
     ".gitignore",
      "ChangeLog",
      "LICENSE",
      "README.rdoc",
+     "README_dev.rdoc",
      "Rakefile",
      "VERSION",
      "amazon-ec2.gemspec",
@@ -31,20 +33,23 @@ Gem::Specification.new do |s|
      "bin/ec2sh",
      "bin/setup.rb",
      "deps.rip",
-     "lib/EC2.rb",
-     "lib/EC2/availability_zones.rb",
-     "lib/EC2/console.rb",
-     "lib/EC2/elastic_ips.rb",
-     "lib/EC2/exceptions.rb",
-     "lib/EC2/image_attributes.rb",
-     "lib/EC2/images.rb",
-     "lib/EC2/instances.rb",
-     "lib/EC2/keypairs.rb",
-     "lib/EC2/products.rb",
-     "lib/EC2/responses.rb",
-     "lib/EC2/security_groups.rb",
-     "lib/EC2/snapshots.rb",
-     "lib/EC2/volumes.rb",
+     "lib/AWS.rb",
+     "lib/AWS/EC2.rb",
+     "lib/AWS/EC2/availability_zones.rb",
+     "lib/AWS/EC2/console.rb",
+     "lib/AWS/EC2/elastic_ips.rb",
+     "lib/AWS/EC2/image_attributes.rb",
+     "lib/AWS/EC2/images.rb",
+     "lib/AWS/EC2/instances.rb",
+     "lib/AWS/EC2/keypairs.rb",
+     "lib/AWS/EC2/products.rb",
+     "lib/AWS/EC2/security_groups.rb",
+     "lib/AWS/EC2/snapshots.rb",
+     "lib/AWS/EC2/volumes.rb",
+     "lib/AWS/ELB.rb",
+     "lib/AWS/ELB/load_balancers.rb",
+     "lib/AWS/exceptions.rb",
+     "lib/AWS/responses.rb",
      "perftools/ec2prof",
      "perftools/ec2prof-results.dot",
      "perftools/ec2prof-results.txt",
@@ -63,6 +68,7 @@ Gem::Specification.new do |s|
      "test/test_EC2_security_groups.rb",
      "test/test_EC2_snapshots.rb",
      "test/test_EC2_volumes.rb",
+     "test/test_ELB_load_balancers.rb",
      "test/test_helper.rb",
      "wsdl/2007-08-29.ec2.wsdl",
      "wsdl/2008-02-01.ec2.wsdl",
@@ -90,6 +96,7 @@ Gem::Specification.new do |s|
      "test/test_EC2_security_groups.rb",
      "test/test_EC2_snapshots.rb",
      "test/test_EC2_volumes.rb",
+     "test/test_ELB_load_balancers.rb",
      "test/test_helper.rb"
   ]
 

data/bin/ec2-gem-example.rb

@@ -9,7 +9,7 @@
 # Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
-require File.dirname(__FILE__) + '/../lib/EC2'
+require File.dirname(__FILE__) + '/../lib/AWS'
 require 'pp'
 
 # pull these from the local shell environment variables set in ~/.bash_login
@@ -34,10 +34,10 @@ end
 # test different servers by running something like:
 # export EC2_URL='https://ec2.amazonaws.com';./bin/ec2-gem-example.rb
 if ENV['EC2_URL']
-  ec2 = EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['EC2_URL']).host )
+  ec2 = AWS::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY, :server => URI.parse(ENV['EC2_URL']).host )
 else
   # default server is US ec2.amazonaws.com
-  ec2 = EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
+  ec2 = AWS::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
 end
 
 puts "----- ec2.methods.sort -----"

data/bin/ec2-gem-profile.rb

@@ -2,9 +2,9 @@
 
 # Basic single command application that we can call with perftools.rb to get consistent results.
 
-require File.dirname(__FILE__) + '/../lib/EC2'
+require File.dirname(__FILE__) + '/../lib/AWS'
 ACCESS_KEY_ID = ENV['AMAZON_ACCESS_KEY_ID']
 SECRET_ACCESS_KEY = ENV['AMAZON_SECRET_ACCESS_KEY']
-ec2 = EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
+ec2 = AWS::EC2::Base.new( :access_key_id => ACCESS_KEY_ID, :secret_access_key => SECRET_ACCESS_KEY )
 @images = ec2.describe_images
 

data/bin/ec2sh

@@ -19,9 +19,9 @@
 
 #   macbook-pro:~ glenn$ ec2sh
 #   >> @ec2.describe_images
-#   => [#<EC2::Item image_location...
+#   => [#<AWS::EC2::Item image_location...
 
-ec2_lib   = File.dirname(__FILE__) + '/../lib/EC2'
+aws_lib   = File.dirname(__FILE__) + '/../lib/AWS'
 setup = File.dirname(__FILE__) + '/setup'
 irb_name = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
 
@@ -48,7 +48,7 @@ if ( ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY'] )
       returns : a string representation of ALL images
       >> @ec2.describe_images.to_s
 
-      returns : an Array of EC2::Response objects, each an EC2 image and its data
+      returns : an Array of AWS::Response objects, each an EC2 image and its data
       >> @ec2.describe_images.imagesSet.item
       >> @ec2.describe_images.imagesSet.item[0] (a hash representing a single item in that array)
       >> @ec2.describe_images.imagesSet.item[0].to_s (a String representation of that item)
@@ -56,7 +56,7 @@ if ( ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY'] )
   MESSAGE
 
   puts welcome_message
-  exec "#{irb_name} -r #{ec2_lib} -r #{setup} --simple-prompt"
+  exec "#{irb_name} -r #{aws_lib} -r #{setup} --simple-prompt"
 else
   puts "You must define AMAZON_ACCESS_KEY_ID and AMAZON_SECRET_ACCESS_KEY as shell environment variables before running #{$0}!"
 end

data/bin/setup.rb

@@ -17,9 +17,11 @@ if ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY']
   if ENV['EC2_URL']
     opts[:server] = URI.parse(ENV['EC2_URL']).host
   end
-  @ec2 = EC2::Base.new(opts)
+  @ec2 = AWS::EC2::Base.new(opts)
+  @elb = AWS::ELB::Base.new(opts)
 end
 
 puts "EC2 Server: #{opts[:server]}"
 
-include EC2
+include AWS
+

data/lib/{EC2.rb → AWS.rb}

@@ -1,46 +1,17 @@
-#--
-# Amazon Web Services EC2 Query API Ruby library
-#
-# Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
-# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
-# License::   Distributes under the same terms as Ruby
-# Home::      http://github.com/grempe/amazon-ec2/tree/master
-#++
-
-%w[ base64 cgi openssl digest/sha1 net/https rexml/document time ostruct ].each { |f| require f }
-
-# Require any lib files that we have bundled with this Ruby Gem in the lib/EC2 directory.
-# Parts of the EC2 module and Base class are broken out into separate
+# Require any lib files that we have bundled with this Ruby Gem in the lib/AWS directory.
+# Parts of the AWS module and Base class are broken out into separate
 # files for maintainability and are organized by the functional groupings defined
-# in the EC2 API developers guide.
-Dir[File.join(File.dirname(__FILE__), 'EC2/**/*.rb')].sort.each { |lib| require lib }
-
-module EC2
-
-  # Which host FQDN will we connect to for all API calls to AWS?
-  # If EC2_URL is defined in the users ENV we can use that. It is
-  # expected that this var is set with something like:
-  #   export EC2_URL='https://ec2.amazonaws.com'
-  #
-  if ENV['EC2_URL']
-    EC2_URL = ENV['EC2_URL']
-    VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
-    raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL)
-    DEFAULT_HOST = URI.parse(EC2_URL).host
-  else
-    # default US host
-    DEFAULT_HOST = 'ec2.amazonaws.com'
-  end
+# in the AWS API developers guide.
+
 
-  # This is the version of the API as defined by Amazon Web Services
-  API_VERSION = '2008-12-01'
+%w[ base64 cgi openssl digest/sha1 net/https rexml/document time ostruct ].each { |f| require f }
 
+module AWS
   # Builds the canonical string for signing. This strips out all '&', '?', and '='
   # from the query string to be signed.
   #   Note:  The parameters in the path passed in must already be sorted in
   #   case-insensitive alphabetical order and must not be url encoded.
-  def EC2.canonical_string(params, host = DEFAULT_HOST, method="POST", base="/")
+  def AWS.canonical_string(params, host, method="POST", base="/")
     # Sort, and encode parameters into a canonical string.
     sorted_params = params.sort {|x,y| x[0] <=> y[0]}
     encoded_params = sorted_params.collect do |p|
@@ -64,7 +35,7 @@ module EC2
   # hmac-sha1 sum, and then base64 encoding it.  Optionally, it will also
   # url encode the result of that to protect the string if it's going to
   # be used as a query string parameter.
-  def EC2.encode(secret_access_key, str, urlencode=true)
+  def AWS.encode(secret_access_key, str, urlencode=true)
     digest = OpenSSL::Digest::Digest.new('sha1')
     b64_hmac =
       Base64.encode64(
@@ -77,25 +48,6 @@ module EC2
     end
   end
 
-
-  #Introduction:
-  #
-  # The library exposes one main interface class, 'EC2::Base'.
-  # This class provides all the methods for using the EC2 service
-  # including the handling of header signing and other security issues .
-  # This class uses Net::HTTP to interface with the EC2 Query API interface.
-  #
-  #Required Arguments:
-  #
-  # :access_key_id => String (default : "")
-  # :secret_access_key => String (default : "")
-  #
-  #Optional Arguments:
-  #
-  # :use_ssl => Boolean (default : true)
-  # :server => String (default : 'ec2.amazonaws.com')
-  # :proxy_server => String (default : nil)
-  #
   class Base
 
     attr_reader :use_ssl, :server, :proxy_server, :port
@@ -105,7 +57,7 @@ module EC2
       options = { :access_key_id => "",
                   :secret_access_key => "",
                   :use_ssl => true,
-                  :server => DEFAULT_HOST,
+                  :server => default_host,
                   :proxy_server => nil
                   }.merge(options)
 
@@ -149,7 +101,7 @@ module EC2
     end
 
 
-    private
+    protected
 
       # pathlist is a utility method which takes a key string and and array as input.
       # It converts the array into a Hash with the hash key being 'Key.n' where
@@ -173,6 +125,19 @@ module EC2
         params
       end
 
+      # Same as _pathlist_ except it deals with arrays of hashes.
+      # So if you pass in args
+      # ("People", [{:name=>'jon', :age=>'22'}, {:name=>'chris'}], {:name => 'Name', :age => 'Age'}) you should get
+      # {"People.1.Name"=>"jon", "People.1.Age"=>'22', 'People.2.Name'=>'chris'}
+      def pathhashlist(key, arr_of_hashes, mappings)
+        params ={}
+        arr_of_hashes.each_with_index do |hash, i|
+          hash.each do |attribute, value|
+            params["#{key}.#{i+1}.#{mappings[attribute]}"] = value
+          end
+        end
+        params
+      end
 
       # Make the connection to AWS EC2 passing in our request.  This is generally called from
       # within a 'Response' class object or one of its sub-classes so the response is interpreted
@@ -188,7 +153,7 @@ module EC2
                           "SignatureVersion" => "2",
                           "SignatureMethod" => 'HmacSHA1',
                           "AWSAccessKeyId" => @access_key_id,
-                          "Version" => API_VERSION,
+                          "Version" => api_version,
                           "Timestamp"=>Time.now.getutc.iso8601} )
 
           sig = get_aws_auth_param(params, @secret_access_key, @server)
@@ -205,7 +170,7 @@ module EC2
 
           # Make a call to see if we need to throw an error based on the response given by EC2
           # All error classes are defined in EC2/exceptions.rb
-          ec2_error?(response)
+          aws_error?(response)
 
           return response
 
@@ -215,8 +180,8 @@ module EC2
 
       # Set the Authorization header using AWS signed header authentication
       def get_aws_auth_param(params, secret_access_key, server)
-        canonical_string =  EC2.canonical_string(params, server)
-        encoded_canonical = EC2.encode(secret_access_key, canonical_string)
+        canonical_string =  AWS.canonical_string(params, server)
+        encoded_canonical = AWS.encode(secret_access_key, canonical_string)
       end
 
       # allow us to have a one line call in each method which will do all of the work
@@ -238,7 +203,7 @@ module EC2
 
       # Raises the appropriate error if the specified Net::HTTPResponse object
       # contains an Amazon EC2 error; returns +false+ otherwise.
-      def ec2_error?(response)
+      def aws_error?(response)
 
         # return false if we got a HTTP 200 code,
         # otherwise there is some type of error (40x,50x) and
@@ -266,14 +231,15 @@ module EC2
 
         # Raise one of our specific error classes if it exists.
         # otherwise, throw a generic EC2 Error with a few details.
-        if EC2.const_defined?(error_code)
-          raise EC2.const_get(error_code), error_message
+        if AWS.const_defined?(error_code)
+          raise AWS.const_get(error_code), error_message
         else
-          raise EC2::Error, error_message
+          raise AWS::Error, error_message
         end
 
       end
 
   end
-
 end
+
+Dir[File.join(File.dirname(__FILE__), 'AWS/*.rb')].sort.each { |lib| require lib }