money 6.8.0 → 6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d58da811f0d0d652d931abc3e027c4ac29f194
-  data.tar.gz: eb6e25dcd90e03488b99913bcbedfed44b9370f3
+  metadata.gz: 15096aaaa1d4cd7f33b54b6763c3ee1fa35dbe30
+  data.tar.gz: e8907ecf8a282428ae9f9da1f183acc2d615e508
 SHA512:
-  metadata.gz: 672f61e940c74f7818db5dcfb0b98cf23976a91e4cd7b40aeb20cfdb365f0ce4b591b94829c913fed9235e653bb3e9b454e9412a183e35df9ad5ff7ffa798197
-  data.tar.gz: d3987957ca8e363e66dd909bc2489f94d47be3ba92e8aa2411470d5541390068ccc40d4df3d3cfda89359d5848ff83dbaaa31260a469e679260852a2584d6119
+  metadata.gz: 1ffc7e4ebb66b8fe190add39f17fa26536d7e5de5e2130fa7d56c01a624ec7886671fe6ad389dd1d661721e168fa738ade3a44671e8616b9dfb83131fb121a99
+  data.tar.gz: 76fbc5414418ccd7bce8e41c7baf481daf29574a641957274c20c830e338030795011a61f33d7c50daa9c3587f36eca1fdf1c51283535e719dd25ee3958a89a1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 6.8.1
+- Fixed issue with calling `format` on a frozen `Money` object
+
 ## 6.8.0
 - Ruby 2.4.0 support
 - Fixed UZS syntax

data/lib/money/money/constructors.rb

@@ -10,7 +10,8 @@ class Money
     # @example
     #   Money.empty #=> #<Money @fractional=0>
     def empty(currency = default_currency)
-      new(0, currency)
+      @empty ||= {}
+      @empty[currency] ||= new(0, currency).freeze
     end
     alias_method :zero, :empty
 

data/lib/money/money/formatting.rb

@@ -205,6 +205,10 @@ class Money
       rules = default_formatting_rules.merge(rules)
       rules = localize_formatting_rules(rules)
       rules = translate_formatting_rules(rules) if rules[:translate]
+
+      thousands_separator = self.thousands_separator
+      decimal_mark = self.decimal_mark
+
       escaped_decimal_mark = Regexp.escape(decimal_mark)
 
       if fractional == 0
@@ -288,11 +292,11 @@ class Money
     end
 
     def thousands_separator
-      @thousands_separator ||= i18n_format_for(:thousands_separator, :delimiter, ",")
+      i18n_format_for(:thousands_separator, :delimiter, ",")
     end
 
     def decimal_mark
-      @decimal_mark ||= i18n_format_for(:decimal_mark, :separator, ".")
+      i18n_format_for(:decimal_mark, :separator, ".")
     end
 
     alias_method :delimiter, :thousands_separator

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.8.0"
+  VERSION = "6.8.1"
 end

data/spec/money/constructors_spec.rb

@@ -7,6 +7,18 @@ describe Money::Constructors do
       expect(Money.empty).to eq Money.new(0)
     end
 
+    it "memoizes the result" do
+      expect(Money.empty.object_id).to eq Money.empty.object_id
+    end
+
+    it "memoizes a result for each currency" do
+      expect(Money.empty(:cad).object_id).to eq Money.empty(:cad).object_id
+    end
+
+    it "doesn't allow money to be modified for a currency" do
+      expect(Money.empty).to be_frozen
+    end
+
     it "instantiates a subclass when inheritance is used" do
       special_money_class = Class.new(Money)
       expect(special_money_class.empty).to be_a special_money_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n