Merge branch 'main' into lint-fix-Style/FileWrite

Author: sunny

.rubocop.yml

@@ -39,6 +39,14 @@ Lint/EmptyClass:
   # Allow defining empty classes, since it can be used as a base class.
   Enabled: false
 
+# Naming
+
+Naming/PredicateMethod:
+  AllowedMethods:
+    # In Ruby, the convention is to return `nil` and not `false` when calling
+    # `#nonzero?`.
+    - nonzero?
+
 # RSpec
 
 RSpec/DescribedClass:
@@ -47,10 +55,19 @@ RSpec/DescribedClass:
     - 'spec/money_spec.rb'
     - 'spec/money/formatting_spec.rb'
 
+RSpec/IdenticalEqualityAssertion:
+  # Allow identical expressions on both sides of the equality since we are
+  # testing defining equality.
+  Enabled: false
+
 RSpec/MultipleExpectations:
   # Do not limit the amount of expectations in a spec
   Enabled: false
 
+RSpec/VerifiedDoubles:
+  # Allow building unverified doubles with `double :foo`.
+  IgnoreSymbolicNames: true
+
 # Style
 
 Style/ClassAndModuleChildren:
@@ -95,6 +112,17 @@ Style/QuotedSymbols:
   # Prefer :"some symbol" to :'some symbol'.
   EnforcedStyle: double_quotes
 
+Style/ReturnNilInPredicateMethodDefinition:
+  AllowedMethods:
+    # In Ruby, the convention is to return `nil` and not `false` when calling
+    # `#nonzero?`.
+    - nonzero?
+
+Style/SafeNavigation:
+  # Allow calling `foo && foo.bar` instead of `foo&.bar` since `foo` can also
+  # be false.
+  Enabled: false
+
 Style/StringLiterals:
   # Prefer "double quotes" over 'single quotes'.
   EnforcedStyle: double_quotes

.rubocop_todo.yml

@@ -339,11 +339,9 @@ def zero?
     # @example
     #   Money.new(100).nonzero? #=> #<Money @fractional=100>
     #   Money.new(0).nonzero?   #=> nil
-    # rubocop:disable Naming/PredicateMethod
     def nonzero?
       fractional != 0 ? self : nil
     end
-    # rubocop:enable Naming/PredicateMethod
 
     # Used to make Money instance handle the operations when arguments order is reversed
     # @return [Array]

lib/money/money/arithmetic.rb

@@ -391,9 +391,6 @@ def to_s
   describe "#inspect" do
     it "works as documented" do
       expect(described_class.new(:usd).inspect).to eq "#<Money::Currency id: usd, priority: 1, symbol_first: true, thousands_separator: ,, html_entity: $, decimal_mark: ., name: United States Dollar, symbol: $, subunit_to_unit: 100, exponent: 2, iso_code: USD, iso_numeric: 840, subunit: Cent, smallest_denomination: 1, format: >"
-    end
-
-    it "works as documented" do
       expect(described_class.new(:aed).inspect).to eq "#<Money::Currency id: aed, priority: 100, symbol_first: false, thousands_separator: ,, html_entity: , decimal_mark: ., name: United Arab Emirates Dirham, symbol: د.إ, subunit_to_unit: 100, exponent: 2, iso_code: AED, iso_numeric: 784, subunit: Fils, smallest_denomination: 25, format: %n %u>"
     end
   end

spec/currency_spec.rb

@@ -223,8 +223,8 @@
 
     it "accepts an optional bank" do
       expect(Money.from_amount(1).bank).to eq Money.default_bank
-      bank = double "bank"
-      expect(Money.from_amount(1, "USD", bank).bank).to eq bank
+      bank = Money::Bank::VariableExchange.new
+      expect(Money.from_amount(1, "USD", bank).bank).to be bank
     end
 
     context 'when given a nil currency' do
@@ -856,17 +856,11 @@
 
   describe "#allocate" do
     it "takes no action when one gets all" do
-      expect(Money.us_dollar(005).allocate([1.0])).to eq [Money.us_dollar(5)]
+      expect(Money.us_dollar(5).allocate([1.0])).to eq [Money.us_dollar(5)]
     end
 
     it "keeps currencies intact" do
-      expect(Money.ca_dollar(005).allocate([1])).to eq [Money.ca_dollar(5)]
-    end
-
-    it "does not lose pennies" do
-      moneys = Money.us_dollar(5).allocate([0.3, 0.7])
-      expect(moneys[0]).to eq Money.us_dollar(2)
-      expect(moneys[1]).to eq Money.us_dollar(3)
+      expect(Money.ca_dollar(5).allocate([1])).to eq [Money.ca_dollar(5)]
     end
 
     it "handles small splits" do
@@ -881,8 +875,14 @@
       expect(moneys[1]).to eq Money.us_dollar(3)
     end
 
-    it "does not lose pennies" do
-      moneys = Money.us_dollar(100).allocate([0.333, 0.333, 0.333])
+    it "does not lose pennies for one decimal" do
+      moneys = Money.us_dollar(5).allocate([0.3, 0.7])
+      expect(moneys[0]).to eq Money.us_dollar(2)
+      expect(moneys[1]).to eq Money.us_dollar(3)
+    end
+
+    it "does not lose pennies for three decimals" do
+      moneys = Money.us_dollar(1_00).allocate([0.333, 0.333, 0.333])
       expect(moneys[0].cents).to eq 34
       expect(moneys[1].cents).to eq 33
       expect(moneys[2].cents).to eq 33