Do not use safe navigation operator for compatibility with Ruby < 2.3

RubyMoney · Sep 5, 2019 · 81881c2 · 81881c2
1 parent b29399c
commit 81881c2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -40,4 +40,6 @@ Style/NumericLiterals:
 Style/Documentation:
   Enabled: false
 Style/AsciiComments:
+  Enabled: false
+Style/SafeNavigation:
   Enabled: false
diff --git a/lib/money/money.rb b/lib/money/money.rb
@@ -592,7 +592,7 @@ def format(*rules)
   # @return [String]
   #
   def thousands_separator
-    (locale_backend&.lookup(:thousands_separator, currency)) ||
+    (locale_backend && locale_backend.lookup(:thousands_separator, currency)) ||
       Money::Formatter::DEFAULTS[:thousands_separator]
   end
 
@@ -601,7 +601,7 @@ def thousands_separator
   # @return [String]
   #
   def decimal_mark
-    (locale_backend&.lookup(:decimal_mark, currency)) ||
+    (locale_backend && locale_backend.lookup(:decimal_mark, currency)) ||
       Money::Formatter::DEFAULTS[:decimal_mark]
   end
 

diff --git a/lib/money/money/formatter.rb b/lib/money/money/formatter.rb
@@ -374,7 +374,7 @@ def format_decimal_part(value)
     def lookup(key)
       return rules[key] || DEFAULTS[key] if rules.key?(key)
 
-      (Money.locale_backend&.lookup(key, currency)) || DEFAULTS[key]
+      (Money.locale_backend && Money.locale_backend.lookup(key, currency)) || DEFAULTS[key]
     end
 
     def regexp_format