omni_exchange 1.2.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79069dcd87cf3788896dbc2093d114028b94592743a5fea03559cfce974b4d5c
-  data.tar.gz: 03a24de2dcfe6dca9ee1c0532e40b8bab6addbc14c9e4863ef644789a0a24adb
+  metadata.gz: c591dfb40110a465f93f0c714d6f26369ba9717592a8deb4da4f92e044a4f660
+  data.tar.gz: 91f086e1912b69998b55d6e76030dfdc8738388071c0405084fc6d8e8fa6174a
 SHA512:
-  metadata.gz: bb380807a18d884f6ebef61b911e9a5301f6704577a15b8b4fc75cc11a4e0337ee1c911ea01c9a8269f919f6df62f86225cc9270bf24c8cad753eed0cefa8e2d
-  data.tar.gz: f0909dabbacc96857512b405cc590431ca9df724f622d0e59d589c62e2856e2d6193e992370f4a06d52df2eff7c3f6d1acca1741f5d6c12c9be20c9736b6eef0
+  metadata.gz: 813ec7f4ce3f0d18360a39cd864c39fcb62bb1dbacc36a4b089b7d970d32b9bfa6c334fd6d11921f99dcc0d4b48ec7e5a45fd169b11ae6e852969e0f6d768ee3
+  data.tar.gz: 75904791e0aaff4d160b5d11424c50ddfbd32450a5e0d52da2e4a246e5dde5aba81efe23f1bb9ed0ab656d4399eb3d48106f68c790c660fa50d76258265e3d55

data/.gitignore

@@ -18,3 +18,7 @@ omni_exchange-0.1.0.gem
 omni_exchange-0.2.0.gem
 omni_exchange-1.1.0.gem
 omni_exchange-1.1.1.gem
+omni_exchange-1.2.0.gem
+omni_exchange-1.3.0.gem
+omni_exchange-1.4.0.gem
+omni_exchange-1.5.0.gem

data/.rubocop_todo.yml

@@ -1,15 +1,20 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-06-30 01:49:03 UTC using RuboCop version 0.93.1.
+# on 2022-07-12 04:26:20 UTC using RuboCop version 0.93.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/sandbox.rb'
+
 # Offense count: 2
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 28
+  Max: 33
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
@@ -39,7 +44,7 @@ Style/ExponentialNotation:
   Exclude:
     - 'spec/omni_exchange_spec.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -47,9 +52,17 @@ Style/StringLiterals:
   Exclude:
     - 'lib/sandbox.rb'
 
-# Offense count: 16
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: .
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: percent
+  MinSize: 3
+
+# Offense count: 19
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 226
+  Max: 220

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    omni_exchange (1.2.0)
-      faraday (= 0.17.4)
+    omni_exchange (1.4.0)
+      faraday (< 2)
       money (~> 6.13.1)
 
 GEM
@@ -12,17 +12,38 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    dotenv (2.7.6)
-    faraday (0.17.4)
-      multipart-post (>= 1.2, < 3)
-    i18n (1.10.0)
+    dotenv (2.8.1)
+    faraday (1.10.1)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     money (6.13.8)
       i18n (>= 0.6.4, <= 2)
     multipart-post (2.2.3)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -53,14 +74,16 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     unicode-display_width (1.8.0)
     vcr (6.1.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   dotenv

data/README.md

@@ -57,7 +57,7 @@ To convert currency and/or get an exchange rate, all you have to do is call `Omn
 What you get back is a hash containing:
 1. converted_amount: (BigDecimal) the amount of money exchanged from the base currency to the target currency
 2. exchange_rate: (BigDecimal) the rate used to calculate the converted_amount
-3. provider_class: (Class) the name of the provider class that supplied the exchange_rate (ie. OmniExchange::OpenExhangeRates)
+3. provider: (Symbol) the provider that supplied the exchange_rate (ie. :open_exchange_rates, :xe)
 
 [For the sake of precise calculation](https://www.bigbinary.com/blog/handling-money-in-ruby), converted_amount and exchange_rate are BigDecimal. Simply call `.to_f` to the results if you'd like to see a number that is easier to read.
 
@@ -67,7 +67,7 @@ Here is an example. Lets say I want to convert $1.00 US Dollar to Japanese Yen,
 ```ruby
 USD_to_JPY = OmniExchange.get_fx_data(amount: 100, base_currency: 'USD', target_currency: 'JPY', providers: [:open_exchange_rates, :xe])
 
-puts USD_to_JPY # => { :converted_amount=>0.13566633333e3, :exchange_rate=>0.13566633333e1, :provider_class=>OmniExchange::OpenExchangeRates }
+puts USD_to_JPY # => { :converted_amount=>0.13566633333e3, :exchange_rate=>0.13566633333e1, :provider=>:open_exchange_rates }
 
 puts USD_to_JPY[:converted_amount] # => 0.13566633333e3
 puts USD_to_JPY[:converted_amount].to_f # => 135.66633333

data/bin/console

@@ -6,6 +6,7 @@ require 'omni_exchange'
 require 'dotenv/load'
 require 'faraday'
 require 'money'
+require 'net/http'
 require_relative '../lib/omni_exchange/provider'
 require_relative '../lib/omni_exchange/configuration'
 require_relative '../lib/omni_exchange/error'

data/lib/omni_exchange/providers/open_exchange_rates.rb

@@ -27,11 +27,15 @@ module OmniExchange
           req.options.timeout = config[:read_timeout] || OmniExchange::Configuration::DEFAULT_READ_TIMEOUT
           req.options.open_timeout = config[:connect_timeout] || OmniExchange::Configuration::DEFAULT_CONNECTION_TIMEOUT
         end
-      rescue Faraday::Error, Faraday::ConnectionFailed => e
+      rescue *EXCEPTIONS => e
         raise e.class, 'Open Exchange Rates has timed out.'
       end
 
-      exchange_rate = JSON.parse(response.body, symbolize_names: true)[:rates][target_currency.to_sym].to_d
+      begin
+        exchange_rate = JSON.parse(response.body, symbolize_names: true)[:rates][target_currency.to_sym].to_d
+      rescue JSON::ParserError => e
+        raise e.class, 'JSON::ParserError in OmniExchange::OpenExchangeRates'
+      end
 
       currency_unit = get_currency_unit(base_currency).to_d
 

data/lib/omni_exchange/providers/xe.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/AbcSize
 require 'omni_exchange'
 
 module OmniExchange
@@ -33,11 +32,15 @@ module OmniExchange
           req.options.timeout = config[:read_timeout] || OmniExchange::Configuration::DEFAULT_READ_TIMEOUT
           req.options.open_timeout = config[:connect_timeout] || OmniExchange::Configuration::DEFAULT_CONNECTION_TIMEOUT
         end
-      rescue Faraday::Error, Faraday::ConnectionFailed => e
+      rescue *EXCEPTIONS => e
         raise e.class, 'xe.com has timed out.'
       end
 
-      body = JSON.parse(response.body, symbolize_names: true)
+      begin
+        body = JSON.parse(response.body, symbolize_names: true)
+      rescue JSON::ParserError => e
+        raise e.class, 'JSON::ParserError in OmniExchange::Xe'
+      end
 
       raise OmniExchange::XeMonthlyLimit, 'Xe.com monthly limit has been exceeded' if body[:code] == 3
 
@@ -49,4 +52,3 @@ module OmniExchange
     OmniExchange::Provider.register_provider(:xe, self)
   end
 end
-# rubocop:enable Metrics/AbcSize

data/lib/omni_exchange/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OmniExchange
-  VERSION = '1.2.0'
+  VERSION = '1.5.0'
 end

data/lib/omni_exchange.rb

@@ -12,6 +12,7 @@ require 'faraday'
 require 'money'
 require 'json'
 require 'bigdecimal/util'
+require 'net/http'
 
 # rubocop:disable Lint/Syntax
 module OmniExchange
@@ -32,6 +33,9 @@ module OmniExchange
     yield(configuration)
   end
 
+  # if a provider raises one of these exceptions, OmniExchange will gracefully attempt to use another provider
+  EXCEPTIONS = [Faraday::Error, Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::SSLError, Net::OpenTimeout, Net::WriteTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError]
+
   module_function
 
   # returns foreign exchange data including the amount of money in one country's currency when exchanged from an
@@ -44,15 +48,12 @@ module OmniExchange
   # @param providers: [Array] an array of symbols of the providers that will be used to get exchange rates API
   #   data. The symbols must be found in the @providers hash in the Provider class (lib/omni_exchange/provider.rb).
   #   ie. xe:, :open_exchange_rates
-  # @return [Hash] If all of the providers in the providers hash fail to retrieve data, or if one of the currencies
-  #   is not valid, an exception is raised.
+  # @return [Hash] If none of the providers in the providers hash are able to retrieve data, or if one of the
+  #   currencies is not valid, an exception is raised.
   #   * :converted_amount [BigDecimal] the amount of money exchanged from the base currency to the target
   #       currency as a BigDecimal for precice calculation. ie. 1, 10, 100
   #   * :exchange_rate [BigDecimal] the rate used to calculate the converted_amount as a BigDecimal. ie. 0.95211e1
-  #   * :provider_class [Class] the provider class that supplied the exchange_rate data. ie. OmniExchange::Xe
-  #the amount of the base currency exchanged to the target currency using an exchange rate
-  #   provided by one of the data providers in the providers hash. The final amount is returned as a BigDecimal
-  #   for precise calculation. If all of the providers in the providers hash fail to retrieve data, an exception is raised.
+  #   * :provider [Symbol] the provider that supplied the exchange_rate data. ie. :xe, :open_exchange_rates
   def get_fx_data(amount:, base_currency:, target_currency:, providers:)
     # if one of the currencies is not valid (ie. 'fake_crypto'), an exception is raised.
     begin
@@ -73,8 +74,8 @@ module OmniExchange
 
       exchanged_amount = rate.to_d * amount.to_d
 
-      return { converted_amount: exchanged_amount, exchange_rate: rate, provider_class: klass }
-    rescue Faraday::Error, Faraday::ConnectionFailed, OmniExchange::XeMonthlyLimit => e
+      return { converted_amount: exchanged_amount, exchange_rate: rate, provider: OmniExchange::Provider.all.key(klass) }
+    rescue *EXCEPTIONS, OmniExchange::XeMonthlyLimit, JSON::ParserError => e
       error_messages << e.inspect
     end
     

data/omni_exchange.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '0.17.4'
+  spec.add_dependency 'faraday', '< 2'
   spec.add_dependency 'money', '~> 6.13.1'
 
   spec.add_development_dependency 'dotenv'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omni_exchange
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Yun Chung
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.17.4
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.17.4
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement