money-open-exchange-rates 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8d1aa20a7e00ad9b92ff6f516af74c9f26a0b4a4cfacdbab246833806976cb7
-  data.tar.gz: 61646aab5bbcfb00e362df9f6fe8e0bc80b9ef553a99ac6bfd26fa1c7d8f5c93
+  metadata.gz: 7a04f2f4222945d437a7c84bfed72c8fbc36188644d00da13528a677eda9515a
+  data.tar.gz: eb7c523fb8d74a9573ea65f8779fa5a41748b477dbc6f7ca9ceef5cde50de59a
 SHA512:
-  metadata.gz: 61eea8294a9b0b0a311db01d9b792c3831adc1d1711af486f9c43bac434bb5ced1dde20527624f16054e56cda867306bbf43f63dda9a17ef536da302cc77c250
-  data.tar.gz: 118f24d214bd24f7264aa575e87de2f04e115ebca9d83ce70c24abdd1cc0d93b2995f192ec760314717bbbed846ab75273ff851812a9fb6fd16a114043f63d76
+  metadata.gz: 508710569f6c2ca135fc5f09047ab20137b5c6ed6e93496c4b02925bdcc85e6f6fbb0a31b7d959534e82649f1302e50a0f6a7e4c06106c8bfc41cc170ee9b1ae
+  data.tar.gz: f2dc857c17c69a5c4faec4bd432bdd3ff89091a24642715c56a0f1f99525118e3199653f1729d33227938ad6d3c943914405b893674be2258650cb65632371bb

data/History.md

@@ -1,4 +1,27 @@
 
+2.0.0 / 2025-12-23
+==================
+
+  * BREAKING: Upgrade to money ~> 7.0
+  * BREAKING: Require Ruby >= 3.1
+  * Update monetize dependency to ~> 2.0
+  * Update CI to test Ruby 3.1, 3.2, 3.3, 3.4
+  * Remove support for Ruby 2.7, 3.0
+  * Update README with money 7.x default currency configuration
+
+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
 ==================
 

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

@@ -45,6 +45,9 @@ gem install money-open-exchange-rates
 ``` ruby
 require 'money/bank/open_exchange_rates_bank'
 
+# Money 7.x requires explicit default currency configuration
+Money.default_currency = Money::Currency.new('USD')
+
 # 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(Money::RatesStore::Memory.new)
@@ -176,6 +179,9 @@ take some time (HTTP call) and can fail.
 ``` ruby
 require 'money/bank/open_exchange_rates_bank'
 
+# Money 7.x requires explicit default currency configuration
+Money.default_currency = Money::Currency.new('USD')
+
 OXR_CACHE_KEY = "#{Rails.env}:money:exchange_rates".freeze
 # ExchangeRate is an ActiveRecord model
 # more info at https://github.com/RubyMoney/money#exchange-rate-stores
@@ -249,7 +255,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
@@ -20,6 +21,14 @@ class Money
     # 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
@@ -261,7 +270,7 @@ class Money
         str = "#{str}&base=#{source}" unless source == OE_SOURCE
         str = "#{str}&show_alternative=#{show_alternative}"
         str = "#{str}&prettyprint=#{prettyprint}"
-        str = "#{str}&symbols=#{symbols.join(',')}" if symbols&.is_a?(Array)
+        str = "#{str}&symbols=#{symbols.join(',')}" if symbols.is_a?(Array)
         str
       end
 
@@ -315,9 +324,7 @@ class Money
         if cache.is_a?(Proc)
           cache.call(text)
         elsif cache.is_a?(String) || cache.is_a?(Pathname)
-          File.open(cache.to_s, 'w') do |f|
-            f.write(text)
-          end
+          File.write(cache.to_s, text)
         else
           raise InvalidCache
         end
@@ -364,7 +371,7 @@ class Money
         return false unless text
 
         parsed = JSON.parse(text)
-        parsed&.key?(RATES_KEY) && parsed&.key?(TIMESTAMP_KEY)
+        parsed&.key?(RATES_KEY) && parsed.key?(TIMESTAMP_KEY)
       rescue JSON::ParserError
         false
       end
@@ -374,9 +381,7 @@ 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
+        raise ERROR_MAP[doc['message'].to_sym] if doc['error'] && ERROR_MAP.key?(doc['message'].to_sym)
 
         self.rates_timestamp = doc[TIMESTAMP_KEY]
         @oer_rates = doc[RATES_KEY]

data/lib/open_exchange_rates_bank/version.rb

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

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
 
-gem 'money', '~> 6.7'
+source 'https://rubygems.org'
+
+gem 'money', '~> 7.0'
 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/integration/api.rb

@@ -3,10 +3,13 @@
 require 'json'
 require 'money/bank/open_exchange_rates_bank'
 
+# Money 7.x requires explicit default currency configuration
+Money.default_currency = Money::Currency.new('USD')
+
 ERROR_MSG = 'Integration test failed!'
 cache_path = '/tmp/latest.json'
 to_currency = 'CAD'
-app_id = ENV['OXR_APP_ID']
+app_id = ENV.fetch('OXR_APP_ID', nil)
 
 if app_id.nil? || app_id.empty?
   puts 'OXR_APP_ID env var not set skipping integration tests'
@@ -29,10 +32,8 @@ begin
   json_to_currency = JSON.parse(File.read(cache_path))['rates'][to_currency]
   puts 'JSON to_currency', json_to_currency
   puts 'Money to_currency', cad_rate
-  # rubocop:disable Style/AndOr
   json_to_currency == cad_rate or raise ERROR_MSG
-  # rubocop:enable Style/AndOr
-  # rubocop:disable Style/RescueStandardError
+# rubocop:disable Style/RescueStandardError
 rescue
   # rubocop:enable Style/RescueStandardError
   raise ERROR_MSG

data/test/open_exchange_rates_bank_test.rb

@@ -28,6 +28,9 @@ describe Money::Bank::OpenExchangeRatesBank do
   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
@@ -106,8 +109,15 @@ describe Money::Bank::OpenExchangeRatesBank do
       _(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|
+      subject.oer_rates.each_key do |currency|
         next unless Money::Currency.find(currency)
 
         _(subject.get_rate('USD', currency)).must_be :>, 0
@@ -295,34 +305,32 @@ 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
       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.read(temp_cache_path).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.read(temp_cache_path).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.read(temp_cache_path).size).must_equal initial_size
     end
   end
 

data/test/test_helper.rb

@@ -7,6 +7,7 @@ rescue LoadError
   warn 'simplecov not loaded'
 end
 
+require 'minitest/unit'
 require 'minitest/autorun'
 require 'mocha/minitest'
 require 'webmock/minitest'
@@ -14,6 +15,9 @@ require 'money/bank/open_exchange_rates_bank'
 require 'monetize'
 require 'timecop'
 
+# Money 7.x requires explicit default currency configuration
+Money.default_currency = Money::Currency.new('USD')
+
 TEST_APP_ID = 'TEST_APP_ID'
 
 def data_file(file)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Laurent Arnoud
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -16,14 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -56,22 +69,16 @@ dependencies:
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: '1.69'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: '1.69'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +151,7 @@ files:
 - 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,8 +161,8 @@ files:
 homepage: http://github.com/spk/money-open-exchange-rates
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -162,16 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A gem that calculates the exchange rate using published rates from open-exchange-rates.
-test_files:
-- test/open_exchange_rates_bank_test.rb
+test_files: []