EGP_Rates 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0c2f82418e56933c9405f6873e9f9b1f0b6775
-  data.tar.gz: 661e559e8c5adab660ea355035b6e94ae6751129
+  metadata.gz: 5e976dae1eab58fd31f597eea3578ccc57e7d3f8
+  data.tar.gz: a6dc1a5e24a3f346c2b76c94a9ccbcc7579e09a4
 SHA512:
-  metadata.gz: 2c4a101d49cad29d9f165098e85dfc6b5962d6c2ac5bae078084667bce71b9ca5bcc42ea514b01b48fbf3ce4da7568dae0f5a35cbe6ea09d59679681b6fbdb2c
-  data.tar.gz: f3198bd2ba87e4da26ea558013ea5994a984f29275016fd9f2b9e0c78485dc14898a458ac461d5084e2409fc68546d7d121a59ba57795a7e5c60d30fdd146932
+  metadata.gz: 5e923542f46a4232deb29b55c8c8945453cb2682851e70cbfb9162964f5cfc1d168996f597f71d63a2bf27b8c19c0eb81ddbf178fbde38a56d93a318358f1106
+  data.tar.gz: 102830270b29082b200f8a5f909351ac82fa392387691768d685215809af46e58640f34012cda9578b5bdc450d52d4ff67585e994a0500802ccf2957b8b29991

data/lib/egp_rates/bank.rb

@@ -33,21 +33,21 @@ module EGPRates
       when /UAE|EMIRATES|Dirham|AED/i then :AED
       when /Australian/i              then :AUD
       when /Bahrain|BHD/i             then :BHD
-      when /Canadian/i                then :CAD
+      when /Canadian|CANAD\. Dollar/i then :CAD
       when /Swiss|CHF/i               then :CHF
       when /Chinese/                  then :CNY
       when /Danish/i                  then :DKK
       when /Euro|EUR/i                then :EUR
-      when /British|Sterling|GBP/i    then :GBP
+      when /British|Sterl.|GBP/i      then :GBP
       when /Jordanian/i               then :JOD
       when /Japanese|JPY|YEN/i        then :JPY
       when /Kuwait/i                  then :KWD
-      when /Norwegian/i               then :NOK
+      when /Norwegian|NORWEG\./i      then :NOK
       when /Omani/i                   then :OMR
       when /Qatar/i                   then :QAR
       when /SAR|Saudi/i               then :SAR
       when /Swidish|Swedish/i         then :SEK
-      when /US Dollar|USD/i           then :USD
+      when /U(\.)?S(\.)? Dollar|USD/i then :USD
       else fail ResponseError, "Unknown currency #{currency}"
       end
     end

data/lib/egp_rates/faisal_bank.rb

@@ -4,7 +4,7 @@ module EGPRates
   class FaisalBank < EGPRates::Bank
     def initialize
       @sym = :FaisalBank
-      @uri = URI.parse('http://www.faisalbank.com.eg/FIB/arabic/rate.html')
+      @uri = URI.parse('https://online.faisalbank.com.eg/IB/.FIBUserServices/currencyXRate.do?op=getCurrencyExchangeRates&LangID=2')
     end
 
     # @return [Hash] of exchange rates for selling and buying
@@ -26,30 +26,10 @@ module EGPRates
     #     ...
     #   ]
     def raw_exchange_rates
-      table_rows = Oga.parse_html(response.body).css('.even')
-      # FaisalBank porvide 13 currencies
-      fail ResponseError, 'Unknown HTML' unless table_rows&.size == 13
-      table_rows.lazy.map(&:children).map do |cell|
-        cell.to_a.drop(2).map(&:text).map(&:strip)
-      end
-    end
-
-    # Parse the #raw_exchange_rates returned in response
-    # @param [Array] of the raw_data scraped
-    # @return [Hash] of exchange rates for selling and buying
-    #   {
-    #     { sell: { SYM: rate }, { SYM: rate }, ... },
-    #     { buy:  { SYM: rate }, { SYM: rate }, ... }
-    #   }
-    def parse(raw_data)
-      raw_data.each_with_object(sell: {}, buy: {}) do |row, result|
-        sell_rate = row[5].to_f
-        buy_rate  = row[3].to_f
-        currency  = row[1].to_sym
-
-        result[:sell][currency] = sell_rate
-        result[:buy][currency]  = buy_rate
-      end
+      table_rows = Oga.parse_html(response.body).css('.Action-Table td')
+      # each  currency of the 13 provided in 5 table data
+      fail ResponseError, 'Unknown HTML' unless table_rows&.size == 13 * 5
+      table_rows.map(&:text).map(&:strip).each_slice(5)
     end
   end
 end

data/lib/egp_rates.rb

@@ -15,7 +15,6 @@ require 'egp_rates/banque_du_caire'
 require 'egp_rates/suez_canal_bank'
 require 'egp_rates/al_baraka_bank'
 require 'egp_rates/al_ahli_bank_of_kuwait'
-require 'egp_rates/saib'
 require 'egp_rates/midb'
 require 'egp_rates/ube'
 require 'egp_rates/cae'

data/spec/egp_rates/faisal_bank_spec.rb

@@ -36,11 +36,11 @@ describe EGPRates::FaisalBank do
         EGPRates::ResponseError, 'Unknown HTML'
     end
 
-    it 'returns <#Enumerator::Lazy> of 9 rows',
+    it 'returns <#Enumerator::Lazy> of 13 rows',
        vcr: { cassette_name: :FaisalBank } do
-      lazy_enumerator = bank.send(:raw_exchange_rates)
-      expect(lazy_enumerator).to be_a Enumerator::Lazy
-      expect(lazy_enumerator.size).to eq 13
+      enumerator = bank.send(:raw_exchange_rates)
+      expect(enumerator).to be_an Enumerator
+      expect(enumerator.size).to eq 13
     end
   end
 
@@ -49,37 +49,37 @@ describe EGPRates::FaisalBank do
 
     it 'returns sell: hash of selling prices' do
       expect(bank.send(:parse, raw_data)[:sell]).to match(
-        AED: 4.9006,
-        CAD: 13.5788,
-        CHF: 17.8625,
-        DKK: 2.5844,
-        EUR: 19.224,
-        GBP: 22.932,
-        JPY: 0.1588,
-        KWD: 59.0551,
-        NOK: 2.1428,
-        QAR: 4.9426,
-        SAR: 4.825,
-        SEK: 1.9604,
-        USD: 18.0
+        AED: 4.2884,
+        CAD: 12.0616,
+        CHF: 15.7092,
+        DKK: 2.2495,
+        EUR: 16.7218,
+        GBP: 19.7899,
+        JPY: 0.140688,
+        KWD: 51.6902,
+        NOK: 1.8928,
+        QAR: 4.3251,
+        SAR: 4.2216,
+        SEK: 1.757,
+        USD: 15.75
       )
     end
 
     it 'returns buy: hash of buying prices' do
       expect(bank.send(:parse, raw_data)[:buy]).to match(
-        AED: 4.7646,
-        CAD: 13.1421,
-        CHF: 17.2942,
-        DKK: 2.4995,
-        EUR: 18.5955,
-        GBP: 22.0833,
-        JPY: 0.15324,
-        KWD: 57.377,
-        NOK: 2.0682,
-        QAR: 4.806,
-        SAR: 4.6407,
-        SEK: 1.8972,
-        USD: 17.5
+        AED: 4.2611,
+        CAD: 11.932,
+        CHF: 15.5273,
+        DKK: 2.2224,
+        EUR: 16.5233,
+        GBP: 19.4796,
+        JPY: 0.139148,
+        KWD: 51.2409,
+        NOK: 1.8679,
+        QAR: 4.2983,
+        SAR: 4.151,
+        SEK: 1.7316,
+        USD: 15.65
       )
     end
   end

data/spec/egp_rates_spec.rb

@@ -6,10 +6,10 @@ describe EGPRates do
       let(:bank) { double(EGPRates::Bank) }
 
       it 'calls #exchange_rates on all Bank Classes' do
-        expect(described_class).to receive(:const_get).exactly(20).times
+        expect(described_class).to receive(:const_get).exactly(19).times
           .and_return bank
-        expect(bank).to receive(:new).exactly(20).times.and_return bank
-        expect(bank).to receive(:exchange_rates).exactly(20).times
+        expect(bank).to receive(:new).exactly(19).times.and_return bank
+        expect(bank).to receive(:exchange_rates).exactly(19).times
 
         described_class.exchange_rates
       end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'vcr'
 require 'simplecov'
 SimpleCov.start do
   add_filter '/spec/'
+  add_filter '/.bundle/'
 end
 
 require 'egp_rates'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: EGP_Rates
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Ahmed Abdel-Razzak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,7 +190,6 @@ files:
 - lib/egp_rates/midb.rb
 - lib/egp_rates/nbe.rb
 - lib/egp_rates/nbg.rb
-- lib/egp_rates/saib.rb
 - lib/egp_rates/suez_canal_bank.rb
 - lib/egp_rates/ube.rb
 - spec/cassettes/AAIB.gz
@@ -231,7 +230,6 @@ files:
 - spec/egp_rates/midb_spec.rb
 - spec/egp_rates/nbe_spec.rb
 - spec/egp_rates/nbg_spec.rb
-- spec/egp_rates/saib_spec.rb
 - spec/egp_rates/suez_canal_bank_spec.rb
 - spec/egp_rates/ube_spec.rb
 - spec/egp_rates_spec.rb

data/lib/egp_rates/saib.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-module EGPRates
-  # Société Arabe Internationale de Banque (SAIB)
-  class SAIB < EGPRates::Bank
-    def initialize
-      @sym = :SAIB
-      @uri = URI.parse('http://www.saib.com.eg/foreign-currencies/')
-    end
-
-    # @return [Hash] of exchange rates for selling and buying
-    #   {
-    #     { sell: { SYM: rate }, { SYM: rate }, ... },
-    #     { buy:  { SYM: rate }, { SYM: rate }, ... }
-    #   }
-    def exchange_rates
-      @exchange_rates ||= parse(raw_exchange_rates)
-    end
-
-    private
-
-    # Send the request to the URL and retrun raw data of the response
-    # @return [Enumerator::Lazy] with the table row in HTML that evaluates to
-    #   [
-    #     [
-    #       "\n", "USD", "\n", "1605.00", "\n", "1675.00", "\n"
-    #     ], [
-    #       \n", "\xC2\xA0EUR", "\n", "1698", "\n", "1773", "\n
-    #     ]
-    #     ...
-    #   ]
-    #
-    def raw_exchange_rates
-      table_rows = Oga.parse_html(response.body).css('.cont table tbody tr')
-      # SAIB porvide 6 currencies on the home page but with header
-      # and an empty row in the end
-      fail ResponseError, 'Unknown HTML' unless table_rows&.size == 8
-      table_rows.lazy.drop(1).take(6).map(&:children).map do |cell|
-        cell.map(&:text)
-      end
-    end
-
-    # Parse the #raw_exchange_rates returned in response
-    # @param [Array] of the raw_data scraped
-    # @return [Hash] of exchange rates for selling and buying
-    #   {
-    #     { sell: { SYM: rate }, { SYM: rate }, ... },
-    #     { buy:  { SYM: rate }, { SYM: rate }, ... }
-    #   }
-    def parse(raw_data)
-      raw_data.each_with_object(sell: {}, buy: {}) do |row, result|
-        sell_rate = (row[5].to_f / 100).round(4)
-        buy_rate  = (row[3].to_f / 100).round(4)
-        currency  = row[1].gsub(/\xC2\xA0/n, '').to_sym
-
-        result[:sell][currency] = sell_rate
-        result[:buy][currency]  = buy_rate
-      end
-    end
-  end
-end

data/spec/egp_rates/saib_spec.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-describe EGPRates::SAIB do
-  subject(:bank) { described_class.new }
-
-  it 'Live Testing', :live do
-    expect(bank.exchange_rates).to include(:buy, :sell)
-    expect(bank.exchange_rates[:buy].size).to eq 6
-    expect(bank.exchange_rates[:sell].size).to eq 6
-    expect(bank.exchange_rates[:buy].keys).to include(
-      :CHF, :EUR, :GBP, :KWD, :SAR, :USD
-    )
-    expect(bank.exchange_rates[:sell].keys).to include(
-      :CHF, :EUR, :GBP, :KWD, :SAR, :USD
-    )
-  end
-
-  describe '.new' do
-    it 'initialize instance variables' do
-      expect(bank.sym).to eq :SAIB
-      expect(bank.instance_variable_get(:@uri)).to be_a URI
-    end
-  end
-
-  describe '#exchange_rates' do
-    it 'calls #parse with #raw_exchange_rates' do
-      expect(bank).to receive(:raw_exchange_rates)
-      expect(bank).to receive(:parse)
-      bank.exchange_rates
-    end
-  end
-
-  describe '#raw_exchange_rates' do
-    it 'raises ResponseError unless Net::HTTPSuccess', :no_vcr do
-      stub_request(:get, /.*saib.*/).to_return(body: '', status: 500)
-      expect { bank.send(:raw_exchange_rates) }.to raise_error\
-        EGPRates::ResponseError, '500'
-    end
-
-    it 'raises ResponseError if HTML structure changed', :no_vcr do
-      stub_request(:get, /.*saib.*/).to_return(body: '', status: 200)
-      expect { bank.send(:raw_exchange_rates) }.to raise_error\
-        EGPRates::ResponseError, 'Unknown HTML'
-    end
-
-    it 'returns <#Enumerator::Lazy> of 6 rows', vcr: { cassette_name: :SAIB } do
-      lazy_enumerator = bank.send(:raw_exchange_rates)
-      expect(lazy_enumerator).to be_a Enumerator::Lazy
-      expect(lazy_enumerator.size).to eq 6
-    end
-  end
-
-  describe '#parse', vcr: { cassette_name: :SAIB } do
-    let(:raw_data) { bank.send(:raw_exchange_rates) }
-
-    it 'returns sell: hash of selling prices' do
-      expect(bank.send(:parse, raw_data)[:sell]).to match(
-        CHF: 17.98,
-        EUR: 19.4,
-        GBP: 22.95,
-        KWD: 59.5,
-        SAR: 4.83,
-        USD: 18.15
-      )
-    end
-
-    it 'returns buy: hash of buying prices' do
-      expect(bank.send(:parse, raw_data)[:buy]).to match(
-        CHF: 17.53,
-        EUR: 18.91,
-        GBP: 22.31,
-        KWD: 58.22,
-        SAR: 4.73,
-        USD: 17.75
-      )
-    end
-  end
-end