moolah 5.3.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259bd848b9c02a4cbec6ae4b48100192caff0c00b9315c82a6dd7b81372711cc
-  data.tar.gz: ac0a29f2335095310e45bc3a597d7a4c7db644e7f15d9262d0f05fd5717d1965
+  metadata.gz: 642cfed3ddab0155c90c5c283aa400e4814a7ccfcaff40ba33349f0192267fbb
+  data.tar.gz: a18e5d28b65c719a1f09779df3fd54c33ad24c806b58aaf06a6a6c0c29cba911
 SHA512:
-  metadata.gz: 706e6c87160955d2cc3cde1e238e79a7f6c0e2a66d2159591dd0227c4008e4ac30cf7aee1f235b0da3f771f3444393de86642390d50ee2d1f669d9837a1bd2a5
-  data.tar.gz: c2b621ca8644131cab99bdf0e13b16447e257472235c54917865bb03695e6af8b92f5343febef98296c69ca86cbecfdca5d95b52e0bd0991942edb9d2500aaed
+  metadata.gz: 10403a45a27a97ed52c8ccd5d402bc6af220e7869cb3cefa0aee1cef8a65db0e5df03702b93a4c082f5509583bc1a76f38700eed611a5c4f23d93fc5538678f7
+  data.tar.gz: f78ec1432d700e5cbffe0c440b6224bd22d37c8452a8f9b51b10317940389ea52d76f49198bbf1a419a92806fa312dc3089fc719874e74056298e7e4d1930223

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/money.rb

@@ -1,30 +1,57 @@
 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 = args.transform_keys(&:to_sym) unless args.is_a?(Money)
+
+      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)
@@ -59,31 +86,31 @@ module Moolah
       "#{self.class.name} (#{as_json})"
     end
 
-    def +(money)
-      return self unless money
+    def +(other)
+      return self if other.nil?
 
-      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 = 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 + new_money.amount, currency: currency, fx_rate: fx_rate)
+      Money.new(amount: amount + money.amount, currency: currency, fx_rate: fx_rate)
     end
 
-    def -(money)
-      return self unless money
+    def -(other)
+      return self if other.nil?
 
-      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 = 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 - new_money.amount, currency: currency, fx_rate: 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
 
@@ -91,22 +118,15 @@ module Moolah
       Money.new(amount: -amount, currency: currency, fx_rate: fx_rate)
     end
 
-    def <=>(money)
-      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 <=> new_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 = 3
+  MINOR = 7
   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.3.0
+  version: 5.7.0
 platform: ruby
 authors:
 - Marc Lee
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-24 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler