world_bank_fetcher 0.0.11 → 0.0.12

data/lib/world_bank_fetcher/job.rb

@@ -15,19 +15,14 @@ module WorldBankFetcher
       all_data = fetch_everything query
       if all_data
         data = CountryParser.filter(all_data)
-        @checksum = checksum data
-        {:results => data, :checksum => @checksum}
+        data
       else
         nil
       end
     end
 
     private
-    
-    def checksum(data)
-      Digest::MD5.hexdigest Marshal.dump(data)
-    end
-    
+        
     def build_query(options)
       options[:indicator] ? indicator_query(options[:indicator]) : countries_query
     end

data/lib/world_bank_fetcher/version.rb

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

data/spec/job_spec.rb

@@ -1,66 +1,45 @@
 require 'helper'
 
 module WorldBankFetcher
-  describe Job do
-    before do
-      CountryParser.stub!(:filter) do |arg|
-        arg
-      end
-    end
-    
+  describe Job do    
     let(:indicator_string) { 'SP.POP.TOTL' }
         
-    context 'initialize' do
+    describe 'initialize' do
       it "should accept hash w/ indicator to specify job type in intializer" do
+        country_parser_filters_nothing!
         WorldBank::Data.should_receive(:country).with('all').and_return(stubbed_query)
         Job.new(:indicator => indicator_string)
       end
       
       it "should accept countries to indicate all countries in initializer hash" do
+        country_parser_filters_nothing!
         WorldBank::Country.should_receive(:all).and_return(stubbed_query)
         Job.new(:countries => true)
       end
     end
 
-    context 'fetch' do
+    describe 'fetch' do
       it "should return nil if query shceduler returns nil" do
-        WorldBank::DataQuery.any_instance.stub(:total).and_return(39)
+        country_parser_filters_nothing!
         QueryScheduler.any_instance.should_receive(:execute!).and_return(nil)
         job = Job.new(:indicator => indicator_string)
         job.fetch.should be_nil
       end
 
       it "should not return nil if query shceduler returns non nil value" do
-        WorldBank::DataQuery.any_instance.stub(:total).and_return(39)
+        country_parser_filters_nothing!
         QueryScheduler.any_instance.should_receive(:execute!).and_return(:something)
         job = Job.new(:indicator => indicator_string)
         job.fetch.should_not be_nil
       end
     
-      it "returns a hash if there are no errors" do
-        WorldBank::DataQuery.any_instance.stub(:total).and_return(39)
+      it "filters return value from Query Scheduler through CountryParser" do
         QueryScheduler.any_instance.should_receive(:execute!).and_return(:something)
-
+        CountryParser.should_receive(:filter).with(:something).and_return(:something_else)
         job = Job.new(:indicator => indicator_string)
-        job.fetch.should be_an_instance_of(Hash)
+        job.fetch.should eq(:something_else)
       end
-  
-      context 'checksum' do
-        it "should return unique checksums given unique results" do
-          job = Job.new(:indicator => indicator_string)
-          d1 = [:blah, :blog, :dj]
-          d2 = [:bjad, :awe, :asdf]
-          job.send(:checksum, d1).should_not eq(job.send(:checksum, d2))
-        end
-        
-        it "should receive same checksum if scheduler returns identical results" do
-          job = Job.new(:indicator => indicator_string)
-          d1 = [:blah, :blog, :dj]
-          job.send(:checksum, d1).should eq(job.send(:checksum, d1))          
-        end
-        
-      end
-    end    
+    end
     
     private
     def stubbed_query
@@ -68,5 +47,11 @@ module WorldBankFetcher
       dummy_query.stub(:indicator)
       dummy_query
     end
+    
+    def country_parser_filters_nothing!
+      CountryParser.stub!(:filter) do |arg|
+        arg
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world_bank_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -36905167652878939
+      hash: -4294862042739340307
 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: -36905167652878939
+      hash: -4294862042739340307
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24