amazon_sdb 0.6.5 → 0.6.7

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.7 / 2008-01-26
+* 2 major enhancements
+  * removed stupid bug I added by accident
+  * domains report correct box usage
+
 == 0.6.5 / 2008-01-15
 * 3 major enhancements
   * New usage tracking via the box_usage method

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/amazon_sdb/item.rb
 lib/amazon_sdb/multimap.rb
 lib/amazon_sdb/resultset.rb
 lib/amazon_sdb/exceptions.rb
+lib/amazon_sdb/usage.rb
 test/test_amazon_base.rb
 test/test_amazon_domain.rb
 test/test_sdb_harness.rb

data/lib/amazon_sdb.rb

@@ -34,7 +34,7 @@ require 'amazon_sdb/usage'
 
 module Amazon
   module SDB
-    VERSION = '0.6.5'    
+    VERSION = '0.6.7'    
   end
 end
 

data/lib/amazon_sdb/base.rb

@@ -16,7 +16,6 @@ module Amazon
         @access_key = aws_access_key
         @secret_key = aws_secret_key
         @usage = Usage.new
-        raise @usage
       end
 
       ##
@@ -81,7 +80,7 @@ module Amazon
           options[:NextToken] = nextToken unless nextToken.nil?
           
           sdb_query(options) do |h|
-            h.search('//DomainName').each {|e| domains << Domain.new(@access_key, @secret_key, e.innerText)}
+            h.search('//DomainName').each {|e| domains << Domain.new(self, e.innerText)}
             mt = h.at('//NextToken')
             if mt
               nextToken = mt.innerText
@@ -98,7 +97,7 @@ module Amazon
       # Returns a domain object for SimpleDB. Assumes the domain already exists, so a ParameterError (NoSuchDomain) might occur if it's not there. This
       # method is useful for getting a domain object without having to incur the operational costs of querying all domains.
       def domain(name)
-        Domain.new(@access_key, @secret_key, name)
+        Domain.new(self, name)
       end
       
       ##

data/lib/amazon_sdb/domain.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Amazon
   module SDB
     
@@ -9,16 +11,20 @@ module Amazon
     # - 256 total attribute name-value pairs per item 
     # - 250 million attributes per domain 
     # - 10 GB of total user data storage per domain 
-    class Domain < Base
+    class Domain
+      extend Forwardable
+      
       attr_reader :name
       
       ##
       # Creates a new Domain object. 
-      def initialize(aws_access_key, aws_secret_key, name)
-        super(aws_access_key, aws_secret_key)
+      def initialize(base, name)
+        @base = base
         @name = name
       end
       
+      def_delegator :@base, :sdb_query
+      
       ##
       # Sets attributes for a given key in the domain. If there are no attributes supplied, it creates an empty set.
       # Takes the following arguments:

data/lib/amazon_sdb/resultset.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module Amazon
   module SDB
     
@@ -6,16 +8,16 @@ module Amazon
     # a set of Items plus an operation to see if there is another set to be retrieved
     # and to load it on demand. When Amazon sees fit to add total results or other metadata
     # for queries that will also be included here.
-    class ResultSet
-      include Enumerable
+    class ResultSet < DelegateClass(Array)
       attr_reader :items
       
-      def initialize(domain, items, more_token = nil)
+      def initialize(domain, items, next_token = nil)
         @domain = domain
         @items = items
-        @more_token = more_token
+        super(@items)
+        @next_token = next_token
       end
-      
+           
       ##
       # Returns true if there is another result set to be loaded
       def more_items?
@@ -25,6 +27,11 @@ module Amazon
       ##
       # Not implemented yet
       def load_next!
+        if @more_token.nil?
+          @items = []
+        else
+          @items = @domain.query(:next_token => @next_token)
+        end
       end
       
       ##
@@ -32,14 +39,6 @@ module Amazon
       def keys
         @items.map {|i| i.key }
       end
-      
-      ##
-      # Support method for Enumerable. Iterates through the items in this set (NOT all the matching results for a query)
-      def each
-        @items.each do |i|
-          yield i
-        end
-      end
     end
   end
 end

data/lib/amazon_sdb/usage.rb

@@ -0,0 +1,25 @@
+module Amazon
+  module SDB
+    ##
+    # A class for accumulating usage data returned from Amazon requests. Returned by Base#usage
+    class Usage
+      attr_reader :box_usage
+      
+      def initialize
+        reset!
+      end
+      
+      def add_usage(value)
+        @box_usage += value
+      end
+      
+      def reset!
+        @box_usage = 0.0
+      end
+      
+      def <<(value)
+        @box_usage += value
+      end
+    end
+  end
+end

data/test/test_amazon_base.rb

@@ -24,12 +24,12 @@ class TestAmazonBase < Test::Unit::TestCase
   def test_cgi_encode
     options = {'foo' => 'bar'}
   
-    assert_equal 'foo=bar', @sdb.cgi_encode(options)
+    assert_equal 'foo=bar', @sdb.send(:cgi_encode, options)
   end
   
   def test_cgi_encode_array
     options = {"foo" => ["bar", "baz"]}
-    assert_equal 'foo=bar&foo=baz', @sdb.cgi_encode(options)
+    assert_equal 'foo=bar&foo=baz', @sdb.send(:cgi_encode, options)
   end
   
   def test_domains

data/test/test_amazon_domain.rb

@@ -30,7 +30,8 @@ EOF
 
 class TestAmazonDomain < Test::Unit::TestCase
   def setup
-    @domain = Amazon::SDB::Domain.new 'API_KEY', 'SECRET_KEY', 'testdb'
+    @sdb = Amazon::SDB::Base.new 'API_KEY', 'SECRET_KEY'
+    @domain = @sdb.domain('testdb')
     @attr_hash = {"foo" => "bar", "baz" => "quux"}
   end
   

data/test/test_item.rb

@@ -2,7 +2,8 @@ require "test_sdb_harness"
 
 class TestItem < Test::Unit::TestCase
   def setup
-    @domain = Amazon::SDB::Domain.new 'API_KEY', 'SECRET_KEY', 'testdb'
+    @base = Amazon::SDB::Base.new 'API_KEY', 'SECRET_KEY'
+    @domain = @base.domain 'testdb'
     @key = 'TEST_ITEM'
     @multimap = Amazon::SDB::Multimap.new({"foo" => "bar", "baz" => "quux"})
     

data/test/test_resultset.rb

@@ -0,0 +1,30 @@
+require "test_sdb_harness"
+
+class TestItem < Test::Unit::TestCase
+  def setup
+    @base = Amazon::SDB::Base.new 'API_KEY', 'SECRET_KEY'
+    @domain = @base.domain 'testdb'
+    # @key = 'TEST_ITEM'
+    # @multimap = Amazon::SDB::Multimap.new({"foo" => "bar", "baz" => "quux"})
+    # 
+    # @empty_item = Amazon::SDB::Item.new(@domain, @key)
+    # @item = Amazon::SDB::Item.new(@domain, @key, @multimap)
+  end
+  
+  def test_more_items_true
+  end
+  
+  def test_more_items_false
+  end
+  
+  def test_load_next_more_results
+  end
+  
+  def test_load_next_no_more
+    
+  end
+  
+  def test_keys
+    
+  end
+end

data/test/test_sdb_harness.rb

@@ -2,26 +2,40 @@ require "test/unit"
 require 'cgi'
 require "amazon_sdb"
 
-# little mock override of open for base (technique from Eric Hodel)
-class Amazon::SDB::Base
-  attr_accessor :uris, :responses
-  
-  def initialize(aws_access_key, aws_secret_key)
-    @access_key = aws_access_key
-    @secret_key = aws_secret_key
-    @usage = Amazon::SDB::Usage.new
-    @responses = []
-    @uris = []  
-  end
-  
-  def open(uri)
-    @uris << uri
-    
-    if @responses.size == 0
-      fail "Unexpected HTTP request #{uri}"
+module Amazon
+  module SDB
+    # little mock override of open for base (technique from Eric Hodel)
+    class Base
+      attr_accessor :uris, :responses
+
+      def initialize(aws_access_key, aws_secret_key)
+        @access_key = aws_access_key
+        @secret_key = aws_secret_key
+        @usage = Amazon::SDB::Usage.new
+        @responses = []
+        @uris = []  
+      end
+
+      def open(uri)
+        @uris << uri
+
+        if @responses.size == 0
+          fail "Unexpected HTTP request #{uri}"
+        end
+
+        yield StringIO.new(@responses.shift)
+      end
     end
     
-    yield StringIO.new(@responses.shift)
+    class Domain
+      def uris
+        @base.uris
+      end
+      
+      def responses
+        @base.responses
+      end
+    end
   end
 end
 
@@ -43,11 +57,13 @@ class Test::Unit::TestCase
     </Response>"
   end
   
+  GENERIC_RESPONSE_USAGE = "0.0000219907"
+  
   def generic_response(method)
     "<#{method}Response xmlns=\"http://sdb.amazonaws.com/doc/2007-11-07\"> 
     <ResponseMetadata> 
     <RequestId>490206ce-8292-456c-a00f-61b335eb202b</RequestId> 
-    <BoxUsage>0.0000219907</BoxUsage> 
+    <BoxUsage>#{GENERIC_RESPONSE_USAGE}</BoxUsage> 
     </ResponseMetadata> 
     </#{method}Response>"
   end

data/test/test_usage.rb

@@ -110,4 +110,13 @@ class TestUsage < Test::Unit::TestCase
     
     assert_in_delta(0.26, usage, 2 ** -20)
   end
+  
+  def test_usage_is_updated_from_domain
+    d = @sdb.domain('testdb')
+    d.responses << generic_response('DeleteAttributes')
+    
+    d.delete_attributes 'key'
+    
+    assert_in_delta(GENERIC_RESPONSE_USAGE, @sdb.box_usage, 2 ** -20)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon_sdb
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors: 
 - Jacob Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 -05:00
+date: 2008-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/amazon_sdb/multimap.rb
 - lib/amazon_sdb/resultset.rb
 - lib/amazon_sdb/exceptions.rb
+- lib/amazon_sdb/usage.rb
 - test/test_amazon_base.rb
 - test/test_amazon_domain.rb
 - test/test_sdb_harness.rb
@@ -89,5 +90,6 @@ test_files:
 - test/test_exceptions.rb
 - test/test_item.rb
 - test/test_multimap.rb
+- test/test_resultset.rb
 - test/test_sdb_harness.rb
 - test/test_usage.rb