money-open-exchange-rates 1.4.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f324ed978cde7c5b05b50a8fe3d1ce4740333874457c8776c9871b3fa9ee31
-  data.tar.gz: ef5d0c06086d520f7a8816a69007b98d4741fb0063148ee0c66b9ec29a658b6d
+  metadata.gz: 3b5f63af5ef2482e223249c50e9972e84c4f9aaa3bcec4b3052089ee3b60a237
+  data.tar.gz: aa6a135ef6dea76c5ca26739dcdabfe5ba2eac6bf83eba3c8b060f54c5357dc6
 SHA512:
-  metadata.gz: 5361f382ab1462ae3c6b1a18e543c1dbe4d8d31f68278c460092d8fd93b65a9fd9070f290915a498b1b9bb10b2c6c6c6fb3bff356a90f0f0b75b12d296914990
-  data.tar.gz: d85876e62c4f13ebe24c71a273cb6667e7a331707cd7f48e90393b1d620b51593ff03cc77bc24cac78075fd21983290d99cba5eb62bfdb3c2235d1b790669f8d
+  metadata.gz: a78deced5445998e4fd6dd9cfa442753dca96bdbeabae0fbf0611e8c1274542030de8ed5be8f7b20a670693095370cb4a72e9a205ac556c1ce075f987ed128e5
+  data.tar.gz: b865cbfd1b40ab43f186aa99e1af7b01314eb90a46cecd586634b2b9e4a83614c99f555bf2aa3c7dd8419aa4faea85429026814f6c5299e657fba015c9d728a8

data/History.md

@@ -1,4 +1,20 @@
 
+2.0.1 / 2026-01-21
+==================
+
+  * Merge pull request #75 from @ps-97 / adarsh/preserve-rates-on-partial-api-response
+    * fix: preserve rates for currencies missing from API response
+
+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
 ==================
 

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

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -187,15 +187,14 @@ class Money
       # @return [Array] Array of exchange rates
       def update_rates
         store.transaction do
-          clear_rates!
-          exchange_rates.each do |exchange_rate|
-            rate = exchange_rate.last
-            currency = exchange_rate.first
+          new_rates = exchange_rates
+          new_rates.each do |currency, rate|
             next unless Money::Currency.find(currency)
 
             set_rate(source, currency, rate)
             set_rate(currency, source, 1.0 / rate)
           end
+          clear_cross_rates_for(new_rates)
         end
       end
 
@@ -270,7 +269,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
 
@@ -324,9 +323,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
@@ -373,7 +370,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
@@ -383,9 +380,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'] && ERROR_MAP.key?(doc['message'].to_sym)
-          raise ERROR_MAP[doc['message'].to_sym]
-        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]
@@ -442,6 +437,20 @@ class Money
           add_rate(iso_from, iso_to, nil)
         end
       end
+
+      # Clears cross-rates for currencies present in new_rates
+      # Cross-rates are calculated on next access via calc_pair_rate_using_base
+      # Direct rates (source -> X) are not cleared, just overwritten
+      #
+      # @param new_rates [Hash] Rates hash from API response
+      def clear_cross_rates_for(new_rates)
+        store.each_rate do |iso_from, iso_to|
+          next if iso_from == source || iso_to == source
+          next unless new_rates.key?(iso_from) || new_rates.key?(iso_to)
+
+          add_rate(iso_from, iso_to, nil)
+        end
+      end
     end
   end
 end

data/lib/open_exchange_rates_bank/version.rb

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

data/test/data/partial_latest.json

@@ -0,0 +1,16 @@
+{
+  "disclaimer": "Exchange rates are provided for informational purposes only.",
+  "license": "Data sourced from various providers.",
+  "timestamp": 1414008100,
+  "base": "USD",
+  "rates": {
+    "AED": 3.67304,
+    "AUD": 1.139103,
+    "BBD": 2,
+    "CAD": 1.124161,
+    "CHF": 0.951922,
+    "GBP": 0.62292,
+    "JPY": 107.0718,
+    "USD": 1
+  }
+}

data/test/integration/Gemfile

@@ -2,5 +2,5 @@
 
 source 'https://rubygems.org'
 
-gem 'money', '~> 6.7'
+gem 'money', '~> 7.0'
 gem 'money-open-exchange-rates', path: '../../'

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

@@ -117,7 +117,7 @@ describe Money::Bank::OpenExchangeRatesBank do
     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
@@ -316,21 +316,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.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
 
@@ -533,5 +533,48 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
     end
   end
+
+  describe 'missing currencies' do
+    let(:oer_partial_path) do
+      data_file('partial_latest.json')
+    end
+
+    before do
+      add_to_webmock(subject)
+      # see test/data/latest.json +52
+      @latest_usd_eur_rate = 0.79085
+      # see test/data/latest.json +33
+      @latest_usd_cad_rate = 1.124161
+      subject.update_rates
+    end
+
+    it 'should preserve direct rates' do
+      _(subject.get_rate('USD', 'EUR')).must_equal @latest_usd_eur_rate
+      subject.cache = nil
+      stub_request(:get, subject.source_url)
+        .to_return(status: 200, body: File.read(oer_partial_path))
+      subject.update_rates
+      _(subject.get_rate('USD', 'EUR')).must_equal @latest_usd_eur_rate
+    end
+
+    it 'should update rates for currencies in response' do
+      _(subject.get_rate('USD', 'CAD')).must_equal @latest_usd_cad_rate
+      subject.cache = nil
+      stub_request(:get, subject.source_url)
+        .to_return(status: 200, body: File.read(oer_partial_path))
+      subject.update_rates
+      _(subject.get_rate('USD', 'CAD')).must_equal @latest_usd_cad_rate
+    end
+
+    it 'should exchange with preserved rates' do
+      money = Money.new(100, 'USD')
+      _(subject.exchange_with(money, 'EUR')).must_equal Money.new(79, 'EUR')
+      subject.cache = nil
+      stub_request(:get, subject.source_url)
+        .to_return(status: 200, body: File.read(oer_partial_path))
+      subject.update_rates
+      _(subject.exchange_with(money, 'EUR')).must_equal Money.new(79, 'EUR')
+    end
+  end
 end
 # rubocop:enable Metrics/BlockLength

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.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Laurent Arnoud
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 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
@@ -146,6 +153,7 @@ files:
 - test/data/access_restricted_error.json
 - test/data/app_id_inactive.json
 - test/data/latest.json
+- test/data/partial_latest.json
 - test/integration/Gemfile
 - test/integration/Gemfile.lock
 - test/integration/api.rb
@@ -154,8 +162,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
@@ -163,16 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      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: []