sucker 1.3.0.pre → 1.3.0.pre.1

data/lib/sucker.rb

@@ -17,6 +17,6 @@ module Sucker
   #     :secret => 'API SECRET')
   #
   def self.new(args={})
-    Sucker::Request.new(args)
+    Request.new(args)
   end
 end

data/lib/sucker.rbc

@@ -141,7 +141,7 @@ x
 3
 new
 i
-45
+43
 23
 0
 10
@@ -159,32 +159,30 @@ i
 45
 2
 3
-43
-4
 13
 71
-5
+4
 47
 9
-39
+37
 47
 49
-6
+5
 0
 13
 20
 0
 47
 49
-7
+6
 1
 15
 8
-44
+42
 20
 0
 49
-5
+4
 1
 11
 I
@@ -197,7 +195,7 @@ I
 1
 n
 p
-8
+7
 x
 4
 Hash
@@ -205,12 +203,9 @@ x
 16
 new_from_literal
 x
-6
-Sucker
-n
-x
 7
 Request
+n
 x
 3
 new
@@ -231,7 +226,7 @@ e
 I
 14
 I
-2d
+2b
 x
 44
 /Users/hakanensari/code/sucker/lib/sucker.rb

data/lib/sucker/parameters.rb

@@ -15,10 +15,10 @@ module Sucker #:nodoc:
     end
 
     def normalize
-      inject({}) do |hash, key_value|
-        key, value = key_value
-        value = value.is_a?(Array) ? value.join(',') : value.to_s
-        hash[key.to_s.camelize] = value
+      inject({}) do |hash, kv|
+        k, v = kv
+        v = v.is_a?(Array) ? v.join(',') : v.to_s
+        hash[k.to_s.camelize] = v
         hash
       end
     end

data/lib/sucker/parameters.rbc

@@ -549,14 +549,14 @@ x
 4
 hash
 x
-9
-key_value
+2
+kv
 x
-3
-key
+1
+k
 x
-5
-value
+1
+v
 x
 6
 inject

data/lib/sucker/request.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'net/http'
-require 'uri'
+require 'openssl'
 
 module Sucker #:nodoc:
 
@@ -36,7 +36,7 @@ module Sucker #:nodoc:
     #     :key    => 'API KEY',
     #     :secret => 'API SECRET')
     #
-    def initialize(args)
+    def initialize(args={})
       args.each { |k, v| send("#{k}=", v) }
     end
 
@@ -48,7 +48,7 @@ module Sucker #:nodoc:
     #     'ItemId'    => '0816614024' }
     #
     def <<(hash)
-      self.parameters.merge!(hash)
+      parameters.merge!(hash)
     end
 
     # Performs a request and returns a response
@@ -56,8 +56,11 @@ module Sucker #:nodoc:
     #   response = worker.get
     #
     def get
-      response = request_through(local_ip) do
-        Net::HTTP.get_response(uri)
+      response = bind_to local_ip do
+        Net::HTTP.start(host) do |http|
+          query = build_signed_query
+          http.get("/onca/xml?#{query}")
+        end
       end
       Response.new(response)
     end
@@ -72,48 +75,20 @@ module Sucker #:nodoc:
     #   worker.version = '2010-06-01'
     #
     def version=(version)
-      self.parameters['Version'] = version
+      parameters['Version'] = version
     end
 
     private
 
-    def build_query
-      parameters.
-        normalize.
-        merge({ 'AWSAccessKeyId' => key }).
-        merge({ 'AssociateTag'   => associate_tag.to_s }).
-        sort.
-        map do |k, v|
-          "#{k}=" + escape(v)
-        end.join('&')
-    end
-
-    def build_signed_query
-      query = build_query
-
-      digest = OpenSSL::Digest::Digest.new('sha256')
-      string = ['GET', host, '/onca/xml', query].join("\n")
-      hmac = OpenSSL::HMAC.digest(digest, secret, string)
-      signature = escape([hmac].pack('m').chomp)
-
-      query + '&Signature=' + signature
-    end
-
-    def escape(value)
-      value.gsub(/([^a-zA-Z0-9_.~-]+)/) do
-        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-      end
-    end
-
-    def host
-      HOSTS[locale]
-    end
-
-    def request_through(local_ip)
+    # I am gently monkey-patching TCPSocket here to be able to bind the request
+    # to a local IP if specified, emulating cURL's interface option. Once a
+    # request is made, I reverse the patch, leaving TCPSOcket in its original
+    # state.
+    def bind_to(local_ip)
       if local_ip
         TCPSocket.instance_eval do
           (class << self; self; end).instance_eval do
-            alias_method :orig_open, :open
+            alias_method :original_open, :open
 
             define_method(:open) do |conn_address, conn_port|
               original_open(conn_address, conn_port, local_ip)
@@ -127,8 +102,8 @@ module Sucker #:nodoc:
       if local_ip
         TCPSocket.instance_eval do
           (class << self; self; end).instance_eval do
-            alias_method :open, :orig_open
-            remove_method :orig_open
+            alias_method :open, :original_open
+            remove_method :original_open
           end
         end
       end
@@ -136,18 +111,35 @@ module Sucker #:nodoc:
       return_value
     end
 
-    def uri
-      URI::HTTP.build(
-        :host   => host,
-        :path   => '/onca/xml',
-        :query  => build_signed_query)
+    def build_query
+      parameters.
+        normalize.
+        merge({ 'AWSAccessKeyId' => key,
+                'AssociateTag'   => associate_tag.to_s }).
+        sort.
+        map { |k, v| "#{k}=" + escape(v) }.
+        join('&')
     end
 
-    def uris
-      locales.map do |locale|
-        self.locale = locale
-        uri.to_s
+    def build_signed_query
+      query = build_query
+
+      digest = OpenSSL::Digest::Digest.new('sha256')
+      string = ['GET', host, '/onca/xml', query].join("\n")
+      hmac = OpenSSL::HMAC.digest(digest, secret, string)
+      signature = escape([hmac].pack('m').chomp)
+
+      query + '&Signature=' + signature
+    end
+
+    def escape(value)
+      value.gsub(/([^a-zA-Z0-9_.~-]+)/) do
+        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
       end
     end
+
+    def host
+      HOSTS[locale]
+    end
   end
 end

data/lib/sucker/request.rbc

@@ -9,7 +9,7 @@ x
 10
 __script__
 i
-46
+55
 5
 7
 0
@@ -28,30 +28,39 @@ i
 1
 1
 15
-99
+5
 7
 3
-65
+64
+47
 49
+1
+1
+15
+99
+7
 4
+65
+49
+5
 2
 13
 99
 12
 7
-5
+6
 12
 7
-6
+7
 12
 65
 12
 49
-7
+8
 4
 15
 49
-5
+6
 0
 15
 2
@@ -66,7 +75,7 @@ I
 0
 n
 p
-8
+9
 s
 8
 net/http
@@ -74,6 +83,9 @@ x
 7
 require
 s
+7
+openssl
+s
 3
 uri
 x
@@ -151,7 +163,7 @@ x
 7
 Request
 i
-289
+275
 5
 66
 65
@@ -426,20 +438,6 @@ i
 49
 26
 4
-15
-99
-7
-48
-7
-49
-65
-67
-49
-25
-0
-49
-26
-4
 11
 I
 6
@@ -451,7 +449,7 @@ I
 0
 n
 p
-50
+48
 x
 5
 HOSTS
@@ -532,13 +530,27 @@ x
 10
 initialize
 i
-8
+22
+23
+0
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+0
+15
 20
 0
 56
-0
+2
 50
-1
+3
 0
 11
 I
@@ -546,12 +558,18 @@ I
 I
 1
 I
-1
+0
 I
 1
 n
 p
-2
+4
+x
+4
+Hash
+x
+16
+new_from_literal
 M
 1
 p
@@ -618,7 +636,7 @@ p
 I
 0
 I
-28
+29
 I
 1b
 x
@@ -640,13 +658,13 @@ p
 I
 -1
 I
-27
+28
 I
-0
+e
 I
-28
+29
 I
-8
+16
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
@@ -672,10 +690,9 @@ x
 2
 <<
 i
-10
+9
 5
-49
-0
+48
 0
 20
 0
@@ -705,13 +722,13 @@ p
 I
 -1
 I
-32
+33
 I
 0
 I
-33
+34
 I
-a
+9
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
@@ -801,7 +818,7 @@ x
 3
 get
 i
-12
+16
 45
 0
 1
@@ -810,12 +827,16 @@ i
 5
 48
 3
-49
 4
-1
+80
+56
+4
+50
+5
+2
 11
 I
-3
+5
 I
 0
 I
@@ -825,7 +846,7 @@ I
 I
 -2
 p
-5
+6
 x
 3
 Net
@@ -834,19 +855,108 @@ x
 4
 HTTP
 x
+4
+host
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
 3
-uri
+get
+i
+25
+57
+19
+0
+15
+5
+48
+0
+19
+1
+15
+20
+0
+7
+1
+20
+1
+47
+101
+2
+63
+2
+49
+3
+1
+11
+I
+6
+I
+2
+I
+1
+I
+1
+n
+p
+4
 x
-12
-get_response
+18
+build_signed_query
+s
+10
+/onca/xml?
+x
+4
+to_s
+x
+3
+get
+p
+7
+I
+0
+I
+3d
+I
+4
+I
+3e
+I
+a
+I
+3f
+I
+19
+x
+52
+/Users/hakanensari/code/sucker/lib/sucker/request.rb
+p
+2
+x
+4
+http
+x
+5
+query
+x
+5
+start
 p
 3
 I
 0
 I
-3c
+3d
 I
-c
+10
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
@@ -873,15 +983,15 @@ p
 I
 -1
 I
-3a
+3b
 I
 0
 I
-3b
+3c
 I
 d
 I
-3e
+42
 I
 2a
 x
@@ -969,11 +1079,11 @@ p
 I
 -1
 I
-42
+46
 I
 0
 I
-43
+47
 I
 21
 x
@@ -992,10 +1102,9 @@ x
 8
 version=
 i
-17
+16
 5
-49
-0
+48
 0
 7
 1
@@ -1035,13 +1144,13 @@ p
 I
 -1
 I
-4a
+4e
 I
 0
 I
-4b
+4f
 I
-11
+10
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
@@ -1064,7 +1173,7 @@ x
 11
 build_query
 i
-66
+56
 5
 48
 0
@@ -1074,7 +1183,7 @@ i
 44
 43
 2
-79
+80
 49
 3
 1
@@ -1089,32 +1198,22 @@ i
 6
 2
 15
-49
-7
-1
-44
-43
-2
-79
-49
-3
-1
 13
 7
-8
+7
 64
 5
 48
-9
+8
 49
-10
+9
 0
 49
 6
 2
 15
 49
-7
+10
 1
 49
 11
@@ -1163,9 +1262,6 @@ key
 x
 3
 []=
-x
-5
-merge
 s
 12
 AssociateTag
@@ -1176,6 +1272,9 @@ x
 4
 to_s
 x
+5
+merge
+x
 4
 sort
 M
@@ -1245,19 +1344,15 @@ x
 1
 +
 p
-7
+5
 I
 0
 I
-51
+55
 I
 2
 I
-56
-I
-a
-I
-57
+5a
 I
 1d
 x
@@ -1285,37 +1380,37 @@ p
 I
 -1
 I
-50
+54
 I
 0
 I
-51
+55
 I
 6
 I
-53
+58
 I
-18
+e
 I
-51
+57
 I
-1b
+19
 I
-54
+58
 I
-30
+26
 I
-51
+55
 I
-3b
+31
 I
-58
+5b
 I
-3e
+34
 I
-51
+55
 I
-42
+38
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
@@ -1531,31 +1626,31 @@ p
 I
 -1
 I
-5b
+5e
 I
 0
 I
-5c
+5f
 I
 6
 I
-5e
+61
 I
 2b
 I
-5f
+62
 I
 41
 I
-60
+63
 I
 53
 I
-61
+64
 I
 68
 I
-63
+66
 I
 74
 x
@@ -1734,7 +1829,7 @@ p
 I
 0
 I
-68
+6b
 I
 27
 x
@@ -1750,11 +1845,11 @@ p
 I
 -1
 I
-66
+69
 I
 0
 I
-67
+6a
 I
 1a
 x
@@ -1813,11 +1908,11 @@ p
 I
 -1
 I
-6c
+6f
 I
 0
 I
-6d
+70
 I
 a
 x
@@ -1980,8 +2075,8 @@ I
 p
 5
 x
-9
-orig_open
+13
+original_open
 x
 4
 open
@@ -2044,11 +2139,11 @@ p
 I
 0
 I
-76
+79
 I
 a
 I
-77
+7a
 I
 17
 x
@@ -2070,11 +2165,11 @@ p
 I
 0
 I
-74
+77
 I
 a
 I
-76
+79
 I
 14
 x
@@ -2090,7 +2185,7 @@ p
 I
 0
 I
-73
+76
 I
 c
 x
@@ -2191,8 +2286,8 @@ x
 4
 open
 x
-9
-orig_open
+13
+original_open
 x
 12
 alias_method
@@ -2204,11 +2299,11 @@ p
 I
 0
 I
-82
+85
 I
 a
 I
-83
+86
 I
 12
 x
@@ -2224,7 +2319,7 @@ p
 I
 0
 I
-81
+84
 I
 c
 x
@@ -2237,39 +2332,39 @@ p
 I
 -1
 I
-70
+73
 I
 0
 I
-71
+74
 I
 4
 I
-72
+75
 I
 e
 I
-71
+74
 I
 10
 I
-7d
+80
 I
 15
 I
-7f
+82
 I
 19
 I
-80
+83
 I
 23
 I
-7f
+82
 I
 25
 I
-88
+8b
 I
 28
 x
@@ -2392,31 +2487,31 @@ p
 I
 -1
 I
-8b
+8e
 I
 0
 I
-8c
+8f
 I
 5
 I
-8f
+92
 I
 e
 I
-8d
+90
 I
 18
 I
-8e
+91
 I
 22
 I
-8f
+92
 I
 2b
 I
-8c
+8f
 I
 2f
 x
@@ -2424,254 +2519,110 @@ x
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
 p
 0
-x
-4
-uris
-M
-1
-n
-n
-x
-4
-uris
-i
-9
-5
-48
-0
-56
-1
-50
-2
-0
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-3
-x
-7
-locales
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-4
-uris
-i
-23
-57
-19
-0
-15
-5
-20
-0
-13
-18
-2
-47
-49
-0
-1
-15
-15
-5
-48
-1
-49
-2
-0
-11
-I
-5
-I
-1
-I
-1
-I
-1
-n
-p
-3
-x
-7
-locale=
-x
-3
-uri
-x
-4
-to_s
-p
-9
-I
-0
-I
-93
-I
-4
-I
-99
-I
-5
-I
-94
-I
-10
-I
-95
-I
-17
-x
-52
-/Users/hakanensari/code/sucker/lib/sucker/request.rb
-p
-1
-x
-6
-locale
-x
-3
-map
-p
-5
-I
--1
-I
-92
-I
-0
-I
-93
-I
-9
-x
-52
-/Users/hakanensari/code/sucker/lib/sucker/request.rb
-p
-0
 p
-53
+51
 I
 2
 I
-a
+b
 I
 5
 I
-10
+11
 I
 e
 I
-b
+c
 I
 18
 I
-c
+d
 I
 22
 I
-d
+e
 I
 2c
 I
-e
+f
 I
 36
 I
-f
+10
 I
 40
 I
-10
+11
 I
 4d
 I
-13
+14
 I
 55
 I
-16
+17
 I
 5d
 I
-19
+1a
 I
 65
 I
-1c
+1d
 I
 6d
 I
-1f
+20
 I
 75
 I
-27
+28
 I
 83
 I
-32
+33
 I
 91
 I
-3a
+3b
 I
 9f
 I
-42
+46
 I
 ad
 I
-4a
+4e
 I
 bb
 I
-4e
+52
 I
 bf
 I
-50
+54
 I
 cd
 I
-5b
+5e
 I
 db
 I
-66
+69
 I
 e9
 I
-6c
+6f
 I
 f7
 I
-70
+73
 I
 105
 I
-8b
+8e
 I
 113
-I
-92
-I
-121
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb
@@ -2685,7 +2636,7 @@ p
 I
 2
 I
-9
+a
 I
 1d
 x
@@ -2697,7 +2648,7 @@ x
 13
 attach_method
 p
-7
+9
 I
 0
 I
@@ -2709,9 +2660,13 @@ I
 I
 12
 I
-6
+5
+I
+1b
+I
+7
 I
-2e
+37
 x
 52
 /Users/hakanensari/code/sucker/lib/sucker/request.rb