russian_central_bank 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd2cd1ed41bb857dc38b988a175a4b21601c21c8
-  data.tar.gz: 0827a6b1c1a905acbf96bb714c442f42578d1636
+  metadata.gz: 7e8cf3185a50f7bb0d936780cba98e25c4237ac7
+  data.tar.gz: add5761d3e996d857e02717df3dce9c2cfeb61b5
 SHA512:
-  metadata.gz: f53cb4d06fc04ca5cb83e6fdde9368239096c49880840ea5704d969e91a0f8a28632ffc646b725479b27934e3f530eab485839f6a4516a1ac2adbcb7f355c8be
-  data.tar.gz: a327bcf332e28e344f47d365cd011ad1c21cf77dc790b89efd5da3face2425c5c472bef32432efcc3945a92028afa09f10fdca7de38e26e5fc280c7fffca3135
+  metadata.gz: 7c60395ac140229da981f938d74bc8e55897a36da2aa8034491990a6197f6a74d7e2b7910359f68a218c2fdc9309f4cf66bf980bad08c2796b08836522470e24
+  data.tar.gz: eb487d9d5a23cc45df699e90f49abba331e7e2ed166cff25c0a19a69e262ade0289cf0cbaa9c34664d6252610208827338850149925d33263e3c779c4dc782f2

data/.circleci/config.yml

@@ -0,0 +1,44 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.4.2
+        environment:
+          BUNDLE_JOBS: 3
+          BUNDLE_RETRY: 3
+          BUNDLE_PATH: vendor/bundle
+    steps:
+      - checkout
+
+      # Which version of bundler?
+      - run:
+          name: Which bundler?
+          command: bundle -v
+
+      # Restore bundle cache
+      - restore_cache:
+          keys:
+            - russian_central_bank-{{ checksum "russian_central_bank.gemspec" }}
+            - russian_central_bank
+
+      - run:
+          name: Bundle Install
+          command: bundle check || bundle install
+
+      # Store bundle cache
+      - save_cache:
+          key: russian_central_bank-{{ checksum "russian_central_bank.gemspec" }}
+          paths:
+            - vendor/bundle
+
+      # Run rspec
+      - run:
+          name: Run rspec
+          command: |
+            gem install rspec && \
+            bundle exec rspec --format progress \
+                              $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+
+      # Save test results for timing analysis
+      - store_test_results:
+          path: test_results

data/.gitignore

@@ -4,13 +4,8 @@
 .config
 .yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
 coverage
 doc/
-lib/bundler/man
-pkg
-rdoc
 spec/reports
 test/tmp
 test/version_tmp

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Metrics/LineLength:
+  Enabled: true
+  Max: 120

data/README.md

@@ -19,19 +19,20 @@ Or install it yourself as:
 
     $ gem install russian_central_bank
 
-NOTE: use 0.x version of `russian_central_bank` for > 6.0 `money` versions
+NOTE: use 0.x version of `russian_central_bank` for `money` versions < 6.0 
 
-##Dependencies
+## Dependencies
 
-* [savon](http://savonrb.com/)
+* [httparty](https://github.com/jnunemaker/httparty)
 * [money](https://github.com/RubyMoney/money)
 
 ## Usage
 
-Regular usage
+### Regular usage
 
     require 'russian_central_bank'
 
+    Money.locale_backend = :currency
     bank = Money::Bank::RussianCentralBank.new
 
     Money.default_bank = bank
@@ -39,14 +40,17 @@ Regular usage
     # Load today's rates
     bank.update_rates
 
-    # Exchange 100 USD to RUB
-    Money.new(1000, "USD").exchange_to('RUB')
+    # Exchange 1000 USD to RUB
+    Money.new(1000_00, "USD").exchange_to('RUB').format  # => 64.592,50 ₽
 
-Specific date rates
+    # Use indirect exchange rates, USD -> RUB -> EUR
+    Money.new(1000_00, "USD").exchange_to('EUR').format  # => €888,26
+
+### Specific date rates
 
     # Specify rates date
-    bank.update_rates(Date.today - 3000)
-    Money.new(1000, "USD").exchange_to('RUB')  # makes you feel better
+    bank.update_rates(Date.new(2010, 12, 31))
+    Money.new(1000_00, "USD").exchange_to('RUB').format  # => 30.476,90 ₽
 
     # Check last rates update
     bank.rates_updated_at
@@ -54,7 +58,7 @@ Specific date rates
     # Check on which date rates were updated
     bank.rates_updated_on
 
-Autoupdate
+### Autoupdate
 
     # Use ttl attribute to enable rates autoupdate
     bank.ttl = 1.day
@@ -62,6 +66,26 @@ Autoupdate
     # Check expiration date
     bank.rates_expired_at
 
+### Safe rates fetch
+
+There are some cases, when the `cbr.ru` doesn't return HTTP 200.
+To avoid issues in production, you use fallback:
+
+```ruby
+bank = Money::Bank::RussianCentralBank.new
+begin
+  bank.update_rates
+rescue Money::Bank::RussianCentralBankFetcher::FetchError => e
+  Rails.logger.info "CBR failed: #{e.response}"
+
+  ## fallback
+  Money.default_bank = Money::Bank::VariableExchange.new
+
+  Money.default_bank.add_rate(:usd, :eur, 1.3)
+  Money.default_bank.add_rate(:eur, :usd, 0.7)
+end
+```
+
 ## Contributing
 
 1. Fork it

data/lib/money/bank/russian_central_bank.rb

@@ -0,0 +1,85 @@
+require 'money'
+
+class Money
+  module Bank
+    class RussianCentralBank < Money::Bank::VariableExchange
+      attr_reader :rates_updated_at, :rates_updated_on, :rates_expired_at, :ttl
+
+      def flush_rates
+        @store = Money::RatesStore::Memory.new
+      end
+
+      def update_rates(date = Date.today)
+        store.transaction do
+          update_parsed_rates(exchange_rates(date))
+          @rates_updated_at = Time.now
+          @rates_updated_on = date
+          update_expired_at
+          store.send(:index)
+        end
+      end
+
+      def add_rate(from, to, rate)
+        super(from, to, rate)
+        super(to, from, 1.0 / rate)
+      end
+
+      def get_rate(from, to)
+        update_rates if rates_expired?
+        super || indirect_rate(from, to)
+      end
+
+      def ttl=(value)
+        @ttl = value
+        update_expired_at
+        @ttl
+      end
+
+      def rates_expired?
+        rates_expired_at && rates_expired_at <= Time.now
+      end
+
+      private
+
+      def fetcher
+        @fetcher ||= RussianCentralBankFetcher.new
+      end
+
+      def exchange_rates(date)
+        fetcher.perform(date)
+      end
+
+      def update_expired_at
+        @rates_expired_at = if ttl
+          @rates_updated_at ? @rates_updated_at + ttl : Time.now
+        else
+          nil
+        end
+      end
+
+      def indirect_rate(from, to)
+        get_rate('RUB', to) / get_rate('RUB', from)
+      end
+
+      def local_currencies
+        @local_currencies ||= Money::Currency.table.map { |currency| currency.last[:iso_code] }
+      end
+
+      def update_parsed_rates(rates)
+        add_rate('RUB', 'RUB', 1)
+        rates.each do |rate|
+          begin
+            if local_currencies.include?(rate[:code])
+              add_rate(
+                'RUB',
+                rate[:code],
+                1 / (rate[:value] / rate[:nominal])
+              )
+            end
+          rescue Money::Currency::UnknownCurrency
+          end
+        end
+      end
+    end
+  end
+end

data/lib/money/bank/russian_central_bank_fetcher.rb

@@ -0,0 +1,49 @@
+require 'httparty'
+
+class Money
+  module Bank
+    class RussianCentralBankFetcher
+      DAILY_RATES_URL = 'http://www.cbr.ru/scripts/XML_daily.asp'.freeze
+
+      class FetchError < StandardError
+        attr_reader :response
+
+        def initialize(message, response = nil)
+          super(message)
+          @response = response
+        end
+      end
+
+      def perform(date = Date.today)
+        response = HTTParty.get(rates_url(date))
+        unless response.success?
+          raise_fetch_error("cbr.ru respond with #{response.code}", response)
+        end
+        extract_rates(response.parsed_response)
+      rescue HTTParty::Error => e
+        raise_fetch_error(e.message)
+      end
+
+      private
+
+      def raise_fetch_error(message, response = nil)
+        raise FetchError.new(message, response)
+      end
+
+      def rates_url(date)
+        "#{DAILY_RATES_URL}?date_req=#{date.strftime('%d/%m/%Y')}"
+      end
+
+      def extract_rates(parsed_response)
+        rates_arr = parsed_response['ValCurs']['Valute']
+        rates_arr.map do |rate|
+          {
+            code: rate['CharCode'],
+            nominal: rate['Nominal'].to_i,
+            value: rate['Value'].tr(',', '.').to_f
+          }
+        end
+      end
+    end
+  end
+end

data/lib/russian_central_bank.rb

@@ -1,83 +1,2 @@
-require 'money'
-require 'savon'
-
-class Money
-  module Bank
-    class RussianCentralBank < Money::Bank::VariableExchange
-
-      CBR_SERVICE_URL = 'http://www.cbr.ru/DailyInfoWebServ/DailyInfo.asmx?WSDL'
-
-      attr_reader :rates_updated_at, :rates_updated_on, :ttl, :rates_expired_at
-
-      def flush_rates
-        @store = Money::RatesStore::Memory.new
-      end
-
-      def update_rates(date = Date.today)
-        store.transaction do
-          update_parsed_rates(exchange_rates(date))
-          @rates_updated_at = Time.now
-          @rates_updated_on = date
-          update_expired_at
-          store.send(:index)
-        end
-      end
-
-      def add_rate(from, to, rate)
-        super(from, to, rate)
-        super(to, from, 1.0 / rate)
-      end
-
-      def get_rate(from, to)
-        update_rates if rates_expired?
-        super || indirect_rate(from, to)
-      end
-
-      def ttl=(value)
-        @ttl = value
-        update_expired_at
-        @ttl
-      end
-
-      def rates_expired?
-        rates_expired_at && rates_expired_at <= Time.now
-      end
-
-      private
-
-      def update_expired_at
-        @rates_expired_at = if ttl
-          @rates_updated_at ? @rates_updated_at + ttl : Time.now
-        else
-          nil
-        end
-      end
-
-      def indirect_rate(from, to)
-        from_base_rate = get_rate('RUB', from)
-        to_base_rate = get_rate('RUB', to)
-        to_base_rate / from_base_rate
-      end
-
-      def exchange_rates(date = Date.today)
-        client = Savon::Client.new wsdl: CBR_SERVICE_URL, log: false, log_level: :error,
-          follow_redirects: true
-        response = client.call(:get_curs_on_date, message: { 'On_date' => date.strftime('%Y-%m-%dT%H:%M:%S') })
-        response.body[:get_curs_on_date_response][:get_curs_on_date_result][:diffgram][:valute_data][:valute_curs_on_date]
-      end
-
-      def update_parsed_rates(rates)
-        local_currencies = Money::Currency.table.map { |currency| currency.last[:iso_code] }
-        add_rate('RUB', 'RUB', 1)
-        rates.each do |rate|
-          begin
-            if local_currencies.include? rate[:vch_code]
-              add_rate('RUB', rate[:vch_code], 1/ (rate[:vcurs].to_f / rate[:vnom].to_i))
-            end
-          rescue Money::Currency::UnknownCurrency
-          end
-        end
-      end
-    end
-  end
-end
+require 'money/bank/russian_central_bank_fetcher'
+require 'money/bank/russian_central_bank'

data/russian_central_bank.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'russian_central_bank'
-  spec.version       = '1.0.1'
+  spec.version       = '1.1.0'
   spec.authors       = ['Ramil Mustafin']
   spec.email         = ['rommel.rmm@gmail.com']
   spec.description   = 'RussianCentralBank extends Money::Bank::VariableExchange and gives you access to the Central Bank of Russia currency exchange rates.'
@@ -17,10 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~>1.3'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~>3'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'webmock', '~>3'
 
-  spec.add_dependency 'money', '~> 6.7.0'
-  spec.add_dependency 'savon', '~>2.0'
+  spec.add_dependency 'httparty', '~>0'
+  spec.add_dependency 'money', '~> 6'
 end

data/spec/integration/update_rates_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'Update Rates' do
+  let(:bank) { Money::Bank::RussianCentralBank.new }
+  let(:rates_xml) { File.read('spec/support/rcb_response.xml') }
+  let(:date) { Date.today }
+  let(:rates_url) do
+    "#{Money::Bank::RussianCentralBankFetcher::DAILY_RATES_URL}?date_req=#{date.strftime('%d/%m/%Y')}"
+  end
+
+  context 'when cbr.ru successfully returns rates' do
+    before do
+      stub_request(:get, rates_url).to_return(
+        status: 200,
+        body: rates_xml,
+        headers: {
+          "content-type"=>["application/xml; charset=windows-1251"]
+        }
+      )
+
+      bank.update_rates
+    end
+
+    it 'adds rates', :aggregete_failure do
+      expect(bank.get_rate('USD', 'RUB')).to eq(64.4993)
+      expect(bank.get_rate('RUB', 'USD')).to eq(0.015504044229937378)
+    end
+
+    it 'adds rates for currencies with nominal > 1', :aggregete_failure do
+      expect(bank.get_rate('DKK', 'RUB')).to eq(9.76581)
+      expect(bank.get_rate('RUB', 'DKK')).to eq(0.10239806017114812)
+    end
+  end
+
+  context 'when cbr.ru request fails' do
+    before do
+      stub_request(:get, rates_url).to_return(
+        status: 503,
+        body: '503'
+      )
+    end
+
+    it 'raises FetchError' do
+      expect { bank.update_rates }.to raise_error(Money::Bank::RussianCentralBankFetcher::FetchError)
+    end
+  end
+end

data/spec/lib/money/bank/russian_central_bank_fetcher_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Money::Bank::RussianCentralBankFetcher do
+  describe 'perform' do
+    subject(:perform) { fetcher.perform(date) }
+
+    let(:date) { Date.today }
+    let(:fetcher) { described_class.new }
+    let(:rates_url) do
+      "http://www.cbr.ru/scripts/XML_daily.asp?date_req=#{date.strftime('%d/%m/%Y')}"
+    end
+
+    context 'when RCB responds' do
+      let(:rcb_response) do
+        instance_double(
+          'response',
+          parsed_response: parsed_response,
+          success?: response_is_success,
+          code: response_code
+        )
+      end
+      let(:parsed_response) do
+        {
+          'ValCurs' => {
+            'Valute' => [
+              {
+                'CharCode' => 'XXX',
+                'Nominal' => '1',
+                'Value' => '100,1'
+              }
+            ]
+          }
+        }
+      end
+
+      before do
+        allow(HTTParty).to receive(:get).with(rates_url).and_return(rcb_response)
+      end
+
+      context 'and respond is successfull' do
+        let(:response_is_success) { true }
+        let(:response_code) { 200 }
+
+        it 'returns a normalized array of rates' do
+          expect(perform).to eq(
+            [
+              {
+                code: 'XXX', nominal: 1, value: 100.1
+              }
+            ]
+          )
+        end
+      end
+
+      context 'and repsond is not successfull' do
+        let(:response_is_success) { false }
+        let(:response_code) { 503 }
+
+        it 'raises FetchError' do
+          expect { perform }.to raise_error(Money::Bank::RussianCentralBankFetcher::FetchError)
+        end
+      end
+    end
+
+    context 'when RCB fails to respond' do
+      let(:error_message) { 'RCB failed to response' }
+
+      before do
+        allow(HTTParty).to receive(:get).with(rates_url).and_raise(HTTParty::Error, error_message)
+      end
+
+      it 'rescues an exception and raises FetchError' do
+        expect { perform }.to raise_error(Money::Bank::RussianCentralBankFetcher::FetchError, error_message)
+      end
+    end
+  end
+end

data/spec/lib/money/bank/russian_central_bank_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe Money::Bank::RussianCentralBank do
+  subject(:bank) { described_class.new }
+
+  describe '#update_rates' do
+    let(:fetcher) { instance_double(Money::Bank::RussianCentralBankFetcher, perform: rates) }
+    let(:rates) do
+      [
+        { code: 'USD', value: 32.4288, nominal: 1 },
+        { code: 'EUR', value: 42.5920, nominal: 1 },
+        { code: 'JPY', value: 32.4029, nominal: 100 }
+      ]
+    end
+
+    before do
+      allow(Money::Bank::RussianCentralBankFetcher).to receive(:new).and_return(fetcher)
+
+      bank.update_rates
+    end
+
+    it 'should update rates from daily rates service' do
+      expect(bank.rates['RUB_TO_USD']).to eq(0.03083678705348332)
+      expect(bank.rates['RUB_TO_EUR']).to eq(0.023478587528174305)
+      expect(bank.rates['RUB_TO_JPY']).to eq(3.086143524190736)
+    end
+  end
+
+  describe '#flush_rates' do
+    before do
+      bank.add_rate('RUB', 'USD', 0.03)
+    end
+
+    it 'should delete all rates' do
+      bank.get_rate('RUB', 'USD')
+      bank.flush_rates
+      expect(bank.store.send(:index)).to be_empty
+    end
+  end
+
+  describe '#get_rate' do
+    context 'when getting direct rates' do
+      before do
+        bank.flush_rates
+        bank.add_rate('RUB', 'USD', 0.03)
+        bank.add_rate('RUB', 'GBP', 0.02)
+      end
+
+      it 'should get rate from @rates' do
+        expect(bank.get_rate('RUB', 'USD')).to eq(0.03)
+      end
+
+      it 'should calculate indirect rates' do
+        expect(bank.get_rate('USD', 'GBP')).to eq(0.6666666666666667)
+      end
+    end
+
+    context 'when getting indirect rate' do
+      let(:indirect_rate) { 4 }
+
+      before do
+        bank.flush_rates
+        bank.add_rate('RUB', 'USD', 123)
+        bank.add_rate('USD', 'RUB', indirect_rate)
+      end
+
+      it 'gets indirect rate from the last set' do
+        expect(bank.get_rate('RUB', 'USD')).to eq(1.0 / indirect_rate)
+      end
+    end
+
+    context 'when ttl is not set' do
+      before do
+        bank.add_rate('RUB', 'USD', 123)
+        bank.ttl = nil
+      end
+
+      it 'should not update rates' do
+        expect(bank).to_not receive(:update_rates)
+        bank.get_rate('RUB', 'USD')
+      end
+    end
+
+    context 'when ttl is set' do
+      before { bank.add_rate('RUB', 'USD', 123) }
+
+      context 'and raks are expired' do
+        before do
+          bank.instance_variable_set('@rates_updated_at', Time.now - 3600)
+          bank.ttl = 3600
+        end
+
+        it 'should update rates' do
+          expect(bank).to receive(:update_rates)
+          bank.get_rate('RUB', 'USD')
+        end
+      end
+
+      context 'and ranks are not expired' do
+        before do
+          bank.instance_variable_set('@rates_updated_at', Time.now - 3000)
+          bank.ttl = 3600
+        end
+
+        it 'should not update rates' do
+          expect(bank).to_not receive(:update_rates)
+          bank.get_rate('RUB', 'USD')
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,8 @@
 require 'russian_central_bank'
-require 'savon'
-require 'support/helpers'
-
+require 'webmock/rspec'
 
 RSpec.configure do |config|
   config.color = true
   config.tty = true
-
   config.order = :random
 end

data/spec/support/rcb_response.xml

@@ -0,0 +1,53 @@
+
+<?xml version="1.0" encoding="windows-1251"?>
+<ValCurs Date="26.03.2019" name="Foreign Currency Market">
+	<Valute ID="R01010">
+		<NumCode>036</NumCode>
+		<CharCode>AUD</CharCode>
+		<Nominal>1</Nominal>
+		<Name>Австралийский доллар</Name>
+		<Value>45,7365</Value>
+	</Valute>
+	<Valute ID="R01035">
+		<NumCode>826</NumCode>
+		<CharCode>GBP</CharCode>
+		<Nominal>1</Nominal>
+		<Name>Фунт стерлингов Соединенного королевства</Name>
+		<Value>85,0552</Value>
+	</Valute>
+	<Valute ID="R01200">
+		<NumCode>344</NumCode>
+		<CharCode>HKD</CharCode>
+		<Nominal>10</Nominal>
+		<Name>Гонконгских долларов</Name>
+		<Value>82,1815</Value>
+	</Valute>
+	<Valute ID="R01215">
+		<NumCode>208</NumCode>
+		<CharCode>DKK</CharCode>
+		<Nominal>10</Nominal>
+		<Name>Датских крон</Name>
+		<Value>97,6581</Value>
+	</Valute>
+	<Valute ID="R01235">
+		<NumCode>840</NumCode>
+		<CharCode>USD</CharCode>
+		<Nominal>1</Nominal>
+		<Name>Доллар США</Name>
+		<Value>64,4993</Value>
+	</Valute>
+	<Valute ID="R01239">
+		<NumCode>978</NumCode>
+		<CharCode>EUR</CharCode>
+		<Nominal>1</Nominal>
+		<Name>Евро</Name>
+		<Value>72,9229</Value>
+	</Valute>
+	<Valute ID="R01820">
+		<NumCode>392</NumCode>
+		<CharCode>JPY</CharCode>
+		<Nominal>100</Nominal>
+		<Name>Японских иен</Name>
+		<Value>58,5958</Value>
+	</Valute>
+</ValCurs>

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: russian_central_bank
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ramil Mustafin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +67,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: money
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: savon
+  name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6'
 description: RussianCentralBank extends Money::Bank::VariableExchange and gives you
   access to the Central Bank of Russia currency exchange rates.
 email:
@@ -88,17 +130,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/money/bank/russian_central_bank.rb
+- lib/money/bank/russian_central_bank_fetcher.rb
 - lib/russian_central_bank.rb
 - russian_central_bank.gemspec
-- spec/russian_central_bank_spec.rb
+- spec/integration/update_rates_spec.rb
+- spec/lib/money/bank/russian_central_bank_fetcher_spec.rb
+- spec/lib/money/bank/russian_central_bank_spec.rb
 - spec/spec_helper.rb
-- spec/support/daily_rates.yml
-- spec/support/helpers.rb
+- spec/support/rcb_response.xml
 homepage: http://github.com/rmustafin/russian_central_bank
 licenses:
 - MIT
@@ -119,12 +166,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Access to Central Bank of Russia currency exchange rates.
 test_files:
-- spec/russian_central_bank_spec.rb
+- spec/integration/update_rates_spec.rb
+- spec/lib/money/bank/russian_central_bank_fetcher_spec.rb
+- spec/lib/money/bank/russian_central_bank_spec.rb
 - spec/spec_helper.rb
-- spec/support/daily_rates.yml
-- spec/support/helpers.rb
+- spec/support/rcb_response.xml

data/spec/russian_central_bank_spec.rb

@@ -1,108 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'RussianCentralBank' do
-  before do
-    rates_hash = symbolize_keys YAML::load(File.open('spec/support/daily_rates.yml'))
-    allow_any_instance_of(Savon::Client).to receive_message_chain(:call, :body) { rates_hash }
-  end
-
-  before :each do
-    @bank = Money::Bank::RussianCentralBank.new
-  end
-
-  describe '#update_rates' do
-    before do
-      @bank.update_rates
-    end
-
-    it 'should update rates from daily rates service' do
-      expect(@bank.rates['RUB_TO_USD']).to eq(0.03083678705348332)
-      expect(@bank.rates['RUB_TO_EUR']).to eq(0.023478587528174305)
-      expect(@bank.rates['RUB_TO_JPY']).to eq(3.086143524190736)
-    end
-  end
-
-  describe '#flush_rates' do
-    before do
-      @bank.add_rate('RUB', 'USD', 0.03)
-    end
-
-    it 'should delete all rates' do
-      @bank.get_rate('RUB', 'USD')
-      @bank.flush_rates
-      expect(@bank.store.send(:index)).to be_empty
-    end
-  end
-
-  describe '#get_rate' do
-    context 'getting dicrect rates' do
-      before do
-        @bank.flush_rates
-        @bank.add_rate('RUB', 'USD', 0.03)
-        @bank.add_rate('RUB', 'GBP', 0.02)
-      end
-
-      it 'should get rate from @rates' do
-        expect(@bank.get_rate('RUB', 'USD')).to eq(0.03)
-      end
-
-      it 'should calculate indirect rates' do
-        expect(@bank.get_rate('USD', 'GBP')).to eq(0.6666666666666667)
-      end
-    end
-
-    context 'getting indirect rate' do
-      let(:indirect_rate) { 4 }
-
-      before do
-        @bank.flush_rates
-        @bank.add_rate('RUB', 'USD', 123)
-        @bank.add_rate('USD', 'RUB', indirect_rate)
-      end
-
-      it 'gets indirect rate from the last set' do
-        expect(@bank.get_rate('RUB', 'USD')).to eq(1.0 / indirect_rate)
-      end
-    end
-
-    context "when ttl is not set" do
-      before do
-        @bank.add_rate('RUB', 'USD', 123)
-        @bank.ttl = nil
-      end
-
-      it "should not update rates" do
-        expect(@bank).to_not receive(:update_rates)
-        @bank.get_rate('RUB', 'USD')
-      end
-    end
-
-    context "when ttl is set" do
-      before { @bank.add_rate('RUB', 'USD', 123) }
-
-      context "and raks are expired" do
-        before do
-          @bank.instance_variable_set('@rates_updated_at', Time.now - 3600)
-          @bank.ttl = 3600
-        end
-
-        it "should update rates" do
-          expect(@bank).to receive(:update_rates)
-          @bank.get_rate('RUB', 'USD')
-        end
-      end
-
-      context "and ranks are not expired" do
-        before do
-          @bank.instance_variable_set('@rates_updated_at', Time.now - 3000)
-          @bank.ttl = 3600
-        end
-
-        it "should not update rates" do
-          expect(@bank).to_not receive(:update_rates)
-          @bank.get_rate('RUB', 'USD')
-        end
-      end
-    end
-  end
-end

data/spec/support/daily_rates.yml

@@ -1,8 +0,0 @@
-get_curs_on_date_response:
-  get_curs_on_date_result:
-    diffgram:
-      valute_data:
-        valute_curs_on_date:
-          - {vname: "US Dollar", vnom: "1", vcurs: "32.4288", vcode: "840", vch_code: "USD"}
-          - {vname: "Euro", vnom: "1", vcurs: "42.5920", vcode: "978", vch_code: "EUR"}
-          - {vname: "Japanese yen", vnom: "100", vcurs: "32.4029", vcode: "392", vch_code: "JPY"}

data/spec/support/helpers.rb

@@ -1,15 +0,0 @@
-def symbolize_keys(hash)
-  hash.inject({}){|result, (key, value)|
-    new_key = case key
-              when String then key.to_sym
-              else key
-              end
-    new_value = case value
-                when Hash then symbolize_keys(value)
-                when Array then value.map{ |v| v.is_a?(Hash) ? symbolize_keys(v) : v }
-                else value
-                end
-    result[new_key] = new_value
-    result
-  }
-end