forforf-aws-sdb 0.5.0 → 0.5.1

data/lib/aws_sdb/service.rb

@@ -72,29 +72,31 @@ module AwsSdb
 
       @logger.debug { "SELECT EXPRESSION BEFORE CALL: #{query.inspect}" } if @logger.debug?
       doc = call(:get, params)
-      item_doc = REXML::XPath.match(doc, '//Item')
+
       items = {}
       attributes = {}
-      
+
       #build the result hash
-      REXML::XPath.each(item_doc, '//Item/Name') do |item_name_doc|
-        item_name = item_name_doc.text
-        REXML::XPath.each(item_doc, '//Attribute') do |attrib_doc|
-          attrib_name = nil
-          attrib_value = nil
-          attrib_doc.elements.each('Name') do |name|
-            attrib_name = CGI.unescape(name.text)
-          end
-          attrib_doc.elements.each('Value') do |value|
-            attrib_value = CGI.unescape(value.text)
-          end
+      REXML::XPath.each(doc, '//Item') do |item_doc|
+        item_name = item_doc.elements["Name"].text
+
+        item_doc.each do |attrib_doc|
+          att_name = attrib_doc.elements["Name"]
+          att_value = attrib_doc.elements["Value"]
+          
+          next unless (att_name && att_value)
+          
+          attrib_name = CGI.unescape(att_name.text)
+          attrib_value = CGI.unescape(att_value.text)
+
           add_value(attributes, attrib_name, attrib_value)
         end
         items[item_name] = attributes
+        #reset attributes so we don't clobber next item
+        attributes = {}
+        items
       end
-      attr_names = REXML::XPath.match(item_doc, '//Attribute/Name/text()')
       results = items
-
       return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
     end
     
@@ -174,12 +176,9 @@ module AwsSdb
           'Timestamp' => Time.now.gmtime.iso8601
         }
       )
-      
       @logger.debug { "CALL: #{method} with #{params.inspect}" } if @logger.debug?
       
-  
       canonical_querystring = build_canonical_query_string(params)
-      
       @logger.debug { "CANONICAL: #{canonical_querystring.inspect}" } if @logger.debug?
       
       string_to_sign= "GET\n#{URI.parse(@base_url).host}\n/\n#{canonical_querystring}"

data/spec/aws_sdb/service_spec.rb

@@ -8,7 +8,7 @@ require 'rubygems'
 require 'uuidtools'
 
 include AwsSdb
-
+=begin
 describe Service, "when creating a new domain" do
   include UUIDTools
   
@@ -126,7 +126,7 @@ describe Service, "when deleting domains" do
     }.should_not raise_error
   end
 end
-
+=end
 describe Service, "when managing items" do
     include UUIDTools
     
@@ -143,10 +143,6 @@ describe Service, "when managing items" do
       :answer => [ true, 'testing123', 4.2, 42, 420 ]
     }
   end
-  
-  before(:each) do
-    #sleep 0.2
-  end
 
   after(:all) do
      @service.delete_domain(@domain)
@@ -172,16 +168,26 @@ describe Service, "when managing items" do
   end
 
   it "should be able to select all from domain" do
+    #add another set of data
+    item2 = "test-#{UUID.random_create.to_s}"
+    attributes2 = {
+      :question => "What are your favorite colors?",
+      :favorite_colors => ['red', 'green', 'blue'],
+      :answer => 'blue'
+      }
+      
+    @service.put_attributes(@domain, item2, attributes2)
+      
     query_str = "select * from `#{@domain}`"
     result = nil
-    lambda {
+    #lambda {
       result = @service.select(query_str)
-    }.should_not raise_error
+    #}.should_not raise_error
     result.should_not be_nil
     result.should_not be_empty
     result.should_not be_nil
     result[0].keys.include?(@item).should == true
-    result[0].values.size.should == 1
+    result[0].values.size.should == 2
     #attribute names
     result[0].values[0].keys.sort.should == ['answer', 'question']
     #questions
@@ -190,6 +196,14 @@ describe Service, "when managing items" do
     result[0].values[0]['answer'].size == 5
     result[0].values[0]['answer'].include?("42").should == true
     result[0].values[0]['answer'].include?("testing123").should == true
+    #attribute names
+    result[0].values[1].keys.sort.should == ['answer', 'favorite_colors', 'question']
+    #questions
+    result[0].values[1]['question'].should == ['What are your favorite colors?']
+    #answers
+    result[0].values[1]['favorite_colors'].size == 3
+    result[0].values[1]['favorite_colors'].sort.should == ['blue', 'green', 'red']
+    result[0].values[1]['answer'].should == ['blue']
   end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Tim Dysinger
@@ -48,7 +48,6 @@ files:
 - lib/aws_sdb/error.rb
 - lib/aws_sdb/service.rb
 - spec/spec_helper.rb
-- spec/aws_sdb/aws_sdb.log
 - spec/aws_sdb/service_spec.rb
 has_rdoc: true
 homepage: http://github.com/forforf/aws-sdb

data/spec/aws_sdb/aws_sdb.log

@@ -1,13 +0,0 @@
-# Logfile created on 2010-12-23 20:04:18 +0000 by logger.rb/25413
-D, [2010-12-23T20:04:18.454524 #25893] DEBUG -- : http://sdb.amazonaws.com?Action=DeleteDomain&AWSAccessKeyId=AKIAJZT2KIZFM36DNBVQ&DomainName=&SignatureVersion=1&Timestamp=2010-12-23T20%3A04%3A18Z&Version=2007-11-07&Signature=xCfsCVEy3dpskdJjmkwYfVIQudY%3D
-D, [2010-12-23T20:04:18.476771 #25893] DEBUG -- : 400
-<?xml version="1.0"?>
-<Response><Errors><Error><Code>InvalidParameterValue</Code><Message>Value () for parameter DomainName is invalid. </Message><BoxUsage>0.0055590278</BoxUsage></Error></Errors><RequestID>5ec30ba5-4b3c-f1f7-c1b2-0c65d16c57b9</RequestID></Response>
-D, [2010-12-23T20:04:18.479966 #25893] DEBUG -- : http://sdb.amazonaws.com?Action=DeleteDomain&AWSAccessKeyId=AKIAJZT2KIZFM36DNBVQ&DomainName=&SignatureVersion=1&Timestamp=2010-12-23T20%3A04%3A18Z&Version=2007-11-07&Signature=xCfsCVEy3dpskdJjmkwYfVIQudY%3D
-D, [2010-12-23T20:04:18.490482 #25893] DEBUG -- : 400
-<?xml version="1.0"?>
-<Response><Errors><Error><Code>InvalidParameterValue</Code><Message>Value () for parameter DomainName is invalid. </Message><BoxUsage>0.0055590278</BoxUsage></Error></Errors><RequestID>1ec92b8e-0053-2452-0140-015fdefa7f8c</RequestID></Response>
-D, [2010-12-23T20:04:18.493872 #25893] DEBUG -- : http://sdb.amazonaws.com?Action=DeleteDomain&AWSAccessKeyId=AKIAJZT2KIZFM36DNBVQ&DomainName=&SignatureVersion=1&Timestamp=2010-12-23T20%3A04%3A18Z&Version=2007-11-07&Signature=xCfsCVEy3dpskdJjmkwYfVIQudY%3D
-D, [2010-12-23T20:04:18.507715 #25893] DEBUG -- : 400
-<?xml version="1.0"?>
-<Response><Errors><Error><Code>InvalidParameterValue</Code><Message>Value () for parameter DomainName is invalid. </Message><BoxUsage>0.0055590278</BoxUsage></Error></Errors><RequestID>756ba7ca-e9f7-e73a-83ed-7d8396498550</RequestID></Response>