briandunn-a2ws 0.1.9 → 0.1.10

data/Rakefile

@@ -6,12 +6,12 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "a2ws"
     gem.summary = %Q{Wrapper for Amazon Associates Web Service (A2WS).}
-    gem.email = "brianpatrickdunn@gmail.com"
+    gem.email = "andy@shenie.info"
     gem.homepage = "http://github.com/handcrafted/a2ws"
     gem.authors = ["Andy Shen", "Josh Owens"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency('httparty', '>= 0.4.3')
     gem.add_dependency('activesupport', '>= 2.2.2')
-    gem.add_dependency('ruby-hmac')
   end
 
 rescue LoadError

data/a2ws.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{a2ws}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Shen", "Josh Owens"]
-  s.date = %q{2009-08-04}
-  s.email = %q{brianpatrickdunn@gmail.com}
+  s.date = %q{2009-06-01}
+  s.email = %q{andy@shenie.info}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -27,43 +27,33 @@ Gem::Specification.new do |s|
      "lib/a2ws/item.rb",
      "lib/a2ws/item_search.rb",
      "lib/a2ws/methodize.rb",
-     "lib/a2ws/signature.rb",
-     "spec/a2ws_live_spec.rb",
      "spec/a2ws_spec.rb",
-     "spec/fixtures/empty_response.yml",
-     "spec/fixtures/single_item_response.yml",
-     "spec/spec_helper.rb",
-     "test/a2ws_test.rb"
+     "spec/spec_helper.rb"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/handcrafted/a2ws}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Wrapper for Amazon Associates Web Service (A2WS).}
   s.test_files = [
-    "spec/a2ws_live_spec.rb",
-     "spec/a2ws_spec.rb",
-     "spec/spec_helper.rb",
-     "test/a2ws_test.rb"
+    "spec/a2ws_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.3"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
-      s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, [">= 0.4.3"])
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0.4.3"])
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0"])
   end
 end

data/lib/a2ws.rb

@@ -4,10 +4,9 @@ require 'activesupport'
 require 'pp'
 
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
-require 'a2ws/signature'
 require 'a2ws/base'
 require 'a2ws/methodize'
 require 'a2ws/item'
 require 'a2ws/image'
 require 'a2ws/item_search'
-require 'a2ws/image_search'
+require 'a2ws/image_search'

data/lib/a2ws/base.rb

@@ -1,10 +1,8 @@
 module A2WS
   class Base
     include HTTParty
-    extend Signature
     base_uri 'http://ecs.amazonaws.com'
     default_params :Service => 'AWSECommerceService', :Operation => 'ItemSearch'
-    @@secret_key = ''
     
     def self.configure
       yield self
@@ -13,21 +11,9 @@ module A2WS
     def self.api_key=(key)
       default_params :AWSAccessKeyId => key
     end
-
-    def self.secret_key=(key)
-      @@secret_key = key 
-    end
-
-    def self.secret_key
-      @@secret_key
-    end
-
-    def self.request_uri
-      '/onca/xml'
-    end
-
+    
     private
-
+    
     def self.downcase_keys(hash)
       new_hash = {}
       hash.keys.each do |key|

data/lib/a2ws/image_search.rb

@@ -4,7 +4,7 @@ module A2WS
   class ImageSearch < Base
     
     def self.find(item) 
-      items = get(request_url, :query => {:ItemId => item, :Operation => "ItemLookup", :ResponseGroup => "Images"})
+      items = get('/onca/xml', :query => {:ItemId => item, :Operation => "ItemLookup", :ResponseGroup => "Images"})
       puts items.inspect
       if items['ItemLookupResponse']["Items"]["Request"]['IsValid'] == 'True'
         items["ItemLookupResponse"]["Items"]["Item"].delete("ImageSets")
@@ -18,4 +18,4 @@ module A2WS
   end
   
   
-end
+end

data/lib/a2ws/item_search.rb

@@ -4,14 +4,11 @@ module A2WS
 
     def self.find(keywords, search_index = :All, options = {})
       options.merge!({:Keywords => keywords, :SearchIndex => search_index})
-      query = sign_request(options)
-      puts query.inspect
-      result = get( request_uri, :query => query )
-      puts result.inspect
+      result = get('/onca/xml', :query => options)
 
       items = result["ItemSearchResponse"]["Items"]
       if items['Request']['IsValid'] == 'True'
-        [ items['Item'] ].flatten.compact.collect do |i|
+        [ items['Item'] ].flatten.collect do |i|
           Item.new downcase_keys(i)
         end
       else

data/spec/a2ws_spec.rb

@@ -7,15 +7,10 @@ describe "A2WS Operations" do
   describe ItemSearch do
 
     it "should survive a search that returns a single result" do
-      ItemSearch.should_receive(:get).and_return(fixture :single_item_response)
+      ItemSearch.should_receive(:get).and_return(YAML.load(File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/single_item_response.yml'))))
       ItemSearch.find('not used')
     end
 
-    it "should return an empty array when there aint no results" do 
-      ItemSearch.should_receive(:get).and_return(fixture :empty_response)
-      ItemSearch.find( "not used" ).should == []
-    end
-
   end
 
 end

data/spec/spec_helper.rb

@@ -7,7 +7,5 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'a2ws'
 
 Spec::Runner.configure do |config|
- def fixture file_name
-   YAML.load(File.open(File.expand_path(File.dirname(__FILE__) + "/fixtures/#{file_name}.yml")))
- end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: briandunn-a2ws
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Andy Shen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,18 +33,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: 
-email: brianpatrickdunn@gmail.com
+email: andy@shenie.info
 executables: []
 
 extensions: []
@@ -67,13 +57,8 @@ files:
 - lib/a2ws/item.rb
 - lib/a2ws/item_search.rb
 - lib/a2ws/methodize.rb
-- lib/a2ws/signature.rb
-- spec/a2ws_live_spec.rb
 - spec/a2ws_spec.rb
-- spec/fixtures/empty_response.yml
-- spec/fixtures/single_item_response.yml
 - spec/spec_helper.rb
-- test/a2ws_test.rb
 has_rdoc: true
 homepage: http://github.com/handcrafted/a2ws
 licenses: 
@@ -99,10 +84,8 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Wrapper for Amazon Associates Web Service (A2WS).
 test_files: 
-- spec/a2ws_live_spec.rb
 - spec/a2ws_spec.rb
 - spec/spec_helper.rb
-- test/a2ws_test.rb

data/lib/a2ws/signature.rb

@@ -1,46 +0,0 @@
-require "hmac"
-require "hmac-sha2"
-require 'cgi'
-
-# reference:
-# http://docs.amazonwebservices.com/AWSECommerceService/2009-07-01/DG/index.html?BasicAuthProcess.html
-# http://docs.amazonwebservices.com/AWSECommerceService/2009-07-01/DG/index.html?Query_QueryAuth.html
-module A2WS
-  module Signature
-    def sign_request(params)
-      params.reverse_merge!(:Timestamp => timestamp, :Version => "2009-07-01")
-      params.merge!(:Signature => build_signature(params, "GET"))
-      params
-    end
-
-    private
-
-    def timestamp
-      Time.now.gmtime.strftime("%Y-%m-%dT%H:%M:%SZ")
-    end
-
-    def build_string_to_sign(params, http_verb)
-      returning [] do |string_to_sign|
-        string_to_sign << http_verb << self.base_uri.gsub(/^https?\:\/\//, "") << self.request_uri
-        canonicalized_params = params.sort_by {|k,v| k.to_s }.map do |( k,v )|
-          "#{aws_escape(k.to_s)}=#{aws_escape(v.to_s)}"
-        end.join("&")
-        string_to_sign << canonicalized_params
-      end.join("\n")
-    end
-
-    def build_signature(params, http_verb)
-      params.merge!(self.default_params)
-
-      hmac = HMAC::SHA256.new(secret_key)
-      hmac.update(build_string_to_sign(params, http_verb))
-
-      Base64.encode64(hmac.digest).chomp
-    end
-
-    def aws_escape(string)
-      CGI.escape(string).gsub("+", "%20").gsub("%7E", "~")
-    end
-  end
-end
-

data/spec/a2ws_live_spec.rb

@@ -1,28 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-include A2WS
-begin
-  conf = YAML::load(open(ENV['HOME'] + '/.a2ws'))
-  A2WS::Base.configure do |config|
-    config.api_key = conf["access_key"]
-    config.secret_key = conf["secret_key"]
-  end
-  describe "A2WS Operations" do
-
-    describe ItemSearch do
-
-      it "should find some items" do
-        ItemSearch.find('Harry Potter', :Books).size.should_not == 0
-      end
-     
-    end
-
-    describe "signing" do
-      ItemSearch.find('Harry Potter', :Books).size.should_not == 0
-    end
-
-  end
-rescue
-  puts "couldn't run live specs. if you want to actually hit up the api, put your key in a yaml file in your home folder.#{$!}"
-end
-

data/spec/fixtures/empty_response.yml

@@ -1,73 +0,0 @@
---- 
-ItemSearchResponse: 
-  OperationRequest: 
-    Arguments: 
-      Argument: 
-      - Name: Operation
-        Value: ItemSearch
-      - Name: Service
-        Value: AWSECommerceService
-      - Name: AWSAccessKeyId
-        Value: AKIAJJES5KN2IIXQSSOA
-      - Name: SearchIndex
-        Value: Books
-      - Name: Keywords
-        Value: assdflasdjfasldkfjasdl
-    RequestId: !str 
-      str: 46ebabe5-abe2-44ff-a010-7b76cb0538c9
-      "@attributes": {}
-
-    RequestProcessingTime: !str 
-      str: "0.0196700000000000"
-      "@attributes": {}
-
-  Items: 
-    TotalPages: !str 
-      str: "0"
-      "@attributes": {}
-
-    Request: 
-      ItemSearchRequest: 
-        DeliveryMethod: !str 
-          str: Ship
-          "@attributes": {}
-
-        Keywords: !str 
-          str: assdflasdjfasldkfjasdl
-          "@attributes": {}
-
-        MerchantId: !str 
-          str: Amazon
-          "@attributes": {}
-
-        Condition: !str 
-          str: New
-          "@attributes": {}
-
-        ResponseGroup: !str 
-          str: Small
-          "@attributes": {}
-
-        SearchIndex: !str 
-          str: Books
-          "@attributes": {}
-
-      Errors: 
-        Error: 
-          Message: !str 
-            str: We did not find any matches for your request.
-            "@attributes": {}
-
-          Code: !str 
-            str: AWS.ECommerceService.NoExactMatches
-            "@attributes": {}
-
-      IsValid: !str 
-        str: "True"
-        "@attributes": {}
-
-    TotalResults: !str 
-      str: "0"
-      "@attributes": {}
-
-  xmlns: http://webservices.amazon.com/AWSECommerceService/2005-10-05

data/spec/fixtures/single_item_response.yml

@@ -1,72 +0,0 @@
---- 
-ItemSearchResponse: 
-  OperationRequest: 
-    Arguments: 
-      Argument: 
-      - Name: Operation
-        Value: ItemSearch
-      - Name: Service
-        Value: AWSECommerceService
-      - Name: AWSAccessKeyId
-        Value: SECRET 
-      - Name: SearchIndex
-        Value: Books
-      - Name: Keywords
-        Value: Something cool from canada
-    RequestId: !str 
-      str: 53b485a7-6bb7-4b3f-9c6d-fa9f2f1293dc
-      "@attributes": {}
-    RequestProcessingTime: !str 
-      str: "0.0551560000000000"
-      "@attributes": {}
-  Items: 
-    TotalPages: !str 
-      str: "1"
-      "@attributes": {}
-    Item: 
-      ItemAttributes: 
-        Author: !str 
-          str: Christopher A. Sawyer
-          "@attributes": {}
-        Title: !str 
-          str: "Something cool from Canada: powersport equipment design requires flowing, edgy forms, an understanding of the role of the rider, and a multi-disciplinary ... article from: Automotive Design & Production"
-          "@attributes": {}
-        ProductGroup: !str 
-          str: Book
-          "@attributes": {}
-        Manufacturer: !str 
-          str: Thomson Gale
-          "@attributes": {}
-      ASIN: !str 
-        str: B000Y757NE
-        "@attributes": {}
-      DetailPageURL: !str 
-        str: http://www.amazon.com/Something-cool-Canada-understanding-multi-disciplinary/dp/B000Y757NE%3FSubscriptionId%3DAKIAJJES5KN2IIXQSSOA%26tag%3Dws%26linkCode%3Dxm2%26camp%3D2025%26creative%3D165953%26creativeASIN%3DB000Y757NE
-        "@attributes": {}
-    Request: 
-      ItemSearchRequest: 
-        DeliveryMethod: !str 
-          str: Ship
-          "@attributes": {}
-        Keywords: !str 
-          str: Something cool from canada
-          "@attributes": {}
-        MerchantId: !str 
-          str: Amazon
-          "@attributes": {}
-        Condition: !str 
-          str: New
-          "@attributes": {}
-        ResponseGroup: !str 
-          str: Small
-          "@attributes": {}
-        SearchIndex: !str 
-          str: Books
-          "@attributes": {}
-      IsValid: !str 
-        str: "True"
-        "@attributes": {}
-    TotalResults: !str 
-      str: "1"
-      "@attributes": {}
-  xmlns: http://webservices.amazon.com/AWSECommerceService/2005-10-05

data/test/a2ws_test.rb

@@ -1,69 +0,0 @@
-require 'rubygems'
-gem 'thoughtbot-shoulda'
-require 'shoulda'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/a2ws')
-include A2WS
-  # black-box testing for generating signatures
-  # reference:
-  # http://docs.amazonwebservices.com/AWSECommerceService/2009-07-01/DG/index.html?rest-signature.html
-class A2WSTest < Test::Unit::TestCase
-  context "Amazon Authentication" do
-    should "occur when finding items" do
-      AAWS.stubs(:timestamp).returns("2009-01-01T12:00:00Z")
-      AAWS.stubs(:build_signature).returns("SIGNATURE")
-      expected_params = has_entries(
-                          :query => has_entries(
-                            :Timestamp => "2009-01-01T12:00:00Z",
-                            :Signature => "SIGNATURE",
-                            :Version => "2009-07-01"
-                          )
-                        )
-      AAWS.expects(:get).with("/onca/xml", expected_params).returns(AAWSCannedResponse.asin_response)
-      AAWS.find("0316769177")
-    end
-
-    should "occur when searching items" do
-      AAWS.stubs(:timestamp).returns("2009-01-01T12:00:00Z")
-      AAWS.stubs(:build_signature).returns("SIGNATURE")
-      expected_params = has_entries(
-                          :query => has_entries(
-                            :Timestamp => "2009-01-01T12:00:00Z",
-                            :Signature => "SIGNATURE",
-                            :Version => "2009-07-01"
-                          )
-                        )
-      AAWS.expects(:get).with("/onca/xml", expected_params).returns(AAWSCannedResponse.search_response)
-      AAWS.search(:Title => "Ruby on Rails")
-    end
-
-    should "properly generate signatures" do
-      AAWS.stubs(:timestamp).returns("2009-01-01T12:00:00Z")
-      AAWS.stubs(:secret_key).returns("1234567890")
-      AAWS.stubs(:default_params).returns({ :Service => "AWSECommerceService",
-                                            :AWSAccessKeyId => "00000000000000000000",
-                                            :ResponseGroup => "ItemAttributes,Offers,Images,Reviews"})
-
-      assert_equal  "Nace+U3Az4OhN7tISqgs1vdLBHBEijWcBeCqL5xN9xg=",
-                    AAWS.sign_request({ :Operation => "ItemLookup",
-                                        :ItemId => "0679722769",
-                                        :Version => "2009-01-06"})[:Signature]
-    end
-
-    should "properly generate signatures with overrides" do
-      AAWS.stubs(:base_uri).returns("http://ecs.amazonaws.co.uk")
-      AAWS.stubs(:timestamp).returns("2009-01-01T12:00:00Z")
-      AAWS.stubs(:secret_key).returns("1234567890")
-      AAWS.stubs(:default_params).returns({ :Service => "AWSECommerceService",
-                                            :AWSAccessKeyId => "00000000000000000000",
-                                            :ResponseGroup => "ItemAttributes,Offers,Images,Reviews,Variations"})
-
-      assert_equal  "TuM6E5L9u/uNqOX09ET03BXVmHLVFfJIna5cxXuHxiU=",
-                    AAWS.sign_request({ :Operation => "ItemSearch",
-                                        :SearchIndex => "DVD",
-                                        :Sort => "salesrank",
-                                        :AssociateTag => "mytag-20",
-                                        :Actor => "Johnny Depp",
-                                        :Version => "2009-01-01"})[:Signature]
-    end
-  end
-end