amazonian 0.0.2 → 0.1.0

data/lib/amazonian/version.rb

@@ -1,3 +1,3 @@
 module Amazonian
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/amazonian.rb

@@ -48,20 +48,33 @@ module Amazonian
   def self.asin(asin, params={})
     params = params.merge :Operation => :ItemLookup, :ItemId => asin
     xml    = self.call params
-    Item.new xml
+    Item.new xml['ItemLookupResponse']['Items']['Item']
   end
 
-  private
+  def self.search(query, params={})
+    params = params.merge :Operation => :ItemSearch,
+                          :Keywords => query
+
+    params[:SearchIndex] = :Music if params[:SearchIndex].nil?
+
+    xml = self.call params
+    Search.new xml['ItemSearchResponse']
+  end
+
+  #private
 
   def self.call(params)
     raise "Cannot call the Amazon API without key and secret key." if @@key.blank? || @@secret.blank?
 
     #get the signed query, and assemble the querystring
-    log :debug, "calling with params=#{params}"  if @@debug
+    log :debug, "Started Amazonian request for params: #{params.map {|p| "#{p[0]}=>#{p[1]}" }.join ','}"  if @@debug
 
     #memoize the last request for faster API querying...
     query = assemble_querystring params
-    return Crack::XML.parse @@response.body if query == @@query
+    if query == @@query
+      log :debug, "MEMO'D! Shortcutting API call for dup request."
+      return Crack::XML.parse @@response.body
+    end
     @@query = query
 
     #sign the query
@@ -76,7 +89,9 @@ module Amazonian
 
     log :debug, "Response Code: #{@@response.status}" if @@debug
 
-    raise "Amazon API Error: #{@@response.status}" if @@response.status >= 400
+    #todo, this memo logic is broken....an error code is not always without a body
+    log :error, "Amazon API Error: #{@@response.status}" if @@response.status >= 400
+
     #parse the response and return it
     Crack::XML.parse @@response.body
   end
@@ -88,25 +103,28 @@ module Amazonian
 
     # CGI escape each param
     # signing needs to order the query alphabetically
-    params.map{|key, value| "#{key}=#{CGI.escape(value.to_s)}" }.sort.join('&')
+    params.map{|key, value| "#{key}=#{CGI.escape(value.to_s)}" }.sort.join('&').gsub('+','%20')
   end
 
   def self.sign_query(query)
+    #make a copy... fixme fixme I'm awkward
     q = query.clone
     # UTC timestamp needed for signing
     q <<= '&Timestamp=' << CGI.escape(Time.now.utc.strftime '%Y-%m-%dT%H:%M:%SZ')
 
     # Sign the entire get-request (not just the querystring)
     # possible gotcha if Patron starts using more/different headers.
-    request_to_sign = %Q{GET\n#{@@host}\n#{@@path}\n#{q}}
+    request_to_sign = "GET\n#{@@host}\n#{@@path}\n#{q}"
+
+    "#{q}&Signature=#{sign_request request_to_sign}"
+  end
 
+  def self.sign_request(request_to_sign)
     # Sign it.
     hmac = OpenSSL::HMAC.digest(@@digest, @@secret, request_to_sign)
 
     # Don't forget to remove the newline from base64
-    signature = CGI.escape(Base64.encode64(hmac).chomp)
-
-    "#{q}&Signature=#{signature}"
+    CGI.escape(Base64.encode64(hmac).chomp)
   end
 
   def self.log(severity, message)
@@ -121,17 +139,23 @@ module Amazonian
   # A Hashie::Mash is used for the internal data representation and can be accessed over the +raw+ attribute.
   #
   class Item
-
     attr_reader :raw
-
     def initialize(hash)
-      @raw = Hashie::Mash.new(hash).ItemLookupResponse.Items.Item
+      @raw = Hashie::Mash.new(hash)
     end
 
     def title
       @raw.ItemAttributes.Title
     end
+  end
 
+  class Search
+    attr_reader :items
+    def initialize(hash)
+      @raw = Hashie::Mash.new(hash)
+      @items = []
+      @raw.Items.Item.each {|i| @items.push Amazonian::Item.new(i) }
+    end
   end
 
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Robert L. Carpenter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -07:00
+date: 2010-11-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency