world_bank_fetcher 0.0.6 → 0.0.7

data/lib/world_bank_fetcher/job.rb

@@ -13,14 +13,8 @@ module WorldBankFetcher
     
     def fetch
       data = fetch_all_data query
-      if data
-        if @job_type == :indicator
-          @results = DataParser.parse data
-        else
-          @results = CountryParser.parse data
-        end
-        
-        @checksum = Digest::MD5.hexdigest Marshal.dump(@results)
+      if data        
+        @checksum = checksum data
         {:results => @results, :checksum => @checksum}
       else
         nil
@@ -29,6 +23,10 @@ module WorldBankFetcher
 
     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.6"
+  VERSION = "0.0.7"
 end

data/spec/job_spec.rb

@@ -42,28 +42,21 @@ module WorldBankFetcher
         job = Job.new(:indicator => indicator_string)
         job.fetch.should be_an_instance_of(Hash)
       end
-    
-      it "should receive same checksum if scheduler returns identical results" do
-        WorldBank::DataQuery.any_instance.stub(:total).and_return(39)
-        QueryScheduler.any_instance.stub(:execute!).and_return(:something)
-
-        job = Job.new(:indicator => indicator_string)
-        first = job.fetch[:checksum]
-        second = job.fetch[:checksum]
-        first.should eq(second)
-      end
-    
-      it "should return unique checksums given unique results" do
-
-        DataParser.should_receive(:parse).twice.and_return(:something, :something_else)
-        WorldBank::DataQuery.any_instance.stub(:total).and_return(39)
-        QueryScheduler.any_instance.stub(:execute!).and_return(:some_stuff)
-
-        job = Job.new(:indicator => indicator_string)
-        second_job = Job.new :indicator => 'different string'
-        first = job.fetch[:checksum]
-        second = second_job.fetch[:checksum]
-        first.should_not eq(second)      
+  
+      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    
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world_bank_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -874768310666581088
+      hash: -3624973243962127060
 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: -874768310666581088
+      hash: -3624973243962127060
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24