Merge branch 'main' into lint-rspec

Author: sunny

.rubocop.yml

@@ -99,6 +99,30 @@ Style/SymbolArray:
   # Prefer [:a, :b] to %i[a b]
   EnforcedStyle: brackets
 
+Style/TrailingCommaInArguments:
+  # Prefer trailing commas in multiline arguments:
+  #   call(
+  #     a: 1,
+  #     b: 2,
+  #   )
+  EnforcedStyleForMultiline: diff_comma
+
+Style/TrailingCommaInArrayLiteral:
+  # Prefer trailing commas in arrays:
+  #   [
+  #     1,
+  #     2,
+  #   ]
+  EnforcedStyleForMultiline: diff_comma
+
+Style/TrailingCommaInHashLiteral:
+  # Prefer trailing commas in multiline hashes:
+  #   {
+  #     a: 1,
+  #     b: 2,
+  #   }
+  EnforcedStyleForMultiline: diff_comma
+
 Style/YodaCondition:
   # Sometimes in specs it makes more sense to write
   #   2 >= Money.new(2, 'USD')

.rubocop_todo.yml

@@ -118,7 +118,7 @@ def exchange_with(from, to_currency, &block)
             from.dup_with(
               fractional: exchange(fractional, rate, &block),
               currency: to_currency,
-              bank: self
+              bank: self,
             )
           else
             raise UnknownRate, "No conversion rate known for '#{from.currency.iso_code}' -> '#{to_currency}'"

lib/money/bank/variable_exchange.rb

@@ -196,11 +196,12 @@ def inherit(parent_iso_code, curr)
       # @return [Boolean] true if the currency previously existed, false
       #   if it didn't.
       def unregister(curr)
-        if curr.is_a?(Hash)
-          key = curr.fetch(:iso_code).downcase.to_sym
-        else
-          key = curr.downcase.to_sym
-        end
+        key =
+          if curr.is_a?(Hash)
+            curr.fetch(:iso_code).downcase.to_sym
+          else
+            curr.downcase.to_sym
+          end
         existed = @table.delete(key)
         @stringified_keys = nil if existed
         existed ? true : false

lib/money/currency.rb

@@ -636,7 +636,7 @@ def dup_with(options = {})
     self.class.new(
       options[:fractional] || fractional,
       options[:currency] || currency,
-      bank: options[:bank] || bank
+      bank: options[:bank] || bank,
     )
   end
 

lib/money/money.rb

@@ -22,13 +22,14 @@ class Allocation
     # @return [Array<Numeric>] An array containing the allocated amounts.
     # @raise [ArgumentError] If parts is empty or not provided.
     def self.generate(amount, parts, decimal_cutoff = true)
-      parts = if parts.is_a?(Numeric)
-        Array.new(parts, 1)
-      elsif parts.all?(&:zero?)
-        Array.new(parts.count, 1)
-      else
-        parts.dup
-      end
+      parts =
+        if parts.is_a?(Numeric)
+          Array.new(parts, 1)
+        elsif parts.all?(&:zero?)
+          Array.new(parts.count, 1)
+        else
+          parts.dup
+        end
 
       raise ArgumentError, 'need at least one part' if parts.empty?
 

lib/money/money/allocation.rb

@@ -6,7 +6,7 @@ class Money
   class Formatter
     DEFAULTS = {
       thousands_separator: '',
-      decimal_mark: '.'
+      decimal_mark: '.',
     }.freeze
 
     # Creates a formatted price string according to several rules.
@@ -230,7 +230,7 @@ def format_number
           [
             html_wrap(whole_part, "whole"),
             html_wrap(decimal_mark, "decimal-mark"),
-            html_wrap(decimal_part, "decimal")
+            html_wrap(decimal_part, "decimal"),
           ].join
         end
       else

lib/money/money/formatter.rb

@@ -8,7 +8,7 @@ class Money
   module LocaleBackend
     BACKENDS = {
       i18n: Money::LocaleBackend::I18n,
-      currency: Money::LocaleBackend::Currency
+      currency: Money::LocaleBackend::Currency,
     }.freeze
 
     def self.find(name)

lib/money/money/locale_backend.rb

@@ -85,7 +85,7 @@ def to_s
           subunit:             "Centimes",
           subunit_to_unit:     100,
           decimal_mark:        ",",
-          thousands_separator: " "
+          thousands_separator: " ",
         )
 
         expect(described_class.find_by_iso_numeric(250)).to eq described_class.new(:frf)
@@ -100,7 +100,7 @@ def to_s
           name:         "French Francs",
           symbol:       "FR",
           subunit:      "Centimes",
-          subunit_to_unit: 100
+          subunit_to_unit: 100,
         )
 
         expect(described_class.find_by_iso_numeric(250)).to eq described_class.new(:frf)
@@ -163,7 +163,7 @@ def to_s
         iso_code: "XXX",
         name: "Golden Doubloon",
         symbol: "%",
-        subunit_to_unit: 100
+        subunit_to_unit: 100,
       )
       new_currency = described_class.find("XXX")
       expect(new_currency).not_to be_nil
@@ -190,12 +190,12 @@ def to_s
         iso_code: "XXX",
         name: "Golden Doubloon",
         symbol: "%",
-        subunit_to_unit: 100
+        subunit_to_unit: 100,
       )
       described_class.inherit(
         "XXX",
         iso_code: "YYY",
-        symbol: "@"
+        symbol: "@",
       )
       new_currency = described_class.find("YYY")
       expect(new_currency).not_to be_nil
@@ -484,7 +484,7 @@ def to_s
         :subunit             => cad.subunit,
         :subunit_to_unit     => cad.subunit_to_unit,
         :thousands_separator => cad.thousands_separator,
-        :decimal_mark        => modified_mark
+        :decimal_mark        => modified_mark,
       )
     end
 

spec/currency_spec.rb

@@ -20,7 +20,7 @@
       before do
         I18n.locale = :de
         I18n.backend.store_translations(:de, number: {
-          currency: { format: { delimiter: '.', separator: ',', unit: '$', format: '%u%n' } }
+          currency: { format: { delimiter: '.', separator: ',', unit: '$', format: '%u%n' } },
         })
       end