world_bank_fetcher 0.0.10 → 0.0.11

data/lib/world_bank_fetcher/country_parser.rb

@@ -4,9 +4,22 @@ module WorldBankFetcher
   class CountryParser
 
     def self.filter(data_collection)
+      if (data_collection.first.is_a? WorldBank::Country)
+        filter_countries data_collection
+      else
+        filter_data_from_non_countries data_collection
+      end        
+    end
+    
+    private
+    def self.filter_countries(data_collection)
       data_collection.reject {|country| non_country_codes.include? country.iso2_code }
     end
     
+    def self.filter_data_from_non_countries(data_collection)
+      data_collection.reject { |datum| non_country_codes.include? datum.raw.country.id }
+    end
+    
     def self.non_country_codes
       NON_COUNTRIES.map {|country_info| country_info[:iso2_code] }
     end

data/lib/world_bank_fetcher/job.rb

@@ -12,9 +12,9 @@ module WorldBankFetcher
     end
     
     def fetch
-      all_data = fetch_all_data query
+      all_data = fetch_everything query
       if all_data
-        data = @job_type == :indicator ? all_data : CountryParser.filter(all_data)
+        data = CountryParser.filter(all_data)
         @checksum = checksum data
         {:results => data, :checksum => @checksum}
       else
@@ -44,7 +44,7 @@ module WorldBankFetcher
       @query
     end
     
-    def fetch_all_data(query)
+    def fetch_everything(query)
       scheduler = QueryScheduler.new query
       query.per_page(MAXIMUM_BUFFER_SIZE)
       scheduler.execute!

data/lib/world_bank_fetcher/version.rb

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

data/spec/job_spec.rb

@@ -2,6 +2,12 @@ require 'helper'
 
 module WorldBankFetcher
   describe Job do
+    before do
+      CountryParser.stub!(:filter) do |arg|
+        arg
+      end
+    end
+    
     let(:indicator_string) { 'SP.POP.TOTL' }
         
     context 'initialize' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world_bank_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1337123450392843755
+      hash: -36905167652878939
 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: -1337123450392843755
+      hash: -36905167652878939
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24