money-open-exchange-rates 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936862d5f32115f726c00579e6e248fd972d4d399d5e5866be087186cdfe2ade
-  data.tar.gz: 2ad7d8ff2636e13aa19284c23a1eb26da74dd7c5ddc5ad3bff9bbec91dc026ff
+  metadata.gz: a8d1aa20a7e00ad9b92ff6f516af74c9f26a0b4a4cfacdbab246833806976cb7
+  data.tar.gz: 61646aab5bbcfb00e362df9f6fe8e0bc80b9ef553a99ac6bfd26fa1c7d8f5c93
 SHA512:
-  metadata.gz: daf9beece860326d2fcdb8413cdbf8b878e799d3c2fb3ecb5d858342d5cfc2b9a052d6e5147abcde56f34529fdcc51cd02e2552253b0944a381f583af8dd59be
-  data.tar.gz: 234054fbc3bbb9e55db3f69976113eb4691806e98e0e7365074e730941932164bc41cc7cd47d5e540200dac8a65af3c9a42e880b3778f89b92fd8415189f9ca4
+  metadata.gz: 61eea8294a9b0b0a311db01d9b792c3831adc1d1711af486f9c43bac434bb5ced1dde20527624f16054e56cda867306bbf43f63dda9a17ef536da302cc77c250
+  data.tar.gz: 118f24d214bd24f7264aa575e87de2f04e115ebca9d83ce70c24abdd1cc0d93b2995f192ec760314717bbbed846ab75273ff851812a9fb6fd16a114043f63d76

data/Gemfile

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-gem 'coveralls', require: false
+gem 'simplecov', require: false

data/History.md

@@ -1,4 +1,37 @@
 
+1.4.1 / 2023-05-07
+==================
+
+  * Merge pull request #69 from @fuentesjr / identify-access-restricted-errors
+    * Fixing typo in scoping of must_raise in access restricted test
+    * Raise a new AccessRestricted error when account is restricted by oer
+
+1.4.0 / 2020-09-11
+==================
+
+  * Fix jruby test for cross courses
+  * Fix deprecation global use of must_equal
+  * Merge pull request #66 from @korun / clear-cross-courses
+    * Update rates inside transaction, to prevent RC issues
+  * Merge pull request #65 from @korun / ensure-file-closed
+    * Fix unclosed file descriptor after read_from_cache
+  * Merge pull request #64 from @anton-smagin / clear-cross-courses
+    * Set old rates to nil on #update_rates before set new one to expire pair rates using base
+  * Add coverage stage on ci
+  * Remove Ruby 2.3 support
+  * Switch to gitlab ci
+  * Update README
+  * Fix rubocop to 0.76.0 and remove minitest-focus
+  * Update gitlab ci gem install does not have --no-ri anymore
+  * README add more doc about update_rates
+  * Fix deprecation for minitest 6
+  * Fix flaky test about Money::Bank::NoAppId
+  * Support Pathname for cache
+  * Update rubocop to 0.76
+  * Remove Ruby 2.2 support and update rubocop
+  * Update travis list
+  * README: improve refresh doc
+
 1.3.0 / 2019-01-20
 ==================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011-2019 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2011-2020 Laurent Arnoud <laurent@spkdev.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -30,15 +30,15 @@ gem 'money-open-exchange-rates'
 
 And then execute:
 
-~~~
+```
 bundle
-~~~
+```
 
 Or install it yourself as:
 
-~~~
+```
 gem install money-open-exchange-rates
-~~~
+```
 
 ## Usage
 
@@ -47,8 +47,14 @@ require 'money/bank/open_exchange_rates_bank'
 
 # Memory store per default; for others just pass as argument a class like
 # explained in https://github.com/RubyMoney/money#exchange-rate-stores
-oxr = Money::Bank::OpenExchangeRatesBank.new
+oxr = Money::Bank::OpenExchangeRatesBank.new(Money::RatesStore::Memory.new)
 oxr.app_id = 'your app id from https://openexchangerates.org/signup'
