world_bank_fetcher 0.1.0 → 0.1.1

data/lib/world_bank_fetcher/country_parser.rb

@@ -11,13 +11,17 @@ module WorldBankFetcher
       end        
     end
     
+    def self.data_from_official_country?(datum)
+      non_country_codes.include? datum.raw.country.id
+    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 }
+      data_collection.reject { |datum| data_from_official_country? datum }
     end
     
     def self.non_country_codes

data/lib/world_bank_fetcher/indicator_data_parser.rb

@@ -4,7 +4,7 @@ module WorldBankFetcher
   class IndicatorDataParser
 
     def self.filter(data_collection)
-      data = data_collection.keep_if {|datum| datum.value != nil }
+      data = data_collection.keep_if {|datum| (datum.value != nil) and CountryParser.data_from_official_country?(datum) }
     end
   end
 end

data/lib/world_bank_fetcher/version.rb

@@ -1,3 +1,3 @@
 module WorldBankFetcher
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/indicator_data_parser_spec.rb

@@ -10,11 +10,24 @@ module WorldBankFetcher
 
     
     it "should filter data with nil values" do
-      # CountryParser.filter([france, arab_world, canada]).should eq([france, canada])
+      CountryParser.stub(:data_from_official_country?).and_return(true)
       good_data = [good_data_1, good_data_2]
       IndicatorDataParser.filter([good_data_1, bad_data_2, bad_data_1, good_data_2]).should eq(good_data)
     end
     
+    it "should confirm that data is from an actual country by passing scores with values to CountryParser" do
+      CountryParser.should_receive(:data_from_official_country?).exactly(2).times.and_return(true)
+    
+      IndicatorDataParser.filter([good_data_1, bad_data_2, bad_data_1, good_data_2])
+    end
+    
+    it "should filter data rejected by CountryParser" do
+      CountryParser.stub(:data_from_official_country?).with(good_data_1).and_return(false)
+      CountryParser.stub(:data_from_official_country?).with(good_data_2).and_return(true)
+
+      IndicatorDataParser.filter([good_data_1, good_data_2]).should eq([good_data_2])
+    end
+    
     private
     
     def attrs_with(attr)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world_bank_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 438441967872334920
+      hash: 4160122140544830138
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 438441967872334920
+      hash: 4160122140544830138
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24