ECS 0.1.6 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.7
+* Instead of RuntimeErrors, the classes for response errors from AWS are now generated dynamically.
+	The name of the dynamic class resembles the AWS error code, so code
+	AWS.ECommerceService.NoExactMatches becomes class ECS::AwseCommerceServiceNoExactMatches.
+
+
 0.1.6
 * Fixed bug #9482 (http://rubyforge.org/tracker/index.php?func=detail&aid=9482&group_id=3190&atid=12267)
 * Fixed bug #9469 (http://rubyforge.org/tracker/index.php?func=detail&aid=9469&group_id=3190&atid=12267)

data/lib/ecs.rb

@@ -13,6 +13,7 @@ module ECS
   Dir[File.join( File.dirname( __FILE__ ), "*.rb" )].each { |f| require f }
 
   require File.join( File.dirname( __FILE__ ), 'ecs', 'operations' )
+  require File.join( File.dirname( __FILE__ ), 'ecs', 'errors' )
   require File.join( File.dirname( __FILE__ ), 'ecs', 'response_groups' )
   require File.join( File.dirname( __FILE__ ), 'ecs', 'help' )
   require File.join( File.dirname( __FILE__ ), 'ecs', 'help_response_group' )
@@ -171,6 +172,7 @@ module ECS
                         #{klass_name}"
       #puts string_to_eval
       klass = instance_eval( string_to_eval, __FILE__, __LINE__ )
+      ECS::ResponseGroups[klass_name] = klass
     end
     klass
   end
@@ -190,9 +192,24 @@ module ECS
                           #{klass_name}"
 #          puts string_to_eval
         klass = instance_eval( string_to_eval, __FILE__, __LINE__ )
+        ECS::Operations[klass_name] = klass
       end
       klass
   end
+  def self.resolve_error_klass( name='' )
+      klass_name = ECS::Help.resolve_error_name( name )
+      klass = ECS::Errors[klass_name]
+      if klass.nil?
+        string_to_eval = "class #{klass_name.to_s} < RuntimeError
+                          end
+                          #{klass_name}"
+#          puts string_to_eval
+        klass = eval( string_to_eval, binding, __FILE__, __LINE__ )
+        ECS::Errors[klass_name] = klass
+      end
+      klass
+  end
+
   
   def self.xml_for_parameters( parameters={}, force=false )
     # if you pass a block to this method, the XML::Document object

data/lib/ecs/errors.rb

@@ -0,0 +1,39 @@
+#!/usr/local/bin/ruby
+
+
+module ECS
+  class Errors
+    @@klasses = {}
+
+    def self.clear
+      @@klasses = {}
+    end
+
+    def self.[]=( ideal, actual )
+      self.clear unless @@klasses.is_a?( Hash )
+      @@klasses[( ideal.is_a?( Class ) ? ideal.name : ideal.to_s ).to_sym] = actual.is_a?( Class ) ? actual : actual.class
+    end
+
+    def self.[]( ideal )
+      self.clear unless @@klasses.is_a?( Hash )
+      @@klasses[( ideal.is_a?( Class ) ? ideal.name : ideal.to_s ).to_sym]
+    end
+    
+    def self.method_missing( meth, *args )
+      #You can send anything to ECS::Errors that you can send to a hash
+      #If there is a conflict between the hash's (@@klasses) method name and
+      #the ECS::Errors module's method name, you can call the method with o_ prepended
+      #
+      # E.G.
+      #
+      # ECS::Errors.include?( something ) # => calls the include? method on ECS::Errors
+      # ECS::Errors.o_include?( something ) # => calls the include? method on the @@klasses class variable
+      @@klasses = {} unless @@klasses.is_a?( Hash )
+      if meth == :each
+        @@klasses.each { |ideal,actual| yield( ideal, actual ) }
+      else
+        @@klasses.send( (meth.to_s =~ /^o_(.*)/ ? $1.to_sym : meth), *args )
+      end
+    end
+  end
+end

data/lib/ecs/help.rb

@@ -60,8 +60,8 @@ module ECS
       xml.find( '//Errors/Error' ).each do |error_node|
         begin
           m = error_node.Message.content
-          c = error_node.Code.content.gsub( /[\.:\s,\-_]/, '' )
-          errors << RuntimeError.new( m )
+          c = ECS.resolve_error_klass( error_node.Code.content )
+          errors << c.new( m )
         rescue Exception => e
         end
       end
@@ -112,6 +112,9 @@ module ECS
       @available_response_groups
     end
 
+    def self.resolve_error_name( t )
+      t.gsub( /[\.\s:]+/, '' ).camel_case
+    end
 
     def self.resolve_operation_name( t )
       t =~ /::([^:]*)$/ ? $1 : t

data/test/unit/ecs/errors_test.rb

@@ -0,0 +1,65 @@
+#!/usr/local/bin/ruby
+
+require 'test/unit'
+require "#{File.expand_path( File.dirname( __FILE__ ) )}/../unit_test_setup"
+
+class ECSErrorsTest < Test::Unit::TestCase
+  def setup
+    @@initial_errors = {} ; ECS::Errors.each { |ideal,actual| @@initial_errors[ideal] = actual }
+    ECS::Errors.clear
+  end
+  def teardown
+    @@initial_errors.each { |ideal,actual| ECS::Errors[ideal] = actual }
+  end
+
+  def test_exists
+    assert_nothing_raised do
+      ECS::Errors
+
+    end
+  end
+
+  def test_add
+    assert_equal nil, ECS::Errors[:AKlass]
+    assert_nothing_raised do
+      ECS::Errors['AKlass'] = Fixnum
+    end
+    assert_equal Fixnum, ECS::Errors[:AKlass]
+    assert_equal Fixnum, ECS::Errors['AKlass']
+  end
+
+
+  def test_clear
+    assert_equal 0, ECS::Errors.size
+    ECS::Errors['A'] = Fixnum
+    ECS::Errors['B'] = String
+    ECS::Errors['C'] = File
+
+    assert_equal 3, ECS::Errors.size
+    assert_nothing_raised do
+      ECS::Errors.clear
+    end
+    assert_equal 0, ECS::Errors.size
+  end
+
+  def test_each
+    ECS::Errors['A'] = Fixnum
+    ECS::Errors['B'] = String
+    ECS::Errors['C'] = File
+    assert_equal 3, ECS::Errors.size
+    ECS::Errors.each do |ideal,actual|
+      assert [ :A, :B, :C ].include?( ideal )
+      assert_equal Class, actual.class
+    end
+  end
+ 
+ 
+  def test_actual_class
+    ECS::Errors['A'] = "Fixnum"
+    assert_equal String, ECS::Errors[:A]
+    assert_equal String, ECS::Errors['A']
+
+    ECS::Errors['A'] = Fixnum
+    assert_equal Fixnum, ECS::Errors['A']
+  end
+end

data/test/unit/ecs/help_test.rb

@@ -99,6 +99,14 @@ class ECSBrowseNodeLookupTest < Test::Unit::TestCase
     
   end
 
+  def test_resolve_operation_name
+    assert_equal 'CrazyClass', ECS::Help.resolve_operation_name( 'Some::CrazyClass' )
+  end
+  def test_resolve_error_name
+    assert_equal 'AwsInternalError', ECS::Help.resolve_error_name( 'AWS.InternalError' )
+  end
+
+
   def test_subclass
     h = ECS.help( :HelpType => 'Operation', :About => 'BrowseNodeLookup' )
     b = ECS.browse_node_lookup( :BrowseNodeId => 23 )
@@ -574,7 +582,8 @@ class ECSBrowseNodeLookupTest < Test::Unit::TestCase
   def test_errors
     h = ECS.something_ridiculous
     assert_equal 1, h.errors.size
-    assert_equal RuntimeError, h.errors.first.class
+    assert h.errors.first.class.ancestors.include?( RuntimeError )
+    assert_equal ECS::AwsInvalidOperationParameter, h.errors.first.class
     assert_match /^The Operation parameter is invalid\. Please modify the Operation parameter and retry\. Valid values for the Operation parameter/, h.errors.first.message
 
     h = ECS.help( :HelpType => 'Operation' )
@@ -584,6 +593,11 @@ class ECSBrowseNodeLookupTest < Test::Unit::TestCase
 
     h = ECS.help( :HelpType => 'Operation', :About => 'BrowseNodeLookup' )
     assert_equal 0, h.errors.size
+
+
+    h = ECS.search_Books_by_Author( 'veli matti karkainnen' )
+    assert_equal 1, h.errors.size
+    assert_equal ECS::AwseCommerceServiceNoExactMatches, h.errors.first.class
   end
 
 

data/test/unit/ecs_test.rb

@@ -399,6 +399,17 @@ class ECSTest < Test::Unit::TestCase
     assert_equal Class, ECS::Operations[:Stinky].class
     assert_equal klass, ECS::Operations[:Stinky]
   end
+  def test_resolve_error_klass
+    assert_equal NilClass, ECS::Errors[:Stinky].class
+    klass = nil
+    assert_nothing_raised do
+      klass = ECS.resolve_error_klass( 'StinkyError' )
+    end
+    assert !klass.nil?
+    assert_equal Class, klass.class
+    assert_equal Class, ECS::Errors[:StinkyError].class
+    assert_equal klass, ECS::Errors[:StinkyError]
+  end
   
   
   def test_api_version

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ECS
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
-date: 2007-03-22 00:00:00 -07:00
+  version: 0.1.7
+date: 2007-04-10 00:00:00 -07:00
 summary: A Ruby interface to Amazon's E-Commerce Service.
 require_paths: 
 - lib
@@ -32,6 +32,7 @@ files:
 - lib/ecs.rb
 - lib/libxml_additions.rb
 - lib/string_additions.rb
+- lib/ecs/errors.rb
 - lib/ecs/help.rb
 - lib/ecs/help_response_group.rb
 - lib/ecs/operations.rb
@@ -42,6 +43,7 @@ files:
 - test/unit/libxml_additions_test.rb
 - test/unit/string_additions_test.rb
 - test/unit/unit_test_setup.rb
+- test/unit/ecs/errors_test.rb
 - test/unit/ecs/help_response_group_test.rb
 - test/unit/ecs/help_test.rb
 - test/unit/ecs/operations_test.rb
@@ -57,6 +59,7 @@ test_files:
 - test/unit/libxml_additions_test.rb
 - test/unit/string_additions_test.rb
 - test/unit/unit_test_setup.rb
+- test/unit/ecs/errors_test.rb
 - test/unit/ecs/help_response_group_test.rb
 - test/unit/ecs/help_test.rb
 - test/unit/ecs/operations_test.rb