asin 0.6.0 → 0.6.1

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== 0.6.1
+
+* fix error when passing nil to config values
+
+== 0.6.0
+
+* change lookup method - pull request https://github.com/phoet/asin/pull/8
+
+== 0.5.1
+
+* fix for https://github.com/phoet/asin/issues/7
+
 == 0.5.0
 
 * move client to own file

data/README.rdoc

@@ -5,7 +5,7 @@ Build: http://travis-ci.org/phoet/asin.png
 
 ASIN is a simple, extensible wrapper for parts of the REST-API of Amazon Product Advertising API (aka Associates Web Service aka Amazon E-Commerce Service).
 
-For more information on the REST calls, have a look at the whole Amazon E-Commerce-API[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/].
+For more information on the REST calls, have a look at the whole Amazon E-Commerce-API[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html].
 
 Have a look at the RDOC[http://rdoc.info/projects/phoet/asin] for this project, if you like browsing some docs.
 
@@ -54,14 +54,13 @@ With the latest version of the Product Advertising API you need to include your
     config.associate_tag = 'your-tag'
   end
 
-
 == Usage
 
 ASIN is designed as a module, so you can include it into any object you like:
 
   # require and include
   require 'asin'
-  include ASIN
+  include ASIN::Client
   
   # lookup an ASIN
   lookup '1430218150'

data/lib/asin/client.rb

@@ -47,7 +47,7 @@ require 'base64'
 # == Further Configuration
 #
 # If you need more controll over the request that is sent to the
-# Amazon API (http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/),
+# Amazon API (http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html),
 # you can override some defaults or add additional query-parameters to the REST calls:
 #
 #   configure :host => 'webservices.amazon.de'
@@ -165,7 +165,7 @@ module ASIN
     #
     #   search_keywords('nirvana', 'never mind', :SearchIndex => :Music)
     #
-    # Have a look at the different search index values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/]
+    # Have a look at the different search index values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html]
     #
     def search_keywords(*keywords)
       params = keywords.last.is_a?(Hash) ? keywords.pop : {:SearchIndex => :Books, :ResponseGroup => :Medium}
@@ -185,7 +185,7 @@ module ASIN
     #
     #   search(:Keywords => 'nirvana', :SearchIndex => :Music)
     #
-    # Have a look at the different search index values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/]
+    # Have a look at the different search index values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html]
     #
     def search(params={:SearchIndex => :Books, :ResponseGroup => :Medium})
       response = call(params.merge(:Operation => :ItemSearch))
@@ -204,7 +204,7 @@ module ASIN
     #
     #   browse_node('163357', :ResponseGroup => :TopSellers)
     #
-    # Have a look at the different browse node values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/]
+    # Have a look at the different browse node values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html]
     #
     def browse_node(node_id, params={:ResponseGroup => :BrowseNodeInfo})
       response = call(params.merge(:Operation => :BrowseNodeLookup, :BrowseNodeId => node_id))
@@ -223,7 +223,7 @@ module ASIN
     #
     #   create_cart({:asin => '1430218150', :quantity => 1}, {:asin => '1430216263', :quantity => 1, :action => :SaveForLater})
     #
-    # Have a look at the different cart item operation values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/]
+    # Have a look at the different cart item operation values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html]
     #
     def create_cart(*items)
       cart(:CartCreate, create_item_params(items))
@@ -251,7 +251,7 @@ module ASIN
     #
     #   add_items(cart, {:asin => '1430218150', :quantity => 1}, {:asin => '1430216263', :quantity => 1, :action => :SaveForLater})
     #
-    # Have a look at the different cart item operation values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/]
+    # Have a look at the different cart item operation values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html]
     #
     def add_items(cart, *items)
       cart(:CartAdd, create_item_params(items).merge({:CartId => cart.cart_id, :HMAC => cart.hmac}))
@@ -269,7 +269,7 @@ module ASIN
     #
     #   update_items(cart, {:cart_item_id => cart.items.first.CartItemId, :action => :SaveForLater}, {:cart_item_id => cart.items.first.CartItemId, :quantity => 7})
     #
-    # Have a look at the different cart item operation values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/2010-11-01/DG/]
+    # Have a look at the different cart item operation values on the Amazon-Documentation[http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html]
     #
     def update_items(cart, *items)
       cart(:CartModify, create_item_params(items).merge({:CartId => cart.cart_id, :HMAC => cart.hmac}))
@@ -361,8 +361,8 @@ module ASIN
       params[:Service] = :AWSECommerceService
       params[:AWSAccessKeyId] = Configuration.key
 
-      params[:Version] = Configuration.version unless Configuration.version.empty?
-      params[:AssociateTag] = Configuration.associate_tag unless Configuration.associate_tag.empty?
+      params[:Version] = Configuration.version unless Configuration.blank? :version
+      params[:AssociateTag] = Configuration.associate_tag unless Configuration.blank? :associate_tag
 
       # utc timestamp needed for signing
       params[:Timestamp] = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')

data/lib/asin/configuration.rb

@@ -68,7 +68,8 @@ module ASIN
       # Checks if given credentials are valid and raises an error if not.
       #
       def validate_credentials!
-        raise "you have to configure ASIN: 'configure :secret => 'your-secret', :key => 'your-key''" unless @secret && @key
+        raise "you have to configure ASIN: 'configure :secret => 'your-secret', :key => 'your-key'" if blank?(:secret) || blank?(:key)
+        [:host, :item_type, :cart_type, :node_type, :version, :associate_tag].each { |item| raise "nil is not a valid value for #{item}" unless self.send item }
       end
 
       # Resets configuration to defaults
@@ -77,6 +78,13 @@ module ASIN
         init_config(true)
       end
 
+      # Check if a key is set
+      #
+      def blank?(key)
+        val = self.send :key
+        val.nil? || val.empty?
+      end
+
       private()
 
       def init_config(force=false)

data/lib/asin/version.rb

@@ -1,3 +1,3 @@
 module ASIN
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/search_spec.rb

@@ -14,9 +14,12 @@ module ASIN
 
     context "configuration" do
       it "should fail without secret and key" do
-        VCR.use_cassette("bad_configuration", :match_requests_on => [:host, :path]) do
-          lambda { @helper.lookup 'bla' }.should raise_error(RuntimeError)
-        end
+        lambda { @helper.lookup 'bla' }.should raise_error(RuntimeError, "you have to configure ASIN: 'configure :secret => 'your-secret', :key => 'your-key'")
+      end
+
+      it "should fail with configuration key set to nil" do
+        @helper.configure :secret => @secret, :key => @key, :associate_tag => nil
+        lambda { @helper.lookup 'bla' }.should raise_error(RuntimeError, "nil is not a valid value for associate_tag")
       end
 
       it "should fail with wrong configuration key" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000 +02:00
+date: 2011-08-24 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2153806140 !ruby/object:Gem::Requirement
+  requirement: &2153661220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153806140
+  version_requirements: *2153661220
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2153805640 !ruby/object:Gem::Requirement
+  requirement: &2153660720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153805640
+  version_requirements: *2153660720
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &2153805180 !ruby/object:Gem::Requirement
+  requirement: &2153660260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153805180
+  version_requirements: *2153660260
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2153804720 !ruby/object:Gem::Requirement
+  requirement: &2153659800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.2.1
   type: :development
   prerelease: false
-  version_requirements: *2153804720
+  version_requirements: *2153659800
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &2153804260 !ruby/object:Gem::Requirement
+  requirement: &2153659340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153804260
+  version_requirements: *2153659340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153803800 !ruby/object:Gem::Requirement
+  requirement: &2153658880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2153803800
+  version_requirements: *2153658880
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2153803340 !ruby/object:Gem::Requirement
+  requirement: &2153658420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.2.1
   type: :development
   prerelease: false
-  version_requirements: *2153803340
+  version_requirements: *2153658420
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2153802880 !ruby/object:Gem::Requirement
+  requirement: &2153657960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.10.3
   type: :development
   prerelease: false
-  version_requirements: *2153802880
+  version_requirements: *2153657960
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153802420 !ruby/object:Gem::Requirement
+  requirement: &2153657500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2153802420
+  version_requirements: *2153657500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153801960 !ruby/object:Gem::Requirement
+  requirement: &2153657040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153801960
+  version_requirements: *2153657040
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &2153801500 !ruby/object:Gem::Requirement
+  requirement: &2153656580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *2153801500
+  version_requirements: *2153656580
 description: Amazon Simple INterface.
 email:
 - phoetmail@googlemail.com
@@ -150,7 +150,6 @@ files:
 - README.rdoc
 - asin.gemspec
 - cassettes/add_items1430216263.yml
-- cassettes/bad_configuration.yml
 - cassettes/browse_node_599826.yml
 - cassettes/clear_cart.yml
 - cassettes/create_cart_with_asin_1430218150_and_other_asin_1430216263.yml

data/cassettes/bad_configuration.yml

@@ -1,29 +0,0 @@
----
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :get
-    uri: http://webservices.amazon.com:80/onca/xml?AWSAccessKeyId=&ItemId=bla&Operation=ItemLookup&ResponseGroup=Medium&Service=AWSECommerceService&Signature=MXy86F4AyavpzBqeo2e4LHZRzhlBxe/3XS7zXcp0wTQ=&Timestamp=2011-08-02T14:48:00Z&Version=2010-11-01
-    body: !!null 
-    headers: !!null 
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
-      code: 403
-      message: Forbidden
-    headers:
-      date:
-      - Tue, 02 Aug 2011 14:49:25 GMT
-      server:
-      - Server
-      vary:
-      - Accept-Encoding,User-Agent
-      cneonction:
-      - close
-      transfer-encoding:
-      - chunked
-      content-type:
-      - text/plain
-    body: ! '<?xml version="1.0"?>
-
-      <ItemLookupErrorResponse xmlns="http://ecs.amazonaws.com/doc/2010-11-01/"><Error><Code>MissingClientTokenId</Code><Message>Request
-      must contain AWSAccessKeyId or X.509 certificate.</Message></Error><RequestID>a0fca4f4-04b1-489c-a021-0737753cfcab</RequestID></ItemLookupErrorResponse>'
-    http_version: '1.1'