ruby-aaws 0.5.0 → 0.5.1

data/NEWS

@@ -1,7 +1,22 @@
-$Id: NEWS,v 1.16 2009/02/20 00:37:15 ianmacd Exp $
+$Id: NEWS,v 1.17 2009/03/28 23:04:22 ianmacd Exp $
 
 
-0.5.0 - 2009-01-20
+0.5.1 - 2009-03-29
+------------------
+
+1. Catch Errno::EPIPE on server connections (Errno::ECONNRESET was already
+   caught). This can occur when the connection times out due to lack of use.
+   Running Ruby in debug mode will print the error message text when such an
+   exception is caught.
+
+2. The version of the AWS API used is now 2009-02-01, the latest at the time
+   of writing.
+
+3. The sequence numbering of shopping cart items incorrectly started from 2
+   instead of 1, but didn't cause a problem in practice.
+
+
+0.5.0 - 2009-02-20
 ------------------
 
 1. The configuration files (/etc/amazonrc and typically ~/.amazonrc) are now

data/README

@@ -1,4 +1,4 @@
-$Id: README,v 1.19 2009/02/20 00:37:15 ianmacd Exp $
+$Id: README,v 1.20 2009/03/28 23:04:23 ianmacd Exp $
 
 
 Introduction
@@ -79,10 +79,10 @@ Please obtain and use an AWS Access Key ID instead.
 API version
 -----------
 
-Ruby/AWS currently requests the 2009-01-06 revision of the AWS API when
+Ruby/AWS currently requests the 2009-02-01 revision of the AWS API when
 performing its operations:
 
-  http://docs.amazonwebservices.com/AWSECommerceService/2009-01-06/DG/
+  http://docs.amazonwebservices.com/AWSECommerceService/2009-02-01/DG/
 
 However, a different version can be requested via the 'api' parameter in the
 user configuration file.

data/README.rdoc

@@ -1,5 +1,5 @@
 #--
-# $Id: README.rdoc,v 1.21 2009/02/20 00:45:17 ianmacd Exp $
+# $Id: README.rdoc,v 1.22 2009/03/28 23:04:23 ianmacd Exp $
 #++
 #
 #
@@ -123,16 +123,16 @@
 #
 # == Download
 #
-# Version 0.5.0
-# === {gzip'ed tar archive}[http://www.caliban.org/files/ruby/ruby-aws-0.5.0.tar.gz]
-# === {Ruby Gem}[http://www.caliban.org/files/ruby/ruby-aaws-0.5.0.gem]
-# === {Fedora 9 RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-0.5.0-1.fc9.noarch.rpm]
-# === {Fedora 9 doc RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-doc-0.5.0-1.fc9.noarch.rpm]
-# === {Fedora 9 source RPM}[http://www.caliban.org/files/redhat/SRPMS/ruby-aws-0.5.0-1.fc9.src.rpm]
+# Version 0.5.1
+# === {gzip'ed tar archive}[http://www.caliban.org/files/ruby/ruby-aws-0.5.1.tar.gz]
+# === {Ruby Gem}[http://www.caliban.org/files/ruby/ruby-aaws-0.5.1.gem]
+# === {Fedora 9 RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-0.5.1-1.fc9.noarch.rpm]
+# === {Fedora 9 doc RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-doc-0.5.1-1.fc9.noarch.rpm]
+# === {Fedora 9 source RPM}[http://www.caliban.org/files/redhat/SRPMS/ruby-aws-0.5.1-1.fc9.src.rpm]
 # 
 # 
 # ---
 # Author::   Ian Macdonald <mailto:ian@caliban.org>
-# Version::  0.5.0
+# Version::  0.5.1
 # Copyright:: (C) 2008-2009 Ian Macdonald
 # Licence::  GPL[http://www.gnu.org/copyleft/gpl.html]

data/lib/amazon/aws.rb

@@ -1,4 +1,4 @@
-# $Id: aws.rb,v 1.84 2009/02/19 16:01:11 ianmacd Exp $
+# $Id: aws.rb,v 1.89 2009/03/28 23:04:23 ianmacd Exp $
 #
 #:include: ../../README.rdoc
 
@@ -12,7 +12,7 @@ module Amazon
     require 'rexml/document'
 
     NAME = '%s/%s' % [ Amazon::NAME, 'AWS' ]
-    VERSION = '0.4.4'
+    VERSION = '0.5.1'
     USER_AGENT = '%s %s' % [ NAME, VERSION ]
 
     # Default Associate tags to use per locale.
@@ -30,7 +30,7 @@ module Amazon
     # changed via the user configuration file.
     #
     SERVICE = { 'Service' => 'AWSECommerceService',
-		'Version' => '2009-01-06'
+		'Version' => '2009-02-01'
     }
 
     # Maximum number of 301 and 302 HTTP responses to follow, should Amazon
@@ -124,7 +124,8 @@ module Amazon
       # just not passed by here recently), the HTTP connection to the server
       # will probably have timed out.
       #
-      rescue Errno::ECONNRESET
+      rescue Errno::ECONNRESET, Errno::EPIPE => error
+	Amazon.dprintf( 'Connection to server lost: %s. Retrying...', error )
 	conn = request.reconnect.conn
 	retry
       end
@@ -646,7 +647,14 @@ module Amazon
 	  #
 	  op_str = 'Item' if op_str =~ /^Cart/
 
-	  all_parameters = [ params ].concat( b_params )
+	  all_parameters = b_params
+
+	  # 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?
+
 	  params = {}
 
 	  all_parameters.each_with_index do |hash, index|

data/test/tc_shopping_cart.rb

@@ -1,4 +1,4 @@
-# $Id: tc_shopping_cart.rb,v 1.5 2008/07/05 14:18:03 ianmacd Exp $
+# $Id: tc_shopping_cart.rb,v 1.6 2009/03/27 14:00:22 ianmacd Exp $
 #
 
 require 'test/unit'
@@ -23,7 +23,7 @@ class TestShoppingCart < AWSTest
     # Create a cart with three items. The last two are given as multiple
     # single-element hashes. MergeCart is false.
     #
-    cart.cart_create( :ASIN, 'B00151HZA6', 3, false,
+    cart.cart_create( :ASIN, 'B001CB0UJC', 3, false,
 		      { 'B000WC4AH0' => 2 },
 		      { 'B0006L16N8' => 1 } )
     items = cart.items
@@ -31,7 +31,7 @@ class TestShoppingCart < AWSTest
     # Check that the quantities match what we expect.
     #
     assert_equal( 3, items.size )
-    item = items.find { |item| item.asin == 'B00151HZA6'  }
+    item = items.find { |item| item.asin == 'B001CB0UJC'  }
     assert_equal( '3', item.quantity[0] )
     item = items.find { |item| item.asin == 'B000WC4AH0'  }
     assert_equal( '2', item.quantity[0] )
@@ -70,7 +70,7 @@ class TestShoppingCart < AWSTest
     # hash. MergeCart is true. Cart#create is used as an alias of
     # Cart#cart_create.
     #
-    cart.create( :ASIN, 'B00151HZA6', 1, true,
+    cart.create( :ASIN, 'B001CB0UJC', 1, true,
 		 { 'B000WC4AH0' => 2,
 		   'B0006L16N8' => 3 } )
     items = cart.items
@@ -78,7 +78,7 @@ class TestShoppingCart < AWSTest
     # Check that the quantities match what we expect.
     #
     assert_equal( 3, items.size )
-    item = items.find { |item| item.asin == 'B00151HZA6'  }
+    item = items.find { |item| item.asin == 'B001CB0UJC'  }
     assert_equal( '1', item.quantity[0] )
     item = items.find { |item| item.asin == 'B000WC4AH0'  }
     assert_equal( '2', item.quantity[0] )
@@ -125,10 +125,10 @@ class TestShoppingCart < AWSTest
 
     # Modify an item quantity.
     #
-    cart.cart_modify( :ASIN, 'B00151HZA6', 2 )
+    cart.cart_modify( :ASIN, 'B001CB0UJC', 2 )
     items = cart.items
     assert_equal( 8, items.size )
-    item = items.find { |item| item.asin == 'B00151HZA6'  }
+    item = items.find { |item| item.asin == 'B001CB0UJC'  }
     assert_equal( '2', item.quantity[0] )
 
     # Move item to 'Save For Later' area.
@@ -174,7 +174,7 @@ class TestShoppingCart < AWSTest
 
     # Move another item to the 'Save For Later' area.
     #
-    cart.cart_modify( :ASIN, 'B00151HZA6', 2, true )
+    cart.cart_modify( :ASIN, 'B001CB0UJC', 2, true )
     items = cart.items
     assert_equal( 6, items.size )
     sfl_items = cart.saved_for_later_items
@@ -182,7 +182,7 @@ class TestShoppingCart < AWSTest
 
     # Now remove that item while it's still in the 'Save For Later' area.
     #
-    cart.cart_modify( :ASIN, 'B00151HZA6', 0 )
+    cart.cart_modify( :ASIN, 'B001CB0UJC', 0 )
     items = cart.items
     assert_equal( 6, items.size )
     sfl_items = cart.saved_for_later_items

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-aaws
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ian Macdonald
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 +01:00
+date: 2009-03-29 00:00:00 +01:00
 default_executable: 
 dependencies: []