From c845fe1ebb43f0afdf9a37239bd86ef45a888d4c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Aug 2009 11:51:32 -0700 Subject: [PATCH] Added more Array methods to ResultsArray. --- VERSION.yml | 8 +------- lib/results_array.rb | 10 +++------- simple_record.gemspec | 2 +- test/test_simple_record.rb | 7 ++++++- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/VERSION.yml b/VERSION.yml index fd63bd6..31064e1 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,11 +1,5 @@ --- :major: 1 :minor: 1 -:patch: 10 - - - - - - +:patch: 11 diff --git a/lib/results_array.rb b/lib/results_array.rb index aa65603..5470c7f 100644 --- a/lib/results_array.rb +++ b/lib/results_array.rb @@ -21,13 +21,9 @@ def << (val) @items << val end - def [](i) + def [](*i) # todo: load items up to i if size > i - @items[i] - end - - def [](i,j) - @items[i,j] + @items[*i] end def first @@ -87,7 +83,7 @@ def each(&blk) #puts 'params in block=' + params.inspect options[:next_token] = next_token res = clz.find(*params) - items = res.items + items = res.items # get the real items array from the ResultsArray items.each do |item| @items << item end diff --git a/simple_record.gemspec b/simple_record.gemspec index c47bb74..04e32ac 100644 --- a/simple_record.gemspec +++ b/simple_record.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{simple_record} - s.version = "1.1.10" + s.version = "1.1.11" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Travis Reeder", "RightScale"] diff --git a/test/test_simple_record.rb b/test/test_simple_record.rb index d754004..9f0cbca 100644 --- a/test/test_simple_record.rb +++ b/test/test_simple_record.rb @@ -172,7 +172,7 @@ def test_changed def test_count SimpleRecord.stats.clear - + count = MyModel.find(:count) # select 1 assert count > 0 @@ -222,5 +222,10 @@ def test_results_array assert !mms.last.nil? assert !mms.empty? assert mms.include?(mms[0]) + + assert mms[2,2].size == 2 + assert mms[2..5].size == 4 + assert mms[2...5].size == 3 + end end