danconia 0.2.9 → 0.3.0

data/spec/danconia/integrations/active_record_spec.rb

@@ -1,12 +1,10 @@
-require 'spec_helper'
-
 module Danconia
   describe Integrations::ActiveRecord, active_record: true do
     context 'single currency' do
       it 'setter' do
-        expect(Product.new(price: 1.536).read_attribute :price).to eq 1.54
-        expect(Product.new(price: nil).read_attribute :price).to eq nil
-        expect(Product.new(price: Money(3)).read_attribute :price).to eq 3
+        expect(Product.new(price: 1.536).read_attribute(:price)).to eq 1.54
+        expect(Product.new(price: nil).read_attribute(:price)).to eq nil
+        expect(Product.new(price: Money(3)).read_attribute(:price)).to eq 3
       end
 
       it 'getter' do
@@ -34,6 +32,28 @@ module Danconia
       end
     end
 
+    context 'exchange options support' do
+      let(:exchange) do
+        Class.new(Exchange) do
+          def rates rate_type:
+            case rate_type
+            when 'divisa' then {'USDARS' => 7}
+            when 'billete' then {'USDARS' => 8}
+            end
+          end
+        end.new
+      end
+
+      it 'allows to specify options that will be pass to the exchange when exchanging to other currencies' do
+        klass = Class.new(ActiveRecord::Base) do
+          self.table_name = 'products'
+          money :price, rate_type: 'divisa'
+        end
+
+        expect(klass.new(price: Money(10, 'USD')).price.exchange_to('ARS', exchange: exchange)).to eq Money(70, 'ARS')
+      end
+    end
+
     class Product < ActiveRecord::Base
       money :price, :tax, :discount, :cost
     end

data/spec/danconia/money_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Danconia
   describe Money do
     context 'instantiation' do
@@ -39,16 +37,15 @@ module Danconia
       end
 
       it 'should exchange the other currency if it is different' do
-        expect(Money(1, 'ARS', exchange: fake_exchange(rate: 4)) + Money(1, 'USD')).to eq Money(5, 'ARS')
+        m1 = Money(1, 'ARS', exchange_opts: {exchange: fake_exchange(rate: 4)})
+        expect(m1 + Money(1, 'USD')).to eq Money(5, 'ARS')
       end
 
       it 'should return a new object with the same options' do
-        e = fake_exchange
-        m1 = Money(4, decimals: 3, exchange: e)
+        m1 = Money(4, decimals: 3)
         m2 = m1 * 2
         expect(m2).to_not eql m1
         expect(m2.decimals).to eq 3
-        expect(m2.exchange).to eq e
       end
 
       it 'round should return a money object with the same currency' do
@@ -72,7 +69,7 @@ module Danconia
       end
 
       it 'should exchange to the source currency if they differ' do
-        TestHelpers.with_rates 'USDARS' => 4 do |config|
+        TestHelpers.with_rates 'USDARS' => 4 do |_config|
           expect(Money(3, 'ARS') < Money(1, 'USD')).to be true
           expect(Money(4, 'ARS') < Money(1, 'USD')).to be false
         end
@@ -129,7 +126,8 @@ module Danconia
       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')
+        m = Money(2, 'USD', exchange_opts: {exchange: fake_exchange(rate: 3)})
+        expect(m.exchange_to('ARS')).to eq Money(6, 'ARS')
       end
 
       it 'should allow to pass the exchange when converting' do
@@ -153,8 +151,8 @@ module Danconia
       end
 
       it 'should return a new object with the same opts' do
-        m1 = Money(1, 'USD', decimals: 0, exchange: fake_exchange(rate: 3))
-        m2 = m1.exchange_to('ARS')
+        m1 = Money(1, 'USD', decimals: 0)
+        m2 = m1.exchange_to('ARS', exchange: fake_exchange(rate: 3))
         expect(m2).to_not eql m1
         expect(m2.decimals).to eq 0
         expect(m1).to eq Money(1, 'USD')
@@ -164,6 +162,38 @@ module Danconia
         expect(Money(1, 'USD').exchange_to('')).to eq Money(1, 'USD')
         expect(Money(1, 'ARS').exchange_to('')).to eq Money(1, 'ARS')
       end
+
+      context 'opts' do
+        let(:exchange) do
+          Class.new(Exchange) do
+            def rates opts
+              case opts[:type]
+              when 'divisa' then {'USDARS' => 7}
+              when 'billete' then {'USDARS' => 8}
+              else {}
+              end
+            end
+          end.new
+        end
+
+        it 'allows to specify opts to pass to the exchange (filters for example)' do
+          expect(Money(1, 'USD').exchange_to('ARS', type: 'divisa', exchange: exchange)).to eq Money(7, 'ARS')
+          expect { Money(1, 'USD').exchange_to('ARS', exchange: exchange) }.to raise_error Errors::ExchangeRateNotFound
+        end
+
+        it 'should be preserved after operations' do
+          m1 = Money(1, 'USD').exchange_to('ARS', type: 'divisa', exchange: exchange)
+          m2 = m1 + Money(2, 'USD')
+
+          expect(m2).to eq Money(21, 'ARS')
+          expect(m1 < Money(2, 'USD')).to eq true
+        end
+
+        it 'should use the instance exchange_opts by default' do
+          m = Money(1, 'USD', exchange_opts: {exchange: exchange, type: 'billete'})
+          expect(m.exchange_to('ARS')).to eq Money(8, 'ARS')
+        end
+      end
     end
 
     context 'default_currency?' do
@@ -190,7 +220,7 @@ module Danconia
     end
 
     def fake_exchange args = {}
-      double 'Danconia::Exchanges::Exchange', args.reverse_merge(rate: nil)
+      double 'Danconia::Exchange', args.reverse_merge(rate: nil)
     end
   end
 end

data/spec/danconia/stores/active_record_spec.rb

@@ -1,31 +1,97 @@
-require 'spec_helper'
-
 module Danconia
   module Stores
     describe ActiveRecord, active_record: true do
+      before do
+        ::ActiveRecord::Schema.define do
+          create_table :exchange_rates do |t|
+            t.string :pair, limit: 6
+            t.decimal :rate, precision: 12, scale: 6
+            t.string :rate_type
+            t.date :date
+          end
+        end
+      end
+
       context 'save_rates' do
         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).to eq('USDEUR' => 3, 'USDARS' => 4)
+
+          expect do
+            subject.save_rates [{pair: 'USDEUR', rate: 3}, {pair: 'USDARS', rate: 4}]
+          end.to change { ExchangeRate.count }.by 1
+
+          expect(subject.rates).to match [
+            include(pair: 'USDEUR', rate: 3),
+            include(pair: 'USDARS', rate: 4)
+          ]
+        end
+
+        it 'allows to specify other keys to use as unique' do
+          store = ActiveRecord.new(unique_keys: %i[pair rate_type])
+          store.save_rates [
+            {pair: 'USDARS', rate: 3, rate_type: 'billetes'},
+            {pair: 'USDARS', rate: 4, rate_type: 'divisas'}
+          ]
+          store.save_rates [
+            {pair: 'USDARS', rate: 33, rate_type: 'billetes'}
+          ]
+          expect(subject.rates).to match [
+            include(pair: 'USDARS', rate: 33, rate_type: 'billetes'),
+            include(pair: 'USDARS', rate: 4, rate_type: 'divisas')
+          ]
+        end
+
+        it 'ignores fields not present in the database table' do
+          subject.save_rates [{pair: 'USDEUR', rate: 3, non_existant: 'ignoreme'}]
         end
       end
 
       context 'rates' do
-        it 'returns a hash with rate by pair' do
+        it 'returns an array like the one it received' do
           ExchangeRate.create! pair: 'USDEUR', rate: 2
           ExchangeRate.create! pair: 'USDARS', rate: 40
-          expect(subject.rates).to eq('USDEUR' => 2, 'USDARS' => 40)
+
+          expect(subject.rates).to match [
+            include(pair: 'USDEUR', rate: 2),
+            include(pair: 'USDARS', rate: 40)
+          ]
+        end
+
+        it 'allows to pass filters' do
+          store = ActiveRecord.new(unique_keys: %i[pair date])
+          store.save_rates [
+            {pair: 'USDEUR', rate: 10, date: Date.new(2020, 1, 1)},
+            {pair: 'USDEUR', rate: 20, date: Date.new(2020, 1, 2)},
+            {pair: 'USDEUR', rate: 30, date: Date.new(2020, 1, 3)}
+          ]
+
+          expect(store.rates.size).to eq 3
+          expect(store.rates(date: Date.new(2020, 1, 2))).to match [include(rate: 20)]
         end
       end
 
-      before do
-        ::ActiveRecord::Schema.define do
-          create_table :exchange_rates do |t|
-            t.string :pair, limit: 6
-            t.decimal :rate, precision: 12, scale: 6
-            t.index :pair, unique: true
-          end
+      context 'special date field' do
+        let(:store) do
+          store = ActiveRecord.new(unique_keys: %i[pair date], date_field: :date)
+          store.save_rates [
+            {pair: 'USDEUR', rate: 10, date: Date.new(2000, 1, 1)},
+            {pair: 'USDEUR', rate: 20, date: Date.new(2000, 1, 2)},
+            {pair: 'USDEUR', rate: 30, date: Date.new(2000, 1, 4)}
+          ]
+          store
+        end
+
+        it 'calling #rates with a particular date when there are rates for that date' do
+          expect(store.rates(date: Date.new(2000, 1, 2))).to match [include(rate: 20)]
+        end
+
+        it 'calling #rates with a particular date when there are not rates for that date should return the previous' do
+          expect(store.rates(date: Date.new(2000, 1, 3))).to match [include(rate: 20)]
+          expect(store.rates(date: Date.new(1999, 12, 31))).to eq []
+        end
+
+        it 'calling #rates without a particular date, uses today' do
+          expect(store.rates).to match [include(rate: 30)]
         end
       end
     end

data/spec/danconia/stores/in_memory_spec.rb

@@ -0,0 +1,18 @@
+module Danconia
+  module Stores
+    describe InMemory do
+      context 'rates' do
+        it 'filters rates by type' do
+          subject.save_rates [
+            {pair: 'USDARS', rate: 3, rate_type: 'divisas'},
+            {pair: 'USDARS', rate: 4, rate_type: 'billetes'}
+          ]
+
+          expect(subject.rates(rate_type: 'divisas')).to match [include(rate: 3)]
+          expect(subject.rates(rate_type: 'billetes')).to match [include(rate: 4)]
+          expect(subject.rates).to match [include(rate: 3), include(rate: 4)]
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
 require 'danconia'
 require 'danconia/test_helpers'
+require 'danconia/integrations/active_record'
 require 'webmock/rspec'
 
-Dir["#{__dir__}/support/*.rb"].each { |f| require f }
+Dir["#{__dir__}/support/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.filter_run_when_matching :focus

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: danconia
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Emmanuel Nicolau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
 description: Multi-currency money library backed by BigDecimal
 email: emmanicolau@gmail.com
 executables:
@@ -117,6 +159,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -127,6 +170,7 @@ files:
 - Rakefile
 - bin/console
 - danconia.gemspec
+- examples/bna.rb
 - examples/currency_layer.rb
 - examples/fixed_rates.rb
 - examples/single_currency.rb
@@ -135,8 +179,9 @@ files:
 - lib/danconia/currency.rb
 - lib/danconia/errors/api_error.rb
 - lib/danconia/errors/exchange_rate_not_found.rb
+- lib/danconia/exchange.rb
+- lib/danconia/exchanges/bna.rb
 - lib/danconia/exchanges/currency_layer.rb
-- lib/danconia/exchanges/exchange.rb
 - lib/danconia/exchanges/fixed_rates.rb
 - lib/danconia/integrations/active_record.rb
 - lib/danconia/kernel.rb
@@ -146,13 +191,16 @@ files:
 - lib/danconia/stores/in_memory.rb
 - lib/danconia/test_helpers.rb
 - lib/danconia/version.rb
+- spec/danconia/exchanges/bna_spec.rb
 - spec/danconia/exchanges/currency_layer_spec.rb
 - spec/danconia/exchanges/exchange_spec.rb
+- spec/danconia/exchanges/fixtures/bna/home.html
 - spec/danconia/exchanges/fixtures/currency_layer/failure.json
 - spec/danconia/exchanges/fixtures/currency_layer/success.json
 - spec/danconia/integrations/active_record_spec.rb
 - spec/danconia/money_spec.rb
 - spec/danconia/stores/active_record_spec.rb
+- spec/danconia/stores/in_memory_spec.rb
 - spec/spec_helper.rb
 - spec/support/database.rb
 homepage: https://github.com/eeng/danconia
@@ -180,12 +228,15 @@ signing_key:
 specification_version: 4
 summary: Multi-currency money library backed by BigDecimal
 test_files:
+- spec/danconia/exchanges/bna_spec.rb
 - spec/danconia/exchanges/currency_layer_spec.rb
 - spec/danconia/exchanges/exchange_spec.rb
+- spec/danconia/exchanges/fixtures/bna/home.html
 - spec/danconia/exchanges/fixtures/currency_layer/failure.json
 - spec/danconia/exchanges/fixtures/currency_layer/success.json
 - spec/danconia/integrations/active_record_spec.rb
 - spec/danconia/money_spec.rb
 - spec/danconia/stores/active_record_spec.rb
+- spec/danconia/stores/in_memory_spec.rb
 - spec/spec_helper.rb
 - spec/support/database.rb

data/lib/danconia/exchanges/exchange.rb

@@ -1,47 +0,0 @@
-require 'danconia/pair'
-
-module Danconia
-  module Exchanges
-    class Exchange
-      attr_reader :store
-
-      def initialize store: Stores::InMemory.new
-        @store = store
-      end
-
-      def rate from, to
-        return 1.0 if from == to
-
-        pair = Pair.new(from, to)
-        rates = direct_and_inverted_rates()
-        rates[pair] or indirect_rate(pair, rates) or raise Errors::ExchangeRateNotFound.new(from, to)
-      end
-
-      def rates
-        @store.rates
-      end
-
-      def update_rates!
-        @store.save_rates fetch_rates
-      end
-
-      private
-
-      # Returns the original rates plus the inverted ones, to simplify rate finding logic.
-      def direct_and_inverted_rates
-        rates.each_with_object({}) do |(pair_str, rate), rs|
-          pair = Pair.parse(pair_str)
-          rs[pair] = rate
-          rs[pair.invert] ||= 1.0 / rate
-        end
-      end
-
-      def indirect_rate ind_pair, rates
-        if (from_pair = rates.keys.detect { |(pair, rate)| pair.from == ind_pair.from }) &&
-           (to_pair = rates.keys.detect { |(pair, rate)| pair.to == ind_pair.to })
-          rates[from_pair] * rates[to_pair]
-        end
-      end
-    end
-  end
-end