money 6.18.0 → 6.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146c73332b26929014c71519d1a698b06aa8782651787d363c3bf6a495e5b6c5
-  data.tar.gz: 7dc290dc12bc060396c291d0b4f8615240d5e745d6dfb6ee493aec60296fceec
+  metadata.gz: 331d852b12ab9a5e62108f3610d1ec5eed8f4fa9bb683be1aab2703cd2df26cd
+  data.tar.gz: 56e2bcad250542c80b800db800c2216dd2b3b10f1df5d8a77819d13153a77844
 SHA512:
-  metadata.gz: a732f1abb1cac4bfeabd12a8541ef88704da0db312ef1a93e625c738724e272ef1848eb60d5fe50910c21ab4de57937e20bc332a752daadb459865c249322892
-  data.tar.gz: 4351c0c06eab76fdfff48a25447606513b525bc04c0cdb478bff472816b11e5d7c9201420e79c85a1697951678a1905530ee484a8c822412c93188c2853044f4
+  metadata.gz: ae6d529a7382aaab721a4ae933658828f975eaa4c9a0ad9444b74b28d8ff1141d59f3e264d08b650367e327987266be03dcd480e0a850fe224feb6cdca4163d1
+  data.tar.gz: bbb76570efd7bf4be700cc3f46d01e26945e9790f5f9f3fee666d4ac3164d1422f5ca1614622a429c430804a9047bcc8f5178886905e5ad814ce21ab4117f94a

data/CHANGELOG.md

@@ -2,14 +2,25 @@
 
 ## Upcoming
 
-- Add second dobra (STN) from São Tomé and Príncipe
-- Use euro symbol as html_entity for euro currency
-- Update Georgian Lari symbol
-- Add Ruby 3.1 to the CI matrix
+-
+
+## 6.19.0
+
+- Change Peruvian Sol (PEN) decimal mark and thousands separator.
+- Improves Precision and Simplifies Allocation Logic
+- explicit declaration of i18n locales
+- Add space to CHF format
+- Update deprecation message to suggest correct formatting.
 
 ## 6.18.0
 
+- Add second dobra (STN) from São Tomé and Príncipe
+- Correct South African Rand (ZAR) to use comma decimal mark, and space thousands separator
+- Use euro symbol as html_entity for euro currency
+- Update Georgian Lari symbol
+- Add Ruby 3.1 and 3.2 to the CI matrix
 - Add `Money.from_dollars` alias as a more explicit initializer, it's the same as `Money.from_amount`
+- Mark Croatian Kuna (HRK) as obsolete by moving its definition to the backwards compatibility data source
 
 ## 6.17.0
 

data/LICENSE

@@ -2,7 +2,7 @@ MIT License
 
 Copyright (c) 2005 Tobias Lutke
 Copyright (c) 2008 Phusion
-Copyright (c) 2022 Shane Emmons
+Copyright (c) 2024 Shane Emmons
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -60,6 +60,10 @@ The development version (hosted on Github) can be installed with:
 ``` ruby
 require 'money'
 
+# explicitly define locales
+I18n.config.available_locales = :en
+Money.locale_backend = :i18n
+
 # 10.00 USD
 money = Money.from_cents(1000, "USD")
 money.cents     #=> 1000

data/config/currency_backwards_compatible.json

@@ -31,6 +31,22 @@
     "iso_numeric": "288",
     "smallest_denomination": 1
   },
+  "hrk": {
+    "priority": 100,
+    "iso_code": "HRK",
+    "name": "Croatian Kuna",
+    "symbol": "kn",
+    "alternate_symbols": [],
+    "subunit": "Lipa",
+    "subunit_to_unit": 100,
+    "symbol_first": false,
+    "format": "%n %u",
+    "html_entity": "",
+    "decimal_mark": ",",
+    "thousands_separator": ".",
+    "iso_numeric": "191",
+    "smallest_denomination": 1
+  },
   "ltl": {
     "priority": 100,
     "iso_code": "LTL",

data/config/currency_iso.json

@@ -452,7 +452,7 @@
     "subunit": "Rappen",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "format": "%u%n",
+    "format": "%u %n",
     "html_entity": "",
     "decimal_mark": ".",
     "thousands_separator": ",",
@@ -922,22 +922,6 @@
     "iso_numeric": "340",
     "smallest_denomination": 5
   },
-  "hrk": {
-    "priority": 100,
-    "iso_code": "HRK",
-    "name": "Croatian Kuna",
-    "symbol": "kn",
-    "alternate_symbols": [],
-    "subunit": "Lipa",
-    "subunit_to_unit": 100,
-    "symbol_first": false,
-    "format": "%n %u",
-    "html_entity": "",
-    "decimal_mark": ",",
-    "thousands_separator": ".",
-    "iso_numeric": "191",
-    "smallest_denomination": 1
-  },
   "htg": {
     "priority": 100,
     "iso_code": "HTG",
@@ -1706,8 +1690,8 @@
     "subunit_to_unit": 100,
     "symbol_first": true,
     "html_entity": "S/",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
+    "decimal_mark": ",",
+    "thousands_separator": ".",
     "iso_numeric": "604",
     "smallest_denomination": 1
   },
@@ -2695,8 +2679,8 @@
     "subunit_to_unit": 100,
     "symbol_first": true,
     "html_entity": "R",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
+    "decimal_mark": ",",
+    "thousands_separator": " ",
     "iso_numeric": "710",
     "smallest_denomination": 10
   },

data/lib/money/money/allocation.rb

@@ -2,16 +2,17 @@
 
 class Money
   class Allocation
-    # Splits a given amount in parts without losing pennies.
-    # The left-over pennies will be distributed round-robin amongst the parts. This means that
-    # parts listed first will likely receive more pennies than the ones listed later.
+    # Splits a given amount in parts. The allocation is based on the parts' proportions
+    # or evenly if parts are numerically specified.
     #
     # The results should always add up to the original amount.
     #
-    # The parts can be specified as:
-    #   Numeric — performs the split between a given number of parties evenely
-    #   Array<Numeric> — allocates the amounts proportionally to the given array
+    # @param amount [Numeric] The total amount to be allocated.
+    # @param parts [Numeric, Array<Numeric>] Number of parts to split into or an array (proportions for allocation)
+    # @param whole_amounts [Boolean] Specifies whether to allocate whole amounts only. Defaults to true.
     #
+    # @return [Array<Numeric>] An array containing the allocated amounts.
+    # @raise [ArgumentError] If parts is empty or not provided.
     def self.generate(amount, parts, whole_amounts = true)
       parts = if parts.is_a?(Numeric)
         Array.new(parts, 1)
@@ -21,7 +22,12 @@ class Money
         parts.dup
       end
 
-      raise ArgumentError, 'need at least one party' if parts.empty?
+      raise ArgumentError, 'need at least one part' if parts.empty?
+
+      if [amount, *parts].any? { |i| i.is_a?(BigDecimal) || i.is_a?(Float) || i.is_a?(Rational) }
+        amount = convert_to_big_decimal(amount)
+        parts.map! { |p| convert_to_big_decimal(p) }
+      end
 
       result = []
       remaining_amount = amount
@@ -42,5 +48,21 @@ class Money
 
       result
     end
+
+    # Converts a given number to BigDecimal.
+    # This method supports inputs of BigDecimal, Rational, and other numeric types by ensuring they are all returned
+    # as BigDecimal instances for consistent handling.
+    #
+    # @param number [Numeric, BigDecimal, Rational] The number to convert.
+    # @return [BigDecimal] The converted number as a BigDecimal.
+    def self.convert_to_big_decimal(number)
+      if number.is_a? BigDecimal
+        number
+      elsif number.is_a? Rational
+        BigDecimal(number.to_f.to_s)
+      else
+        BigDecimal(number.to_s)
+      end
+    end
   end
 end

data/lib/money/money/formatting_rules.rb

@@ -117,7 +117,7 @@ class Money
     def warn_about_deprecated_rules(rules)
       if rules.has_key?(:symbol_position)
         position = rules[:symbol_position]
-        template = position == :before ? '%u %n' : '%n %u'
+        template = position == :before ? '%u%n' : '%n%u'
 
         warn "[DEPRECATION] `symbol_position: :#{position}` is deprecated - you can replace it with `format: #{template}`"
       end

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.18.0'
+  VERSION = '6.19.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.18.0
+  version: 6.19.0
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n