uservoice-ruby 0.0.6 → 0.0.7

data/lib/uservoice/collection.rb

@@ -1,32 +1,34 @@
 module UserVoice
   class Collection
+    PER_PAGE = 500
+
     def initialize(client, query, opts={})
       @client = client
       @query = query
       @limit = opts[:limit] || 2**60
-      @per_page = [@limit, 500].min
+      @per_page = [@limit, PER_PAGE].min
       @pages = {}
     end
 
     def first
-      load_record(0)
+      self[0]
     end
 
     def last
-      load_record(size() - 1)
+      self[size() - 1]
     end
 
     def size
       if @response_data.nil?
-        load_record(0)
+        self[0]
       end
-      @response_data['total_records']
+      [@response_data['total_records'], @limit].min
     end
 
     def map
       index = 0
       records = []
-      while record = load_record(index)
+      while record = self[index]
         records.push(yield record)
         index += 1
       end
@@ -40,12 +42,17 @@ module UserVoice
         value
       end
     end
+
+    def to_a
+      each {}
+    end
         
+    def [](i)
+      load_page((i/PER_PAGE.to_f).floor + 1)[i%PER_PAGE] if (0..@limit-1).include?(i)
+    end
+
     private
 
-    def load_record(i)
-      load_page((i/500.0).floor + 1)[i%500]
-    end
 
     def load_page(i)
       if @pages[i].nil?

data/lib/uservoice/version.rb

@@ -1,3 +1,3 @@
 module Uservoice
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/lib/uservoice/collection_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe UserVoice::Collection do
-  PER_PAGE = 500
-  ELEMENTS = 1501 # 4 pages, one record in the last page
 
   context 'having an empty result set' do
     let(:client) do
@@ -23,6 +21,14 @@ describe UserVoice::Collection do
         raise RuntimeError.new('should be empty')
       end
     end
+
+    it 'should convert to empty array with to_a' do
+      @collection.to_a.should == []
+    end
+
+    it 'should not have first record' do
+      @collection[0].should == nil
+    end
   end
 
   context 'having a list with one element' do
@@ -60,7 +66,7 @@ describe UserVoice::Collection do
     end
 
     it 'should collect ids' do
-      @client.should_receive(:get).with("/api/v1/suggestions?per_page=#{PER_PAGE}&page=1").once
+      @client.should_receive(:get).with("/api/v1/suggestions?per_page=#{UserVoice::Collection::PER_PAGE}&page=1").once
 
       @collection.collect do |val|
         val['id']
@@ -73,15 +79,25 @@ describe UserVoice::Collection do
   end
 
   context 'having a list with 1501 elements' do
+    ELEMENTS = 1501 # 4 pages, one record in the last page
 
     before do
       @client = mock()
-      
+
       4.times.map do |page_index|
-        @client.stub(:get).with("/api/v1/suggestions?per_page=#{PER_PAGE}&page=#{page_index+1}") do
+        page_first_index = UserVoice::Collection::PER_PAGE * page_index + 1
+        page_last_index = [UserVoice::Collection::PER_PAGE * (page_index + 1), ELEMENTS].min
+
+        @client.stub(:get).with("/api/v1/suggestions?per_page=#{UserVoice::Collection::PER_PAGE}&page=#{page_index+1}") do
           {
-            "response_data" => {"page"=> page_index+1, "per_page" => PER_PAGE, "total_records" => ELEMENTS, "filter"=>"all", "sort"=>"votes"},
-            "suggestions"=> (PER_PAGE * page_index + 1).upto([PER_PAGE * (page_index + 1), ELEMENTS].min).map do |idea_index| 
+            "response_data" => {
+              "page"=> page_index+1,
+              "per_page" => UserVoice::Collection::PER_PAGE,
+              "total_records" => ELEMENTS,
+              "filter"=>"all",
+              "sort"=>"votes"
+            },
+            "suggestions"=> page_first_index.upto(page_last_index).map do |idea_index|
               {
                 "url"=>"http://uservoice-subdomain.uservoice.com/forums/1-general/suggestions/#{idea_index}-idea",
                 "id"=> idea_index,
@@ -99,10 +115,16 @@ describe UserVoice::Collection do
     end
 
     it 'should have correct size' do
-      @client.should_receive(:get).with("/api/v1/suggestions?per_page=#{PER_PAGE}&page=1").once
+      @client.should_receive(:get).with("/api/v1/suggestions?per_page=#{UserVoice::Collection::PER_PAGE}&page=1").once
       @collection.size.should == ELEMENTS
     end
 
+    it 'should the size defined by limit' do
+      collection = UserVoice::Collection.new(@client, '/api/v1/suggestions', :limit => 1337)
+      collection.size.should == 1337
+      collection.last['id'].should == 1337
+    end
+
     it 'should get last element and array size with two api calls' do
       @collection.last['id'].should == ELEMENTS
       @collection.first['id'].should == 1
@@ -122,5 +144,11 @@ describe UserVoice::Collection do
         val['id']
       end.should == 1.upto(ELEMENTS).to_a
     end
+
+    it 'should convert to array' do
+      @collection.to_a.map do |val|
+        val['id']
+      end.should == 1.upto(ELEMENTS).to_a
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uservoice-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: