world_bank_fetcher 0.0.9 → 0.0.10

data/lib/world_bank_fetcher/query_scheduler.rb

@@ -4,7 +4,6 @@ module WorldBankFetcher
   
     def initialize(query)
       @query = query
-      @results = []
     end
     
     def execute!
@@ -31,26 +30,21 @@ module WorldBankFetcher
     end
     
     def fetch_data_query!
-      results = []
-      total_queries.times do |i|
-        res = query.page(i+1).fetch
-        return nil if res.nil?
-        results.concat res
+      results = query.fetch
+      if query.total > MAXIMUM_BUFFER_SIZE
+        total_queries.times do |i|
+          unless i == 0
+            results.concat query.page(i+1).fetch
+          end
+        end
+        results
+      else
+        results
       end
-      results      
     end
     
     def total_queries
-      query.per_page(1).fetch unless query.total
       (query.total / MAXIMUM_BUFFER_SIZE.to_f).ceil
     end
-
-    def results=(results)
-      @results = results
-    end
-  
-    def results
-      @results
-    end
   end  
 end

data/lib/world_bank_fetcher/version.rb

@@ -1,3 +1,3 @@
 module WorldBankFetcher
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/query_scheduler_spec.rb

@@ -34,17 +34,15 @@ module WorldBankFetcher
       fake_results = scheduler.execute!
     end
   
-    it "should call preliminary fetch on query if total is nil, then full data query" do
-      query.should_receive(:total).and_return(nil)
-      query.should_receive(:fetch).twice.and_return(fake_results)
-      query.should_receive(:total).and_return(DEFAULT_INITIAL_BUFFER_SIZE - 1)
+    it "should only call fetch once if all data received in first fetch" do
+      query.should_receive(:fetch).once.and_return(fake_results)
+      query.should_receive(:total).and_return(MAXIMUM_BUFFER_SIZE - 1)
       scheduler.execute!
     end
 
     it "should call preliminary fetch on query if total is nil, then two full data queries given larger data set" do
-      query.should_receive(:total).and_return(nil)
-      query.should_receive(:fetch).exactly(3).times.and_return(fake_results)
-      query.should_receive(:total).and_return(MAXIMUM_BUFFER_SIZE + 1)
+      query.should_receive(:fetch).twice.and_return(fake_results)
+      query.stub(:total).and_return(MAXIMUM_BUFFER_SIZE + 1)      
       scheduler.execute!
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world_bank_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 780221342756096436
+      hash: -1337123450392843755
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 780221342756096436
+      hash: -1337123450392843755
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24