danconia 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ebf1db97ca89c6a822b12279f873193c97d7e9f412aa0054967cf02e1d3f74d
-  data.tar.gz: da1e807e1d5e0c4ec0619f8d93a7a023c4e8361c4b48a3f16b138c4013122fed
+  metadata.gz: fc840f5913a010c41495c7fd843304d67565217acf7eb7c248be9bf4c17624f8
+  data.tar.gz: d8906df663f918a41d91525b6ac51de9f8ac6decef179c813fc30145be876c50
 SHA512:
-  metadata.gz: 1836de03b18616b074b76028d6ff6cf392e8148e294d80783a918836c9d75eb78aa2f6df666302a5d68435362f90091f3690daa7ca1c08bf1fa746bd4b0171ab
-  data.tar.gz: bc00add76fb57dd0b30ddc8c0a2c4ba5790335bc4f4ad5dd4e29c73b2445fe5b3cec06edd8df2dd5eec4b9abcadc158196f2cb8a146807dcb43a6952b67f5c68
+  metadata.gz: dc66bbeaf202e6b288f79d4a6fb9b93cc66585771f9543c14a14980252f5a112eb4e6a2cad21d15e4132bda2400f74cdb5567eb9a47a4f7ac7b6161105c2ae9c
+  data.tar.gz: 222d602fb10b842955d921ede2c7bae8bba4fd56dcdb1bcbcc74c12f795959c58250141f05943b607f0de80cdb3a07dc7425219e38f534c375236a0029d29ce2

data/.travis.yml

@@ -1 +1,5 @@
+---
+sudo: false
 language: ruby
+cache: bundler
+before_install: gem install bundler -v 1.16.1

data/Gemfile.lock

@@ -1,28 +1,27 @@
 PATH
   remote: .
   specs:
-    danconia (0.2.3)
+    danconia (0.2.8)
       activerecord (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activesupport (5.2.0)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -43,7 +42,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.7)
-    i18n (1.0.1)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -51,7 +50,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.0)
-    minitest (5.11.3)
+    minitest (5.14.1)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -60,7 +59,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rake (10.3.2)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -80,15 +79,16 @@ GEM
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     shellany (0.0.1)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.1)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -103,4 +103,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/README.md

@@ -65,6 +65,18 @@ Product.new(price: 30, price_currency: 'ARS').price # => 30 ARS
 
 Currently, there is no option to customize the names of the columns but should be fairly simple to implement if needed.
 
+## Testing
+
+There is a FixedRates exchange that can be used during testing to supply static rates (see `examples/fixed_rates.rb`). Another possibility is to use the following helper:
+
+```ruby
+require 'danconia/test_helpers'
+
+Danconia::TestHelpers.with_rates 'USDARS' => 3 do
+  Money(2, 'USD').exchange_to('ARS') # => 6.0 ARS
+end
+```
+
 ## Contributing
 
 1. Fork it

data/examples/currency_layer.rb

@@ -23,4 +23,4 @@ end
 puts 'Updating dates with CurrencyLayer API...'
 Danconia.config.default_exchange.update_rates!
 
-puts Money(1, 'USD').exchange_to('EUR').inspect # => 0.854896 EUR
+puts Money(1, 'USD').exchange_to('EUR').inspect # => 0.854896 EUR

data/lib/danconia/currency.rb

@@ -5,4 +5,4 @@ module Danconia
       new Danconia.config.available_currencies.find { |c| c[:code] == code } || {code: code, symbol: '$'}
     end
   end
-end
+end

data/lib/danconia/exchanges/exchange.rb

@@ -8,7 +8,9 @@ module Danconia
       end
 
       def rate from, to
-        if from == 'USD' and direct_rate = @store.direct_rate(from, to)
+        if from == to
+          1.0
+        elsif from == 'USD' and direct_rate = @store.direct_rate(from, to)
           direct_rate
         elsif to == 'USD' and inverse_rate = @store.direct_rate(to, from)
           (1.0 / inverse_rate).round 6
@@ -28,4 +30,4 @@ module Danconia
       end
     end
   end
-end
+end

data/lib/danconia/money.rb

@@ -13,13 +13,12 @@ module Danconia
       @exchange = exchange
     end
 
-    def format decimals: @decimals
-      ActiveSupport::NumberHelper.number_to_currency amount, precision: decimals, unit: currency.symbol
+    def format decimals: @decimals, **other_options
+      opts = other_options.reverse_merge precision: decimals, unit: currency.symbol
+      ActiveSupport::NumberHelper.number_to_currency amount, opts
     end
 
-    def to_s
-      format
-    end
+    alias to_s format
 
     def inspect
       "#{amount} #{currency.code}"
@@ -46,23 +45,17 @@ module Danconia
       amount <=> other
     end
 
-    def exchange_to other_currency
+    def exchange_to other_currency, exchange: @exchange
       other_currency = other_currency.presence && Currency.find(other_currency, exchange) || currency
-      rate = exchange_rate_to(other_currency.code)
-      clone_with amount * rate, other_currency
-    end
-
-    def exchange_rate_to to
-      from = currency.code
-      return 1 if from == to
-      exchange.rate from, to
+      rate = exchange.rate currency.code, other_currency.code
+      clone_with amount * rate, other_currency, exchange
     end
 
     %w(+ - * /).each do |op|
       class_eval <<-EOR, __FILE__, __LINE__ + 1
         def #{op} other
-          other = other.exchange_to(currency).amount if other.is_a? Money
-          clone_with amount #{op} other
+          other = other.exchange_to(currency, exchange: @exchange).amount if other.is_a? Money
+          clone_with(amount #{op} other)
         end
       EOR
     end
@@ -75,6 +68,10 @@ module Danconia
       (self * 100).round
     end
 
+    def as_json *args
+      amount.as_json *args
+    end
+
     def default_currency?
       currency.code == Danconia.config.default_currency
     end
@@ -97,7 +94,7 @@ module Danconia
       BigDecimal(object.to_s) rescue BigDecimal(0)
     end
 
-    def clone_with amount, currency = @currency
+    def clone_with amount, currency = @currency, exchange = @exchange
       Money.new amount, currency, decimals: decimals, exchange: exchange
     end
   end

data/lib/danconia/stores/active_record.rb

@@ -14,7 +14,7 @@ module Danconia
       end
 
       def rates
-        ExchangeRate.all
+        Hash[ExchangeRate.all.map { |er| [er.pair, er.rate] }]
       end
     end
 

data/lib/danconia/version.rb

@@ -1,3 +1,3 @@
 module Danconia
-  VERSION = '0.2.3'
+  VERSION = '0.2.8'
 end

data/spec/danconia/money_spec.rb

@@ -39,7 +39,7 @@ module Danconia
       end
 
       it 'should exchange the other currency if it is different' do
-        expect(Money(1, 'ARS') + Money(1, 'USD', exchange: fake_exchange(rate: 4))).to eq Money(5, 'ARS')
+        expect(Money(1, 'ARS', exchange: fake_exchange(rate: 4)) + Money(1, 'USD')).to eq Money(5, 'ARS')
       end
 
       it 'should return a new object with the same options' do
@@ -89,6 +89,10 @@ module Danconia
       it 'allow to override the number of decimals' do
         expect(Money(3.561, decimals: 3).format(decimals: 1)).to eq '$3.6'
       end
+
+      it 'pass the options to the activesupport helper' do
+        expect(Money(2).format(format: '%n %u')).to eq '2.00 $'
+      end
     end
 
     context 'to_s' do
@@ -117,17 +121,29 @@ module Danconia
     end
 
     context 'exchange_to' do
-      it 'should use the exchange passed to the instance to get the rate' do
-        expect(Money(2, 'USD', exchange: fake_exchange(rate: 3)).exchange_to('ARS')).to eq Money(6, 'ARS')
-      end
-
-      it 'should use the default exchange if not set' do
+      it 'should use a default exchange if not overriden' do
         TestHelpers.with_rates 'USDEUR' => 3, 'USDARS' => 4 do
           expect(Money(2, 'USD').exchange_to('EUR')).to eq Money(6, 'EUR')
           expect(Money(2, 'USD').exchange_to('ARS')).to eq Money(8, 'ARS')
         end
       end
 
+      it 'should allow to pass the exchange to the instance' do
+        expect(Money(2, 'USD', exchange: fake_exchange(rate: 3)).exchange_to('ARS')).to eq Money(6, 'ARS')
+      end
+
+      it 'should allow to pass the exchange when converting' do
+        expect(Money(2, 'USD').exchange_to('ARS', exchange: fake_exchange(rate: 4))).to eq Money(8, 'ARS')
+      end
+
+      it 'when overriding the exchange, should preserve it in the new instances' do
+        m1 = Money(1, 'USD').exchange_to('ARS', exchange: fake_exchange(rate: 2))
+        m2 = m1 + Money(3, 'USD')
+        m3 = m2 * Money(1, 'USD')
+        expect(m2).to eq Money(8, 'ARS')
+        expect(m3).to eq Money(16, 'ARS')
+      end
+
       it 'if no rate if found should raise error' do
         expect { Money(2, 'USD').exchange_to('ARS') }.to raise_error Errors::ExchangeRateNotFound
       end
@@ -167,8 +183,14 @@ module Danconia
       end
     end
 
+    context 'to_json' do
+      it 'should delegate to the amount' do
+        expect(Money(1).to_json).to eq '"1.0"'
+      end
+    end
+
     def fake_exchange args = {}
-      double 'exchange', args.reverse_merge(rate: nil)
+      double 'Danconia::Exchanges::Exchange', args.reverse_merge(rate: nil)
     end
   end
 end

data/spec/danconia/stores/active_record_spec.rb

@@ -7,7 +7,7 @@ module Danconia
         it 'should create or update the rates' do
           ExchangeRate.create! pair: 'USDEUR', rate: 2
           expect { subject.save_rates 'USDEUR' => 3, 'USDARS' => 4 }.to change { ExchangeRate.count }.by 1
-          expect(subject.rates.map { |e| [e.pair, e.rate] }).to eq({'USDEUR' => 3, 'USDARS' => 4}.to_a)
+          expect(subject.rates).to eq('USDEUR' => 3, 'USDARS' => 4)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danconia
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Emmanuel Nicolau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord