amazon_sdb 0.5.5 → 0.6.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.0 / 2007-12-28
+* 2 major enhancements
+  * Correct error handling for API's HTTP responses (with tests)
+  * I now have Amazon::SimpleDB, so I can see if it works or not
+
 == 0.5.5 / 2007-12-15
 
 * 2 major enhancements

data/lib/amazon_sdb.rb

@@ -33,7 +33,7 @@ require 'amazon_sdb/exceptions'
 
 module Amazon
   module SDB
-    VERSION = '0.5.5'    
+    VERSION = '0.6.0'    
   end
 end
 

data/lib/amazon_sdb/base.rb

@@ -76,12 +76,27 @@ module Amazon
         errnode = hpricot.at('//Errors/Error')
         return unless errnode
         
-        msg = errnode.at('Message').innerText
-        case errnode.at('Code').innerText
-        when 'InvalidParameterValue'
-          raise InvalidParameterError, msg
-        when 'NumberDomainsExceeded'
-          raise DomainLimitError, msg
+        code = errnode.at('Code').innerText
+        msg = "#{code}: #{errnode.at('Message').innerText}"
+
+        if AUTH_ERROR_CODES.include? code
+          raise AuthError, msg
+        elsif ACCESS_ERROR_CODES.include? code
+          raise AccessError, msg
+        elsif PARAMETER_ERROR_CODES.include? code
+          raise ParameterError, msg
+        elsif QUERY_ERROR_CODES.include? code
+          raise QuerySyntaxError, msg
+        elsif LIMIT_ERROR_CODES.include? code
+          raise LimitError, msg
+        elsif REQUEST_ERROR_CODES.include? code
+          raise RequestError, msg
+        elsif SERVER_ERROR_CODES.include? code
+          raise ServerError, msg
+        elsif TIMEOUT_ERROR_CODES.include? code
+          raise TimeoutError, msg
+        elsif VERSION_ERROR_CODES.include? code
+          raise VersionError, msg
         else
           raise UnknownError, msg
         end
@@ -129,11 +144,16 @@ module Amazon
         url = BASE_PATH + '?' + cgi_encode(options)
 
         # puts "Requesting #{url}" #if $DEBUG
-        open(url) do |f|
-          h = Hpricot.XML(f)
+        begin
+          open(url) do |f|
+            h = Hpricot.XML(f)
 
+            raise_errors h
+            yield h if block_given?
+          end
+        rescue OpenURI::HTTPError => e
+          h = Hpricot.XML(e.io.read)
           raise_errors h
-          yield h if block_given?
         end
       end
 

data/lib/amazon_sdb/exceptions.rb

@@ -1,18 +1,50 @@
 module Amazon
   module SDB
-    class InvalidParameterError < ArgumentError
+    class Error < ::StandardError
     end
     
-    class LimitError < Exception
+    ACCESS_ERROR_CODES = %w{AccessFailure}
+    class AccessError < Error
     end
     
-    class DomainLimitError < LimitError
+    AUTH_ERROR_CODES = %w{AuthFailure AuthMissingFailure InvalidHTTPAuthHeader OptInRequired}
+    class AuthError < Error
     end
     
-    class UnknownError < Exception
+    PARAMETER_ERROR_CODES = %w(InvalidAction InvalidNextToken InvalidParameterError 
+    InvalidParameterCombination InvalidParameterValue MissingAction MissingParameter NoSuchDomain
+    )
+    class ParameterError < Error
     end
     
-    class RecordNotFoundError < Exception
+    QUERY_ERROR_CODES = %w{InvalidNumberPredicates InvalidNumberValueTests InvalidQueryExpression}
+    class QuerySyntaxError < Error
+    end
+    
+    LIMIT_ERROR_CODES = %w{NumberDomainsExceeded NumberDomainAttributesExceeded NumberDomainBytesExceeded NumberDomainBytesExceeeded URITooLong}
+    class LimitError < Error
+    end
+    
+    SERVER_ERROR_CODES = %w{InternalError ServiceOverload ServiceUnavailable}
+    class ServerError < Error
+    end
+    
+    class UnknownError < Error
+    end
+    
+    REQUEST_ERROR_CODES = %w{InvalidHttpRequest InvalidSOAPRequest InvalidURI InvalidService UnsupportedHttpVerb}
+    class RequestError < Error
+    end
+    
+    TIMEOUT_ERROR_CODES = %w{RequestExpired RequestTimeout RequestThrottled}
+    class TimeoutError < Error
+    end
+    
+    VERSION_ERROR_CODES = %w{FeatureDeprecated NoSuchVersion NotYetImplemented}
+    class VersionError < Error
+    end
+    
+    class RecordNotFoundError < Error
     end
   end
 end

data/test/test_amazon_base.rb

@@ -115,14 +115,14 @@ class TestAmazonBase < Test::Unit::TestCase
   def test_create_domain_invalid_param
     @sdb.responses << error_response('InvalidParameterValue', 'Value (X) for parameter DomainName is invalid.')
 
-    assert_raise(Amazon::SDB::InvalidParameterError) { @sdb.create_domain('(X)') }
+    assert_raise(Amazon::SDB::ParameterError) { @sdb.create_domain('(X)') }
     assert_equal 1, @sdb.uris.length
   end
   
   def test_create_domain_limit_error
     @sdb.responses << error_response('NumberDomainsExceeded', 'Domain Limit reached')
     
-    assert_raise(Amazon::SDB::DomainLimitError) { @sdb.create_domain('foo') }
+    assert_raise(Amazon::SDB::LimitError) { @sdb.create_domain('foo') }
   end
   
   def test_delete_domain

data/test/test_exceptions.rb

@@ -0,0 +1,152 @@
+require 'test_sdb_harness'
+
+class TestException < Test::Unit::TestCase
+  def setup
+    @sdb = Amazon::SDB::Base.new 'API_KEY', 'SECRET_KEY' 
+  end
+  
+  def assert_err(code, exception_class)
+    @sdb.responses << error_response(code)
+    assert_raise(exception_class) { @sdb.domains }
+  end
+  
+  def test_access_failure
+    assert_err('AccessFailure', Amazon::SDB::AccessError)
+  end
+  
+  def test_auth_failure
+    assert_err('AuthFailure', Amazon::SDB::AuthError)
+  end
+  
+  def test_auth_missing
+    assert_err('AuthMissingFailure', Amazon::SDB::AuthError)
+  end
+  
+  def test_deprecated
+    assert_err('FeatureDeprecated', Amazon::SDB::VersionError)
+  end
+  
+  def test_internal_error
+    assert_err('InternalError', Amazon::SDB::ServerError)
+  end
+  
+  def test_invalid_action
+    assert_err('InvalidAction', Amazon::SDB::ParameterError)
+  end
+  
+  def test_invalid_http_auth_header
+    assert_err('InvalidHTTPAuthHeader', Amazon::SDB::AuthError)
+  end
+
+  def test_invalid_http_request
+    assert_err('InvalidHttpRequest', Amazon::SDB::RequestError)
+  end
+
+  def test_invalid_param_value
+    assert_err('InvalidParameterValue', Amazon::SDB::ParameterError)
+  end
+  
+  def test_invalid_next_token
+    assert_err('InvalidNextToken', Amazon::SDB::ParameterError)
+  end
+
+  def test_invalid_num_predicates
+    assert_err('InvalidNumberPredicates', Amazon::SDB::QuerySyntaxError)
+  end
+  
+  def test_invalid_number_value_tests
+    assert_err('InvalidNumberValueTests', Amazon::SDB::QuerySyntaxError)
+  end
+  
+  def test_invalid_parameter_combo
+    assert_err('InvalidParameterCombination', Amazon::SDB::ParameterError)
+  end
+  
+  def test_invalid_parameter_value
+    assert_err('InvalidParameterValue', Amazon::SDB::ParameterError)
+  end
+
+  def test_invalid_query_expr
+    assert_err('InvalidQueryExpression', Amazon::SDB::QuerySyntaxError)
+  end
+  
+  def test_invalid_response_groups
+    assert_err('InvalidResponseGroups', Amazon::SDB::UnknownError)
+  end
+  
+  def test_invalid_service
+    assert_err('InvalidService', Amazon::SDB::RequestError)
+  end
+  
+  def test_soap_request
+    assert_err('InvalidSOAPRequest', Amazon::SDB::RequestError)
+  end
+  
+  def test_invalid_uri
+    assert_err('InvalidURI', Amazon::SDB::RequestError)
+  end
+  
+  def test_missing_action
+    assert_err('MissingAction', Amazon::SDB::ParameterError)
+  end
+  
+  def test_missing_parameter
+    assert_err('MissingParameter', Amazon::SDB::ParameterError)
+  end
+  
+  def test_no_such_domain
+    assert_err('NoSuchDomain', Amazon::SDB::ParameterError)
+  end
+     
+  def test_no_such_version
+    assert_err('NoSuchVersion', Amazon::SDB::VersionError)
+  end
+  
+  def test_not_yet_implemented
+    assert_err('NotYetImplemented', Amazon::SDB::VersionError)
+  end
+  
+  def test_num_domains_exceeded
+    assert_err('NumberDomainsExceeded', Amazon::SDB::LimitError)
+  end
+  
+  def test_num_domain_attributes_exceed
+    assert_err('NumberDomainAttributesExceeded', Amazon::SDB::LimitError)
+  end
+  
+  def test_num_domain_bytes_exceed
+    assert_err('NumberDomainBytesExceeded', Amazon::SDB::LimitError)
+  end
+  
+  def test_num_item_attrs_exceed
+    assert_err('NumberDomainBytesExceeded', Amazon::SDB::LimitError)
+  end
+  
+  def test_request_expired
+    assert_err('RequestExpired', Amazon::SDB::TimeoutError)
+  end
+  
+  def test_request_timeout
+    assert_err('RequestTimeout', Amazon::SDB::TimeoutError)
+  end
+
+  def test_request_throttle
+    assert_err('RequestThrottled', Amazon::SDB::TimeoutError)
+  end
+
+  def test_service_overload
+    assert_err('ServiceOverload', Amazon::SDB::ServerError)
+  end
+  
+  def test_service_unavailable
+    assert_err('ServiceUnavailable', Amazon::SDB::ServerError)
+  end
+
+  def test_unsupported_http_verb
+    assert_err('UnsupportedHttpVerb', Amazon::SDB::RequestError)
+  end
+  
+  def test_uri_too_long
+    assert_err('URITooLong', Amazon::SDB::LimitError)
+  end
+end

data/test/test_sdb_harness.rb

@@ -25,7 +25,9 @@ class Amazon::SDB::Base
 end
 
 class Test::Unit::TestCase
-  def error_response(code, msg)
+  def error_response(code, msg=nil)
+    msg ||= "ERROR MESSAGE"
+    
     "<Response> 
     <Errors> 
     <Error> 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amazon_sdb
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
-platform: ""
+  version: 0.6.0
+platform: ruby
 authors: 
 - Jacob Harris
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2007-12-17 00:00:00 -05:00
+date: 2007-12-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.0
     version: 
 description: A ruby wrapper to Amazon's sdb service
 email: harrisj@nytimes.com
@@ -79,12 +79,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nytimes
-rubygems_version: 0.9.5
+rubygems_version: 1.0.0
 signing_key: 
 specification_version: 2
 summary: A ruby wrapper to Amazon's sdb service
 test_files: 
 - test/test_amazon_base.rb
 - test/test_amazon_domain.rb
+- test/test_exceptions.rb
 - test/test_multimap.rb
 - test/test_sdb_harness.rb