moolah 5.0.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115af710c730393a90c68062b1ab169762039a21262e37436253903bd212c6fd
-  data.tar.gz: '06296e3e90b8d761400150bb5338dcf442fa5b84efde22bc9b83d56146dfe9a9'
+  metadata.gz: 259bd848b9c02a4cbec6ae4b48100192caff0c00b9315c82a6dd7b81372711cc
+  data.tar.gz: ac0a29f2335095310e45bc3a597d7a4c7db644e7f15d9262d0f05fd5717d1965
 SHA512:
-  metadata.gz: 2625001e06725cef62bb406554c015606fbbf82679d039d74bd715432ec9312b6fa0b07b3496dba4853539ee26bdaad17017d243a088656a9925268ceb09a381
-  data.tar.gz: 34fa35fde5cfd8819cddf8ce89c88509ad6989b73a89e147f8c1f34cfcf03f0119a2f4c72505cf610a041adc93ca8b059324d1900df957628aa8c3de0b034f04
+  metadata.gz: 706e6c87160955d2cc3cde1e238e79a7f6c0e2a66d2159591dd0227c4008e4ac30cf7aee1f235b0da3f771f3444393de86642390d50ee2d1f669d9837a1bd2a5
+  data.tar.gz: c2b621ca8644131cab99bdf0e13b16447e257472235c54917865bb03695e6af8b92f5343febef98296c69ca86cbecfdca5d95b52e0bd0991942edb9d2500aaed

data/lib/moolah/formatter.rb

@@ -14,7 +14,7 @@ module Moolah
     end
 
     def format_fx_rate
-      ('%.2f' % money.fx_rate)
+      sprintf('%.4f', money.fx_rate)
     end
 
     private

data/lib/moolah/money.rb

@@ -7,11 +7,12 @@ module Moolah
     include Comparable
 
     attribute :amount, BigDecimal, default: BigDecimal(0)
-    attribute :currency, String, default: 'AUD'
+    attribute :currency, String
     attribute :fx_rate, BigDecimal
 
     def initialize(args = {})
-      args[:fx_rate] = 1.0 if args[:currency] == 'AUD'
+      args[:currency] = 'AUD' if args[:currency].nil? || args[:currency] == ''
+      args[:fx_rate] = '1.0000' if args[:currency] == 'AUD'
 
       raise ArgumentError.new('missing keyword: :fx_rate') unless args[:fx_rate]
 
@@ -34,6 +35,10 @@ module Moolah
       formatter.format(symbol: false, delimit: false)
     end
 
+    def formatted_fx_rate
+      formatter.format_fx_rate
+    end
+
     def amount_in_cents
       (bankers_rounded.amount * 100).to_i
     end
@@ -56,18 +61,22 @@ module Moolah
 
     def +(money)
       return self unless money
-      raise ArgumentError, 'Cannot add two Money objects with different currencies' if currency != money.currency
-      raise ArgumentError, 'Cannot add two Money objects with different fx rates' if fx_rate != money.fx_rate
 
-      Money.new(amount: amount + money.amount, currency: currency, fx_rate: fx_rate)
+      new_money = money.is_a?(Moolah::Money) ? money : Moolah::Money.new(money)
+      raise ArgumentError, "Cannot add currency: #{currency} with given currency: #{new_money.currency}" if currency != new_money.currency
+      raise ArgumentError, "Cannot add fx rate: #{formatter.format_fx_rate} with given fx rate: #{new_money.formatted_fx_rate}" if fx_rate != new_money.fx_rate
+
+      Money.new(amount: amount + new_money.amount, currency: currency, fx_rate: fx_rate)
     end
 
     def -(money)
       return self unless money
-      raise ArgumentError, 'Cannot subtract two Money objects with different currencies' if currency != money.currency
-      raise ArgumentError, 'Cannot subtract two Money objects with different fx rates' if fx_rate != money.fx_rate
 
-      Money.new(amount: amount - money.amount, currency: currency, fx_rate: fx_rate)
+      new_money = money.is_a?(Moolah::Money) ? money : Moolah::Money.new(money)
+      raise ArgumentError, "Cannot subtract currency: #{currency} with given currency: #{new_money.currency}" if currency != new_money.currency
+      raise ArgumentError, "Cannot subtract fx rate: #{formatter.format_fx_rate} with given fx rate: #{new_money.formatted_fx_rate}" if fx_rate != new_money.fx_rate
+
+      Money.new(amount: amount - new_money.amount, currency: currency, fx_rate: fx_rate)
     end
 
     def *(_money)
@@ -83,10 +92,11 @@ module Moolah
     end
 
     def <=>(money)
-      raise ArgumentError, 'Cannot compare two Money objects with different currencies' if currency != money.currency
-      raise ArgumentError, 'Cannot compare two Money objects with different fx rates' if fx_rate != money.fx_rate
+      new_money = money.is_a?(Moolah::Money) ? money : Moolah::Money.new(money)
+      raise ArgumentError, "Cannot compare currency: #{currency} with given currency: #{money.currency}" if currency != new_money.currency
+      raise ArgumentError, "Cannot compare fx rate: #{formatter.format_fx_rate} with given fx rate: #{new_money.formatted_fx_rate}" if fx_rate != new_money.fx_rate
 
-      amount <=> money.amount
+      amount <=> new_money.amount
     end
 
     def bankers_rounded

data/lib/moolah/version.rb

@@ -1,6 +1,6 @@
 module Moolah
   MAJOR = 5
-  MINOR = 0
+  MINOR = 3
   PATCH = ENV['PATCH_VERSION'] || 0
 
   private_constant :MAJOR, :MINOR, :PATCH

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moolah
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Marc Lee
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler