Merge branch 'main' into lint-fix-RSpec/InstanceVariable

Author: sunny

.rubocop_todo.yml

@@ -278,9 +278,9 @@ def stringify_keys
                 :disambiguate_symbol, :html_entity, :subunit, :subunit_to_unit, :decimal_mark,
                 :thousands_separator, :symbol_first, :smallest_denomination, :format
 
-    alias_method :separator, :decimal_mark
-    alias_method :delimiter, :thousands_separator
-    alias_method :eql?, :==
+    alias separator decimal_mark
+    alias delimiter thousands_separator
+    alias eql? ==
 
     # Create a new +Currency+ object.
     #

lib/money/currency.rb

@@ -168,7 +168,7 @@ class << self
     # @attr_writer rounding_mode Use this to specify the rounding mode
     attr_writer :rounding_mode
 
-    alias_method :from_cents, :new
+    alias from_cents new
   end
 
   # @!attribute default_currency
@@ -578,7 +578,8 @@ def allocate(parts)
     amounts = Money::Allocation.generate(fractional, parts, !Money.default_infinite_precision)
     amounts.map { |amount| dup_with(fractional: amount) }
   end
-  alias_method :split, :allocate
+
+  alias split allocate
 
   # Round the monetary amount to smallest unit of coinage.
   #

lib/money/money.rb

@@ -13,7 +13,8 @@ module Constructors
     def empty(currency = default_currency)
       new(0, currency)
     end
-    alias_method :zero, :empty
+
+    alias zero empty
 
     # Creates a new Money object of the given value, using the Canadian
     # dollar currency.
@@ -29,7 +30,8 @@ def empty(currency = default_currency)
     def ca_dollar(cents)
       new(cents, "CAD")
     end
-    alias_method :cad, :ca_dollar
+
+    alias cad ca_dollar
 
     # Creates a new Money object of the given value, using the American dollar
     # currency.
@@ -45,7 +47,8 @@ def ca_dollar(cents)
     def us_dollar(cents)
       new(cents, "USD")
     end
-    alias_method :usd, :us_dollar
+
+    alias usd us_dollar
 
     # Creates a new Money object of the given value, using the Euro currency.
     #
@@ -60,7 +63,8 @@ def us_dollar(cents)
     def euro(cents)
       new(cents, "EUR")
     end
-    alias_method :eur, :euro
+
+    alias eur euro
 
     # Creates a new Money object of the given value, in British pounds.
     #
@@ -75,6 +79,7 @@ def euro(cents)
     def pound_sterling(pence)
       new(pence, "GBP")
     end
-    alias_method :gbp, :pound_sterling
+
+    alias gbp pound_sterling
   end
 end

lib/money/money/constructors.rb

@@ -209,8 +209,8 @@ def decimal_mark
       lookup :decimal_mark
     end
 
-    alias_method :delimiter, :thousands_separator
-    alias_method :separator, :decimal_mark
+    alias delimiter thousands_separator
+    alias separator decimal_mark
 
     private
 

lib/money/money/formatter.rb

@@ -12,7 +12,7 @@
 
   describe "#initialize" do
     it "accepts a block and stores @rounding_method" do
-      proc = Proc.new { |n| n.ceil }
+      proc = proc(&:ceil)
       bank = described_class.new(&proc)
       expect(bank.rounding_method).to eq proc
     end

spec/bank/base_spec.rb

@@ -67,7 +67,7 @@
         # end
 
         it "accepts a custom truncation method" do
-          proc = Proc.new { |n| n.ceil }
+          proc = proc(&:ceil)
           expect(bank.exchange_with(Money.new(10, 'USD'), 'EUR', &proc)).to eq Money.new(14, 'EUR')
         end
 
@@ -89,7 +89,7 @@
 
     context "with &block" do
       let(:bank) do
-        proc = Proc.new { |n| n.ceil }
+        proc = proc(&:ceil)
         described_class.new(&proc).tap do |bank|
           bank.add_rate('USD', 'EUR', 1.33)
         end
@@ -101,7 +101,7 @@
         end
 
         it "accepts a custom truncation method" do
-          proc = Proc.new { |n| n.ceil + 1 }
+          proc = proc { |n| n.ceil + 1 }
           expect(bank.exchange_with(Money.new(10, 'USD'), 'EUR', &proc)).to eq Money.new(15, 'EUR')
         end
       end

spec/bank/variable_exchange_spec.rb

@@ -447,7 +447,7 @@ def to_s
 
     it "doesn't create new symbols indefinitely" do
       expect { described_class.new("bogus") }.to raise_error(described_class::UnknownCurrency)
-      expect(Symbol.all_symbols.map { |s| s.to_s }).not_to include("bogus")
+      expect(Symbol.all_symbols.map(&:to_s)).not_to include("bogus")
     end
   end
 

spec/currency_spec.rb

@@ -150,7 +150,7 @@
     end
 
     it "respects the thousands_separator and decimal_mark defaults" do
-      one_thousand = Proc.new do |currency|
+      one_thousand = proc do |currency|
         Money.new(1000_00, currency).format
       end
 
@@ -293,7 +293,7 @@
       end
 
       specify "(symbol: true) returns symbol based on the given currency code" do
-        one = Proc.new do |currency|
+        one = proc do |currency|
           Money.new(100, currency).format(symbol: true)
         end
 

spec/money/formatting_spec.rb

@@ -1103,7 +1103,7 @@
     end
 
     it "accepts a lambda" do
-      Money.default_currency = lambda { :eur }
+      Money.default_currency = -> { :eur }
       expect(Money.default_currency).to eq Money::Currency.new(:eur)
     end
 
@@ -1130,7 +1130,7 @@
     end
 
     it 'accepts a lambda' do
-      Money.default_bank = lambda { Money::Bank::SingleCurrency.instance }
+      Money.default_bank = -> { Money::Bank::SingleCurrency.instance }
       expect(Money.default_bank).to be_instance_of(Money::Bank::SingleCurrency)
     end
   end