moolah 5.1.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2da115bb4dda298972fa96865bb4ed3fc1d19804a0cf8c958c5b42af3136dfa
-  data.tar.gz: 662d6e21e8e2fdbd51d08f5dc87d657e667a45d261c1327259e96ff9c4106df0
+  metadata.gz: e1d1a1e892be6a4317fb014f59b05ab26db3b9e1d38272b89e59fe76bb005c9a
+  data.tar.gz: b60ac538ac82a63ffa21afdf643d41e7da02144e3ffa01b211caa003379374c0
 SHA512:
-  metadata.gz: 6bda8b4e7dffbf8ac27d0595436c73a598376ee217190a4a2741e4873bfe4c2c1b475d4102aa7e5c8e1181185fa2803e8a0186e995311d3e7721dbbde55014e6
-  data.tar.gz: 3482d8f55571ec7a0d7f08c8c64d97eca27c2b8d60e42c0f9de5daf90c2901eb9d925367b3f30eaa75ae682b70ab4c6f4ee59b2a5941404269d60d508e390c64
+  metadata.gz: cc2acc4608c640be60f8833ecfedee7d56a41fe8fca58b21c521052b47d85c4ac93fa1bab37333eb8ce4c26fce7e189eaf65a679bf5fbd8606f4a52a1b079547
+  data.tar.gz: 31728aa78f418380e551a2be5dfbbe7b9e6bf3ba889663d5522fb00af5b254e2a2cfde8e2a94b8c64481b2a8c78e87674476606b8add8814cc014d22eb533116

data/README.md

@@ -1,13 +1,9 @@
 # Moolah
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/moolah`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Moolah is a Money gem that deals with Currency and FX_RATE. It is being used in multiple repos in Hotels/Bookings.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
 ```ruby
 gem 'moolah'
 ```
@@ -20,9 +16,48 @@ Or install it yourself as:
 
     $ gem install moolah
 
+### How to upgrade to version 5
+
+For version 5, `fx_rate` is a must field while initializing a Moolah::Money object with different currency other than AUD. 
+When you initialize Moolah::Money with AUD as the currency, the fx_rate will be default to 1.0
+
+This will break projects that are using older Moolah version expect the project is using AUD as the main currency.
+
+```ruby
+gem 'moolah', -> '5.3'
+```
+
+```
+$ bundle update moolah
+```
+
 ## Usage
 
-TODO: Write usage instructions here
+### To create a new Moolah::Money object
+```ruby
+Moolah::Money.new(amount: '10', currency: 'AUD', fx_rate: '1.0000')
+```
+
+### To create a AUD dollar Moolah::Money object
+```ruby
+Moolah::Money.in_aud('10')
+```
+
+### To create a zero dollar Moolah::Money object
+```ruby
+Moolah::Money.zero(currency: 'AUD', fx_rate: '1.0000')
+```
+
+### To display a json format of the Moolah::Money object
+```ruby
+money = Moolah::Money.new(amount: '10', currency: 'AUD', fx_rate: '1.0000')
+money.as_json 
+=> {
+    'amount' => '10.00',
+    'currency' => 'AUD',
+    'fx_rate' => '1.0000'
+   }
+```
 
 ## Development
 

data/lib/moolah/currency_registry.rb

@@ -9,7 +9,7 @@ module Moolah
       def load_csv(file)
         currencies = {}
 
-        CSV.foreach(file, headers: true, header_converters: :symbol, encoding: 'ISO-8859-1') do |row|
+        CSV.foreach(file, headers: true, header_converters: :symbol, encoding: 'UTF-8') do |row|
           code = row[:code]
           currencies[code] = Currency.new(
             name: row[:currency],

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

@@ -1,30 +1,55 @@
 require 'anemic/model'
 require 'bigdecimal'
+require 'active_support'
 
 module Moolah
   class Money
     include Anemic::Model
     include Comparable
 
+    delegate :zero?, :positive?, :negative?, to: :amount
+
     attribute :amount, BigDecimal, default: BigDecimal(0)
     attribute :currency, String
     attribute :fx_rate, BigDecimal
 
     def initialize(args = {})
-      args[:currency] = 'AUD' if args[:currency].nil? || args[:currency] == ''
-      args[:fx_rate] = 1.0 if args[:currency] == 'AUD'
+      args[:currency] = 'AUD' if args[:currency].blank?
+      args[:fx_rate] = '1.0000' if args[:currency] == 'AUD'
 
-      raise ArgumentError.new('missing keyword: :fx_rate') unless args[:fx_rate]
+      if args[:fx_rate].nil?
+        # So fx_rate appears as nil as part of the error message
+        args[:fx_rate] = nil
+        raise ArgumentError, "missing keyword: :fx_rate in #{self.class.name} (#{args.sort.to_h})"
+      end
 
       super(args)
     end
 
     def self.in_aud(amount)
-      Money.new(currency: 'AUD', amount: amount)
+      new(amount: amount)
+    end
+
+    def self.zero(currency = 'AUD', fx_rate = nil)
+      new(currency: currency, amount: 0, fx_rate: fx_rate)
+    end
+
+    def to_aud
+      return Money.new if fx_rate.zero?
+
+      Money.new(amount: amount / fx_rate)
     end
 
-    def self.zero(currency='AUD', fx_rate=1)
-      Money.new(currency: currency, amount: 0, fx_rate: fx_rate)
+    def convert_to(other)
+      money = other.is_a?(Money) ? other : Money.new(other)
+
+      converted = Money.new(
+        amount: to_aud.amount * money.fx_rate,
+        currency: money.currency,
+        fx_rate: money.fx_rate
+      )
+
+      converted.bankers_rounded
     end
 
     def formatted(symbol: true, delimit: true)
@@ -35,6 +60,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
@@ -55,27 +84,31 @@ module Moolah
       "#{self.class.name} (#{as_json})"
     end
 
-    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
+    def +(other)
+      return self if other.nil?
+
+      money = other.is_a?(Money) ? other : Money.new(other)
+      raise ArgumentError, "Cannot add currency: #{currency} with given currency: #{money.currency}" if currency != money.currency
+      raise ArgumentError, "Cannot add fx rate: #{formatter.format_fx_rate} with given fx rate: #{money.formatted_fx_rate}" if fx_rate != money.fx_rate
 
       Money.new(amount: amount + 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
+    def -(other)
+      return self if other.nil?
+
+      money = other.is_a?(Money) ? other : Money.new(other)
+      raise ArgumentError, "Cannot subtract currency: #{currency} with given currency: #{money.currency}" if currency != money.currency
+      raise ArgumentError, "Cannot subtract fx rate: #{formatter.format_fx_rate} with given fx rate: #{money.formatted_fx_rate}" if fx_rate != money.fx_rate
 
       Money.new(amount: amount - money.amount, currency: currency, fx_rate: fx_rate)
     end
 
-    def *(_money)
+    def *(_other)
       raise ArgumentError, 'Cannot multiply Money objects due to rounding issues'
     end
 
-    def /(_money)
+    def /(_other)
       raise ArgumentError, 'Cannot divide Money objects due to rounding issues'
     end
 
@@ -83,21 +116,15 @@ module Moolah
       Money.new(amount: -amount, currency: currency, fx_rate: fx_rate)
     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
-
-      amount <=> money.amount
+    def <=>(other)
+      money = other.is_a?(Money) ? other : Money.new(other)
+      to_aud.amount <=> money.to_aud.amount
     end
 
     def bankers_rounded
       Rounder.new(self).bankers_rounded
     end
 
-    def zero?
-      amount.zero?
-    end
-
     def negate
       negated_amount = amount * -1
       negated_amount = 0 if negated_amount.to_s == '-0.0'

data/lib/moolah/version.rb

@@ -1,6 +1,6 @@
 module Moolah
   MAJOR = 5
-  MINOR = 1
+  MINOR = 5
   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.1.0
+  version: 5.5.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-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler