aws-sdb 0.1.2 → 0.1.3

data/Rakefile

@@ -7,7 +7,7 @@ Spec::Rake::SpecTask.new
 gem_spec = Gem::Specification.new do |s|
   s.name = "aws-sdb"
   s.rubyforge_project = s.name
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE"]

data/lib/aws_sdb/service.rb

@@ -20,16 +20,16 @@ module AwsSdb
     
     def list_domains(max = nil, token = nil)
       params = { 'Action' => 'ListDomains' }
-      params['MoreToken'] = 
+      params['NextToken'] = 
         token unless token.nil? || token.empty?
-      params['MaxResults'] = 
+      params['MaxNumberOfDomains'] = 
         max.to_s unless max.nil? || max.to_i == 0
       doc = call(:get, params)
       results = []
       REXML::XPath.each(doc, '//DomainName/text()') do |domain| 
         results << domain.to_s
       end
-      return results, REXML::XPath.each(doc, '/MoreToken/text()').to_s 
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s 
     end
         
     def create_domain(domain)
@@ -45,23 +45,22 @@ module AwsSdb
       nil
     end  
     
-    def query(domain, query, sort = nil, max = nil, token = nil)
+    def query(domain, query, max = nil, token = nil)
       params = { 
         'Action' => 'Query', 
         'QueryExpression' => query,
         'DomainName' => domain.to_s 
       }
-      params['Sort'] = sort unless sort.nil? || sort.empty?
-      params['MoreToken'] = 
+      params['NextToken'] = 
         token unless token.nil? || token.empty?
-      params['MaxResults'] = 
-        max.to_s unless max.nil? || max.to_i != 0
+      params['MaxNumberOfItems'] = 
+        max.to_s unless max.nil? || max.to_i == 0
       doc = call(:get, params)
       results = []
       REXML::XPath.each(doc, '//ItemName/text()') do |item| 
         results << item.to_s
       end
-      return results, REXML::XPath.each(doc, '/MoreToken/text()').to_s 
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s 
     end
     
     def put_attributes(domain, item, attributes, replace = true)
@@ -136,9 +135,10 @@ module AwsSdb
       query = query.join('&')
       url = "http://sds.amazonaws.com?#{query}"
       uri = URI.parse(url)
+      @logger.debug("#{url}") if @logger
       response = 
         Net::HTTP.new(uri.host, uri.port).send_request(method, url)
-      @logger.debug("#{url} #{response.code} #{response.body}")
+      @logger.debug("#{response.code}\n#{response.body}") if @logger
       raise(ConnectionError.new(response)) unless (200..400).include?(
         response.code.to_i
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdb
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tim Dysinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-23 00:00:00 -10:00
+date: 2008-02-20 00:00:00 -10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency