kernow-ruby-aaws 0.5.4 → 0.7.1

data/example/multiple_operation1

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 #
-# $Id: multiple_operation1,v 1.1 2008/04/11 15:00:56 ianmacd Exp $
+# $Id: multiple_operation1,v 1.2 2009/02/20 00:25:59 ianmacd Exp $
 
 require 'amazon/aws/search'
 
@@ -14,9 +14,10 @@ include Amazon::AWS::Search
 # availability status.
 #
 il = ItemLookup.new( 'ASIN', { 'ItemId' => 'B000AE4QEC',
-			       'MerchantId' => 'Amazon' },
-		             { 'ItemId' => 'B000051WBE',
 			       'MerchantId' => 'Amazon' } )
+il2 = ItemLookup.new( 'ASIN', { 'ItemId' => 'B000051WBE',
+				'MerchantId' => 'Amazon' } )
+il.batch( il2 )
 is = ItemSearch.new( 'Books', { 'Title' => 'Ruby' } )
 
 mo = MultipleOperation.new( is, il )

data/example/vehicle_search

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby -w
+#
+# $Id: vehicle_search,v 1.1 2009/02/19 15:48:57 ianmacd Exp $
+
+require 'amazon/aws/search'
+
+include Amazon::AWS
+include Amazon::AWS::Search
+
+is = VehicleSearch.new( { 'Year' => 2008 } )
+rg = ResponseGroup.new( 'VehicleMakes' )
+
+req = Request.new
+req.locale = 'us'
+
+resp = req.search( is, rg )
+makes = resp.vehicle_search_response[0].vehicle_years[0].vehicle_year[0].
+        vehicle_makes[0].vehicle_make
+
+printf( "Search returned %d makes of vehicle for 2008.\n\n", makes.size )
+
+makes.each { |make| puts make, '' }

data/lib/amazon.rb

@@ -1,4 +1,4 @@
-# $Id: amazon.rb,v 1.25 2008/10/03 09:35:37 ianmacd Exp $
+# $Id: amazon.rb,v 1.29 2009/06/08 15:20:11 ianmacd Exp $
 #
 
 module Amazon
@@ -8,6 +8,7 @@ module Amazon
   class AmazonError < StandardError; end
 
   NAME = 'Ruby/Amazon'
+
   @@config = {}
 
   # Prints debugging messages and works like printf, except that it prints
@@ -22,28 +23,31 @@ module Amazon
   #
   def Amazon.url_encode(string)
 
-    # Shamelessly plagiarised from Wakou Aoyama's cgi.rb.
+    # Shamelessly plagiarised from Wakou Aoyama's cgi.rb, but then altered
+    # slightly to please AWS.
     #
-    string.gsub( /([^ a-zA-Z0-9_.-]+)/n ) do
-      '%' + $1.unpack( 'H2' * $1.size ).join( '%' ).upcase
-    end.tr( ' ', '+' )
+    string.gsub( /([^a-zA-Z0-9_.~-]+)/ ) do
+      '%' + $1.unpack( 'H2' * $1.bytesize ).join( '%' ).upcase
+    end
   end
 
 
   # Convert a string from CamelCase to ruby_case.
   #
-  def Amazon.uncamelise(str)
+  def Amazon.uncamelise(string)
     # Avoid modifying by reference.
     #
-    str = str.dup
+    string = string.dup
 
     # Don't mess with string if all caps.
     #
-    str.gsub!( /(.+?)(([A-Z][a-z]|[A-Z]+$))/, "\\1_\\2" ) if str =~ /[a-z]/
+    if string =~ /[a-z]/
+      string.gsub!( /(.+?)(([A-Z][a-z]|[A-Z]+$))/, "\\1_\\2" )
+    end
 
     # Convert to lower case.
     #
-    str.downcase
+    string.downcase
   end
 
 
@@ -63,6 +67,7 @@ module Amazon
     # and are readable.
     #
     def initialize(config_str=nil)
+      locale = nil
 
       if config_str
 
@@ -105,16 +110,24 @@ module Amazon
 	if readable
 
 	  Amazon.dprintf( 'Opening %s ...', cf ) if config_class == File
-    
+
 	  config_class.open( cf ) { |f| lines = f.readlines }.each do |line|
 	    line.chomp!
-    
+
 	    # Skip comments and blank lines.
 	    #
 	    next if line =~ /^(#|$)/
-    
+
 	    Amazon.dprintf( 'Read: %s', line )
-    
+
+	    # Determine whether we're entering the subsection of a new locale.
+	    #
+	    if match = line.match( /^\[(\w+)\]$/ )
+	      locale = match[1]
+	      Amazon.dprintf( "Config locale is now '%s'.", locale )
+	      next
+	    end
+
 	    # Store these, because we'll probably find a use for these later.
 	    #
 	    begin
@@ -125,9 +138,14 @@ module Amazon
 	    rescue NoMethodError, ConfigError
 	      raise ConfigError, "bad config line: #{line}"
 	    end
-    
-	    self[key] = val
-    
+
+	    if locale && locale != 'global'
+	      self[locale] ||= {}
+	      self[locale][key] = val
+	    else
+	      self[key] = val
+	    end
+
 	  end
 	end
 

data/lib/amazon/aws.rb

@@ -1,4 +1,4 @@
-# $Id: aws.rb,v 1.72 2008/10/03 09:37:25 ianmacd Exp $
+# $Id: aws.rb,v 1.118 2009/06/15 23:51:53 ianmacd Exp $
 #
 #:include: ../../README.rdoc
 
@@ -6,13 +6,15 @@ module Amazon
 
   module AWS
 
-    require 'uri'
     require 'amazon'
     require 'amazon/aws/cache'
+    require 'enumerator'
+    require 'iconv'
     require 'rexml/document'
+    require 'uri'
 
     NAME = '%s/%s' % [ Amazon::NAME, 'AWS' ]
-    VERSION = '0.4.4'
+    VERSION = '0.7.0'
     USER_AGENT = '%s %s' % [ NAME, VERSION ]
 
     # Default Associate tags to use per locale.
@@ -26,10 +28,11 @@ module Amazon
       'us' => 'calibanorg-20'
     }
 
-    # Service name and version for AWS.
+    # Service name and API version for AWS. The version of the API used can be
+    # changed via the user configuration file.
     #
     SERVICE = { 'Service' => 'AWSECommerceService',
-		'Version' => '2008-08-19'
+		'Version' => '2009-03-31'
     }
 
     # Maximum number of 301 and 302 HTTP responses to follow, should Amazon
@@ -53,7 +56,9 @@ module Amazon
       'CustomerContentLookup' => { 'parameter' => 'ReviewPage',
 						  'max_page' =>  10 },
       'CustomerContentSearch' => { 'parameter' => 'CustomerPage',
-						  'max_page' =>  20 }
+						  'max_page' =>  20 },
+      'VehiclePartLookup'     => { 'parameter' => 'FitmentPage',
+						  'max_page' =>  10 }
     }
     # N.B. ItemLookup can also use the following two pagination parameters
     #
@@ -61,11 +66,23 @@ module Amazon
     #		      ---------
     # VariationPage   150
     # ReviewPage       20
-	  
+  
+
+    # A hash to store character encoding converters.
+    #
+    @@encodings = {}
+
+
     # Exception class for HTTP errors.
     #
     class HTTPError < AmazonError; end
 
+
+    # Exception class for faulty batch operations.
+    #
+    class BatchError < AmazonError; end
+
+
     class Endpoint
 
       attr_reader :host, :path
@@ -86,11 +103,12 @@ module Amazon
       'us' => Endpoint.new( 'http://ecs.amazonaws.com/onca/xml' )
     }
 
+
     # Fetch a page, either from the cache or by HTTP. This is used internally.
     #
-    def AWS.get_page(request, query)  # :nodoc:
+    def AWS.get_page(request)  # :nodoc:
 
-      url = ENDPOINT[request.locale].path + query
+      url = ENDPOINT[request.locale].path + request.query
       cache_url = ENDPOINT[request.locale].host + url
 
       # Check for cached page and return that if it's there.
@@ -100,6 +118,17 @@ module Amazon
 	return body if body
       end
 
+      # Check whether we have a secret key available for signing the request.
+      # If so, sign the request for authentication.
+      #
+      if request.config['secret_key_id']
+	unless request.sign
+	  Amazon.dprintf( 'Warning! Failed to sign request. No OpenSSL support for SHA256 digest.' )
+	end
+
+	url = ENDPOINT[request.locale].path + request.query
+      end
+
       # Get the existing connection. If there isn't one, force a new one.
       #
       conn = request.conn || request.reconnect.conn
@@ -114,7 +143,10 @@ module Amazon
       # just not passed by here recently), the HTTP connection to the server
       # will probably have timed out.
       #
-      rescue Errno::ECONNRESET
+      rescue EOFError,		Errno::ECONNABORTED, Errno::ECONNREFUSED,
+	     Errno::ECONNRESET, Errno::EPIPE,	     Errno::ETIMEDOUT,
+	     Timeout::Error	=> error
+	Amazon.dprintf( 'Connection to server lost: %s. Retrying...', error )
 	conn = request.reconnect.conn
 	retry
       end
@@ -148,16 +180,23 @@ module Amazon
     end
 
 
-    def AWS.assemble_query(items)  # :nodoc:
+    def AWS.assemble_query(items, encoding=nil)  # :nodoc:
+
       query = ''
+      @@encodings[encoding] ||= Iconv.new( 'utf-8', encoding ) if encoding
 
       # We must sort the items into an array to get reproducible ordering
       # of the query parameters. Otherwise, URL caching would not work. We
-      # must also convert the keys to strings, in case Symbols have been used
-      # as the keys.
+      # must also convert the parameter values to strings, in case Symbols
+      # have been used as the values.
       #
       items.sort { |a,b| a.to_s <=> b.to_s }.each do |k, v|
-	query << '&%s=%s' % [ k, Amazon.url_encode( v.to_s ) ]
+	if encoding
+	  query << '&%s=%s' %
+	    [ k, Amazon.url_encode( @@encodings[encoding].iconv( v.to_s ) ) ]
+	else
+	  query << '&%s=%s' % [ k, Amazon.url_encode( v.to_s ) ]
+	end
       end
 
       # Replace initial ampersand with question-mark.
@@ -217,7 +256,7 @@ module Amazon
       # dynamically defined by a separate process.
       #
       def AWSObject.yaml_load(io)
-        io.each do |line|
+	io.each do |line|
     
 	  # File data is external, so it's deemed unsafe when $SAFE > 0, which
 	  # is the case with mod_ruby, for example, where $SAFE == 1.
@@ -234,7 +273,7 @@ module Amazon
 	  
 	    # Module#const_defined? takes 2 parameters in Ruby 1.9.
 	    #
-	    cl_name << false if Object.method( :const_defined? ).arity == -1
+	    cl_name << false if RUBY_VERSION >= '1.9.0'
 	  
 	    unless AWSObject.const_defined?( *cl_name )
 	      AWSObject.const_set( m[1], Class.new( AWSObject ) )
@@ -264,6 +303,9 @@ module Amazon
 	iv = '@' + method.id2name
 
 	if instance_variables.include?( iv )
+
+	  # Return the instance variable that matches the method called.
+	  #
 	  instance_variable_get( iv )
 	elsif instance_variables.include?( iv.to_sym )
 
@@ -271,6 +313,12 @@ module Amazon
 	  # not String.
 	  #
 	  instance_variable_get( iv.to_sym )
+	elsif @__val__.respond_to?( method.id2name )
+
+	  # If our value responds to the method in question, call the method
+	  # on that.
+	  #
+	  @__val__.send( method.id2name )
 	else
 	  nil
 	end
@@ -320,13 +368,8 @@ module Amazon
       alias :to_str :to_s
 
 
-      def to_i	# :nodoc:
-	@__val__.to_i
-      end
-
-
       def ==(other)  # :nodoc:
-        @__val__.to_s == other
+	@__val__.to_s == other
       end
 
 
@@ -421,7 +464,7 @@ module Amazon
 
 	  # Module#const_defined? takes 2 parameters in Ruby 1.9.
 	  #
-	  cl_name << false if Object.method( :const_defined? ).arity == -1
+	  cl_name << false if RUBY_VERSION >= '1.9.0'
 
 	  # Create a class for the new element type unless it already exists.
 	  #
@@ -468,12 +511,12 @@ module Amazon
       #
       def get(discount=nil)
 	if self.class.to_s =~ /Image$/ && @url
-          url = URI.parse( @url[0] )
-          url.path.sub!( /(\.\d\d\._)/, "\\1PE#{discount}" ) if discount
+	  url = URI.parse( @url[0] )
+	  url.path.sub!( /(\.\d\d\._)/, "\\1PE#{discount}" ) if discount
 
 	  # FIXME: All HTTP in Ruby/AWS should go through the same method.
 	  #
-          Net::HTTP.start( url.host, url.port ) do |http|
+	  Net::HTTP.start( url.host, url.port ) do |http|
 	    http.get( url.path )
 	  end.body
 
@@ -554,45 +597,82 @@ module Amazon
       OPERATIONS = %w[
 	BrowseNodeLookup      CustomerContentLookup   CustomerContentSearch
 	Help		      ItemLookup	      ItemSearch
-	ListLookup	      ListSearch	      SellerListingLookup
-	SellerListingSearch   SellerLookup	      SimilarityLookup
-	TagLookup	      TransactionLookup
+	ListLookup	      ListSearch	      MultipleOperation
+	SellerListingLookup   SellerListingSearch     SellerLookup
+	SimilarityLookup      TagLookup		      TransactionLookup
+	VehiclePartLookup     VehiclePartSearch	      VehicleSearch
 
 	CartAdd		      CartClear		      CartCreate
 	CartGet		      CartModify
       ]
 
-      # These are the valid search parameters that can be used with
-      # ItemSearch.
-      #
-      PARAMETERS = %w[
-	Actor		Artist	      AudienceRating	Author
-	Brand		BrowseNode    City Composer	Conductor
-	Director	Keywords      Manufacturer	MusicLabel
-	Neighborhood	Orchestra     Power		Publisher
-	TextStream	Title
-      ]
-
-      OPT_PARAMETERS = %w[
-	Availability	Condition     MaximumPrice	MerchantId
-	MinimumPrice	OfferStatus   Sort
-      ]
-
-      ALL_PARAMETERS = PARAMETERS + OPT_PARAMETERS
-
       attr_reader :kind
-      attr_accessor :params
+      attr_accessor :params, :response_group
 
       def initialize(parameters)
 
 	op_kind = self.class.to_s.sub( /^.*::/, '' )
-	unless OPERATIONS.include?( op_kind ) || op_kind == 'MultipleOperation'
+	unless OPERATIONS.include?( op_kind )
 	  raise "Bad operation: #{op_kind}"
 	end
 	#raise 'Too many parameters' if parameters.size > 10
 
 	@kind = op_kind
 	@params = { 'Operation' => op_kind }.merge( parameters )
