Merge pull request #124 from petergoldstein/feature/add_ruby_3_1_and_3_2_to_ci

Adds Ruby 3.1 and 3.2 to CI

Author: semmons99

.github/workflows/ruby.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

CHANGELOG.md

@@ -1,5 +1,6 @@
 # eu_central_bank changelog
 
+* Update YAML loading from compatibility with recent Psych versions.
 * Move Croatian Kuna (HRK) and Russian Ruble (RUB) to legacy currencies
 
 ## 1.7.0 (Nov 17 2021)

eu_central_bank.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency "nokogiri", RUBY_VERSION >= "2.1" ? "~> 1.9" : "~> 1.6.8"
   s.add_dependency "money", "~> 6.13", ">= 6.13.6"
 
-  s.add_development_dependency "rspec", "~> 3.5.0"
+  s.add_development_dependency "rspec", "~> 3.12.0"
 
   s.files         = Dir.glob("lib/**/*") + %w(CHANGELOG.md LICENSE README.md)
   s.require_path = "lib"

lib/eu_central_bank.rb

@@ -149,7 +149,11 @@ def import_rates(format, s, opts = {})
        when :ruby
          Marshal.load(s)
        when :yaml
-         YAML.load(s)
+         if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+           YAML.safe_load(s, permitted_classes: [ BigDecimal ])
+         else
+           YAML.safe_load(s, [ BigDecimal ], [], true)
+         end
        end
 
       data.each do |key, rate|

spec/eu_central_bank_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'yaml'
 
 describe "EuCentralBank" do
   before(:each) do
@@ -11,7 +10,7 @@
     @tmp_history_cache_path = File.expand_path(@dir_path + '/tmp/exchange_rates_90_day.xml')
     @tmp_full_history_cache_path = File.expand_path(@dir_path + '/tmp/exchange_rates_all.xml')
     yml_cache_path = File.expand_path(@dir_path + '/exchange_rates.yml')
-    @exchange_rates = YAML.load_file(yml_cache_path)
+    @exchange_rates = load_exchange_rates_from_file(yml_cache_path)
   end
 
   after(:each) do
@@ -146,7 +145,7 @@
 
   it "should return the correct exchange rates using historical exchange" do
     yml_path = File.expand_path(File.dirname(__FILE__) + '/historical_exchange_rates.yml')
-    historical_exchange_rates = YAML.load_file(yml_path)
+    historical_exchange_rates = load_exchange_rates_from_file(yml_path)
     @bank.update_historical_rates(@history_cache_path)
 
     EuCentralBank::CURRENCIES.each do |currency|
@@ -173,7 +172,7 @@
     @bank.update_rates(odd_rates)
 
     10.times do
-      rates = YAML.load(@bank.export_rates(:yaml))
+      rates = load_exchange_rates(@bank.export_rates(:yaml))
       rates.delete('EUR_TO_EUR')
       rates = rates.values.collect(&:to_i)
       expect(rates.length).to eq(32)

spec/spec_helper.rb

@@ -1,3 +1,16 @@
 require 'eu_central_bank'
+require 'yaml'
 
 I18n.enforce_available_locales = false
+
+def load_exchange_rates_from_file(file)
+  load_exchange_rates(File.open(file))
+end
+
+def load_exchange_rates(input)
+  if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+    ::YAML.safe_load(input, permitted_classes: [ BigDecimal ])
+  else
+    ::YAML.safe_load(input, [ BigDecimal ], [], true)
+  end
+end