appoxy-simple_record 1.0.26 → 1.0.27

data/lib/results_array.rb

@@ -0,0 +1,58 @@
+module SimpleRecord
+    class ResultsArray
+
+        attr_reader :next_token, :clz, :params, :items, :i
+
+        def initialize(clz=nil, params=[], items=[], next_token=nil)
+            @clz = clz
+            puts 'class=' + clz.inspect
+            @params = params
+            #puts 'params in ra=' + params.inspect
+            @items = items
+            @next_token = next_token
+            @i = 0            
+        end
+
+        def << (val)
+            @items << val
+        end
+
+        def [](i)
+            @items[i]
+        end
+
+
+        def each(&blk)
+            limit = nil
+            if params.size > 1
+                options = params[1]
+                limit = options[:limit]
+            else
+                options = {}
+                params[1] = options
+            end
+            
+            @items.each do |v|
+                puts @i.to_s
+                yield v
+                @i += 1
+                if !limit.nil? && @i >= limit
+                    return
+                end
+            end
+            # no more items, but is there a next token?
+            return if clz.nil?
+
+            unless next_token.nil?
+                puts 'finding more items...'
+                #puts 'params in block=' + params.inspect
+                options[:next_token] = next_token
+                res = clz.find(*params)
+                @items = res.items
+                @next_token = res.next_token
+                each(&blk)
+            end
+        end
+    end
+end
+

data/lib/simple_record.rb

@@ -25,6 +25,8 @@
 
 require 'right_aws'
 require 'sdb/active_sdb'
+#require 'results_array'
+require File.expand_path(File.dirname(__FILE__) + "/results_array")
 
 module SimpleRecord
 
@@ -841,6 +843,7 @@ This is done on getters now
         end
 
         def self.find(*params)
+            puts 'params=' + params.inspect
             reload=true
             first=false
             all=false
@@ -854,15 +857,20 @@ This is done on getters now
 
 
             # Pad and Offset number attributes
-            options = params[1]
-            #puts 'options=' + options.inspect
+            options = {}
+            if params.size > 1
+                options = params[1]
+                #puts 'options=' + options.inspect
+                #puts 'after collect=' + options.inspect
+            end
             convert_condition_params(options)
-            #puts 'after collect=' + options.inspect
+            #puts 'params2=' + params.inspect
 
             results = all ? [] : nil
             begin
                 results=super(*params)
                 cache_results(results)
+                results = SimpleRecord::ResultsArray.new(self, params, results, next_token)
             rescue RightAws::AwsError, RightAws::ActiveSdb::ActiveSdbError
                 puts "RESCUED: " + $!.message
                 if ($!.message().index("NoSuchDomain") != nil)
@@ -909,15 +917,15 @@ This is done on getters now
         end
 
         def self.convert_condition_params(options)
-            if !options.nil? && options.size > 0
-                conditions = options[:conditions]
-                if !conditions.nil? && conditions.size > 1
-                    # all after first are values
-                    conditions.collect! { |x|
-                        self.pad_and_offset(x)
-                    }
-                end
+            return if options.nil?
+            conditions = options[:conditions]
+            if !conditions.nil? && conditions.size > 1
+                # all after first are values
+                conditions.collect! { |x|
+                    self.pad_and_offset(x)
+                }
             end
+
         end
 
         def self.cache_results(results)

data/test/paging_array_test.rb

@@ -0,0 +1,15 @@
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
+
+array = SimpleRecord::ResultsArray.new()
+#array.extend(ResultsArray)
+
+500.times do |i|
+    array << "_ob_" + i.to_s
+end
+
+array.each do |v|
+    puts v.to_s
+end
+
+puts array[10]

data/test/test_simple_record.rb

@@ -18,6 +18,7 @@ class TestSimpleRecord < Test::Unit::TestCase
         SimpleRecord.close_connection()
     end
 
+
     def test_save_get
         mm = MyModel.new
         mm.name = "Travis"
@@ -176,4 +177,16 @@ class TestSimpleRecord < Test::Unit::TestCase
         #MyChildModel.defined_attributes.inspect
 
     end
+
+
+    # ensures that it uses next token and what not
+    def test_big_result
+        #110.times do |i|
+        #    MyModel
+        #end
+        #rs = MyModel.find(:all, :limit=>300)
+        #rs.each do |x|
+        #   puts 'x=' + x.id
+        #end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy-simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors: 
 - Travis Reeder
@@ -23,6 +23,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- lib/results_array.rb
 - lib/simple_record.rb
 - README.markdown
 has_rdoc: true
@@ -55,5 +56,6 @@ summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 test_files: 
 - test/my_child_model.rb
 - test/my_model.rb
+- test/paging_array_test.rb
 - test/temp_test.rb
 - test/test_simple_record.rb