+
+# Update the rates for the current rates storage
+# If the storage is memory you will have to restart the server to be taken into
+# account.
+# If the storage is a database, file, this can be added to
+# crontab/worker/scheduler `Money.default_bank.update_rates`
 oxr.update_rates
 
 # (optional)
@@ -97,7 +103,8 @@ oxr.refresh_rates
 # (optional)
 # Force refresh rates cache and store on the fly when ttl is expired
 # This will slow down request on get_rate, so use at your on risk, if you don't
-# want to setup crontab/worker/scheduler for your application
+# want to setup crontab/worker/scheduler for your application.
+# Again this is not safe with multiple servers and could increase API usage.
 oxr.force_refresh_rate_on_expire = true
 
 Money.default_bank = oxr
@@ -105,6 +112,31 @@ Money.default_bank = oxr
 Money.default_bank.get_rate('USD', 'CAD')
 ```
 
+## Refresh rates
+
+### With [whenever](https://github.com/javan/whenever)
+
+``` ruby
+every :hour do
+  runner "Money.default_bank.refresh_rates"
+  # you will have to restart the server if you are using memory rate store
+  runner "Money.default_bank.update_rates"
+end
+```
+
+### With rake task
+
+``` ruby
+namespace :open_exchange_rates do
+  desc "Refresh rates from cache and update rates"
+  task :refresh_rates => :environment do
+    Money.default_bank.refresh_rates
+    # you will have to restart the server if you are using memory rate store
+    Money.default_bank.update_rates
+  end
+end
+```
+
 ## Cache
 
 You can also provide a `Proc` as a cache to provide your own caching mechanism
@@ -162,11 +194,15 @@ end
 oxr.app_id = ENV['OXR_API_KEY']
 oxr.show_alternative = true
 oxr.prettyprint = false
+
+# This can be removed if you have data to avoid http call on boot for production
 oxr.update_rates
 
 Money.default_bank = oxr
 ```
 
+See also how to [refresh and update rates](#refresh-rates)
+
 ### Tests
 
 To avoid to hit the API we can use the cache option with a saved file like this:
@@ -194,9 +230,9 @@ or using base currency rate to both currencies forming the pair.
 
 ## Tests
 
-~~~
+```
 bundle exec rake
-~~~
+```
 
 ## Refs
 
@@ -213,12 +249,12 @@ See [GitHub](https://github.com/spk/money-open-exchange-rates/graphs/contributor
 
 The MIT License
 
-Copyright © 2011-2019 Laurent Arnoud <laurent@spkdev.net>
+Copyright © 2011-2020 Laurent Arnoud <laurent@spkdev.net>
 
 ---
-[![Build](https://img.shields.io/travis-ci/spk/money-open-exchange-rates.svg)](https://travis-ci.org/spk/money-open-exchange-rates)
+[![Build](https://img.shields.io/gitlab/pipeline/spkdev/money-open-exchange-rates/master)](https://gitlab.com/spkdev/money-open-exchange-rates/-/commits/master)
+[![Coverage](https://gitlab.com/spkdev/money-open-exchange-rates/badges/master/coverage.svg)](https://gitlab.com/spkdev/money-open-exchange-rates/-/commits/master)
 [![Version](https://img.shields.io/gem/v/money-open-exchange-rates.svg)](https://rubygems.org/gems/money-open-exchange-rates)
 [![Documentation](https://img.shields.io/badge/doc-rubydoc-blue.svg)](http://www.rubydoc.info/gems/money-open-exchange-rates)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT "MIT")
-[![Coverage Status](https://img.shields.io/coveralls/github/spk/money-open-exchange-rates.svg)](https://coveralls.io/github/spk/money-open-exchange-rates?branch=master)
 [![Inline docs](https://inch-ci.org/github/spk/money-open-exchange-rates.svg?branch=master)](http://inch-ci.org/github/spk/money-open-exchange-rates)

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -7,7 +7,7 @@ require 'json'
 require File.expand_path('../../open_exchange_rates_bank/version', __dir__)
 
 # Money gem class
-# rubocop:disable ClassLength
+# rubocop:disable Metrics/ClassLength
 class Money
   # https://github.com/RubyMoney/money#exchange-rate-stores
   module Bank
@@ -17,19 +17,22 @@ class Money
     # APP_ID not set error
     class NoAppId < StandardError; end
 
+    # Access restricted (e.g. usage/request limit exceeded for account)
+    class AccessRestricted < StandardError; end
+
     # OpenExchangeRatesBank base class
     class OpenExchangeRatesBank < Money::Bank::VariableExchange
       VERSION = ::OpenExchangeRatesBank::VERSION
-      BASE_URL = 'https://openexchangerates.org/api/'.freeze
+      BASE_URL = 'https://openexchangerates.org/api/'
 
       # OpenExchangeRates urls
       OER_URL = URI.join(BASE_URL, 'latest.json')
       OER_HISTORICAL_URL = URI.join(BASE_URL, 'historical/')
 
       # Default base currency "base": "USD"
-      OE_SOURCE = 'USD'.freeze
-      RATES_KEY = 'rates'.freeze
-      TIMESTAMP_KEY = 'timestamp'.freeze
+      OE_SOURCE = 'USD'
+      RATES_KEY = 'rates'
+      TIMESTAMP_KEY = 'timestamp'
 
       # As of the end of August 2012 all requests to the Open Exchange Rates
       # API must have a valid app_id
@@ -174,13 +177,16 @@ class Money
       #
       # @return [Array] Array of exchange rates
       def update_rates
-        exchange_rates.each do |exchange_rate|
-          rate = exchange_rate.last
-          currency = exchange_rate.first
-          next unless Money::Currency.find(currency)
-
-          set_rate(source, currency, rate)
-          set_rate(currency, source, 1.0 / rate)
+        store.transaction do
+          clear_rates!
+          exchange_rates.each do |exchange_rate|
+            rate = exchange_rate.last
+            currency = exchange_rate.first
+            next unless Money::Currency.find(currency)
+
+            set_rate(source, currency, rate)
+            set_rate(currency, source, 1.0 / rate)
+          end
         end
       end
 
@@ -255,9 +261,7 @@ class Money
         str = "#{str}&base=#{source}" unless source == OE_SOURCE
         str = "#{str}&show_alternative=#{show_alternative}"
         str = "#{str}&prettyprint=#{prettyprint}"
-        if symbols && symbols.is_a?(Array)
-          str = "#{str}&symbols=#{symbols.join(',')}"
-        end
+        str = "#{str}&symbols=#{symbols.join(',')}" if symbols&.is_a?(Array)
         str
       end
 
@@ -300,6 +304,7 @@ class Money
 
       # Store the provided text data by calling the proc method provided
       # for the cache, or write to the cache file.
+      # Can raise InvalidCache
       #
       # @example
       #   oxr.store_in_cache("{\"rates\": {\"AED\": 3.67304}}")
@@ -309,10 +314,12 @@ class Money
       def store_in_cache(text)
         if cache.is_a?(Proc)
           cache.call(text)
-        elsif cache.is_a?(String)
-          File.open(cache, 'w') do |f|
+        elsif cache.is_a?(String) || cache.is_a?(Pathname)
+          File.open(cache.to_s, 'w') do |f|
             f.write(text)
           end
+        else
+          raise InvalidCache
         end
       end
 
@@ -322,8 +329,8 @@ class Money
       def read_from_cache
         result = if cache.is_a?(Proc)
                    cache.call(nil)
-                 elsif cache.is_a?(String) && File.exist?(cache)
-                   File.open(cache).read
+                 elsif File.exist?(cache.to_s)
+                   File.read(cache)
                  end
         result if valid_rates?(result)
       end
@@ -357,7 +364,7 @@ class Money
         return false unless text
 
         parsed = JSON.parse(text)
-        parsed && parsed.key?(RATES_KEY) && parsed.key?(TIMESTAMP_KEY)
+        parsed&.key?(RATES_KEY) && parsed&.key?(TIMESTAMP_KEY)
       rescue JSON::ParserError
         false
       end
@@ -367,6 +374,10 @@ class Money
       # @return [Hash] key is country code (ISO 3166-1 alpha-3) value Float
       def exchange_rates
         doc = JSON.parse(read_from_cache || read_from_url)
+        if doc['error'] && doc['message'] == 'access_restricted'
+          raise AccessRestricted
+        end
+
         self.rates_timestamp = doc[TIMESTAMP_KEY]
         @oer_rates = doc[RATES_KEY]
       end
@@ -413,7 +424,16 @@ class Money
         add_rate(from_currency, to_currency, rate)
         rate
       end
+
+      # Clears cached rates in store
+      #
+      # @return [Hash] All rates from store as Hash
+      def clear_rates!
+        store.each_rate do |iso_from, iso_to|
+          add_rate(iso_from, iso_to, nil)
+        end
+      end
     end
   end
 end
-# rubocop:enable ClassLength
+# rubocop:enable Metrics/ClassLength

data/lib/open_exchange_rates_bank/version.rb

@@ -2,5 +2,5 @@
 
 # Module for version constant
 module OpenExchangeRatesBank
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.1'
 end

data/test/data/access_restricted_error.json

@@ -0,0 +1,6 @@
+{
+  "error": true,
+  "status": 429,
+  "message": "access_restricted",
+  "description": "Access restricted until 2050-01-01 (reason: too_many_requests). If there has been a mistake, please contact support@openexchangerates.org."
+}

data/test/integration/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 gem 'money', '~> 6.7'
 gem 'money-open-exchange-rates', path: '../../'

data/test/integration/api.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'money/bank/open_exchange_rates_bank'
 
-ERROR_MSG = 'Integration test failed!'.freeze
+ERROR_MSG = 'Integration test failed!'
 cache_path = '/tmp/latest.json'
 to_currency = 'CAD'
 app_id = ENV['OXR_APP_ID']

data/test/open_exchange_rates_bank_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 # rubocop:disable Metrics/BlockLength
@@ -14,12 +16,18 @@ describe Money::Bank::OpenExchangeRatesBank do
   let(:temp_cache_path) do
     data_file('tmp.json')
   end
+  let(:temp_cache_pathname) do
+    Pathname.new('test/data/tmp.json')
+  end
   let(:oer_latest_path) do
     data_file('latest.json')
   end
   let(:oer_historical_path) do
     data_file('2015-01-01.json')
   end
+  let(:oer_access_restricted_error_path) do
+    data_file('access_restricted_error.json')
+  end
 
   describe 'exchange' do
     before do
@@ -35,12 +43,12 @@ describe Money::Bank::OpenExchangeRatesBank do
     describe 'without rates' do
       it 'able to exchange a money to its own currency even without rates' do
         money = Money.new(0, 'USD')
-        subject.exchange_with(money, 'USD').must_equal money
+        _(subject.exchange_with(money, 'USD')).must_equal money
       end
 
       it "raise if it can't find an exchange rate" do
         money = Money.new(0, 'USD')
-        proc { subject.exchange_with(money, 'SSP') }
+        _(proc { subject.exchange_with(money, 'SSP') })
           .must_raise Money::Bank::UnknownRate
       end
     end
@@ -52,33 +60,33 @@ describe Money::Bank::OpenExchangeRatesBank do
 
       it 'should be able to exchange money from USD to a known exchange rate' do
         money = Money.new(100, 'USD')
-        subject.exchange_with(money, 'BBD').must_equal Money.new(200, 'BBD')
+        _(subject.exchange_with(money, 'BBD')).must_equal Money.new(200, 'BBD')
       end
 
       it 'should be able to exchange money from a known exchange rate to USD' do
         money = Money.new(200, 'BBD')
-        subject.exchange_with(money, 'USD').must_equal Money.new(100, 'USD')
+        _(subject.exchange_with(money, 'USD')).must_equal Money.new(100, 'USD')
       end
 
       it 'should be able to exchange money when direct rate is unknown' do
         money = Money.new(100, 'BBD')
-        subject.exchange_with(money, 'BMD').must_equal Money.new(50, 'BMD')
+        _(subject.exchange_with(money, 'BMD')).must_equal Money.new(50, 'BMD')
       end
 
       it 'should be able to handle non integer rates' do
         money = Money.new(100, 'BBD')
-        subject.exchange_with(money, 'TJS').must_equal Money.new(250, 'TJS')
+        _(subject.exchange_with(money, 'TJS')).must_equal Money.new(250, 'TJS')
       end
 
       it "should raise if it can't find an currency" do
         money = Money.new(0, 'USD')
-        proc { subject.exchange_with(money, 'PLP') }
+        _(proc { subject.exchange_with(money, 'PLP') })
           .must_raise Money::Currency::UnknownCurrency
       end
 
       it "should raise if it can't find an exchange rate" do
         money = Money.new(0, 'USD')
-        proc { subject.exchange_with(money, 'SSP') }
+        _(proc { subject.exchange_with(money, 'SSP') })
           .must_raise Money::Bank::UnknownRate
       end
     end
@@ -91,11 +99,18 @@ describe Money::Bank::OpenExchangeRatesBank do
       subject.update_rates
     end
 
+    it 'should raise AccessRestricted error when restricted by oer' do
+      subject.cache = nil
+      filepath = oer_access_restricted_error_path
+      subject.stubs(:api_response).returns File.read(filepath)
+      _(proc { subject.update_rates }).must_raise Money::Bank::AccessRestricted
+    end
+
     it 'should update itself with exchange rates from OpenExchangeRates' do
       subject.oer_rates.keys.each do |currency|
         next unless Money::Currency.find(currency)
 
-        subject.get_rate('USD', currency).must_be :>, 0
+        _(subject.get_rate('USD', currency)).must_be :>, 0
       end
     end
 
@@ -113,7 +128,7 @@ describe Money::Bank::OpenExchangeRatesBank do
       Money::Currency.register(wtf)
       subject.add_rate('USD', 'WTF', 2)
       subject.add_rate('WTF', 'USD', 2)
-      subject.exchange_with(5000.to_money('WTF'), 'USD').cents.wont_equal 0
+      _(subject.exchange_with(5000.to_money('WTF'), 'USD').cents).wont_equal 0
     end
 
     # in response to #4
@@ -132,17 +147,50 @@ describe Money::Bank::OpenExchangeRatesBank do
       rate = 13.7603
       subject.add_rate('USD', 'BTC', 1 / 13.7603)
       subject.add_rate('BTC', 'USD', rate)
-      subject.exchange_with(100.to_money('BTC'), 'USD').cents.must_equal 137_603
+      _(subject.exchange_with(100.to_money('BTC'), 'USD').cents)
+        .must_equal 137_603
     end
   end
 
   describe 'App ID' do
+    describe 'nil' do
+      before do
+        subject.app_id = nil
+      end
+
+      it 'should raise an error if no App ID is set' do
+        _(proc { subject.update_rates }).must_raise Money::Bank::NoAppId
+      end
+    end
+
+    describe 'empty' do
+      before do
+        subject.app_id = ''
+      end
+
+      it 'should raise an error if no App ID is set' do
+        _(proc { subject.update_rates }).must_raise Money::Bank::NoAppId
+      end
+    end
+  end
+
+  describe '#cache' do
     before do
-      subject.cache = temp_cache_path
+      subject.app_id = TEST_APP_ID
+    end
+
+    it 'support Pathname object' do
+      subject.cache = temp_cache_pathname
+      subject.stubs(:api_response).returns File.read(oer_latest_path)
+      subject.update_rates
+      subject.expects(:read_from_url).never
+      subject.update_rates
     end
 
-    it 'should raise an error if no App ID is set' do
-      proc { subject.update_rates }.must_raise Money::Bank::NoAppId
+    it 'raise InvalidCache when the arg is not known' do
+      subject.cache = Array
+      add_to_webmock(subject)
+      _(proc { subject.update_rates }).must_raise Money::Bank::InvalidCache
     end
   end
 
@@ -155,7 +203,7 @@ describe Money::Bank::OpenExchangeRatesBank do
     it 'should get from url' do
       subject.expects(:save_cache).never
       subject.update_rates
-      subject.oer_rates.wont_be_empty
+      _(subject.oer_rates).wont_be_empty
     end
   end
 
@@ -181,17 +229,18 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
 
       it 'should use the secure https url' do
-        subject.source_url.must_equal historical_url
-        subject.source_url.must_include 'https://'
-        subject.source_url.must_include "/api/historical/#{subject.date}.json"
+        _(subject.source_url).must_equal historical_url
+        _(subject.source_url).must_include 'https://'
+        exp_url = "/api/historical/#{subject.date}.json"
+        _(subject.source_url).must_include exp_url
       end
     end
 
     describe 'latest' do
       it 'should use the secure https url' do
-        subject.source_url.must_equal source_url
-        subject.source_url.must_include 'https://'
-        subject.source_url.must_include '/api/latest.json'
+        _(subject.source_url).must_equal source_url
+        _(subject.source_url).must_include 'https://'
+        _(subject.source_url).must_include '/api/latest.json'
       end
     end
   end
@@ -203,7 +252,7 @@ describe Money::Bank::OpenExchangeRatesBank do
     end
 
     it 'should raise an error if invalid path is given to update_rates' do
-      proc { subject.update_rates }.must_raise Money::Bank::InvalidCache
+      _(proc { subject.update_rates }).must_raise Money::Bank::InvalidCache
     end
   end
 
@@ -222,14 +271,14 @@ describe Money::Bank::OpenExchangeRatesBank do
     end
 
     it 'should get from url normally' do
-      subject.oer_rates.wont_be_empty
+      _(subject.oer_rates).wont_be_empty
     end
 
     it 'should save from url and get from cache' do
-      @global_rates.wont_be_empty
+      _(@global_rates).wont_be_empty
       subject.expects(:source_url).never
       subject.update_rates
-      subject.oer_rates.wont_be_empty
+      _(subject.oer_rates).wont_be_empty
     end
   end
 
@@ -259,21 +308,21 @@ describe Money::Bank::OpenExchangeRatesBank do
       initial_size = File.read(temp_cache_path).size
       subject.stubs(:api_response).returns ''
       subject.refresh_rates
-      File.open(temp_cache_path).read.size.must_equal initial_size
+      _(File.open(temp_cache_path).read.size).must_equal initial_size
     end
 
     it 'should not break an existing file if save returns json without rates' do
       initial_size = File.read(temp_cache_path).size
       subject.stubs(:api_response).returns '{"error": "An error"}'
       subject.refresh_rates
-      File.open(temp_cache_path).read.size.must_equal initial_size
+      _(File.open(temp_cache_path).read.size).must_equal initial_size
     end
 
     it 'should not break an existing file if save returns a invalid json' do
       initial_size = File.read(temp_cache_path).size
       subject.stubs(:api_response).returns '{invalid_json: "An error"}'
       subject.refresh_rates
-      File.open(temp_cache_path).read.size.must_equal initial_size
+      _(File.open(temp_cache_path).read.size).must_equal initial_size
     end
   end
 
@@ -283,12 +332,12 @@ describe Money::Bank::OpenExchangeRatesBank do
     end
 
     it 'should be now when not updated from api' do
-      subject.rates_timestamp.must_be :>, Time.at(1_414_008_044)
+      _(subject.rates_timestamp).must_be :>, Time.at(1_414_008_044)
     end
 
     it 'should be set on update_rates' do
       subject.update_rates
-      subject.rates_timestamp.must_equal Time.at(1_414_008_044)
+      _(subject.rates_timestamp).must_equal Time.at(1_414_008_044)
     end
   end
 
@@ -316,21 +365,21 @@ describe Money::Bank::OpenExchangeRatesBank do
     describe 'when the ttl has expired' do
       it 'should update the rates' do
         Timecop.freeze(subject.rates_timestamp) do
-          subject.get_rate('USD', 'EUR').must_equal @old_usd_eur_rate
+          _(subject.get_rate('USD', 'EUR')).must_equal @old_usd_eur_rate
         end
         Timecop.freeze(subject.rates_timestamp + (@ttl_in_seconds + 1)) do
-          subject.get_rate('USD', 'EUR').wont_equal @old_usd_eur_rate
-          subject.get_rate('USD', 'EUR').must_equal @new_usd_eur_rate
+          _(subject.get_rate('USD', 'EUR')).wont_equal @old_usd_eur_rate
+          _(subject.get_rate('USD', 'EUR')).must_equal @new_usd_eur_rate
         end
       end
 
       it 'should save rates' do
         Timecop.freeze(subject.rates_timestamp) do
-          subject.get_rate('USD', 'EUR').must_equal @old_usd_eur_rate
+          _(subject.get_rate('USD', 'EUR')).must_equal @old_usd_eur_rate
         end
         Timecop.freeze(subject.rates_timestamp + (@ttl_in_seconds + 1)) do
-          subject.get_rate('USD', 'EUR').must_equal @new_usd_eur_rate
-          @global_rates.wont_be_empty
+          _(subject.get_rate('USD', 'EUR')).must_equal @new_usd_eur_rate
+          _(@global_rates).wont_be_empty
         end
       end
 
@@ -338,7 +387,7 @@ describe Money::Bank::OpenExchangeRatesBank do
         Timecop.freeze(subject.rates_timestamp + (@ttl_in_seconds + 1)) do
           exp_time = subject.rates_timestamp + @ttl_in_seconds
           subject.expire_rates
-          subject.rates_expiration.must_equal exp_time
+          _(subject.rates_expiration).must_equal exp_time
         end
       end
 
@@ -346,12 +395,12 @@ describe Money::Bank::OpenExchangeRatesBank do
         it 'should save rates and force refresh' do
           subject.force_refresh_rate_on_expire = true
           Timecop.freeze(subject.rates_timestamp) do
-            subject.get_rate('USD', 'EUR').must_equal @old_usd_eur_rate
+            _(subject.get_rate('USD', 'EUR')).must_equal @old_usd_eur_rate
           end
           Timecop.freeze(Time.now + 1001) do
             @global_rates = []
-            subject.get_rate('USD', 'EUR').must_equal @new_usd_eur_rate
-            @global_rates.wont_be_empty
+            _(subject.get_rate('USD', 'EUR')).must_equal @new_usd_eur_rate
+            _(@global_rates).wont_be_empty
           end
         end
       end
@@ -364,7 +413,7 @@ describe Money::Bank::OpenExchangeRatesBank do
           subject.expects(:update_rates).never
           subject.expects(:refresh_rates_expiration).never
           subject.expire_rates
-          subject.rates_expiration.must_equal exp_time
+          _(subject.rates_expiration).must_equal exp_time
         end
       end
     end
@@ -373,19 +422,31 @@ describe Money::Bank::OpenExchangeRatesBank do
   describe 'historical' do
     before do
       add_to_webmock(subject)
-      # see test/latest.json +52
+      # see test/data/latest.json +52
       @latest_usd_eur_rate = 0.79085
-      # see test/2015-01-01.json +52
+      @latest_chf_eur_rate = 0.830792859
+      # see test/data/2015-01-01.json +52
       @old_usd_eur_rate = 0.830151
+      @old_chf_eur_rate = 0.832420177
       subject.update_rates
     end
 
     it 'should be different than the latest' do
-      subject.get_rate('USD', 'EUR').must_equal @latest_usd_eur_rate
+      _(subject.get_rate('USD', 'EUR')).must_equal @latest_usd_eur_rate
+      subject.date = '2015-01-01'
+      add_to_webmock(subject, oer_historical_path)
+      subject.update_rates
+      _(subject.get_rate('USD', 'EUR')).must_equal @old_usd_eur_rate
+    end
+
+    it 'should update cross courses' do
+      _(subject.get_rate('CHF', 'EUR').round(9).to_f)
+        .must_equal @latest_chf_eur_rate
       subject.date = '2015-01-01'
       add_to_webmock(subject, oer_historical_path)
       subject.update_rates
-      subject.get_rate('USD', 'EUR').must_equal @old_usd_eur_rate
+      _(subject.get_rate('CHF', 'EUR').round(9).to_f)
+        .must_equal @old_chf_eur_rate
     end
   end
 
@@ -393,15 +454,15 @@ describe Money::Bank::OpenExchangeRatesBank do
     it 'should be changed when a known currency is given' do
       source = 'EUR'
       subject.source = source
-      subject.source.must_equal source
-      subject.source_url.must_include "base=#{source}"
+      _(subject.source).must_equal source
+      _(subject.source_url).must_include "base=#{source}"
     end
 
     it 'should use USD when given unknown currency' do
       source = 'invalid'
       subject.source = source
-      subject.source.must_equal default_source
-      subject.source_url.wont_include "base=#{default_source}"
+      _(subject.source).must_equal default_source
+      _(subject.source_url).wont_include "base=#{default_source}"
     end
   end
 
@@ -412,11 +473,11 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
 
       it 'should return the default value' do
-        subject.prettyprint.must_equal true
+        _(subject.prettyprint).must_equal true
       end
 
       it 'should include prettyprint param as true' do
-        subject.source_url.must_include 'prettyprint=true'
+        _(subject.source_url).must_include 'prettyprint=true'
       end
     end
 
@@ -426,11 +487,11 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
 
       it 'should return the value' do
-        subject.prettyprint.must_equal false
+        _(subject.prettyprint).must_equal false
       end
 
       it 'should include prettyprint param as false' do
-        subject.source_url.must_include 'prettyprint=false'
+        _(subject.source_url).must_include 'prettyprint=false'
       end
     end
   end
@@ -442,11 +503,11 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
 
       it 'should return the default value' do
-        subject.show_alternative.must_equal false
+        _(subject.show_alternative).must_equal false
       end
 
       it 'should include show_alternative param as false' do
-        subject.source_url.must_include 'show_alternative=false'
+        _(subject.source_url).must_include 'show_alternative=false'
       end
     end
 
@@ -456,11 +517,11 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
 
       it 'should return the value' do
-        subject.show_alternative.must_equal true
+        _(subject.show_alternative).must_equal true
       end
 
       it 'should include show_alternative param as true' do
-        subject.source_url.must_include 'show_alternative=true'
+        _(subject.source_url).must_include 'show_alternative=true'
       end
     end
   end

data/test/test_helper.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
 begin
-  require 'coveralls'
-  Coveralls.wear!
+  require 'simplecov'
+  SimpleCov.start
 rescue LoadError
-  STDERR.puts 'coveralls not loaded'
+  warn 'simplecov not loaded'
 end
 
 require 'minitest/autorun'
-require 'minitest/focus'
 require 'mocha/minitest'
 require 'webmock/minitest'
 require 'money/bank/open_exchange_rates_bank'
 require 'monetize'
 require 'timecop'
 
-TEST_APP_ID = 'TEST_APP_ID'.freeze
+TEST_APP_ID = 'TEST_APP_ID'
 
 def data_file(file)
   File.expand_path(File.join(File.dirname(__FILE__), 'data', file))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Laurent Arnoud
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2023-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: minitest-focus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: 0.76.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: 0.76.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +143,7 @@ files:
 - lib/money/bank/open_exchange_rates_bank.rb
 - lib/open_exchange_rates_bank/version.rb
 - test/data/2015-01-01.json
+- test/data/access_restricted_error.json
 - test/data/latest.json
 - test/integration/Gemfile
 - test/integration/Gemfile.lock
@@ -167,7 +154,7 @@ homepage: http://github.com/spk/money-open-exchange-rates
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,16 +162,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: A gem that calculates the exchange rate using published rates from open-exchange-rates.
 test_files: