money 6.11.1 → 6.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1d4f4df8ad562014dbb4ae22806844149097c84
-  data.tar.gz: cd1dfde292d4ce67beb09c59d0c793f6b2f99e83
+  metadata.gz: 839ee653922ffdc788d8e2228cb5a1abb45ba8d0
+  data.tar.gz: 4b088a1a439eb25e919e7866d27d4c005a34820e
 SHA512:
-  metadata.gz: 1ef2ea4a84d5f2ac90b2dd189aac326d4149412a85c4a8bd70d3fa55237a0bcc610cb5b410b96d1d2c97a613e34ed94189216afed15718f081385ffca5d1545d
-  data.tar.gz: a83595b34a6947923d0f4fc7cf8ecaadd7ef3d46f41840fb65c28d616312259610e1c6ce0be584dde111b3aab903f6a294feac1745788a2e661784daceb44569
+  metadata.gz: 63c6e4d523b63113dc36c0d243700611078fa16649a12d04cb1a48f8be30cc9799a59363fcb53c71b20d3d94bdfe0eaafe0b72dbe372b99430203d7b24bb25da
+  data.tar.gz: bb0848ba4f66abac84545a718671d0e7aee2a0a2d836ef4607a2ff807e61cce5cf24324c835b32b59e4773c64bacf6e0f743422798fbf07b9ca43358902923e8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.11.2
+- Fix regression: ignore formatting defaults for Money#to_s
+
+## 6.11.1
+- Fix issue with adding non-USD money to zero (used when calling `.sum` on an array)
+
 ## 6.11.0
 - Support i18n 1.0
 - Update yard dependency to 0.9.11

data/lib/money/money.rb

@@ -354,7 +354,8 @@ class Money
     format decimal_mark: currency.decimal_mark,
            thousands_separator: '',
            no_cents_if_whole: currency.decimal_places == 0,
-           symbol: false
+           symbol: false,
+           ignore_defaults: true
   end
 
   # Return the amount of money as a BigDecimal.

data/lib/money/money/formatting_rules.rb

@@ -8,7 +8,7 @@ class Money
       # support for old format parameters
       @rules = normalize_formatting_rules(raw_rules)
 
-      @rules = default_formatting_rules.merge(@rules)
+      @rules = default_formatting_rules.merge(@rules) unless @rules[:ignore_defaults]
       @rules = localize_formatting_rules(@rules)
       @rules = translate_formatting_rules(@rules) if @rules[:translate]
     end

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.11.1'
+  VERSION = '6.11.2'
 end

data/spec/money_spec.rb

@@ -482,6 +482,15 @@ YAML
       expect(Money.new(10_00, "BRL").to_s).to eq "10,00"
     end
 
+    context "with defaults set" do
+      before { Money.default_formatting_rules = { with_currency: true } }
+      after { Money.default_formatting_rules = nil }
+
+      it "ignores defaults" do
+        expect(Money.new(10_00, 'USD').to_s).to eq '10.00'
+      end
+    end
+
     context "with infinite_precision", :infinite_precision do
       it "shows fractional cents" do
         expect(Money.new(1.05, "USD").to_s).to eq "0.0105"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.11.1
+  version: 6.11.2
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n