amazon-ecs 2.1.1 → 2.2.0

data/README

@@ -21,16 +21,22 @@ For HPricot dependency implementation, please install 1.2.x version or checkout
 
     require 'amazon/ecs'
 	
-    # set the default options; options will be camelized and converted to REST request parameters.
-    Amazon::Ecs.options = {:aWS_access_key_id => '[your access key]'}
-
-    # to generate signed requests include your secret key:
-    Amazon::Ecs.options = {:aWS_access_key_id => '[your developer token]', :aWS_secret_key => '[your secret access key]'}
+    # Set the default options; options will be camelized and converted to REST request parameters.
+    # associate_tag and AWS_access_key_id are required options, associate_tag is required option
+    # since API version 2011-08-01. 
+    #
+    # To sign your request, include AWS_secret_key. 
+    Amazon::Ecs.options = {
+      :associate_tag => '[your associate tag]',
+      :AWS_access_key_id => '[your developer token]',       
+      :AWS_secret_key => '[your secret access key]'
+    }
 
     # alternatively,
     Amazon::Ecs.configure do |options|
-        options[:aWS_access_key_id] = '[your access key]'
-        options[:aWS_secret_key] = '[you secret key]'
+      options[:associate_tag] = '[your associate tag]'
+      options[:AWS_access_key_id] = '[your access key]'
+      options[:AWS_secret_key] = '[you secret key]'
     end
 
     # options provided on method call will merge with the default options

data/lib/amazon/ecs.rb

@@ -32,13 +32,15 @@ module Amazon
   class RequestError < StandardError; end
   
   class Ecs
-    SERVICE_URLS = {:us => 'http://ecs.amazonaws.com/onca/xml?',
-        :uk => 'http://ecs.amazonaws.co.uk/onca/xml?',
-        :ca => 'http://ecs.amazonaws.ca/onca/xml?',
-        :de => 'http://ecs.amazonaws.de/onca/xml?',
-        :jp => 'http://ecs.amazonaws.jp/onca/xml?',
-        :fr => 'http://ecs.amazonaws.fr/onca/xml?',
-        :it => 'http://ecs.amazonaws.it/onca/xml?'
+    SERVICE_URLS = {
+        :us => 'http://ecs.amazonaws.com/onca/xml',
+        :uk => 'http://ecs.amazonaws.co.uk/onca/xml',
+        :ca => 'http://ecs.amazonaws.ca/onca/xml',
+        :de => 'http://ecs.amazonaws.de/onca/xml',
+        :jp => 'http://ecs.amazonaws.jp/onca/xml',
+        :fr => 'http://ecs.amazonaws.fr/onca/xml',
+        :it => 'http://webservices.amazon.it/onca/xml',
+        :cn => 'http://webservices.amazon.cn/onca/xml'
     }
     
     OPENSSL_DIGEST_SUPPORT = OpenSSL::Digest.constants.include?( 'SHA256' ) ||
@@ -47,7 +49,7 @@ module Amazon
     OPENSSL_DIGEST = OpenSSL::Digest::Digest.new( 'sha256' ) if OPENSSL_DIGEST_SUPPORT
     
     @@options = {
-      :version => "2010-10-01",
+      :version => "2011-08-01",
       :service => "AWSECommerceService"
     }
     
@@ -126,6 +128,10 @@ module Amazon
       end
       Response.new(res.body)
     end
+    
+    def self.validate_request(opts) 
+      raise Amazon::RequestError, "" if opts[:associate_tag]
+    end
 
     # Response object returned after a REST call to Amazon service.
     class Response
@@ -216,7 +222,7 @@ module Amazon
         request_url = SERVICE_URLS[country.to_sym]
         raise Amazon::RequestError, "Invalid country '#{country}'" unless request_url
 
-        secret_key = opts.delete(:aWS_secret_key)
+        secret_key = opts.delete(:AWS_secret_key)
         request_host = URI.parse(request_url).host
         
         qs = ''
@@ -243,11 +249,9 @@ module Amazon
         unless secret_key.nil?
           request_to_sign="GET\n#{request_host}\n/onca/xml\n#{qs}"
           signature = "&Signature=#{sign_request(request_to_sign, secret_key)}"
-        else
-          raise Amazon::RequestError, "Must provide aWS_secret_key to sign request"
         end
 
-        "#{request_url}#{qs}#{signature}"
+        "#{request_url}?#{qs}#{signature}"
       end
       
       def self.url_encode(string)

data/test/amazon/ecs_test.rb

@@ -15,9 +15,13 @@ class Amazon::EcsTest < Test::Unit::TestCase
   
   Amazon::Ecs.configure do |options|
     options[:response_group] = 'Large'
-    options[:aWS_access_key_id] = AWS_ACCESS_KEY_ID
-    options[:aWS_secret_key] = AWS_SECRET_KEY
+    options[:AWS_access_key_id] = AWS_ACCESS_KEY_ID
+    options[:AWS_secret_key] = AWS_SECRET_KEY
+    options[:associate_tag] = 'bookjetty-20'
   end
+  
+  # To print debug information
+  # Amazon::Ecs.debug = true
 
   # Test item_search
   def test_item_search
@@ -31,7 +35,6 @@ class Amazon::EcsTest < Test::Unit::TestCase
   end
   
   def test_item_search_with_special_characters
-      Amazon::Ecs.debug = true
     resp = Amazon::Ecs.item_search('()*&^%$')
     assert resp.is_valid_request?,
       "Not a valid request"
@@ -185,4 +188,18 @@ class Amazon::EcsTest < Test::Unit::TestCase
     assert_equal resp.total_results,  dumped_resp.total_results
     assert_equal resp.total_pages,    dumped_resp.total_pages
   end
+  
+  def test_other_service_urls
+    Amazon::Ecs::SERVICE_URLS.each do |key, value|
+      next if key == :us
+      
+      begin
+        resp = Amazon::Ecs.item_search('ruby', :country => key)
+        assert resp, "#{key} service url (#{value}) is invalid"
+      rescue => e
+        assert false, "'#{key}' service url (#{value}) is invalid. Error: #{e}"
+        puts e.backtrace
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-ecs
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 +08:00
+date: 2011-09-06 00:00:00.000000000 +08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165162400 !ruby/object:Gem::Requirement
+  requirement: &2156946340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165162400
+  version_requirements: *2156946340
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &2165161920 !ruby/object:Gem::Requirement
+  requirement: &2156945860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2165161920
+  version_requirements: *2156945860
 description: Generic Amazon Product Advertising Ruby API
 email: herryanto@gmail.com
 executables: []