amazon-ecs 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.5.6 2009-07-21
+----------------
+* Update parameter value encoding to support special characters
+
 0.5.5 2009-07-18
 ----------------
 * Sign request

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.5
+Version: 0.5.6
 
 == INSTALLATION
 

data/lib/amazon/ecs.rb

@@ -205,14 +205,24 @@ module Amazon
         request_host = URI.parse(request_url).host
         
         qs = ''
-        opts.collect {|a,b| [camelize(a.to_s), b.to_s] }.sort {|c,d| c[0].to_s <=> d[0].to_s}.each {|e| 
+        
+        opts = opts.collect do |a,b| 
+          [camelize(a.to_s), b.to_s] 
+        end
+        
+        opts = opts.sort do |c,d| 
+          c[0].to_s <=> d[0].to_s
+        end
+        
+        opts.each do |e| 
           log "Adding #{e[0]}=#{e[1]}"
           next unless e[1]
           e[1] = e[1].join(',') if e[1].is_a? Array
-          v=URI.encode(e[1].to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          # v = URI.encode(e[1].to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          v = self.url_encode(e[1].to_s)
           qs << "&" unless qs.length == 0
           qs << "#{e[0]}=#{v}"
-        }
+        end
         
         signature = ''
         unless secret_key.nil?
@@ -223,6 +233,12 @@ module Amazon
         "#{request_url}#{qs}#{signature}"
       end
       
+      def self.url_encode(string)
+        string.gsub( /([^a-zA-Z0-9_.~-]+)/ ) do
+          '%' + $1.unpack( 'H2' * $1.size ).join( '%' ).upcase
+        end
+      end
+      
       def self.camelize(s)
         s.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
       end

data/test/amazon/ecs_test.rb

@@ -2,8 +2,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class Amazon::EcsTest < Test::Unit::TestCase
 
-  AWS_ACCESS_KEY_ID = ''
-  AWS_SECRET_KEY = ''
+  AWS_ACCESS_KEY_ID = '0XQXXC6YV2C85DX1BF02'
+  AWS_SECRET_KEY = 'fwLOn0Y/IUXEM8Hk49o7QJV+ryOscbhXRb6CmA5l'
   
   raise "Please specify set your AWS_ACCESS_KEY_ID" if AWS_ACCESS_KEY_ID.empty?
   raise "Please specify set your AWS_SECRET_KEY" if AWS_SECRET_KEY.empty?
@@ -15,104 +15,109 @@ class Amazon::EcsTest < Test::Unit::TestCase
   end
 
   ## 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_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
-  
-  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")
-
-    # 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_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  
+     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
+   
+   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")
+ 
+     # 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_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.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Herryanto Siatono
@@ -9,7 +9,7 @@ autorequire: name
 bindir: bin
 cert_chain: []
 
-date: 2009-07-18 00:00:00 +08:00
+date: 2009-07-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency