simple-json 1.0.0 → 1.0.1

data/lib/simple_json_db.rb

@@ -57,10 +57,10 @@ class SimpleJSON
 					elsif r_data.is_a?(Hash)
 						mem[obj[0]] = r_data
 					else
-						mem[obj[0]] = [false, "SDB Error. Unable to 'put attributes'"]
+						mem[obj[0]] = {'error', "SDB ERROR! Transaction returned: #{r_data.inspect}"}
 					end 
 				rescue => ex
-					mem[obj[0]] =  [false, "#{ex.class}: #{ex.message}"]
+					mem[obj[0]] =  {"error", "#{ex.class}: #{ex.message}"}
 				end
 				mem
 			end
@@ -74,7 +74,7 @@ class SimpleJSON
 				if ids.is_a?(Array)
 					ids.inject(Hash.new) { |mem,id| mem[id] = query_get(id,v); mem }
 				else
-					return [false,"Query Failed: v:#{v.inspect} | r:#{r_ids.inspect}"]
+					return "Query Failed: v:#{v.inspect} | r:#{r_ids.inspect}"
 				end
 			end
 		end

data/test/tc_simple_json.rb

@@ -4,7 +4,7 @@ require 'json'
 
 # require File.join( File.dirname( File.expand_path(__FILE__)), '..','aws-sdb','lib','aws_sdb')
 require 'aws_sdb'
-require File.join( File.dirname( File.expand_path(__FILE__)), '..','simple_json')
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'simple_json')
 
 class TestSimpleJSONDB < Test::Unit::TestCase
 	BEGIN {
@@ -16,7 +16,7 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 	end
 	
 	def test_01_bootload
-		@@sdb = AwsSdb::Service.new
+		@@sdb = AwsSdb::Service.new(:logger=>SimpleJSON::DB::LogDuck.new)
 		config = eval(File.open(File.join( File.dirname( File.expand_path(__FILE__)), '..','simple_json_config.rb'), 'r').read)
 		assert(@@sdb.list_domains[0].include?(config['AMAZON_DOMAIN']), 'boot?')
 	end
@@ -79,7 +79,7 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 		assert(o_data[@@id]['more'].size == 2, 'append data?')
 	end
 	
-	def test_08_query_all
+	def test_08_query_id_only
 		o_data = JSON.parse( SimpleJSON.rack_mock(:query, JSON.generate({'' => nil}))[2])
 		assert(o_data.is_a?(Hash),'query all is not a Hash?')
 		assert(o_data.size == 1,'query all Hash contains more than one key value pair')
@@ -87,7 +87,16 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 		assert(o_data[''].to_a.map { |obj| obj[1] }.uniq.size == 1,'query all Hash does not bring id => nil? ')
 	end
 	
-	def test_09_query_specific_all
+	def test_09_query_all
+		o_data = JSON.parse( SimpleJSON.rack_mock(:query, JSON.generate({'' => true}))[2])
+		assert(o_data.is_a?(Hash),'query all is not a Hash?')
+		assert(o_data.size == 1,'query all Hash contains more than one key value pair')
+		assert(o_data.has_key?(''),'query all Hash does not contain the query string as key')
+		assert(o_data[''].has_key?(@@id))
+		assert(o_data[''][@@id].size > 1)
+	end
+	
+	def test_10_query_specific_all
 		query = "['name' = '#{@@id}']"
 		t_data = {query => true}
 		o_data = JSON.parse( SimpleJSON.rack_mock(:query, JSON.generate(t_data))[2])
@@ -98,7 +107,7 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 		assert(o_data[query][@@id].size == @@i_data[@@id].size)
 	end
 	
-	def test_10_query_specific_none
+	def test_11_query_specific_none
 		query = "['name' = '#{@@id}']"
 		t_data = {query => nil}
 		o_data = JSON.parse( SimpleJSON.rack_mock(:query, JSON.generate(t_data))[2])
@@ -109,7 +118,7 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 		assert(o_data[query][@@id].nil?)
 	end
 	
-	def test_11_query_specific_some
+	def test_12_query_specific_some
 		query = "['name' = '#{@@id}']"
 		t_data = {query => {'name' => nil, 'more' => nil}}
 		o_data = JSON.parse( SimpleJSON.rack_mock(:query, JSON.generate(t_data))[2])
@@ -120,7 +129,7 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 		assert(o_data[query][@@id].size == 2)
 	end
 	
-	def test_12_delete
+	def test_13_delete
 		o_data = JSON.parse( SimpleJSON.rack_mock(:delete, JSON.generate({@@id => nil}))[2])
 		assert(o_data.is_a?(Hash))
 		assert(o_data.size == 1)
@@ -135,7 +144,7 @@ class TestSimpleJSONDB < Test::Unit::TestCase
 		assert(o_data[@@id].empty?)
 	end
 	
-	def test_13_other_config
+	def test_14_other_config
 		domain = 'other_test_domain'
 		o_data = JSON.parse( SimpleJSON.rack_mock(:delete, JSON.generate({@@id => nil}), {'AMAZON_DOMAIN' => domain})[2])
 		assert(@@sdb.list_domains[0].include?(domain), 'other domain')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple-json
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -04:00
+date: 2009-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- an Amazon Web Service account to access SimpleDB
+- an Amazon Web Service Secret Key to access SimpleDB
 rubyforge_project: SimpleJSON
 rubygems_version: 1.3.5
 signing_key: