omni_exchange 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c10147e9b33c5288fe9d59249c2d51ff23e5fbf2be87f352fa59e6244b2949f8
-  data.tar.gz: beff303239c412ff7e4d2691319be4fce1cf7c1424d2589397900f5c45184c21
+  metadata.gz: 3ae87cd7a839738c4e8a91ff800a1c0f5867c74540b90bdc69d2d7e1091cae8c
+  data.tar.gz: 84c043b737c6e7ad350dbedc02b4398059526f3ab39d282ee9d4f3cc07363653
 SHA512:
-  metadata.gz: cdb12eb02901081566e65046c780f02eea5691689b9d4fd7fa646f6acee57686d2eab1138a0c289ae893930076ba099235ed46fb3e1a95ca64815122502c8ee5
-  data.tar.gz: c049ff4bc1946d7c87018f308beb7cffca268bae4601c3796447c22acef34118e5e50cb5aa004b012e690e15714c0b10342b0226bafb6c6a3a51d53266dd2365
+  metadata.gz: bb39b4b6f07e8c7539055aa08e073b8a96c768537950b0c23053c03d978167f5c31d1ee3220125d41ca507d79a8956de7066f96041096d8d69f161a6a86a0fa4
+  data.tar.gz: f4b145799b92ba721a559db9623e188a9957877b87bffe6e7a899f3bb57469273882790627ad9e74b6fe8c3f42efbc6f34cfdc8f39fbabce161a2cb9a99843e5

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    omni_exchange (1.8.0)
-      faraday (< 2)
+    omni_exchange (2.0.0)
+      faraday (~> 2)
       money (~> 6.13.1)
 
 GEM
@@ -10,38 +10,20 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.3)
     diff-lcs (1.5.0)
     dotenv (2.8.1)
-    faraday (1.10.3)
-      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)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     money (6.13.8)
       i18n (>= 0.6.4, <= 2)
-    multipart-post (2.3.0)
+    net-http (0.4.1)
+      uri
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -77,8 +59,8 @@ GEM
     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)
+    uri (0.13.0)
     vcr (6.1.0)
 
 PLATFORMS

data/lib/omni_exchange/providers/open_exchange_rates.rb

@@ -23,10 +23,7 @@ module OmniExchange
           req.params['symbols'] = target_currency
         end
 
-        exchange_rate = body['rates'][target_currency].to_d
-        currency_unit = get_currency_unit(base_currency).to_d
-
-        (exchange_rate * currency_unit).to_d
+        body['rates'][target_currency].to_d
       end
 
       def get_historic_rate(base_currency:, target_currencies:, date:)
@@ -37,10 +34,7 @@ module OmniExchange
           req.params['symbols'] = target_currencies.join(',')
         end
 
-        currency_unit = get_currency_unit(base_currency).to_d
-        body['rates'].transform_values do |rate|
-          (rate * currency_unit).to_d
-        end
+        body['rates']
       end
 
       private

data/lib/omni_exchange/providers/xe.rb

@@ -17,14 +17,12 @@ module OmniExchange
       #   rate will be used to calculate an convert an exchange of currencies. However, an exception will be raised
       #   if there is a timeout while connecting to xe.com or a timeout while reading xe.com's API.
       def get_exchange_rate(base_currency:, target_currency:)
-        currency_unit = get_currency_unit(base_currency)
-
         body = api_get do |req|
           req.url 'v1/convert_from.json'
 
           req.params['from'] = base_currency
           req.params['to'] = target_currency
-          req.params['amount'] = currency_unit
+          req.params['amount'] = 1
         end
 
         body[:to][0][:mid].to_d
@@ -38,14 +36,12 @@ module OmniExchange
       #                                   exchanging to. ie. ["EUR", "KRW"]
       # @param date: [Date] the date for which you want the historic exchange rate.
       def get_historic_rate(base_currency:, target_currencies:, date:)
-        currency_unit = get_currency_unit(base_currency)
-
         body = api_get do |req|
           req.url 'v1/historic_rate.json'
 
           req.params['from'] = base_currency
           req.params['to'] = target_currencies.join(',')
-          req.params['amount'] = currency_unit
+          req.params['amount'] = 1
           req.params['date'] = date.strftime('%Y-%m-%d')
         end
 
@@ -81,7 +77,7 @@ module OmniExchange
         api_key = config[:api_key]
 
         Faraday.new(OmniExchange::Xe::ENDPOINT_URL) do |f|
-          f.request :basic_auth, api_id, api_key
+          f.set_basic_auth api_id, api_key
           f.adapter :net_http
         end
       end

data/lib/omni_exchange/version.rb

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

data/lib/omni_exchange.rb

@@ -116,14 +116,19 @@ module OmniExchange
     error_messages = []
 
     provider_classes.each do |klass|
-      return klass.get_exchange_rate(base_currency: base_currency,
+      rate = klass.get_exchange_rate(base_currency: base_currency,
                                      target_currency: target_currency)
 
+      return {
+        rate: rate,
+        provider: OmniExchange::Provider.all.key(klass)
+      }
+
     rescue *EXCEPTIONS, OmniExchange::XeMonthlyLimit, JSON::ParserError => e
       error_messages << e.inspect
     end
 
-    raise OmniExchange::HttpError, "Failed to get historic rate:\n" \
+    raise OmniExchange::HttpError, "Failed to get exchange rate:\n" \
                                    "#{error_messages.join("\n")}"
   end
 
@@ -146,9 +151,14 @@ module OmniExchange
     error_messages = []
 
     provider_classes.each do |klass|
-      return klass.get_historic_rate(base_currency: base_currency,
-                                    target_currencies: target_currencies,
-                                    date: date)
+      rates = klass.get_historic_rate(base_currency: base_currency,
+                                      target_currencies: target_currencies,
+                                      date: date)
+
+      return {
+        rates: rates,
+        provider: OmniExchange::Provider.all.key(klass)
+      }
 
     rescue *EXCEPTIONS, OmniExchange::XeMonthlyLimit, JSON::ParserError => e
       error_messages << e.inspect

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', '< 2'
+  spec.add_dependency 'faraday', '~> 2'
   spec.add_dependency 'money', '~> 6.13.1'
 
   spec.add_development_dependency 'dotenv'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: omni_exchange
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yun Chung
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency