world_bank 0.0.1 → 0.9.0

data/lib/world_bank/region.rb

@@ -3,26 +3,19 @@ module WorldBank
 
     attr_reader :raw, :id, :name, :code, :type
 
-    def self.client
-      @client ||= WorldBank::Client.new
-    end
-
-    def self.all(client)
-      client.query[:dirs] = ['regions']
-      client.get_query
+    def self.all
+      find('all')
     end
 
     def self.find(id)
-      client.query[:dirs] = ['regions', id.to_s]
-      result = client.get_query
-      new(result[1][0])
+      WorldBank::ParamQuery.new('regions', id, self)
     end
 
     def initialize(values={})
       @raw = values
       @id = values['id']
-      @name = values['name']
       @code = values['code']
+      @name = values['name']
       @type = 'regions'
     end
   end

data/lib/world_bank/source.rb

@@ -1,21 +1,15 @@
 module WorldBank
 
   class Source
-  
+
     attr_reader :raw, :id, :name, :description, :url, :type
 
-    def self.client
-      @client ||= WorldBank::Client.new
-    end
-    def self.all(client)
-      client.query[:dirs] = ['sources']
-      client.get_query
+    def self.all
+      find('all')
     end
-  
+
     def self.find(id)
-      client.query[:dirs] = ['sources', id.to_s]
-      result = client.get_query
-      new(result[1][0])
+      WorldBank::ParamQuery.new('sources', id, self)
     end
 
     def initialize(values={})

data/lib/world_bank/topic.rb

@@ -1,24 +1,17 @@
 module WorldBank
 
   class Topic
-  
+
     attr_reader :raw, :id, :name, :note, :type
-  
-    def self.client
-      @client ||= WorldBank::Client.new
-    end
 
-    def self.all(client)
-      client.query[:dirs] = ['topics']
-      client.get_query
+    def self.all
+      find('all')
     end
-    
+
     def self.find(id)
-      client.query[:dirs] = ['topics', id.to_s]
-      result = client.get_query
-      new(result[1][0])
+      WorldBank::ParamQuery.new('topics', id, self)
     end
-    
+
     def initialize(values={})
       @raw = values
       @id = values['id']
@@ -26,7 +19,7 @@ module WorldBank
       @note = values['sourceNote']
       @type = 'topics'
     end
-    
+
   end
-  
+
 end

data/lib/world_bank/version.rb

@@ -1,3 +1,3 @@
 module WorldBank
-  VERSION = "0.0.1"
+  VERSION = "0.9.0"
 end

data/spec/world_bank/client_spec.rb

@@ -2,83 +2,15 @@ require 'helper'
 
 describe WorldBank::Client do
 
-  before do
-    @client = WorldBank::Client.new
-  end
-  
-  context 'topics' do
-    it 'returns all of the topics for the world bank' do
-      stub_get('topics?format=json').
-        to_return(:status => 200, :body => fixture('topics.json'))
-      test = @client.topics
-      a_get('topics?format=json').should have_been_made
-      test[0][:total].should eql 18
-    end    
-  end
-
-  context 'indicators' do
-    it 'returns all of the indicators for the world bank' do
-      stub_get('indicators?format=json').
-        to_return(:status => 200, :body => fixture('indicators.json'))
-      test = @client.indicators
-      a_get('indicators?format=json').should have_been_made
-      test[0][:pages].should eql 82
-    end
-  end
-
-  context 'countries' do
-    it 'returns all of the countries for the world bank' do
-      stub_get('countries?format=json').
-        to_return(:status => 200, :body => fixture('countries.json'))
-      test = @client.countries
-      a_get('countries?format=json').should have_been_made
-      test[0][:pages].should eql 5
-    end
-  end
-
-  context 'lending_types' do
-    it 'returns all of the lending types for the world bank' do
-      stub_get('lendingTypes?format=json').
-        to_return(:status => 200, :body => fixture('lending_types.json'))
-      test = @client.lending_types
-      a_get('lendingTypes?format=json').should have_been_made
-      test[0][:total].should eql '4'
-    end
-  end
-  
-  context 'income_levels' do
-    it 'returns all of the income levels for the world bank' do
-      stub_get('incomeLevels?format=json').
-        to_return(:status => 200, :body => fixture('income_levels.json'))
-      test = @client.income_levels
-      a_get('incomeLevels?format=json').should have_been_made
-      test[0][:total].should eql '9'
-    end
-  end
-  
-  context 'sources' do
-    it 'returns all of the sources for the world bank' do
-      stub_get('sources?format=json').
-        to_return(:status => 200, :body => fixture('sources.json'))
-      test = @client.sources
-      a_get('sources?format=json').should have_been_made
-      test[0][:total].should eql '14'
-    end
-  end
-
   context 'get' do
     it 'returns the response from the specified path' do
-      stub_get('sources?format=json').
+      stub_get('sources/all?format=json').
         to_return(:status => 200, :body => fixture('sources.json'))
-      test = @client.sources
-      a_get('sources?format=json').should have_been_made
-      test[0][:total].should eql '14'
-    end
-  end
-
-  context 'connection' do 
-    it 'returns an instance of Faraday' do
-      @client.send(:connection).should be_a Faraday::Connection
+      client = WorldBank::Client.new( { :dirs => ['sources', 'all'],
+                                        :params => {:format => 'json'}
+                                      }, false)
+      client.get('sources/all?format=json')
+      a_get('sources/all?format=json').should have_been_made
     end
   end
 

data/spec/world_bank/country_spec.rb

@@ -1,47 +1,32 @@
 require 'helper'
 
 describe WorldBank::Country do
-  context 'client' do
-    it 'returns WorldBank::Client' do
-      client = WorldBank::Country.client
-      client.should be_a WorldBank::Client
-    end
-  end
-  context 'find' do
-    it 'returns the correct Country' do
+  context 'returned Country has' do
+    before do
       stub_get('countries/in?format=json').
         to_return(:status => 200, :body => fixture('countries_india.json'))
-      india = WorldBank::Country.find('in')
-      a_get('countries/in?format=json').should have_been_made
-      india.should be_a WorldBank::Country
-    end
-    context 'returned Country has' do
-      before do
-        stub_get('countries/in?format=json').
-          to_return(:status => 200, :body => fixture('countries_india.json'))
-        @india = WorldBank::Country.find('in')
-      end
-      it 'a three letter code' do
-        @india.iso3_code.should eql 'IND'
-      end
-      it 'a two letter code' do
-        @india.iso2_code.should eql 'IN'
-      end
-      it 'a name' do
-        @india.name.should eql 'India'
-      end
-      it 'an IncomeLevel' do
-        @india.income_level.should be_a WorldBank::IncomeLevel
-      end
-      it 'a LendingType' do
-        @india.lending_type.should be_a WorldBank::LendingType
-      end
-      it 'a capital' do
-        @india.capital.should eql 'New Delhi'
-      end
-      it 'a region' do
-        @india.region.should be_a WorldBank::Region
-      end
+      @india = WorldBank::Country.find('in').fetch
+    end
+    it 'a three letter code' do
+      @india.iso3_code.should eql 'IND'
+    end
+    it 'a two letter code' do
+      @india.iso2_code.should eql 'IN'
+    end
+    it 'a name' do
+      @india.name.should eql 'India'
+    end
+    it 'an IncomeLevel' do
+      @india.income_level.should be_a WorldBank::IncomeLevel
+    end
+    it 'a LendingType' do
+      @india.lending_type.should be_a WorldBank::LendingType
+    end
+    it 'a capital' do
+      @india.capital.should eql 'New Delhi'
+    end
+    it 'a region' do
+      @india.region.should be_a WorldBank::Region
     end
   end
 end

data/spec/world_bank/data_query_spec.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+describe WorldBank::DataQuery do
+  context 'lending types' do
+    it 'accepts a single LendingType as param' do
+      stub_get('lendingTypes/IDB/indicators/all?format=json')
+      lending_type = WorldBank::LendingType.new({"id" => "IDB","value" => "Blend"})
+      WorldBank::Data.raw.lending_type(lending_type).fetch
+      a_get('lendingTypes/IDB/indicators/all?format=json').should have_been_made
+    end
+  end
+  context 'income levels' do
+    it 'accepts a single IncomeLevels as param' do
+      stub_get('incomeLevels/LMC/indicators/all?format=json')
+      WorldBank::Data.raw.income_level('LMC').fetch
+      a_get('incomeLevels/LMC/indicators/all?format=json').should have_been_made
+    end
+  end
+  context 'sources' do
+    it 'accepts a single Source as param' do
+      stub_get('sources/1/indicators/all?format=json')
+      WorldBank::Data.raw.source(1).fetch
+      a_get('sources/1/indicators/all?format=json').should have_been_made
+    end
+  end
+  context 'country' do
+    it 'adds countries to the params if given ISO-2 code' do
+      stub_get('countries/br/indicators/AB.LND.ARBL.ZS?format=json')
+      WorldBank::Data.find('AB.LND.ARBL.ZS').country('br').raw.fetch
+      a_get('countries/br/indicators/AB.LND.ARBL.ZS?format=json').should have_been_made
+    end
+    it 'adds countries to the params if given human name' do
+      stub_get('countries/BR/indicators/AB.LND.ARBL.ZS?format=json')
+      WorldBank::Data.find('AB.LND.ARBL.ZS').country('brazil').raw.fetch
+      a_get('countries/BR/indicators/AB.LND.ARBL.ZS?format=json').should have_been_made
+    end
+  end
+end

data/spec/world_bank/income_level_spec.rb

@@ -1,18 +1,11 @@
 require 'helper'
 
 describe WorldBank::IncomeLevel do
-  context 'client' do
-    # my god these need to be refactored... but can they be? what about including client within????
-    it 'returns a WorldBank::Client' do
-      client = WorldBank::IncomeLevel.client
-      client.should be_a WorldBank::Client
-    end
-  end
   context 'find' do
     it 'returns a WorldBank::IncomeLevel' do
       stub_get('incomeLevels/lmc?format=json').
         to_return(:status => 200, :body => fixture('income_level_lmc.json'))
-      @working_class = WorldBank::IncomeLevel.find('lmc')
+      @working_class = WorldBank::IncomeLevel.find('lmc').fetch
       a_get('incomeLevels/lmc?format=json').should have_been_made
       @working_class.should be_a WorldBank::IncomeLevel
     end
@@ -20,7 +13,7 @@ describe WorldBank::IncomeLevel do
       before do
         stub_get('incomeLevels/lmc?format=json').
           to_return(:status => 200, :body => fixture('income_level_lmc.json'))
-        @working_class = WorldBank::IncomeLevel.find('lmc')
+        @working_class = WorldBank::IncomeLevel.find('lmc').fetch
       end
       it 'an id' do
         @working_class.id.should eql 'LMC'

data/spec/world_bank/indicator_spec.rb

@@ -5,7 +5,7 @@ describe WorldBank::Indicator do
     it 'returns a WorldBank::Indicator' do
       stub_get('indicators/AG.AGR.TRAC.NO?format=json').
         to_return(:status => 200, :body => fixture('indicators_tractors.json'))
-      tractors = WorldBank::Indicator.find('AG.AGR.TRAC.NO')
+      tractors = WorldBank::Indicator.find('AG.AGR.TRAC.NO').fetch
       a_get('indicators/AG.AGR.TRAC.NO?format=json').should have_been_made
       tractors.should be_a WorldBank::Indicator
     end
@@ -13,7 +13,7 @@ describe WorldBank::Indicator do
       before do
         stub_get('indicators/AG.AGR.TRAC.NO?format=json').
           to_return(:status => 200, :body => fixture('indicators_tractors.json'))
-        @tractors = WorldBank::Indicator.find 'AG.AGR.TRAC.NO'
+        @tractors = WorldBank::Indicator.find('AG.AGR.TRAC.NO').fetch
       end
       it 'an id' do
         @tractors.id.should eql 'AG.AGR.TRAC.NO'

data/spec/world_bank/lending_type_spec.rb

@@ -1,17 +1,11 @@
 require 'helper'
 
 describe WorldBank::LendingType do
-  context 'client' do
-    it 'should return a Client' do
-      client = WorldBank::LendingType.client
-      client.should be_a WorldBank::Client
-    end
-  end
   context 'find' do
     it 'returns a LendingType' do
       stub_get('lendingTypes/idb?format=json').
         to_return(:status => 200, :body => fixture('lending_type_idb.json'))
-      @blend = WorldBank::LendingType.find('idb')
+      @blend = WorldBank::LendingType.find('idb').fetch
       a_get('lendingTypes/idb?format=json').should have_been_made
       @blend.should be_a WorldBank::LendingType
     end
@@ -19,7 +13,7 @@ describe WorldBank::LendingType do
       before do
         stub_get('lendingTypes/idb?format=json').
           to_return(:status => 200, :body => fixture('lending_type_idb.json'))
-        @blend = WorldBank::LendingType.find('idb')
+        @blend = WorldBank::LendingType.find('idb').fetch
       end
       it 'an id' do
         @blend.id.should eql 'IDB'

data/spec/world_bank/param_query_spec.rb

@@ -0,0 +1,45 @@
+require 'helper'
+
+describe WorldBank::ParamQuery do
+  context 'lending types' do
+    it 'accepts a single LendingType as param' do
+      stub_get('countries/all?format=json&lendingTypes=IDB')
+      lending_type = WorldBank::LendingType.new({"id" => "IDB","value" => "Blend"})
+      WorldBank::Country.all.raw.lending_type(lending_type).fetch
+      a_get('countries/all?format=json&lendingTypes=IDB').should have_been_made
+    end
+  end
+  context 'income levels' do
+    it 'accepts a single IncomeLevels as param' do
+      stub_get('countries/all?format=json&incomeLevels=LMC')
+      WorldBank::Country.all.raw.income_level('LMC').fetch
+      a_get('countries/all?format=json&incomeLevels=LMC').should have_been_made
+    end
+  end
+  context 'sources' do
+    it 'accepts a single Source as param' do
+      stub_get('countries/all?format=json&sources=1')
+      WorldBank::Country.all.raw.source(1).fetch
+      a_get('countries/all?format=json&sources=1').should have_been_made
+    end
+  end
+  context 'featured_indicators' do
+    it 'adds featured param with value of 1' do
+      stub_get('indicators/all?format=json&featured=1')
+      WorldBank::Indicator.featured.raw.fetch
+      a_get('indicators/all?format=json&featured=1').should have_been_made
+    end
+  end
+  context 'country' do
+    it 'adds countries to the params if given ISO-2 code' do
+      stub_get('indicators/AB.LND.ARBL.ZS?format=json&countries=br')
+      WorldBank::Indicator.find('AB.LND.ARBL.ZS').country('br').raw.fetch
+      a_get('indicators/AB.LND.ARBL.ZS?format=json&countries=br').should have_been_made
+    end
+    it 'adds countries to the params if given human name' do
+      stub_get('indicators/AB.LND.ARBL.ZS?format=json&countries=BR')
+      WorldBank::Indicator.find('AB.LND.ARBL.ZS').country('brazil').raw.fetch
+      a_get('indicators/AB.LND.ARBL.ZS?format=json&countries=BR').should have_been_made
+    end
+  end
+end

data/spec/world_bank/query_spec.rb

@@ -1,114 +1,74 @@
 require 'helper'
 
 describe WorldBank::Query do
-  before do
-    @india = {"id" => "IND",
-              "iso2Code" => "IN",
-              "name" => "India",
-              "region" => {
-                "id" => "SAS",
-                "value" => "South Asia"},
-              "adminregion" => {
-                "id" => "SAS",
-                "value" => "South Asia"},
-              "incomeLevel" => {
-                "id" => "LMC",
-                "value" => "Lower middle income"},
-              "lendingType" => {
-                "id" => "IDB",
-                "value" => "Blend"},
-              "capitalCity" => "New Delhi",
-              "longitude" => "77.225",
-              "latitude" => "28.6353"}
-    @country = WorldBank::Country.new(@india)
-    @query = WorldBank::Query::Base.new(@country)
-    @client = @query.instance_variable_get :@client
-  end
-  context 'client' do
-    it 'returns WorldBank::Client' do
-      @client.should be_a WorldBank::Client
-    end
-  end
   context 'dates' do
+    it 'should return self' do
+      WorldBank::Source.all.dates('something').should be_a_kind_of WorldBank::Query
+    end
     it 'adds a date string to the params hash' do
-      @query.dates('2000:2010')
-      @client.query[:params].should eql({:format => 'json', :date => '2000:2010'})
+      stub_get('sources/all?date=2000:2010&format=json')
+      WorldBank::Source.all.raw.dates('2000:2010').fetch
+      a_get('sources/all?date=2000:2010&format=json').should have_been_made
     end
     it 'adds a range of date objects to the params hash' do
-      @birthday = Date.new(1982, 3, 7)
-      @q3 = Date.new(2010, 9, 30)
-      @query.dates(@birthday...@q3)
-      @client.query[:params].should eql({:format => 'json', :date => '1982M03:2010M09'})
+      stub_get('sources/all?date=1982M03:2010M09&format=json')
+      birthday = Date.new(1982, 3, 7)
+      q3 = Date.new(2010, 9, 30)
+      WorldBank::Source.all.raw.dates(birthday...q3).fetch
+      a_get('sources/all?date=1982M03:2010M09&format=json').should have_been_made
     end
   end
   context 'format' do
     it 'adds a format string to the params' do
-      @query.format('xml')
-      @client.query[:params].should eql({:format => 'xml'})
-    end
-  end
-  context 'id' do
-    it 'adds an id string to the params' do
-      @query.id(9)
-      @client.query[:params].should eql({:format => 'json', :id => 9})
+      stub_get('sources/all?format=xml')
+      WorldBank::Source.all.raw.format(:xml).fetch
+      a_get('sources/all?format=xml').should have_been_made
     end
   end
   context 'most_recent_values' do
     it 'adds a MRV to the params' do
-      @query.most_recent_values(10)
-      @client.query[:params].should eql({:format => 'json', :MRV => 10})
-    end
+      stub_get('sources/all?MRV=5&format=json')
+      WorldBank::Source.all.raw.most_recent_values(5).fetch
+      a_get('sources/all?MRV=5&format=json').should have_been_made end
   end
   context 'per page' do
     it 'adds a perPage string to the params' do
-      @query.per_page(50)
-      @client.query[:params].should eql({:format => 'json', :perPage => 50})
+      stub_get('sources/all?perPage=50&format=json')
+      WorldBank::Source.all.raw.per_page(50).fetch
+      a_get('sources/all?perPage=50&format=json').should have_been_made
     end
   end
   context 'page' do
-    it 'adds a page param' do
-      @query.page(3)
-      @client.query[:params].should eql({:format => 'json', :page => 3})
+    it 'adds a page param when passed a value' do
+      stub_get('sources/all?page=3&format=json')
+      WorldBank::Source.all.raw.page(3).fetch
+      a_get('sources/all?page=3&format=json').should have_been_made
     end
   end
-  context 'language' do
-    it 'adds one of (en, es, fr, ar) to the dir array' do
-      @query.language('es')
-      @client.query[:dirs].should eql(['countries', 'es'])
+  context 'next' do
+    it 'increments the page count' do
+      stub_get('sources/all?page=3&format=json')
+      query = WorldBank::Source.all.raw.page(2)
+      query.next.fetch
+      a_get('sources/all?page=3&format=json').should have_been_made
     end
   end
-  context 'lending types' do
-    it 'accepts a single LendingType as param' do
-      @query = WorldBank::Query::Base::Countries.new(@country)
-      @client = @query.instance_variable_get :@client
-      @lending_type = WorldBank::LendingType.new({"id" => "IDB","value" => "Blend"})
-      @query.lending_types(@lending_type)
-      @client.query[:params].should eql({:format => 'json', :lendingTypes => 'IDB'})
-    end
-    it 'converts an array of LendingTypes to a param' do
-      @query = WorldBank::Query::Base::Countries.new(@country)
-      @client = @query.instance_variable_get :@client
-      @lending_type = WorldBank::LendingType.new({"id" => "IDB","value" => "Blend"})
-      @other_type = @lending_type.dup
-      @query.lending_types([@other_type, @lending_type])
-      @client.query[:params].should eql({:format => 'json', :lendingTypes => 'IDB;IDB'})
+  context 'cycle' do
+    it 'cycles through all of the pages of results' do
+      3.times do |i|
+        stub_get("sources/all?page=#{i+1}&format=json").
+          to_return(:status => 200, :body => ["#{i+1}"])
+      end
+      query = WorldBank::Source.all.raw.page(1)
+      query.instance_variable_set(:@pages, 3)
+      query.cycle.should == ["2", "3"]
     end
   end
-  context 'income levels' do
-    it 'accepts a single IncomeLevels as param' do
-      @query = WorldBank::Query::Base::Countries.new(@country)
-      @client = @query.instance_variable_get :@client
-      @income_level = WorldBank::IncomeLevel.new({"id" => "LMC","value" => "Lower middle income"})
-      @query.income_levels(@income_level)
-      @client.query[:params].should eql({:format => 'json', :incomeLevels => 'LMC'})
-    end
-    it 'converts an array of IncomeLevels to a param' do
-      @query = WorldBank::Query::Base::Countries.new(@country)
-      @client = @query.instance_variable_get :@client
-      @income_level = WorldBank::IncomeLevel.new({"id" => "LMC","value" => "Lower middle income"})
-      @other_type = @income_level.dup
-      @query.income_levels([@other_type, @income_level])
-      @client.query[:params].should eql({:format => 'json', :incomeLevels => 'LMC;LMC'})
+  context 'language' do
+    it 'adds language param to the front of the query path' do
+      stub_get('es/sources/all?format=json')
+      WorldBank::Source.all.raw.language(:spanish).fetch
+      a_get('es/sources/all?format=json').should have_been_made
     end
   end
 end