money 6.9.0 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f268faeee9a1901f8a4e482e8497370697eb436a
-  data.tar.gz: 54f37ca793f33929f7c1dd10de33d58c813495fe
+  metadata.gz: 19c937d927f70901c2a2deda19899ec893b567b1
+  data.tar.gz: 213e8242c26aadfb1030453815547765ea030022
 SHA512:
-  metadata.gz: b9d33bfe048a6ba6fe92391ac9223a92268f31bd6c1f0ef932f2d202fd3a45e7df013c5c96d5ac99b98aacde1ece7a905fda77949aa9e4ad7625698b16b5914f
-  data.tar.gz: b3b255302aec3569a1b7e1b4dc5a7e1a77b1b4129c09eb65f295461eadc48cc342f09de81236a229a6d4139a5038069108fdc53660d09255c9d3fa1130d22a02
+  metadata.gz: 0bb443e04dccacd832fd53fad627eb4076b895a79da97adb29c32407689ddb53a95e3dc4e36ab8e9e5b5f764a13a3a579ea887a53ee748e2c60dea05ef882596
+  data.tar.gz: dce49cc4288a72a187ca03d709abd9659d9dab3965ade09fe5f86c69034a09a5106f4da57da2d3201233f256c1353a2661d95b70f2deb19cede3a6d4ac022ec4

data/.rspec

@@ -1 +1,2 @@
---require spec_helper
+--require spec_helper
+--color

data/.travis.yml

@@ -4,9 +4,9 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - rbx-2
   - jruby-9.0.5.0
   - jruby-9.1.2.0
@@ -18,6 +18,8 @@ matrix:
     - rvm: jruby-head
     - rvm: rbx-2
   fast_finish: true
+before_install:
+  - gem update bundler
 script: bundle exec rspec spec
 notifications:
   email:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 6.10.0
+- Added support for i18n version 0.9
+- Disabled rounding when verifying allocation splits
+- Added Chinese Yuan Offshore (CNH)
+- Fixed html_entity for ARS
+- Fixed KZT symbol
+- Allowed comparing cross currency when both are zero
+- Fixed memory rate store
+- Corrected HUF subunit and thousands separator config
+
 ## 6.9.0
 - Extracted heuristics into money-heuristics gem
 

data/README.md

@@ -119,15 +119,15 @@ below.
 
 ``` ruby
 curr = {
-  :priority        => 1,
-  :iso_code        => "USD",
-  :iso_numeric     => "840",
-  :name            => "United States Dollar",
-  :symbol          => "$",
-  :subunit         => "Cent",
-  :subunit_to_unit => 100,
-  :separator       => ".",
-  :delimiter       => ","
+  :priority            => 1,
+  :iso_code            => "USD",
+  :iso_numeric         => "840",
+  :name                => "United States Dollar",
+  :symbol              => "$",
+  :subunit             => "Cent",
+  :subunit_to_unit     => 100,
+  :decimal_mark        => ".",
+  :thousands_separator => ","
 }
 
 Money::Currency.register(curr)
@@ -142,8 +142,8 @@ The pre-defined set of attributes includes:
 - `:symbol` the currency symbol (UTF-8 encoded)
 - `:subunit` the name of the fractional monetary unit
 - `:subunit_to_unit` the proportion between the unit and the subunit
-- `:separator` character between the whole and fraction amounts
-- `:delimiter` character between each thousands place
+- `:decimal_mark` character between the whole and fraction amounts
+- `:thousands_separator` character between each thousands place
 
 All attributes except `:iso_code` are optional. Some attributes, such as
 `:symbol`, are used by the Money class to print out a representation of the

data/config/currency_iso.json

@@ -100,7 +100,7 @@
     "subunit": "Centavo",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "html_entity": "₱",
+    "html_entity": "$",
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "032",
@@ -931,12 +931,12 @@
     "name": "Hungarian Forint",
     "symbol": "Ft",
     "alternate_symbols": [],
-    "subunit": "Fillér",
+    "subunit": "",
     "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ",",
-    "thousands_separator": ".",
+    "thousands_separator": " ",
     "iso_numeric": "348",
     "smallest_denomination": 5
   },
@@ -1202,7 +1202,7 @@
     "priority": 100,
     "iso_code": "KZT",
     "name": "Kazakhstani Tenge",
-    "symbol": "〒",
+    "symbol": "₸",
     "alternate_symbols": [],
     "subunit": "Tiyn",
     "subunit_to_unit": 100,
@@ -2561,7 +2561,7 @@
   },
   "xts": {
     "priority": 100,
-    "iso_code": "xts",
+    "iso_code": "XTS",
     "name": "Codes specifically reserved for testing purposes",
     "symbol": "",
     "alternate_symbols": [],

data/config/currency_non_iso.json

@@ -93,5 +93,21 @@
     "thousands_separator": ",",
     "iso_numeric": "",
     "smallest_denomination": 1
+  },
+  "cnh": {
+    "priority": 100,
+    "iso_code": "CNH",
+    "name": "Chinese Renminbi Yuan Offshore",
+    "symbol": "¥",
+    "disambiguate_symbol": "CNH",
+    "alternate_symbols": ["CN¥", "元", "CN元"],
+    "subunit": "Fen",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "￥",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "",
+    "smallest_denomination": 1
   }
 }

data/lib/money/money.rb

@@ -584,7 +584,7 @@ class Money
   end
 
   def allocations_from_splits(splits)
-    splits.inject(0) { |sum, n| sum + as_d(n) }
+    splits.inject(0) { |sum, n| sum + n }
   end
 
   def amounts_from_splits(allocations, splits)

data/lib/money/money/arithmetic.rb

@@ -57,6 +57,7 @@ class Money
         return unless other.respond_to?(:zero?) && other.zero?
         return other.is_a?(CoercedNumeric) ? 0 <=> fractional : fractional <=> 0
       end
+      return 0 if zero? && other.zero?
       other = other.exchange_to(currency)
       fractional <=> other.fractional
     rescue Money::Bank::UnknownRate

data/lib/money/rates_store/memory.rb

@@ -58,10 +58,9 @@ class Money
       end
 
       def marshal_dump
-        [self.class, index, options]
+        [self.class, options, index]
       end
 
-
       # Wraps block execution in a thread-safe transaction
       def transaction(&block)
         if @in_transaction || options[:without_mutex]

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.9.0"
+  VERSION = '6.10.0'
 end

data/money.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = "A Ruby Library for dealing with money and currency conversion."
   s.license     = "MIT"
 
-  s.add_dependency 'i18n', ['>= 0.6.4', '< 0.9']
+  s.add_dependency 'i18n', [">= 0.6.4", '< 1.0']
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"

data/spec/money/arithmetic_spec.rb

@@ -23,7 +23,6 @@ describe Money do
     end
 
     it "returns true if both amounts are zero, even if currency differs" do
-      allow_any_instance_of(Money).to receive(:exchange_to) { Money.usd(0) }
       expect(Money.new(0, "USD")).to eq Money.new(0, "USD")
       expect(Money.new(0, "USD")).to eq Money.new(0, "EUR")
       expect(Money.new(0, "USD")).to eq Money.new(0, "AUD")
@@ -69,6 +68,12 @@ describe Money do
       expect(Money.new(1_00, "USD").eql?(Money.new(99_00, "EUR"))).to be false
     end
 
+    it "returns true when their amounts are zero and currencies differ" do
+      expect(Money.new(0, "USD").eql?(Money.new(0, "EUR"))).to be true
+      expect(Money.new(0, "USD").eql?(Money.new(0, "USD"))).to be true
+      expect(Money.new(0, "AUD").eql?(Money.new(0, "EUR"))).to be true
+    end
+
     it "returns false if used to compare with an object that doesn't inherit from Money" do
       expect(Money.new(1_00, "USD").eql?(Object.new)).to  be false
       expect(Money.new(1_00, "USD").eql?(Class)).to       be false
@@ -130,6 +135,32 @@ describe Money do
       expect(Money.new(1_00) <=> /foo/).to be_nil
     end
 
+    context 'when conversions disallowed' do
+      around do |example|
+        begin
+          old_default_bank = Money.default_bank
+          Money.disallow_currency_conversion!
+          example.run
+        ensure
+          Money.default_bank = old_default_bank
+        end
+      end
+
+      context 'when currencies differ' do
+        context 'when both values are 1_00' do
+          it 'raises currency error' do
+            expect { Money.usd(1_00) <=> Money.gbp(1_00) }.to raise_error Money::Bank::DifferentCurrencyError
+          end
+        end
+
+        context 'when both values are 0' do
+          it 'considers them equal' do
+            expect(Money.usd(0) <=> Money.gbp(0)).to eq(0)
+          end
+        end
+      end
+    end
+
     it 'compares with numeric 0' do
       expect(Money.usd(1) < 0).to eq false
       expect(Money.usd(1) > 0.0).to eq true
@@ -661,7 +692,7 @@ describe Money do
     end
   end
 
-  %w(+ - / <=> divmod remainder).each do |op|
+  %w(+ - / divmod remainder).each do |op|
     describe "##{op}" do
       subject { ->(other = self.other) { instance.send(op, other) } }
       let(:instance) { Money.usd(1) }

data/spec/money_spec.rb

@@ -598,6 +598,22 @@ YAML
       expect(moneys[2].cents).to eq 33
     end
 
+    it "does not round rationals" do
+      splits = 7.times.map { Rational(950, 6650) }
+      moneys = Money.us_dollar(6650).allocate(splits)
+      moneys.each do |money|
+        expect(money.cents).to eq 950
+      end
+    end
+
+    it "handles mixed split types" do
+      splits = [Rational(1, 4), 0.25, 0.25, BigDecimal.new('0.25')]
+      moneys = Money.us_dollar(100).allocate(splits)
+      moneys.each do |money|
+        expect(money.cents).to eq 25
+      end
+    end
+
     context "negative amount" do
       it "does not lose pennies" do
         moneys = Money.us_dollar(-100).allocate([0.333, 0.333, 0.333])

data/spec/rates_store/memory_spec.rb

@@ -66,4 +66,15 @@ describe Money::RatesStore::Memory do
       end
     end
   end
+
+  describe '#marshal_dump' do
+    let(:subject) { Money::RatesStore::Memory.new(:optional => true) }
+
+    it 'can reload' do
+      bank = Money::Bank::VariableExchange.new(subject)
+      bank = Marshal.load(Marshal.dump(bank))
+      expect(bank.store.instance_variable_get(:@options)).to eq subject.instance_variable_get(:@options)
+      expect(bank.store.instance_variable_get(:@index)).to eq subject.instance_variable_get(:@index)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.10.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -19,7 +19,7 @@ dependencies:
         version: 0.6.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.6.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement