simple_record 1.3.3 → 1.3.4

data/lib/simple_record.rb

@@ -229,6 +229,7 @@ module SimpleRecord
         end
 
         def has_id_on_end(name_s)
+            name_s = name_s.to_s
             name_s.length > 3 && name_s[-3..-1] == "_id"
         end
 
@@ -804,6 +805,8 @@ module SimpleRecord
         # Query example:
         #   MyModel.find(:all, :conditions=>["name = ?", name], :order=>"created desc", :limit=>10)
         #
+        # Extra options:
+        #   :per_token => the number of results to return per next_token, max is 2500.
         def self.find(*params)
             #puts 'params=' + params.inspect
             q_type = :all
@@ -820,6 +823,13 @@ module SimpleRecord
                 #puts 'options=' + options.inspect
                 #puts 'after collect=' + options.inspect
                 convert_condition_params(options)
+                per_token = options[:per_token]
+                if per_token
+                    op_dup = options.dup
+                    op_dup[:limit] = per_token # simpledb uses Limit as a paging thing, not what is normal
+                    params[1] = op_dup
+                end
+
             end
 #            puts 'params2=' + params.inspect
 

data/test/test_results_array.rb

@@ -19,10 +19,12 @@ class TestResultsArray < TestBase
     # ensures that it uses next token and what not
     def test_big_result
         i = TestHelpers.clear_out_my_models
+        SimpleRecord.stats.clear
         num_made = 110
         num_made.times do |i|
             mm = MyModel.create(:name=>"Travis", :age=>i, :cool=>true)
         end
+        assert SimpleRecord.stats.saves == num_made
         rs = MyModel.find(:all) # should get 100 at a time
         assert rs.size == num_made
         i = 0
@@ -30,15 +32,26 @@ class TestResultsArray < TestBase
             #puts 'x=' + x.id
             i+=1
         end
+        assert SimpleRecord.stats.selects == 3 # one for count.
         assert i == num_made
         # running through all the results twice to ensure it works properly after lazy loading complete.
+        SimpleRecord.stats.clear
         i = 0
         rs.each do |x|
             #puts 'x=' + x.id
             i+=1
         end
+        assert SimpleRecord.stats.selects == 0
         assert i == num_made
     end
+
+    def test_limit
+        SimpleRecord.stats.clear
+        rs = MyModel.find(:all, :per_token=>2500)
+        assert rs.size == 110
+        assert SimpleRecord.stats.selects == 1, "SimpleRecord.stats.selects is #{SimpleRecord.stats.selects}"
+
+    end
     
     
 end

data/test/test_simple_record.rb

@@ -662,4 +662,5 @@ class TestSimpleRecord < TestBase
 
     end
 
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency