hungryblank-dead_simple_db 0.0.1 → 0.0.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 0

data/lib/dead_simple_db/dead_simple_db.rb

@@ -59,7 +59,8 @@ module DeadSimpleDb
       #please note the query syntax is SimpleDB custom syntax, refer to SimpleDB docs for details
       #
       def find(how_many, query, opts={})
-        results = find_ids(how_many, query, opts).map { |o| get(o) }
+        results, token = service.query_with_attributes(@domain, query, parse_limit(how_many))
+        results.map! { |hash| new(hash) }
         return results.first if how_many == :first
         results
       end
@@ -68,13 +69,8 @@ module DeadSimpleDb
       #the object ids satisfyng the query
       #
       def find_ids(how_many, query, opts={})
-        limit = case how_many
-          when :all : nil
-          when :first : 1
-        else
-          how_many
-        end
-        service.query(@domain, query, limit).first
+        ids, token = service.query(@domain, query, parse_limit(how_many))
+        ids
       end
 
       def attr_definitions
@@ -93,6 +89,15 @@ module DeadSimpleDb
           attr_definitions << AttributeDefinition.new(name, klass, opts)
         end
 
+        def parse_limit(how_many)
+          limit = case how_many
+            when :all : nil
+            when :first : 1
+          else
+            how_many
+          end
+        end
+
     end
 
     #Instantiates a new object passing an hash

data/test/dead_simple_db_test.rb

@@ -52,14 +52,14 @@ class DeadSimpleDbTest < Test::Unit::TestCase
   end
 
   should "issue a query when finding ids" do
-    @service.expects(:query).with('test_domain', "['name' = 'Arturo']", nil).returns(['e34979d4dc7b5b949fa67916acb63743'])
+    @service.expects(:query).with('test_domain', "['name' = 'Arturo']", nil).returns([['e34979d4dc7b5b949fa67916acb63743'], ''])
     Employee.find_ids(:all, "['name' = 'Arturo']")
   end
 
-  should "fetch ids and after get attributes when finding" do
-    Employee.expects(:find_ids).with(:all, "['name' = 'Arturo']", {}).returns(['e34979d4dc7b5b949fa67916acb63743'])
-    Employee.expects(:get).with("e34979d4dc7b5b949fa67916acb63743")
-    Employee.find(:all, "['name' = 'Arturo']")
+  should "issue a query with attributes when finding" do
+    @service.expects(:query_with_attributes).with('test_domain', "['name' = 'Arturo']", nil).returns([[{'name' => 'Arturo'}], ''])
+    results = Employee.find(:all, "['name' = 'Arturo']")
+    assert_equal 'Arturo', results.first.name
   end
 
   should "instantiate an attribute definition when sdb_attr is called" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hungryblank-dead_simple_db
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Paolo Negri
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.4.0
     version: 
 description: TODO
 email: hungryblank@gmail.com