investtools-money 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8458cdfb679db2487e1e81878eeaef25157c8ee6
-  data.tar.gz: 6da5f97104de3b942a00e17271d16f8249e788cf
+  metadata.gz: 1b51a40a8b2b92c769f751c4941380b3f4b5c48c
+  data.tar.gz: 0a51a081cfc1472e637b15028235c5793d16a82c
 SHA512:
-  metadata.gz: c55882b31924e6265a721a8caa17f7fe735698d517fde014e9d57b24f0a42181760920f584cf4bf82ebd6d9cbdc76ab8ef3716afdcec79c4777179b464e5b98b
-  data.tar.gz: 7e99f98c1c92adea31259773dc0fc8803425bfdf495f8bdd088000690b06fe92f4874da22d70f034488f068ccc25fc1b22b0623e260f7d655c3b3f86ace0cde4
+  metadata.gz: e5f69b2abd97bff616361a44df8909bb4ff220e0b05d432ab9a0c1117b23bfe1d2d22867e27b51af247bfb0076ad9cbce6ce4f9450aacede3b0af6957ffec432
+  data.tar.gz: 0abf4f8f0ec685dde72fc1904187572ec5ee308dd6c644dd5dda313a375c18e3622663b68426042a78433aa0fcc8cc5fd48e50dec669228eb448a24ae640afe2

data/lib/money/money.rb

@@ -46,9 +46,17 @@ class Money
   protected
 
   def calculate(operation, other)
-    other = other.amount if other.kind_of?(Money)
+    if other.kind_of?(Money)
+      if other.date != date and other.date != nil and date != nil
+        raise "Can't calculate the amount with different dates."
+      end 
+      new_date = date || other.date
+      other = other.exchange_to(currency).amount
+    else
+      new_date = date
+    end
     if other.kind_of?(Numeric)
-      Money.new(amount.send(operation, other), currency, date)
+      Money.new(amount.send(operation, other), currency, new_date)
     else
       raise TypeError, "#{other.class} can't be coerced into Money"
     end

data/lib/money/version.rb

@@ -1,5 +1,5 @@
 require 'money/base'
 
 class Money
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/money/money_spec.rb

@@ -25,6 +25,29 @@ describe Money do
         expect { Money.new(1_000.0, 'BRL') - 'TEST' }.to raise_error(TypeError)
       end
     end
+    context 'when the given money is in other currency' do
+      it 'converts the given amount before the operation' do
+        expect(Money.new(1_150.0, 'BRL') - Money.new(100.0, 'USD')).to eq Money.new(1_000.0, 'BRL')
+      end
+    end
+    context 'when the given money is on different date' do
+      it 'raises an error' do
+        expect { Money.new(1_000.0, 'BRL', Date.parse('2015-06-24')) - Money.new(100.0, 'BRL', Date.parse('2015-06-25')) }.
+          to raise_error("Can't calculate the amount with different dates.")
+      end
+    end 
+    context 'when the given money is on nil date' do
+      it 'substracts the given money amount from amount and returns a new Money' do
+        expect(Money.new(1_000.0, 'BRL', Date.parse('2015-06-24')) - Money.new(100.0, 'BRL')).
+        to eq Money.new(900.0, 'BRL', Date.parse('2015-06-24'))
+      end
+    end 
+    context 'when the date is nil and the given money has a date' do
+      it 'substracts the given money amount from amount and returns a new Money with the given money date' do
+        expect(Money.new(1_000.0, 'BRL') - Money.new(100.0, 'BRL', Date.parse('2015-06-24'))).
+        to eq Money.new(900.0, 'BRL', Date.parse('2015-06-24'))
+      end
+    end      
   end
   describe '#/' do
     it 'divides the amount by the given value and returns a new object' do
@@ -40,6 +63,23 @@ describe Money do
         expect { Money.new(1_000.0, 'BRL') / 'TEST' }.to raise_error(TypeError)
       end
     end
+    context 'when the given money is in other currency' do
+      it 'converts the given amount before the operation' do
+        expect(Money.new(1_500.0, 'BRL') / Money.new(100.0, 'USD')).to eq Money.new(10.0, 'BRL')
+      end
+    end 
+    context 'when the given money is on nil date' do
+      it 'divides the amount by the given money amount and returns a new Money' do
+        expect(Money.new(1_000.0, 'BRL', Date.parse('2015-06-24')) / Money.new(10.0, 'BRL')).
+        to eq Money.new(100.0, 'BRL', Date.parse('2015-06-24'))
+      end
+    end 
+    context 'when the date is nil and the given money has a date' do
+      it 'divides the amount by the given money amount and returns a new Money with the given money date' do
+        expect(Money.new(1_000.0, 'BRL') / Money.new(10.0, 'BRL', Date.parse('2015-06-24'))).
+        to eq Money.new(100.0, 'BRL', Date.parse('2015-06-24'))
+      end 
+    end      
   end
   describe '#*' do
     it 'multiplies the amount by the given value and returns a new object' do
@@ -55,6 +95,23 @@ describe Money do
         expect { Money.new(1_000.0, 'BRL') * 'TEST' }.to raise_error(TypeError)
       end
     end
+    context 'when the given money is in other currency' do
+      it 'converts the given amount before the operation' do
+        expect(Money.new(1_000.0, 'BRL') * Money.new(1.0, 'USD')).to eq Money.new(1_500.0, 'BRL')
+      end
+    end 
+    context 'when the given money is on nil date' do
+      it 'multiplies the amount by the given money amount and returns a new Money' do
+        expect(Money.new(100.0, 'BRL', Date.parse('2015-06-24')) * Money.new(10.0, 'BRL')).
+        to eq Money.new(1_000.0, 'BRL', Date.parse('2015-06-24'))
+      end
+    end 
+    context 'when the date is nil and the given money has a date' do
+      it 'multiplies the amount by the given money amount and returns a new Money with the given money date' do
+        expect(Money.new(100.0, 'BRL') * Money.new(10.0, 'BRL', Date.parse('2015-06-24'))).
+        to eq Money.new(1_000.0, 'BRL', Date.parse('2015-06-24'))
+      end 
+    end         
   end
   describe '#+' do
     it 'adds the amount to the given value and returns a new object' do
@@ -70,6 +127,23 @@ describe Money do
         expect { Money.new(1_000.0, 'BRL') + 'TEST' }.to raise_error(TypeError)
       end
     end
+    context 'when the given money is in other currency' do
+      it 'converts the given amount before the operation' do
+        expect(Money.new(1_000.0, 'BRL') + Money.new(100.0, 'USD')).to eq Money.new(1_150.0, 'BRL')
+      end
+    end 
+    context 'when the given money is on nil date' do
+      it 'adds the amount to the given money amount and returns a new Money' do
+        expect(Money.new(1_000.0, 'BRL', Date.parse('2015-06-24')) + Money.new(100.0, 'BRL')).
+        to eq Money.new(1_100.0, 'BRL', Date.parse('2015-06-24'))
+      end
+    end 
+    context 'when the date is nil and the given money has a date' do
+      it 'adds the amount to the given money amount and returns a new Money with the given money date' do
+        expect(Money.new(1_000.0, 'BRL') + Money.new(100.0, 'BRL', Date.parse('2015-06-24'))).
+        to eq Money.new(1_100.0, 'BRL', Date.parse('2015-06-24'))
+      end 
+    end         
   end
   describe '#coerce' do
     it 'wraps first operator in a Money' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: investtools-money
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.