money-open-exchange-rates 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213847dd55f3bbc717a20dc056e61510f4b00ede31bce5b1c7022b16eedc875e
-  data.tar.gz: e245e87886f4c2fc2d8ae6fcf25c80d5f7797ffc3d877eaafab18abd2f911050
+  metadata.gz: 86f324ed978cde7c5b05b50a8fe3d1ce4740333874457c8776c9871b3fa9ee31
+  data.tar.gz: ef5d0c06086d520f7a8816a69007b98d4741fb0063148ee0c66b9ec29a658b6d
 SHA512:
-  metadata.gz: 7a63501cb0baad531f152bedc2a232697f9c64da9bfeef9dd576ecbcda9dceaed83aba902f272c5cd4d44af20e9a55bd7654e1c244a60a5620b9db6f033c6f4b
-  data.tar.gz: 0c5466657cac8fb4e826d7d9e24ac354778eca529ac156385d3dc44070ed78d3e9278ffc2e17ccad705311195fdaa2822d17855cbcd2e721d90cab37ebe1c0c2
+  metadata.gz: 5361f382ab1462ae3c6b1a18e543c1dbe4d8d31f68278c460092d8fd93b65a9fd9070f290915a498b1b9bb10b2c6c6c6fb3bff356a90f0f0b75b12d296914990
+  data.tar.gz: d85876e62c4f13ebe24c71a273cb6667e7a331707cd7f48e90393b1d620b51593ff03cc77bc24cac78075fd21983290d99cba5eb62bfdb3c2235d1b790669f8d

data/History.md

@@ -1,4 +1,24 @@
 
+1.4.2 / 2023-07-25
+==================
+
+  * gitlab: Ruby 3.2 in, 2.6 out
+  * Merge pull request #70 from @swiknaba / master
+    * CI: nicer name, latest versions of Github actions
+    * CI: Ruby 3.2 in, 2.6 out
+  * Bump year
+  * Update jruby version
+  * Update rubocop target ruby version
+  * Update Rubies on CIs
+  * Handle AppIdInactive error
+
+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
 ==================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011-2020 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2011-2023 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

@@ -249,7 +249,7 @@ See [GitHub](https://github.com/spk/money-open-exchange-rates/graphs/contributor
 
 The MIT License
 
-Copyright © 2011-2020 Laurent Arnoud <laurent@spkdev.net>
+Copyright © 2011-2023 Laurent Arnoud <laurent@spkdev.net>
 
 ---
 [![Build](https://img.shields.io/gitlab/pipeline/spkdev/money-open-exchange-rates/master)](https://gitlab.com/spkdev/money-open-exchange-rates/-/commits/master)

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
+require 'json'
+require 'money'
 require 'net/http'
+require 'time'
 require 'uri'
-require 'money'
-require 'json'
 require File.expand_path('../../open_exchange_rates_bank/version', __dir__)
 
 # Money gem class
@@ -17,6 +18,17 @@ 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
+
+    # app_id_inactive
+    class AppIdInactive < StandardError; end
+
+    ERROR_MAP = {
+      access_restricted: AccessRestricted,
+      app_id_inactive: AppIdInactive
+    }.freeze
+
     # OpenExchangeRatesBank base class
     class OpenExchangeRatesBank < Money::Bank::VariableExchange
       VERSION = ::OpenExchangeRatesBank::VERSION
@@ -371,6 +383,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'] && ERROR_MAP.key?(doc['message'].to_sym)
+          raise ERROR_MAP[doc['message'].to_sym]
+        end
+
         self.rates_timestamp = doc[TIMESTAMP_KEY]
         @oer_rates = doc[RATES_KEY]
       end

data/lib/open_exchange_rates_bank/version.rb

@@ -2,5 +2,5 @@
 
 # Module for version constant
 module OpenExchangeRatesBank
-  VERSION = '1.4.0'
+  VERSION = '1.4.2'
 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/data/app_id_inactive.json

@@ -0,0 +1 @@
+{"error": true, "status": 401, "message": "app_id_inactive", "description": "This App ID has been deactivated. Please use another or contact support@openexchangerates.org for assistance."}

data/test/integration/Gemfile

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 
+source 'https://rubygems.org'
+
 gem 'money', '~> 6.7'
 gem 'money-open-exchange-rates', path: '../../'

data/test/integration/Gemfile.lock

@@ -1,26 +1,24 @@
 PATH
-  remote: ../../
+  remote: ../..
   specs:
-    money-open-exchange-rates (0.6.1)
-      monetize (~> 1.4)
-      money (~> 6.7)
+    money-open-exchange-rates (1.4.1)
+      money (~> 6.12)
 
 GEM
+  remote: https://rubygems.org/
   specs:
-    i18n (0.7.0)
-    monetize (1.4.0)
-      money (~> 6.7)
-    money (6.7.1)
-      i18n (>= 0.6.4, <= 0.7.0)
-      sixarm_ruby_unaccent (>= 1.1.1, < 2)
-    sixarm_ruby_unaccent (1.1.1)
+    concurrent-ruby (1.2.2)
+    i18n (1.13.0)
+      concurrent-ruby (~> 1.0)
+    money (6.16.0)
+      i18n (>= 0.6.4, <= 2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   money (~> 6.7)
   money-open-exchange-rates!
 
 BUNDLED WITH
-   1.13.1
+   2.4.12

data/test/open_exchange_rates_bank_test.rb

@@ -25,6 +25,12 @@ describe Money::Bank::OpenExchangeRatesBank do
   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
+  let(:oer_app_id_inactive_error_path) do
+    data_file('app_id_inactive.json')
+  end
 
   describe 'exchange' do
     before do
@@ -96,6 +102,20 @@ 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 raise AppIdInactive error when restricted by oer' do
+      subject.cache = nil
+      filepath = oer_app_id_inactive_error_path
+      subject.stubs(:api_response).returns File.read(filepath)
+      _(proc { subject.update_rates }).must_raise Money::Bank::AppIdInactive
+    end
+
     it 'should update itself with exchange rates from OpenExchangeRates' do
       subject.oer_rates.keys.each do |currency|
         next unless Money::Currency.find(currency)
@@ -285,13 +305,11 @@ describe Money::Bank::OpenExchangeRatesBank do
     end
 
     it 'should allow update after save' do
-      begin
-        subject.refresh_rates
-        # rubocop:disable Style/RescueStandardError
-      rescue
-        # rubocop:enable Style/RescueStandardError
-        assert false, 'Should allow updating after saving'
-      end
+      subject.refresh_rates
+      # rubocop:disable Style/RescueStandardError
+    rescue
+      # rubocop:enable Style/RescueStandardError
+      assert false, 'Should allow updating after saving'
     end
 
     it 'should not break an existing file if save fails to read' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Laurent Arnoud
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -143,6 +143,8 @@ 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/app_id_inactive.json
 - test/data/latest.json
 - test/integration/Gemfile
 - test/integration/Gemfile.lock
@@ -153,7 +155,7 @@ homepage: http://github.com/spk/money-open-exchange-rates
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,15 +163,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-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: