ECS 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.1.1
+* Forces ECS API version 2007-02-22
+* Modified ECS.method_missing to understand methods like ECS.search_INDEX_by_PARAMETER
+	This means you can do ECS.search_DVD_by_Actor( 'Carrot Top' )
+	or ECS.search_Books_by_Title( 'Microserfs' )
+* Added ECS.counter to track calls to the web service
+
+
 0.1.0
 * Initial release
 * Forces ECS API version 2007-01-17

data/lib/ecs.rb

@@ -29,6 +29,7 @@ module ECS
   @@cache_directory = ''
   @@cache = true
   @@cache_suffix = 'ecs_cache'
+  @@counter = 0
 
   # libxml-ruby is not able to do XML::Document#find or XML::Node#find with xml returned from Amazon.
   # If you remove the namespace from the xml, it works perfectly
@@ -36,22 +37,23 @@ module ECS
   
   def self.method_missing( meth, *args )
     meth_s = meth.to_s
+    a = *args
     begin
       klass_name = meth_s.camel_case
       instance = nil
-      if meth_s =~ /^(.*)_response_group$/
+      case meth_s
+      when /^(.*)_response_group$/
         instance = self.resolve_response_group_klass( klass_name )
+      when /^search_([^_]*)_by_([^_]*)$/
+        # Allow things like ECS.search_Books_by_Author( 'Marcus Aurelius' )
+        params = { :SearchIndex => $1 }.merge( a.is_a?( Hash ) ? a : { $2.to_sym => a } )
+        instance = self.item_search( params )
       else
         klass = self.resolve_operation_klass( klass_name )
-
-#        string_to_eval = "#{klass_name}.new"
-#        puts "Now going to #{string_to_eval}"
         instance = klass.new
-#        instance = instance_eval( string_to_eval, __FILE__, __LINE__ )
-        instance.parameters = *args
-        instance.parameters = {} unless instance.parameters.is_a?( Hash )
+        instance.parameters = a.is_a?( Hash ) ? a : {}
 
-        # If no ResponsGroup is set, then allow the defaults
+        # If no ResponseGroup is set, then allow the defaults
         unless instance.parameters[:ResponseGroup].nil?
           # Otherwise, be sure :Request is included
           instance.parameters[:ResponseGroup] = [instance.parameters[:ResponseGroup]] unless instance.parameters[:ResponseGroup].is_a?( Array )
@@ -63,8 +65,18 @@ module ECS
       raise NameError, "#{e.message}"#Are you sure that ECS::#{klass_name} is defined?"
     end
   end
-
-
+  
+  
+  def self.counter
+    @@counter
+  end
+  def self.reset_counter
+    @@counter = 0
+  end
+  def self.increment_counter
+    @@counter += 1
+  end
+  
   def self.associate_id
     @@associate_id
   end
@@ -133,6 +145,7 @@ module ECS
     parameters.delete( :locale )
 
     sleep( ECS::TimeManagement.sleep_duration )
+    self.increment_counter
     url = "#{ self.base_urls[locale] }&AWSAccessKeyId=#{self.access_key_id}&Version=#{self.api_version}&AssociateTag=#{self.associate_id}&#{ parameters.keys.map{ |k| "#{ERB::Util.url_encode( k.to_s ) }=#{ERB::Util.url_encode( parameters[k].is_a?( Array ) ? parameters[k].join( ',' ) : parameters[k].to_s )}" }.join( '&' ) }"
     #puts url
     r = Net::HTTP.get_response( URI.parse( url ) )
@@ -240,6 +253,7 @@ module ECS
   def self.resolve_cache_tag( p={} )
     "#{cache_directory}/#{Digest::MD5.hexdigest( p.is_a?( String ) ? p : query_string( p ) )}.#{@@cache_suffix}"
   end
+  
 end
 
 ##At this point I can do

data/test/unit/ecs_test.rb

@@ -230,6 +230,27 @@ class ECSTest < Test::Unit::TestCase
     assert_equal '', ECS.query_string( 'c=d&a=b' )
   end
 
+
+  def test_counter
+    initial_counter = ECS.counter
+    assert ECS.reset_counter
+    assert_equal 0, ECS.counter
+    
+    (1..10).to_a.each do |i|
+      assert ECS.increment_counter
+    end
+    assert_equal 10, ECS.counter
+    assert ECS.reset_counter
+    assert_equal 0, ECS.counter
+    
+    while ECS.counter < initial_counter do
+      ECS.increment_counter
+    end
+    assert_equal initial_counter, ECS.counter
+  end
+
+
+
   def test_call_web_service
     sleep 1 #make sure we don't need to sleep 
     time_1 = time_2 = time_3 =  nil
@@ -357,6 +378,27 @@ class ECSTest < Test::Unit::TestCase
   def test_api_version
     assert_equal '2007-02-22', ECS.api_version
   end
+  
+  
+  def test_index_type_search
+    search_results = ECS.search_Books_by_Author( 'Steven King' )
+
+    assert_equal 10, search_results.Item.size
+    assert_equal 0, search_results.errors.size
+    first_title = search_results.Item.first.ItemAttributes.Title.content
+    
+    search_results = ECS.search_Books_by_Author( :Author => 'Steven King', :locale => :uk )
+    
+    assert_equal 10, search_results.Item.size
+    assert_equal 0, search_results.errors.size
+    assert_not_equal first_title, search_results.Item.first.ItemAttributes.Title.content
+    
+    search_results = ECS.search_DVD_by_Title( "James Bond" )
+    assert_equal 10, search_results.Item.size
+    
+    search_results = ECS.search_Music_by_Artist( "U2" )
+    assert_equal 10, search_results.Item.size
+  end
 end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ECS
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-03-08 00:00:00 -08:00
+  version: 0.1.1
+date: 2007-03-12 00:00:00 -07:00
 summary: A Ruby interface to Amazon's E-Commerce Service.
 require_paths: 
 - lib