Fix a bug related to character entities in URLs.

Fingertips · Feb 13, 2012 · 6f6340e · 6f6340e
1 parent 43f0892
commit 6f6340e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/lib/supreme/response.rb b/lib/supreme/response.rb
@@ -50,7 +50,8 @@ def amount
     end
 
     def url
-      text('//URL')
+      # For some reason REXML doesn't process the character entities in the XML
+      text('//URL').gsub('&amp;', '&')
     end
   end
 

diff --git a/lib/supreme/uri.rb b/lib/supreme/uri.rb
@@ -19,7 +19,7 @@ def self.encode_www_form_component(s)
       str = s.to_s
       if RUBY_VERSION < "1.9" && $KCODE =~ /u/i
         str.gsub(/([^ a-zA-Z0-9_.-]+)/) do
-          '%' + $1.unpack('H2' * Rack::Utils.bytesize($1)).join('%').upcase
+          '%' + $1.unpack('H2' * $1.length).join('%').upcase
         end.tr(' ', '+')
       else
         if TBLENCWWWCOMP_.empty?

diff --git a/remote/basic_test.rb b/remote/basic_test.rb
@@ -17,7 +17,7 @@
 
 puts
 puts "Open the following link and complete the transaction: "
-puts transaction.url.gsub('&amp;', '&')
+puts transaction.url
 puts
 
 puts "Waiting 20 seconds for you to complete the payment"

diff --git a/test/api_test.rb b/test/api_test.rb
@@ -88,7 +88,7 @@ def test_fetch
     assert transaction.kind_of?(Supreme::Transaction)
     assert_equal '482d599bbcc7795727650330ad65fe9b', transaction.transaction_id
     assert_equal '123', transaction.amount
-    assert_equal 'https://mijn.postbank.nl/internetbankieren/SesamLoginServlet?sessie=ideal&amp;trxid=003123456789123&amp;random=123456789abcdefgh', transaction.url
+    assert_equal 'https://mijn.postbank.nl/internetbankieren/SesamLoginServlet?sessie=ideal&trxid=003123456789123&random=123456789abcdefgh', transaction.url
     assert !transaction.error?
   end