simple_record 1.1.55 → 1.1.56

data/lib/simple_record.rb

@@ -426,6 +426,7 @@ module SimpleRecord
                 end
             end
 #            puts '@atts2=' + @attributes.inspect
+            @attributes_rb = {} unless @attributes_rb # was getting errors after upgrade.
             @attributes_rb.clear # clear out the ruby versions so they can reload on next get.
             if ret
                 self.class.cache_results(self)
@@ -515,6 +516,7 @@ module SimpleRecord
 #            puts "defined?(#{instance_var.to_sym}) " + (defined?(instance_var.to_sym)).inspect
 #            if defined?(instance_var.to_sym) # this returns "method" for some reason??
 #            puts "attribute #{instance_var} is defined"
+            @attributes_rb = {} unless @attributes_rb # was getting errors after upgrade.
             ret = @attributes_rb[arg_s] # instance_variable_get(instance_var)
 #            puts 'ret=' + ret.to_s
             return ret if !ret.nil?

data/lib/simple_record/results_array.rb

@@ -19,7 +19,6 @@ module SimpleRecord
             @items = items
             @currentset_items = items
             @next_token = next_token
-            @i = 0
         end
 
         def << (val)
@@ -91,14 +90,18 @@ module SimpleRecord
         end
 
         def each(&blk)
+            each2(0, &blk)
+        end
+
+        def each2(i, &blk)
             options = @params[1]
             limit = options[:limit]
 
-            @currentset_items.each do |v|
+            @items.each do |v|
 #                puts @i.to_s
                 yield v
-                @i += 1
-                if !limit.nil? && @i >= limit
+                i += 1
+                if !limit.nil? && i >= limit
                     return
                 end
             end
@@ -111,7 +114,7 @@ module SimpleRecord
                 #puts "i from results_array = " + @i.to_s
 
                 load_next_token_set
-                each(&blk)
+                each2(i, &blk)
             end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.55
+  version: 1.1.56
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -08:00
+date: 2010-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency