world_bank_fetcher 0.0.8 → 0.0.9

data/lib/world_bank_fetcher/country_parser.rb

@@ -2,16 +2,55 @@ require 'world_bank'
 
 module WorldBankFetcher
   class CountryParser
-    def self.parse(data_collection)
-      results = []
-      data_collection.each do |datum|
-        current_country = {}
-        current_country[:name] = datum.name
-        current_country[:capital] = datum.capital
-        current_country[:region] = datum.region.raw.value
-        results << current_country
-      end
-      results
+
+    def self.filter(data_collection)
+      data_collection.reject {|country| non_country_codes.include? country.iso2_code }
+    end
+    
+    def self.non_country_codes
+      NON_COUNTRIES.map {|country_info| country_info[:iso2_code] }
     end
+    
+    NON_COUNTRIES = [
+      {:name => "Arab World", :iso2_code => "1A"}, 
+      {:name => "Caribbean small states", :iso2_code => "S3"}, 
+      {:name => "East Asia & Pacific (developing only)", :iso2_code => "4E"}, 
+      {:name => "East Asia & Pacific (all income levels)", :iso2_code => "Z4"}, 
+      {:name => "Europe & Central Asia (developing only)", :iso2_code => "7E"}, 
+      {:name => "Europe & Central Asia (all income levels)", :iso2_code => "Z7"}, 
+      {:name => "Euro area", :iso2_code => "XC"}, 
+      {:name => "European Union", :iso2_code => "EU"}, 
+      {:name => "High income", :iso2_code => "XD"}, 
+      {:name => "Heavily indebted poor countries (HIPC)", :iso2_code => "XE"}, 
+      {:name => "Not classified", :iso2_code => "XY"}, 
+      {:name => "Latin America & Caribbean (developing only)", :iso2_code => "XJ"}, 
+      {:name => "Latin America & Caribbean (all income levels)", :iso2_code => "ZJ"}, 
+      {:name => "Least developed countries: UN classification", :iso2_code => "XL"}, 
+      {:name => "Low income", :iso2_code => "XM"}, 
+      {:name => "Lower middle income", :iso2_code => "XN"}, 
+      {:name => "Low & middle income", :iso2_code => "XO"}, 
+      {:name => "Middle East & North Africa (all income levels)", :iso2_code => "ZQ"}, 
+      {:name => "Middle income", :iso2_code => "XP"}, 
+      {:name => "Middle East & North Africa (developing only)", :iso2_code => "XQ"}, 
+      {:name => "North America", :iso2_code => "XU"}, 
+      {:name => "High income: nonOECD", :iso2_code => "XR"}, 
+      {:name => "High income: OECD", :iso2_code => "XS"}, 
+      {:name => "OECD members", :iso2_code => "OE"}, 
+      {:name => "Other small states", :iso2_code => "S4"}, 
+      {:name => "Pacific island small states", :iso2_code => "S2"}, 
+      {:name => "South Asia", :iso2_code => "8S"}, 
+      {:name => "Sub-Saharan Africa (developing only)", :iso2_code => "ZF"}, 
+      {:name => "Sub-Saharan Africa (all income levels)", :iso2_code => "ZG"}, 
+      {:name => "Small states", :iso2_code => "S1"}, 
+      {:name => "Upper middle income", :iso2_code => "XT"}, 
+      {:name => "World", :iso2_code => "1W"}
+    ]
   end
 end
+
+
+  
+  
+  
+  
+  

data/lib/world_bank_fetcher/job.rb

@@ -12,8 +12,9 @@ module WorldBankFetcher
     end
     
     def fetch
-      data = fetch_all_data query
-      if data        
+      all_data = fetch_all_data query
+      if all_data
+        data = @job_type == :indicator ? all_data : CountryParser.filter(all_data)
         @checksum = checksum data
         {:results => data, :checksum => @checksum}
       else

data/lib/world_bank_fetcher/version.rb

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

data/lib/world_bank_fetcher.rb

@@ -2,7 +2,6 @@ require "world_bank_fetcher/version"
 require 'world_bank'
 require 'world_bank_fetcher/job'
 require 'world_bank_fetcher/query_scheduler'
-require 'world_bank_fetcher/data_parser'
 require 'world_bank_fetcher/country_parser'
 
 module WorldBankFetcher

data/spec/country_parser_spec.rb

@@ -2,32 +2,14 @@ require 'helper'
 
 module WorldBankFetcher
   describe CountryParser do
-    let(:france) { mock_country('France', "Paris", "Europe") }
-    let(:canada) { mock_country('Canada', "Ottawa", "North America") }
-    
-    it "should parse a country object" do
-      expected = [{:name => "France", :capital => "Paris", :region => "Europe"}]
-      CountryParser.parse([france]).should eq(expected)
-    end
-    
-    it "should parse multiple country objects" do
-      expected = [{:name => "France", :capital => "Paris", :region => "Europe"},
-        {:name => "Canada", :capital => "Ottawa", :region => "North America"} ]
-      CountryParser.parse([france, canada]).should eq(expected)
-    end
-    
-    private
-    def mock_country(name, capital, region_name)
-      region_hash = Object.new
-      raw_object = Object.new
-      raw_object.stub(:value).and_return(region_name)
-      region_hash.stub(:raw).and_return(raw_object)
-      country = double('country')
-      country.stub(:name).and_return(name)
-      country.stub(:capital).and_return(capital)
-      country.stub(:region).and_return(region_hash)
-      country      
-    end
-    
+    let(:france) { WorldBank::Country.new('name' => 'France', 'iso2Code' => 'FR')}
+    let(:canada) { WorldBank::Country.new('name' => 'Canada', 'iso2Code' => 'CA')}
+    let(:arab_world) { WorldBank::Country.new('name' => 'Arab World', 'iso2Code' => '1A')}
+    let(:euro_area) {WorldBank::Country.new('name' => "Euro area", 'iso2Code' => "XC")}
+     
+    it "should filter expected countries" do
+      CountryParser.filter([france, arab_world, canada]).should eq([france, canada])
+      CountryParser.filter([canada, euro_area, france, arab_world]).should eq([canada, france])
+    end    
   end  
 end

data/spec/job_spec.rb

@@ -3,10 +3,6 @@ require 'helper'
 module WorldBankFetcher
   describe Job do
     let(:indicator_string) { 'SP.POP.TOTL' }
-
-    before do
-      DataParser.stub(:parse).and_return(:something)
-    end
         
     context 'initialize' do
       it "should accept hash w/ indicator to specify job type in intializer" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world_bank_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -56,17 +56,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- country_list.txt
+- country_lists/country_list.txt
+- country_lists/non_country_list.txt
+- country_lists/sorted_countries.txt
 - lib/world_bank_fetcher.rb
 - lib/world_bank_fetcher/country_parser.rb
-- lib/world_bank_fetcher/data_parser.rb
 - lib/world_bank_fetcher/job.rb
 - lib/world_bank_fetcher/query_scheduler.rb
 - lib/world_bank_fetcher/version.rb
-- non_country_list.txt
-- sorted_countries.txt
 - spec/country_parser_spec.rb
-- spec/data_parser_spec.rb
 - spec/helper.rb
 - spec/job_spec.rb
 - spec/query_scheduler_spec.rb
@@ -85,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1312866395706772168
+      hash: 780221342756096436
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1312866395706772168
+      hash: 780221342756096436
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -103,7 +101,6 @@ specification_version: 3
 summary: Fetches local WorldBank country and indicator data.
 test_files:
 - spec/country_parser_spec.rb
-- spec/data_parser_spec.rb
 - spec/helper.rb
 - spec/job_spec.rb
 - spec/query_scheduler_spec.rb

data/lib/world_bank_fetcher/data_parser.rb

@@ -1,16 +0,0 @@
-require 'world_bank'
-
-module WorldBankFetcher
-  class DataParser
-    def self.parse(data_collection)
-      indicator_id = data_collection.first.id
-      results = {:id => indicator_id }
-      data_collection.each do |datum|
-        return nil unless datum.id === indicator_id
-        results[datum.others['country']['value']] ||= []
-        results[datum.others['country']['value']] << { :year => datum.date, :value => datum.value }
-      end
-      results
-    end
-  end
-end

data/spec/data_parser_spec.rb

@@ -1,47 +0,0 @@
-require 'helper'
-
-module WorldBankFetcher
-  describe DataParser do
-    let(:indicator_id) { 'DJ.JIE.JIDL' }
-    let(:datum1) { mock_data(:country => 'Mexico', :year => 1990, :id => indicator_id, :value => 234) }
-    let(:data) { [datum1] }
-
-    it "should parse data and return expected hash structure" do
-      actual = DataParser.parse data
-      actual.should eq({:id => indicator_id, 'Mexico' => [{:year => 1990, :value => 234}]})
-    end
-  
-    it "should return nil when provided data for multiple indicators" do
-      datum2 = mock_data(:country => 'Mexico', :year => 1990, :id => 'NJ.EKD.DKEL', :value => 234)
-      DataParser.parse([datum1, datum2]).should be_nil
-    end
-  
-    it "should handle more complext data" do
-      d1 = mock_data(:country => 'Mexico', :year => 1990, :id => indicator_id, :value => 234)
-      d2 = mock_data(:country => 'Mexico', :year => 1992, :id => indicator_id, :value => 456)
-      d3 = mock_data(:country => 'France', :year => 1990, :id => indicator_id, :value => 789)
-      expected = {:id => indicator_id, 'Mexico' => [{:year => 1990, :value => 234}, {:year => 1992, :value => 456}], 'France' => [{:year => 1990, :value => 789}]}
-
-      DataParser.parse([d1,d2,d3]).should eq(expected)    
-    end
-
-    it "should mock data properly" do
-      f = data.first
-      f.value.should eq(234)
-      f.id.should eq('DJ.JIE.JIDL')
-      f.date.should eq(1990)
-      f.others['country']['value'].should eq('Mexico')
-    end
-  
-    def mock_data(attr)
-      mockal = Object.new
-      mockal.stub(:value).and_return(attr[:value])
-      mockal.stub(:id).and_return(attr[:id])
-      mockal.stub(:date).and_return(attr[:year])
-
-      country_data = {'country' => {'value' => attr[:country]}}
-      mockal.stub(:others).and_return(country_data)
-      mockal
-    end
-  end
-end