active_currency 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deaf57273ac8a06081edea671655192a53a560f5b4d2573818e1b3998d892f94
-  data.tar.gz: 78a851b36ae4a92fda99e8dd768685b0e5627069e75bbc07b349154823549c61
+  metadata.gz: cfc5f4cd4fb66fb4bf8792dacfd16014f2bb5bb44d603a4b5cd72985999b1729
+  data.tar.gz: 20995e8b1c9b3d4935bc1e6f1d9a2832fd0cd703e4fcb60de44b413e78995dae
 SHA512:
-  metadata.gz: 502199ad5fa78e5b7710ef17e82de1e1f9e3ff68758a9193321c15524c636b2bec34c7f9839079122693f9c3044821aec37e862745279dbe34d9c2e45e97dfeb
-  data.tar.gz: 1f733721568ddacbc5a99335b761dee893191415a147c6639c0996f6d95a3df6fb373eebae298260906ddf704dbe9b3be0120857d845b9aa88ef0719ae06ca0e
+  metadata.gz: 8804e7be48d851288b48efb05d7dbba0c57b62d3b71937d5e375c98de4485bbcab9a2de042abe4614e37d77cfc0a709b310faca4d6245156373c4924c4311b80
+  data.tar.gz: 3843245a24efe3d2eec8ae19a834b4d7e1e7b82d48c7203c5f41326e894c42228b524c6379f38beee9732448587b58392f814894dfbc75a1b5199d344a9290a0

data/README.md

@@ -84,6 +84,9 @@ bank.app_id = '…'
 ActiveCurrency::AddRates.call(%w[EUR USD], bank: bank)
 ```
 
+The first currency you give to `AddRates` is considered the default currency
+against which other currency rates will be guessed if they are unavailable.
+
 ## Tests
 
 In your app test suite you may not want to have to fill your database to be
@@ -128,12 +131,17 @@ Then:
 
 ```sh
 gem install bundler:1.17.2
-BUNDLE_GEMFILE=Gemfile-rails3.2 bundle update active_currency
-BUNDLE_GEMFILE=Gemfile-rails4.2 bundle update active_currency
+BUNDLE_GEMFILE=Gemfile-rails3.2 bundle update
+BUNDLE_GEMFILE=Gemfile-rails4.2 bundle update
 
 gem install bundler:2.1.2
-BUNDLE_GEMFILE=Gemfile-rails5.2 bundle update active_currency
-BUNDLE_GEMFILE=Gemfile-rails6.0 bundle update active_currency
+BUNDLE_GEMFILE=Gemfile-rails5.2 bundle update
+BUNDLE_GEMFILE=Gemfile-rails6.0 bundle update
+
+BUNDLE_GEMFILE=Gemfile-rails3.2 bundle exec rake
+BUNDLE_GEMFILE=Gemfile-rails4.2 bundle exec rake
+BUNDLE_GEMFILE=Gemfile-rails5.2 bundle exec rake
+BUNDLE_GEMFILE=Gemfile-rails6.0 bundle exec rake
 
 git add CHANGELOG.md lib/active_currency/version.rb Gemfile-rails*.lock
 git commit -m v`ruby -r./lib/active_currency/version <<< 'puts ActiveCurrency::VERSION'`

data/app/models/active_currency/rate.rb

@@ -11,10 +11,13 @@ module ActiveCurrency
     }
 
     def self.value_for(from, to, date = nil)
-      scope = date ? before(date) : all_scope
+      from = Money::Currency.new(from)
+      to = Money::Currency.new(to)
+      return 1 if from == to
 
+      scope = date ? before(date) : all_scope
       scope
-        .where(from: from, to: to)
+        .where(from: from.iso_code, to: to.iso_code)
         .order(:created_at)
         .last
         &.value

data/lib/active_currency/add_rates.rb

@@ -4,16 +4,18 @@ module ActiveCurrency
   # Store the latest currency rates.
   class AddRates
     def initialize(currencies, bank: EuCentralBank.new)
-      @currencies = currencies
+      @currencies = currencies.map(&:to_s).map(&:upcase)
       @bank = bank
     end
 
     def call
       bank.update_rates
 
-      other_currencies.each do |to|
-        store_rate(to)
+      rates_hash.each do |(from, to), rate|
+        store.add_rate(from, to, rate)
       end
+
+      nil
     end
 
     def self.call(currencies, *options)
@@ -22,38 +24,40 @@ module ActiveCurrency
 
     private
 
-    attr_accessor :bank
-
-    def currencies
-      @currencies.map(&:to_s).map(&:upcase)
-    end
-
-    def other_currencies
-      currencies.drop(1)
-    end
-
-    def from
-      @from ||= currencies.first
-    end
+    attr_accessor :bank, :currencies
 
     def store
       @store ||= ActiveCurrency::RateStore.new
     end
 
-    def store_rate(to)
-      rate, inverse = get_rates(to)
+    def rates_hash
+      currencies.each_with_object({}) do |from, hash|
+        currencies.each do |to|
+          next if from == to
 
-      store.add_rate(from, to, rate)
-      store.add_rate(to, from, inverse)
+          hash[[from, to]] = get_rate(hash, from, to)
+        end
+      end
     end
 
-    def get_rates(to)
+    def get_rate(hash, from, to)
       rate = bank.get_rate(from, to)
-      raise "Unknown rate between #{from} and #{to}" if rate.nil? || rate.zero?
+      return rate if rate
+
+      # Inverse rate (not so good)
+      inverse = hash[[to, from]]
+      return 1.fdiv(inverse) if inverse
 
-      inverse = bank.get_rate(to, from) || 1.fdiv(rate)
+      # Rate going through the first currency (desperate)
+      from_main = hash[[from, main_currency]]
+      to_main = hash[[main_currency, to]]
+      return from_main * to_main if from_main && to_main
+
+      raise "Unknown rate between #{from} and #{to}"
+    end
 
-      [rate, inverse]
+    def main_currency
+      currencies.first
     end
   end
 end

data/lib/active_currency/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_currency
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Store your currency.
 email:
 - sunny@sunfox.org