+
+	if ResponseGroup::DEFAULT.key?( op_kind )
+	  @response_group =
+	    ResponseGroup.new( ResponseGroup::DEFAULT[op_kind] )
+	else
+	  @response_group = nil
+	end
+      end
+
+
+      # Group together operations of the same class in a batch request.
+      # _operations_ should be either an operation of the same class as *self*
+      # or an array of such operations.
+      #
+      # If you need to batch operations from different classes, use a
+      # MultipleOperation instead.
+      #
+      # Example:
+      #
+      #  is = ItemSearch.new( 'Books', { 'Title' => 'ruby programming' } )
+      #  is2 = ItemSearch.new( 'Music', { 'Artist' => 'stranglers' } )
+      #  is.response_group = ResponseGroup.new( :Small )
+      #  is2.response_group = ResponseGroup.new( :Tracks )
+      #  is.batch( is2 )
+      #
+      # Please see MultipleOperation.new for implementation details that also
+      # apply to batched operations.
+      #
+      def batch(*operations)
+
+	# Remove the Operation parameter to avoid batch syntax being applied.
+	# We'll readd it at the end.
+	#
+	op_type = @params.delete( 'Operation' )
+
+	operations.flatten.each do |op|
+
+	  unless self.class == op.class
+	    raise BatchError, "You can't batch different classes of operation. Use class MultipleOperation."
+	  end
+
+	  # Remove the Operation parameter.
+	  #
+	  op.params.delete( 'Operation' )
+
+	  # Apply batch syntax.
+	  #
+	  @params = batch_parameters( @params, op.params )
+	  @response_group.params = batch_response_groups( op )
+	end
+
+	# Reinstate the Operation parameter.
+	#
+	@params.merge!( { 'Operation' => op_type } )
       end
 
 
@@ -603,21 +683,33 @@ module Amazon
 	@index ||= 1
 
 	unless b_params.empty?
-	  op_str = self.class.to_s.sub( /^.+::/, '' )
+	  op_str = @kind || self.class.to_s.sub( /^.*::/, '' )
 
 	  # Fudge the operation string if we're dealing with a shopping cart.
 	  #
 	  op_str = 'Item' if op_str =~ /^Cart/
 
-	  all_parameters = [ params ].concat( b_params )
+	  all_parameters = []
+
+	  # Shopping carts pass an empty hash in params, so we have to ditch
+	  # params in such a case to prevent the batch index from being off by
+	  # one.
+	  #
+	  all_parameters.concat( [ params ] ) unless params.empty?
+	  all_parameters.concat( b_params )
+
 	  params = {}
+	  index = 0
 
-	  all_parameters.each_with_index do |hash, index|
+	  all_parameters.each do |hash|
+
+	    next if hash.empty?
 
 	    # Don't batch an already batched hash.
 	    #
-	    if ! hash.empty? && hash.to_a[0][0] =~ /^.+\..+\..+$/
-	      params = hash
+	    if hash.to_a[0][0] =~ /^.+\..+\..+$/
+	      params.merge!( hash )
+	      @index += 1
 	      next
 	    end
 
@@ -625,6 +717,8 @@ module Amazon
 	      shared_param = '%s.%d.%s' % [ op_str, @index + index, tag ]
 	      params[shared_param] = val
 	    end
+
+	    index += 1
 	  end
 
 	  @index += b_params.size
@@ -634,69 +728,109 @@ module Amazon
 	params
       end
 
+    end
+
+
+    # Convert response groups to batch format, e.g. ItemSearch.1.ResponseGroup.
+    #
+    def batch_response_groups(operation)
+
+      rg = {}
+      op_count = Hash.new( 1 )
 
-      def parameter_check(parameters)
-	parameters.each_key do |key|
-	  raise "Bad parameter: #{key}" unless ALL_PARAMETERS.include? key.to_s
+      [ self, operation ].each do |op|
+	rg_hash = op.response_group.params
+
+	if m = rg_hash.to_a[0][0].match( /^(.+)\..+\..+$/ )
+	  # This hash is already in batch format.
+	  #
+	  rg.merge!( rg_hash )
+
+	  # Keep a record of the highest index currently in use for each type
+	  # of operation.
+	  #
+	  rg_hash.each do |key, val|
+	    op_kind, index = key.match( /^(.+)\.(\d+)\..+$/ )[1, 2]
+	    if index.to_i == op_count[op_kind]
+	      op_count[op_kind] += 1
+	    end
+	  end
+
+	else
+	  # Convert hash to batch format.
+	  #
+	  rg_hash.each_value do |val|
+	    rg_str = '%s.%d.ResponseGroup' % [ op.kind, op_count[op.kind] ]
+	    op_count[op.kind] += 1
+	    rg[rg_str] = val
+	  end
 	end
+
       end
-      private :parameter_check
 
+     rg 
     end
 
 
-    # This class can be used to merge operations into a single operation.
-    # AWS currently supports combining two operations, 
+    # This class can be used to merge multiple operations into a single
+    # operation for greater efficiency.
     #
     class MultipleOperation < Operation
 
-      # This will allow you to take two Operation objects and combine them to
-      # form a single object, which can then be used to perform searches. AWS
-      # itself imposes the maximum of two combined operations.
+      # This allows you to take two Operation objects and combine them to form
+      # a single object, which can then be used to perform a single request to
+      # AWS. This allows for greater efficiency, reducing the number of
+      # requests sent to AWS.
+      #
+      # AWS currently imposes a limit of two operations when encapsulating
+      # operations in a multiple operation.
       #
       # <em>operation1</em> and <em>operation2</em> are both objects from a
       # subclass of Operation, such as ItemSearch, ItemLookup, etc.
       #
-      # There are currently a few restrictions in the Ruby/AWS implementation
-      # of multiple operations:
+      # Please note the following implementation details:
+      #
+      # - If you use the _response_group_ parameter of Search::Request#search
+      #   to pass the list of response groups, it will apply to both
+      #   operations.
       #
-      # - ResponseGroup objects used when calling AWS::Search::Request#search
-      #   apply to both operations. You cannot have a separate ResponseGroup
-      #   set per operation.
+      #   If you want to use a different response group set for each
+      #   operation, you should assign the relevant groups to the
+      #   @response_group attribute of each Operation object. You must do this
+      #   *before* you instantiate the MultipleOperation.
       #
       # - One or both operations may have multiple results pages available,
-      #   but only the first page can be returned. If you need the other
+      #   but only the first page is returned. If you need the subsequent
       #   pages, perform the operations separately, not as part of a
-      #   MultipleOperation.
+      #   multiple operation.
       #
       # Example:
       #
       #  is = ItemSearch.new( 'Books', { 'Title' => 'Ruby' } )
       #  il = ItemLookup.new( 'ASIN', { 'ItemId' => 'B0013DZAYO',
       #					'MerchantId' => 'Amazon' } )
-      #	 mo = MultipleOperation.new( is, il )
+      #  is.response_group = ResponseGroup.new( :Large )
+      #  il.response_group = ResponseGroup.new( :Small )
+      #  mo = MultipleOperation.new( is, il )
       #
-      #	In the above example, we compose a multiple operation consisting of an
-      #	ItemSearch and an ItemLookup.
+      # As you can see, the operations that are combined as a
+      # MultipleOperation do not have to belong to the same class. In the
+      # above example, we compose a multiple operation consisting of an
+      # ItemSearch and an ItemLookup.
+      #
+      # If you want to batch operations belonging to the same class,
+      # Operation#batch provides an alternative.
       # 
       def initialize(operation1, operation2)
 
-	# Safeguard against changing original Operation objects in place. This
-	# is to protect me, not for user code.
-	#
-	operation1.freeze
-	operation2.freeze
-
-	op_kind = '%s,%s' % [ operation1.kind, operation2.kind ]
+	op_kind = [ operation1.kind, operation2.kind ].join( ',' )
 
 	# Duplicate Operation objects and remove their Operation parameter.
 	# 
 	op1 = operation1.dup
-	op1.params = op1.params.dup
 	op1.params.delete( 'Operation' )
 
 	op2 = operation2.dup
-	op2.params = op2.params.dup
 	op2.params.delete( 'Operation' )
 
 	if op1.class == op2.class
@@ -717,6 +851,9 @@ module Amazon
 	params = { 'Operation' => op_kind }.merge( b_params )
 	super( params )
 
+	@response_group = ResponseGroup.new( [] )
+	@response_group.params.delete( 'ResponseGroup' )
+	@response_group.params = op1.batch_response_groups( op2 )
       end
       
     end
@@ -737,8 +874,8 @@ module Amazon
       #
       # _help_type_ is the type of object for which help is being sought, such
       # as *Operation* or *ResponseGroup*. _about_ is the name of the
-      # operation or response group you need help with, and _parameters_ is a
-      # hash of parameters that serve to further refine the request for help.
+      # operation or response group you need help with, and _parameters_ is an
+      # optional hash of parameters that further refine the request for help.
       #
       def initialize(help_type, about, parameters={})
 	super( { 'HelpType' => help_type,
@@ -764,9 +901,9 @@ module Amazon
       #
       # - *All* searches through all indices (but currently exists only in the
       #   *US* locale).
-      # - *Blended* combines DVD, Electronics, Toys, VideoGames, PCHardware,
-      #   Tools, SportingGoods, Books, Software, Music, GourmetFood, Kitchen
-      #   and Apparel.
+      # - *Blended* combines Apparel, Automotive, Books, DVD, Electronics,
+      #   GourmetFood, Kitchen, Music, PCHardware, PetSupplies, Software,
+      #   SoftwareVideoGames, SportingGoods, Tools, Toys, VHS and VideoGames.
       # - *Merchants* combines all search indices for a merchant given with
       #   MerchantId.
       # - *Music* combines the Classical, DigitalMusic, and MusicTracks
@@ -774,25 +911,60 @@ module Amazon
       # - *Video* combines the DVD and VHS search indices.
       #
       SEARCH_INDICES = %w[
-	    All
-	    Apparel		Hobbies		    PetSupplies
-	    Automotive		HomeGarden	    Photo
-	    Baby		Jewelry		    Software
-	    Beauty		Kitchen		    SoftwareVideoGames
-	    Blended		Magazines	    SportingGoods
-	    Books		Merchants	    Tools
-	    Classical		Miscellaneous	    Toys
-	    DigitalMusic	Music		    VHS
-	    DVD			MusicalInstruments  Video
-	    Electronics		MusicTracks	    VideoGames
-	    ForeignBooks	OfficeProducts      Wireless
-	    GourmetFood		OutdoorLiving	    WirelessAccessories
-	    HealthPersonalCare  PCHardware
-	]
+	All
+	Apparel
+	Automotive
+	Baby
+	Beauty
+	Blended
+	Books
+	Classical
+	DigitalMusic
+	DVD
+	Electronics
+	ForeignBooks
+	GourmetFood
+	Grocery
+	HealthPersonalCare
+	Hobbies
+	HomeGarden
+	HomeImprovement
+	Industrial
+	Jewelry
+	KindleStore
+	Kitchen
+	Magazines
+	Merchants
+	Miscellaneous
+	MP3Downloads
+	Music
+	MusicalInstruments
+	MusicTracks
+	OfficeProducts
+	OutdoorLiving
+	PCHardware
+	PetSupplies
+	Photo
+	Shoes
+	SilverMerchants
+	Software
+	SoftwareVideoGames
+	SportingGoods
+	Tools
+	Toys
+	UnboxVideo
+	VHS
+	Video
+	VideoGames
+	Watches
+	Wireless
+	WirelessAccessories
+      ]
 
 
       # Search AWS for items. _search_index_ must be one of _SEARCH_INDICES_
-      # and _parameters_ is a hash of relevant search parameters.
+      # and _parameters_ is an optional hash of parameters that further refine
+      # the scope of the search.
       #
       # Example:
       #
@@ -806,7 +978,6 @@ module Amazon
 	  raise "Invalid search index: #{search_index}"
 	end
 
-	parameter_check( parameters )
 	super( { 'SearchIndex' => search_index }.merge( parameters ) )
       end
 
@@ -820,33 +991,20 @@ module Amazon
     class ItemLookup < Operation
 
       # Look up a specific item in the AWS catalogue. _id_type_ is the type of
-      # identifier, _parameters_ is a hash that identifies the item to be
-      # located and narrows the scope of the search, and _b_parameters_ is an
-      # optional hash of further items to be located. Use of _b_parameters_
-      # effectively results in a batch operation being sent to AWS.
+      # identifier and  _parameters_ is a hash that identifies the item to be
+      # located and narrows the scope of the search.
       #
       # Example:
       #
       #  il = ItemLookup.new( 'ASIN', { 'ItemId' => 'B000AE4QEC'
-      #					'MerchantId' => 'Amazon' },
-      #				      { 'ItemId' => 'B000051WBE',
       #					'MerchantId' => 'Amazon' } )
       #
-      # In the above example, we search for two items, based on their ASIN.
-      # The use of _MerchantId_ restricts the offers returned to those for
-      # sale by Amazon (as opposed to third-party sellers).
+      # In the above example, we search for an item, based on its ASIN. The
+      # use of _MerchantId_ restricts the offers returned to those for sale
+      # by Amazon (as opposed to third-party sellers).
       #
-      def initialize(id_type, parameters, *b_parameters)
-
-	id_type_str = 'IdType'
-
-	unless b_parameters.empty?
-	  class_str = self.class.to_s.sub( /^.+::/, '' )
-	  id_type_str = '%s.Shared.IdType' % [ class_str ]
-	  parameters = batch_parameters( parameters, *b_parameters )
-	end
-
-	super( { id_type_str => id_type }.merge( parameters ) )
+      def initialize(id_type, parameters)
+	super( { 'IdType' => id_type }.merge( parameters ) )
       end
 
     end
@@ -857,8 +1015,8 @@ module Amazon
     class SellerListingSearch < Operation
 
       # Search for items for sale by a particular seller. _seller_id_ is the
-      # Amazon seller ID and _parameters_ is a hash of parameters that narrows
-      # the scope of the search.
+      # Amazon seller ID and _parameters_ is an optional hash of parameters
+      # that further refine the scope of the search.
       #
       # Example:
       #
@@ -880,11 +1038,8 @@ module Amazon
     class SellerListingLookup < ItemLookup
 
       # Look up a specific item for sale by a specific seller. _id_type_ is
-      # the type of identifier, _parameters_ is a hash that identifies the
-      # item to be located and narrows the scope of the search, and
-      # _b_parameters_ is an optional hash of further items to be located. Use
-      # of _b_parameters_ effectively results in a batch operation being sent
-      # to AWS.
+      # the type of identifier and _parameters_ is a hash that identifies the
+      # item to be located and narrows the scope of the search.
       #
       # Example:
       #
@@ -894,9 +1049,8 @@ module Amazon
       # In the above example, we search seller <b>AP8U6Y3PYQ9VO</b>'s listings
       # to find items for sale with the ASIN <b>B0009RRRC8</b>.
       #
-      def initialize(seller_id, id_type, parameters, *b_parameters)
-	super( id_type, { 'SellerId' => seller_id }.merge( parameters ),
-	       b_parameters )
+      def initialize(seller_id, id_type, parameters)
+	super( id_type, { 'SellerId' => seller_id }.merge( parameters ) )
       end
 
     end
@@ -907,8 +1061,8 @@ module Amazon
     class SellerLookup < Operation
 
       # Search for the details of a specific seller. _seller_id_ is the Amazon
-      # ID of the seller in question and _parameters_ is a hash of parameters
-      # that serve to further refine the search.
+      # ID of the seller in question and _parameters_ is an optional hash of
+      # parameters that further refine the scope of the search.
       #
       # Example:
       #
@@ -930,8 +1084,8 @@ module Amazon
     class CustomerContentLookup < Operation
 
       # Search for public customer data. _customer_id_ is the unique ID
-      # identifying the customer on Amazon and _parameters_ is a hash of
-      # parameters that serve to further refine the search.
+      # identifying the customer on Amazon and _parameters_ is an optional
+      # hash of parameters that further refine the scope of the search.
       #
       # Example:
       #
@@ -981,8 +1135,8 @@ module Amazon
     class ListSearch < Operation
 
       # Search for Amazon lists. _list_type_ is the type of list to search for
-      # and _parameters_ is a hash of parameters that narrows the scope of the
-      # search.
+      # and _parameters_ is an optional hash of parameters that narrow the
+      # scope of the search.
       #
       # Example:
       #
@@ -1003,8 +1157,8 @@ module Amazon
     class ListLookup < Operation
 
       # Look up and return details about a specific list. _list_id_ is the
-      # Amazon list ID, _list_type_ is the type of list and _parameters_ is a
-      # hash of parameters that narrows the scope of the search.
+      # Amazon list ID, _list_type_ is the type of list and _parameters_ is an
+      # optional hash of parameters that narrow the scope of the search.
       #
       # Example:
       #
@@ -1014,7 +1168,7 @@ module Amazon
       # <b>3P722DU4KUPCP</b> is retrieved from AWS.
       #
       def initialize(list_id, list_type, parameters={})
-        super( { 'ListId'   => list_id,
+	super( { 'ListId'   => list_id,
 	         'ListType' => list_type
 	       }.merge( parameters ) )
       end
@@ -1030,8 +1184,9 @@ module Amazon
     class BrowseNodeLookup < Operation
 
       # Look up and return the details of an Amazon browse node. _node_ is the
-      # browse node to look up and _parameters_ is a hash of parameters that
-      # serves to further define the search. _parameters_ is currently unused.
+      # browse node to look up and _parameters_ is an optional hash of
+      # parameters that further refine the scope of the search. _parameters_
+      # is currently unused.
       #
       # Example:
       #
@@ -1052,8 +1207,8 @@ module Amazon
     class SimilarityLookup < Operation
 
       # Look up items similar to _asin_, which can be a single item or an
-      # array. _parameters_ is a hash of parameters that serve to further
-      # refine the search.
+      # array. _parameters_ is an optional hash of parameters that further
+      # refine the scope of the search.
       #
       # Example:
       #
@@ -1076,8 +1231,8 @@ module Amazon
     class TagLookup < Operation
 
       # Look up entities based on user-defined tags. _tag_name_ is the tag to
-      # search on and _parameters_ is a hash of parameters that serve to
-      # further refine the search.
+      # search on and _parameters_ is an optional hash of parameters that
+      # further refine the scope of the search.
       #
       # Example:
       #
@@ -1115,28 +1270,149 @@ module Amazon
     end
 
 
+    # Look up individual vehicle parts.
+    #
+    class VehiclePartLookup < Operation
+
+      # Look up a particular vehicle part. _item_id_ is the ASIN of the part
+      # in question and _parameters_ is an optional hash of parameters that
+      # further refine the scope of the search.
+      #
+      # Although the _item_id_ alone is enough to locate the part, providing
+      # _parameters_ can be useful in determining whether the part looked up
+      # is a fit for a particular vehicle type, as with the *VehiclePartFit*
+      # response group.
+      # 
+      # Example:
+      #
+      #  vpl = VehiclePartLookup.new( 'B000C1ZLI8',
+      #				      { 'Year' => 2008,
+      #				        'MakeId' => 73,
+      #				        'ModelId' => 6039,
+      #				        'TrimId' => 20 } )
+      #
+      #	Here, we search for a <b>2008</b> model *Audi* <b>R8</b> with *Base*
+      #	trim. The required Ids can be found using VehiclePartSearch.
+      #
+      def initialize(item_id, parameters={})
+	super( { 'ItemId' => item_id }.merge( parameters ) )
+      end
+
+    end
+
+
+    # Search for parts for a given vehicle.
+    #
+    class VehiclePartSearch < Operation
+
+      # Find parts for a given _year_, _make_id_ and _model_id_ of vehicle.
+      # _parameters_ is an optional hash of parameters that further refine the
+      # scope of the search.
+      #
+      # Example:
+      #
+      #  vps = VehiclePartSearch.new( 2008, 73, 6039,
+      #				      { 'TrimId' => 20,
+      #				        'EngineId' => 8914 } )
+      #
+      # In this example, we look for parts that will fit a <b>2008</b> model
+      # *Audi* <b>R8</b> with *Base* trim and a <b>4.2L V8 Gas DOHC
+      # Distributorless Naturally Aspirated Bosch Motronic Electronic FI
+      # MFI</b> engine.
+      #
+      # Note that pagination of VehiclePartSearch results is not currently
+      # supported.
+      #
+      # Use VehicleSearch to learn the MakeId and ModelId of the vehicle in
+      # which you are interested.
+      #
+      def initialize(year, make_id, model_id, parameters={})
+	super( { 'Year'	   => year,
+		 'MakeId'  => make_id,
+		 'ModelId' => model_id }.merge( parameters ) )
+      end
+
+    end
+
+
+    # Search for vehicles.
+    #
+    class VehicleSearch < Operation
+
+      # Search for vehicles, based on one or more of the following
+      # _parameters_: Year, MakeId, ModelId and TrimId.
+      #
+      # This method is best used iteratively. For example, first search on
+      # year with a response group of *VehicleMakes* to return all makes for
+      # that year.
+      #
+      # Next, search on year and make with a response group of *VehicleModels*
+      # to find all models for that year and make.
+      #
+      # Then, search on year, make and model with a response group of
+      # *VehicleTrims* to find all trim packages for that year, make and model.
+      #
+      # Finally, if required, search on year, make, model and trim package
+      # with a response group of *VehicleOptions* to find all vehicle options
+      # for that year, make, model and trim package.
+      #
+      # Example:
+      #
+      #  vs = VehicleSearch.new( { 'Year' => 2008,
+      #				   'MakeId' => 20,
+      #				   'ModelId' => 6039,
+      #				   'TrimId' => 20 } )
+      #
+      # In this example, we search for <b>2008 Audi R8</b> vehicles with a
+      # *Base* trim package. Used with the *VehicleOptions* response group,
+      # a list of vehicle options would be returned.
+      #
+      def initialize(parameters={})
+	super
+      end
+
+    end
+
     # Response groups determine which data pertaining to the item(s) being
-    # sought is returned. They can strongly influence the amount of data
-    # returned, so you should always use the smallest response group(s)
-    # containing the data of interest to you, to avoid masses of unnecessary
-    # data being returned.
+    # sought is returned. They strongly influence the amount of data returned,
+    # so you should always use the smallest response group(s) containing the
+    # data of interest to you, to avoid masses of unnecessary data being
+    # returned.
     #
     class ResponseGroup
 
-      attr_reader :list, :params
+      # The default type of response group to use with each type of operation.
+      #
+      DEFAULT = { 'BrowseNodeLookup'	  => [ :BrowseNodeInfo, :TopSellers ],
+		  'CustomerContentLookup' => [ :CustomerInfo, :CustomerLists ],
+		  'CustomerContentSearch' => :CustomerInfo,
+		  'Help'		  => :Help,
+		  'ItemLookup'		  => :Large,
+		  'ItemSearch'		  => :Large,
+		  'ListLookup'		  => [ :ListInfo, :Small ],
+		  'ListSearch'		  => :ListInfo,
+		  'SellerListingLookup'	  => :SellerListing,
+		  'SellerListingSearch'	  => :SellerListing,
+		  'SellerLookup'	  => :Seller,
+		  'SimilarityLookup'	  => :Large,
+		  'TagLookup'		  => [ :Tags, :TagsSummary ],
+		  'TransactionLookup'	  => :TransactionDetails,
+		  'VehiclePartLookup'	  => :VehiclePartFit,
+		  'VehiclePartSearch'	  => :VehicleParts,
+		  'VehicleSearch'	  => :VehicleMakes
+      }
+
+      attr_reader :list
+      attr_accessor :params
 
       # Define a set of one or more response groups to be applied to items
       # retrieved by an AWS operation.
       #
-      # If no response groups are given in _rg_ when instantiating an object,
-      # *Small* will be used by default.
-      #
       # Example:
       #
       #  rg = ResponseGroup.new( 'Medium', 'Offers', 'Reviews' )
       #
       def initialize(*rg)
-	rg << 'Small' if rg.empty?
 	@list = rg
 	@params = { 'ResponseGroup' => @list.join( ',' ) }
       end
@@ -1154,13 +1430,19 @@ module Amazon
       class AWSError < AmazonError; end
 
       def Error.exception(xml)
-        err_class = xml.elements['Code'].text.sub( /^AWS.*\./, '' )
-        err_msg = xml.elements['Message'].text
+	err_class = xml.elements['Code'].text.sub( /^AWS.*\./, '' )
+	err_msg = xml.elements['Message'].text
 
 	# Dynamically define a new exception class for this class of error,
 	# unless it already exists.
 	#
-	unless Amazon::AWS::Error.const_defined?( err_class )
+	# Note that Ruby 1.9's Module.const_defined? needs a second parameter
+	# of *false*, or it will also search AWSError's ancestors.
+	#
+	cd_params = [ err_class ]
+	cd_params << false if RUBY_VERSION >= '1.9.0'
+
+	unless Amazon::AWS::Error.const_defined?( *cd_params )
 	  Amazon::AWS::Error.const_set( err_class, Class.new( AWSError ) )
 	end
 
@@ -1171,6 +1453,59 @@ module Amazon
 
     end
 
+
+    # Create a shorthand module method for each of the AWS operations. These
+    # can be used to create less verbose code at the expense of flexibility.
+    #
+    # For example, we might normally write the following code:
+    #
+    #  is = ItemSearch.new( 'Books', { 'Title' => 'Ruby' } )
+    #  rg = ResponseGroup.new( 'Large' )
+    #  req = Request.new
+    #  response = req.search( is, rg )
+    #
+    # but we could instead use ItemSearch's associated module method as
+    # follows:
+    #
+    #  response = Amazon::AWS.item_search( 'Books', { 'Title' => 'Ruby' } )
+    #
+    # Note that these equivalent module methods all attempt to use the *Large*
+    # response group, which may or may not work. If an
+    # Amazon::AWS::Error::InvalidResponseGroup is raised, we will scan the
+    # text of the error message returned by AWS to try to glean a valid
+    # response group and then retry the operation using that instead.
+
+
+    # Ontain a list of all subclasses of the Operation class.
+    #
+    classes =
+      ObjectSpace.enum_for( :each_object, class << Operation; self; end ).to_a
+
+    classes.each do |cl|
+      # Convert class name to Ruby case, e.g. ItemSearch => item_search.
+      #
+      class_name = cl.to_s.sub( /^.+::/, '' )
+      uncamelised_name = Amazon.uncamelise( class_name )
+
+      # Define the module method counterpart of each operation.
+      #
+      module_eval %Q(
+	def AWS.#{uncamelised_name}(*params)
+	  # Instantiate an object of the desired operational class.
+	  #
+	  op = #{cl.to_s}.new( *params )
+
+	  # Attempt a search for the given operation using its default
+	  # response group types.
+	  #
+	  results = Search::Request.new.search( op )
+	  yield results if block_given?
+	  return results
+
+	end
+      )
+    end
+
   end
 
 end