amazon-ecs 0.5.6 → 0.5.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.5.7 2009-08-28
+----------------
+* Added support for to sign request using openssl with fallback on ruby-hmac
+
 0.5.6 2009-07-21
 ----------------
 * Update parameter value encoding to support special characters

data/README

@@ -12,7 +12,7 @@ If in the future, there is a change in REST XML output structure,
 no changes will be required on <tt>amazon-ecs</tt> library, 
 instead you just need to change the element path.
 
-Version: 0.5.6
+Version: 0.5.7
 
 == INSTALLATION
 

data/lib/amazon/ecs.rb

@@ -26,6 +26,7 @@ require 'hpricot'
 require 'cgi'
 require 'hmac-sha2'
 require 'base64'
+require 'openssl'
 
 module Amazon
   class RequestError < StandardError; end
@@ -39,6 +40,11 @@ module Amazon
         :fr => 'http://webservices.amazon.fr/onca/xml?'
     }
     
+    OPENSSL_DIGEST_SUPPORT = OpenSSL::Digest.constants.include?( 'SHA256' ) ||
+                             OpenSSL::Digest.constants.include?( :SHA256 )
+    
+    OPENSSL_DIGEST = OpenSSL::Digest::Digest.new( 'sha256' ) if OPENSSL_DIGEST_SUPPORT
+    
     @@options = {
       :version => "2009-01-06",
       :service => "AWSECommerceService"
@@ -245,10 +251,16 @@ module Amazon
       
       def self.sign_request(url, key)
         return nil if key.nil?
-        signature = URI.escape( Base64.encode64( HMAC::SHA256.digest(key, url) ).strip, Regexp.new("[+=]") )
+        
+        if (OPENSSL_DIGEST_SUPPORT)
+          signature = OpenSSL::HMAC.digest(OPENSSL_DIGEST, key, url)
+          signature = [signature].pack('m').chomp
+        else
+          signature = Base64.encode64( HMAC::SHA256.digest(key, url) ).strip
+        end
+        signature = URI.escape(signature, Regexp.new("[+=]"))
         return signature
       end
-      
   end
 
   # Internal wrapper class to provide convenient method to access Hpricot element value.

data/test/amazon/ecs_test.rb

@@ -16,108 +16,111 @@ class Amazon::EcsTest < Test::Unit::TestCase
 
   ## Test item_search
   def test_item_search
-     resp = Amazon::Ecs.item_search('ruby')
-     
-     assert(resp.is_valid_request?)
-     assert(resp.total_results >= 3600)
-     assert(resp.total_pages >= 360)
-     
-     signature_elements = (resp.doc/"arguments/argument").select {|ele| ele.attributes['name'] == 'Signature' }.length
-     assert(signature_elements == 1)
-   end
-   
-   def test_item_search_with_special_characters
-     Amazon::Ecs.debug = true
-     resp = Amazon::Ecs.item_search('()*&^%$')
-     assert(resp.is_valid_request?)
-   end
- 
-   def test_item_search_with_paging
-     resp = Amazon::Ecs.item_search('ruby', :item_page => 2)
-     assert resp.is_valid_request?
-     assert 2, resp.item_page
-   end
- 
-   def test_item_search_with_invalid_request
-     resp = Amazon::Ecs.item_search(nil)
-     assert !resp.is_valid_request?
-   end
- 
-   def test_item_search_with_no_result
-     resp = Amazon::Ecs.item_search('afdsafds')
-     
-     assert resp.is_valid_request?
-     assert_equal "We did not find any matches for your request.", 
-       resp.error
-   end
-   
-   def test_item_search_uk
-     resp = Amazon::Ecs.item_search('ruby', :country => :uk)
-     assert resp.is_valid_request?
-   end
+    resp = Amazon::Ecs.item_search('ruby')
+    
+    assert(resp.is_valid_request?)
+    assert(resp.total_results >= 3600)
+    assert(resp.total_pages >= 360)
+    
+    signature_elements = (resp.doc/"arguments/argument").select do |ele| 
+      ele.attributes['name'] == 'Signature' || ele.attributes['Name'] == 'Signature'
+    end.length
+    
+    assert(signature_elements == 1)
+  end
+      
+  def test_item_search_with_special_characters
+    Amazon::Ecs.debug = true
+    resp = Amazon::Ecs.item_search('()*&^%$')
+    assert(resp.is_valid_request?)
+  end
    
-   def test_item_search_by_author
-     resp = Amazon::Ecs.item_search('dave', :type => :author)
-     assert resp.is_valid_request?
-   end
+  def test_item_search_with_paging
+    resp = Amazon::Ecs.item_search('ruby', :item_page => 2)
+    assert resp.is_valid_request?
+    assert 2, resp.item_page
+  end
    
-   def test_item_get
-     resp = Amazon::Ecs.item_search("0974514055")
-     item = resp.first_item
-         
-     # test get
-     assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", 
-       item.get("itemattributes/title")
-       
-     # test get_array
-     assert_equal ['Dave Thomas', 'Chad Fowler', 'Andy Hunt'], 
-       item.get_array("author")
- 
-     # test get_hash
-     small_image = item.get_hash("smallimage")
-     
-     assert_equal 3, small_image.keys.size
-     assert_match ".jpg", small_image[:url]
-     assert_equal "75", small_image[:height]
-     assert_equal "59", small_image[:width]
-     
-     # test /
-     reviews = item/"editorialreview"
- reviews.each do |review|
-   # returns unescaped HTML content, Hpricot escapes all text values
-   assert Amazon::Element.get_unescaped(review, 'source')
-   assert Amazon::Element.get_unescaped(review, 'content')
- end
-   end
+  def test_item_search_with_invalid_request
+    resp = Amazon::Ecs.item_search(nil)
+    assert !resp.is_valid_request?
+  end
    
-   ## Test item_lookup
-   def test_item_lookup
-     resp = Amazon::Ecs.item_lookup('0974514055')
-     assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", 
-     resp.first_item.get("itemattributes/title")
-   end
+  def test_item_search_with_no_result
+    resp = Amazon::Ecs.item_search('afdsafds')
+    
+    assert resp.is_valid_request?
+    assert_equal "We did not find any matches for your request.", 
+      resp.error
+  end
+  
+  def test_item_search_uk
+    resp = Amazon::Ecs.item_search('ruby', :country => :uk)
+    assert resp.is_valid_request?
+  end
+  
+  def test_item_search_by_author
+    resp = Amazon::Ecs.item_search('dave', :type => :author)
+    assert resp.is_valid_request?
+  end
+  
+  def test_item_get
+    resp = Amazon::Ecs.item_search("0974514055")
+    item = resp.first_item
+        
+    # test get
+    assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", 
+      item.get("itemattributes/title")
+      
+    # test get_array
+    assert_equal ['Dave Thomas', 'Chad Fowler', 'Andy Hunt'], 
+      item.get_array("author")
    
-   def test_item_lookup_with_invalid_request
-     resp = Amazon::Ecs.item_lookup(nil)
-     assert resp.has_error?
-     assert resp.error
-   end
- 
-   def test_item_lookup_with_no_result
-     resp = Amazon::Ecs.item_lookup('abc')
-     
-     assert resp.is_valid_request?
-     assert_match(/ABC is not a valid value for ItemId/, resp.error)
-   end  
+    # test get_hash
+    small_image = item.get_hash("smallimage")
+    
+    assert_equal 3, small_image.keys.size
+    assert_match ".jpg", small_image[:url]
+    assert_equal "75", small_image[:height]
+    assert_equal "59", small_image[:width]
+    
+    # test /
+    reviews = item/"editorialreview"
+    reviews.each do |review|
+      # returns unescaped HTML content, Hpricot escapes all text values
+      assert Amazon::Element.get_unescaped(review, 'source')
+      assert Amazon::Element.get_unescaped(review, 'content')
+    end
+  end
+  
+  ## Test item_lookup
+  def test_item_lookup
+    resp = Amazon::Ecs.item_lookup('0974514055')
+    assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", 
+    resp.first_item.get("itemattributes/title")
+  end
+  
+  def test_item_lookup_with_invalid_request
+    resp = Amazon::Ecs.item_lookup(nil)
+    assert resp.has_error?
+    assert resp.error
+  end
    
-   def test_search_and_convert
-     resp = Amazon::Ecs.item_lookup('0974514055')
-     title = resp.first_item.get("itemattributes/title")
-     authors = resp.first_item.search_and_convert("author")
-     
-     assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", title
-     assert authors.is_a?(Array)
-     assert 3, authors.size
-     assert_equal "Dave Thomas", authors.first.get
-   end  
-end
+  def test_item_lookup_with_no_result
+    resp = Amazon::Ecs.item_lookup('abc')
+    
+    assert resp.is_valid_request?
+    assert_match(/ABC is not a valid value for ItemId/, resp.error)
+  end  
+  
+  def test_search_and_convert
+    resp = Amazon::Ecs.item_lookup('0974514055')
+    title = resp.first_item.get("itemattributes/title")
+    authors = resp.first_item.search_and_convert("author")
+    
+    assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", title
+    assert authors.is_a?(Array)
+    assert 3, authors.size
+    assert_equal "Dave Thomas", authors.first.get
+  end  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ecs
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Herryanto Siatono
@@ -9,7 +9,7 @@ autorequire: name
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 +08:00
+date: 2009-08-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency