danconia 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baded88d58c693935472d8cc00e274384505ffd9859bca99c1accf4780f7cdf3
-  data.tar.gz: 50150e40b421805ff2f383250bb77f741932f66b4f324c9bb935388628521c77
+  metadata.gz: fc840f5913a010c41495c7fd843304d67565217acf7eb7c248be9bf4c17624f8
+  data.tar.gz: d8906df663f918a41d91525b6ac51de9f8ac6decef179c813fc30145be876c50
 SHA512:
-  metadata.gz: 5c936191102548a99cc30fddd737e95df0e9319adcfe6fbd12cd1d2a6b6b0228566c0f000da74125fbefa47ce63fe13e61417fce00ac69b3da531c71f7de9bb8
-  data.tar.gz: '09dffba5565f6c5207a396b943fd23bebe30eec94122ea4c86ade7ebeeebaa12294aa9378eb7cf2c7f7ab99ced0fcc424f81349f1d0c840b44e2cd2038be7733'
+  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,27 +1,27 @@
 PATH
   remote: .
   specs:
-    danconia (0.2.7)
+    danconia (0.2.8)
       activerecord (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.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.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -42,7 +42,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.7)
-    i18n (1.7.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -50,7 +50,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.0)
-    minitest (5.13.0)
+    minitest (5.14.1)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -59,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)
@@ -82,13 +82,13 @@ GEM
     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.1.10)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -103,4 +103,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/lib/danconia/money.rb

@@ -45,17 +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 currency.code, other_currency.code
-      clone_with amount * rate, other_currency
+      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
@@ -94,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/version.rb

@@ -1,3 +1,3 @@
 module Danconia
-  VERSION = '0.2.7'
+  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
@@ -121,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
@@ -178,7 +190,7 @@ module Danconia
     end
 
     def fake_exchange args = {}
-      double 'exchange', args.reverse_merge(rate: nil)
+      double 'Danconia::Exchanges::Exchange', args.reverse_merge(rate: nil)
     end
   end
 end

metadata

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