money 6.13.2 → 6.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7913c2be69c77f43c10cb0a6262dadeccbbc9a9f
-  data.tar.gz: bb7de5d50d2a8e7185ebb4a87e5a60a637602e62
+  metadata.gz: f37a415a5295b884c2d1c5c55a94d1bb68856a01
+  data.tar.gz: efea099f7b00a66f8ccda8099426ba16edd8b1f0
 SHA512:
-  metadata.gz: f92d1aef2013a80abb618b49ce72d07406a93678b0ce183ce2c6051c397ccc24dd121d21eda707fab2dae042b369e83cf1deb6e45db15770b1a417b989014fe6
-  data.tar.gz: eeb2491fca41a8a3c858bad2314c4c8d3a29384f7f0da9e836b871071110f321c76ea697222f6b47903839f344bfbdcf85e0636b59a80dca1381bfa29aaa1b59
+  metadata.gz: 60c02cb6a321987bacea58784b5707337ff09dcf793189a9ffee28f6eee73fd57b5bedd49948a08215c7d6a7e9e124d713a33cf04fc55cc77b57b749545250c8
+  data.tar.gz: 17120c61dd889fd9de0f5c498497cedb4aa4b7b4f27c477e6069b6cdc1017b3fb77453d761c34a7fd07baef08295d5ce979a094344a888c3219f0d698733869c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.13.3
+- Remove specs from the packaged gem
+- Use Currency::Loader directly without extending
+- Add Money.with_rounding_mode as a replacement for calling Money.roudning_mode with a block
+- Fix currency search for two digit ISO numbers
+- Add description to TypeError raised by +/- operations
+
 ## 6.13.2
 - Prevent Money initialization with non-finite amounts
 - Convert the fractional value of a Money object to BigDecimal when initializing

data/lib/money/currency.rb

@@ -13,7 +13,6 @@ class Money
   class Currency
     include Comparable
     extend Enumerable
-    extend Money::Currency::Loader
     extend Money::Currency::Heuristics
 
     # Keeping cached instances in sync between threads
@@ -76,9 +75,10 @@ class Money
       #
       # @example
       #   Money::Currency.find_by_iso_numeric(978) #=> #<Money::Currency id: eur ...>
+      #   Money::Currency.find_by_iso_numeric(51) #=> #<Money::Currency id: amd ...>
       #   Money::Currency.find_by_iso_numeric('001') #=> nil
       def find_by_iso_numeric(num)
-        num = num.to_s
+        num = num.to_s.rjust(3, '0')
         return if num.empty?
         id, _ = self.table.find { |key, currency| currency[:iso_numeric] == num }
         new(id)
@@ -121,7 +121,7 @@ class Money
       # See https://en.wikipedia.org/wiki/List_of_circulating_currencies and
       # http://search.cpan.org/~tnguyen/Locale-Currency-Format-1.28/Format.pm
       def table
-        @table ||= load_currencies
+        @table ||= Loader.load_currencies
       end
 
       # List the currencies imported and registered

data/lib/money/currency/loader.rb

@@ -3,21 +3,23 @@ class Money
     module Loader
       DATA_PATH = File.expand_path("../../../../config", __FILE__)
 
-      # Loads and returns the currencies stored in JSON files in the config directory.
-      #
-      # @return [Hash]
-      def load_currencies
-        currencies = parse_currency_file("currency_iso.json")
-        currencies.merge! parse_currency_file("currency_non_iso.json")
-        currencies.merge! parse_currency_file("currency_backwards_compatible.json")
-      end
+      class << self
+        # Loads and returns the currencies stored in JSON files in the config directory.
+        #
+        # @return [Hash]
+        def load_currencies
+          currencies = parse_currency_file("currency_iso.json")
+          currencies.merge! parse_currency_file("currency_non_iso.json")
+          currencies.merge! parse_currency_file("currency_backwards_compatible.json")
+        end
 
-      private
+        private
 
-      def parse_currency_file(filename)
-        json = File.read("#{DATA_PATH}/#{filename}")
-        json.force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
-        JSON.parse(json, symbolize_names: true)
+        def parse_currency_file(filename)
+          json = File.read("#{DATA_PATH}/#{filename}")
+          json.force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
+          JSON.parse(json, symbolize_names: true)
+        end
       end
     end
   end

data/lib/money/money.rb

@@ -186,32 +186,36 @@ class Money
 
   setup_defaults
 
-  # Use this to return the rounding mode.  You may also pass a
-  # rounding mode and a block to temporarily change it.  It will
-  # then return the results of the block instead.
+  # Use this to return the rounding mode.
   #
   # @param [BigDecimal::ROUND_MODE] mode
   #
-  # @return [BigDecimal::ROUND_MODE,Yield] rounding mode or block results
+  # @return [BigDecimal::ROUND_MODE] rounding mode
+  def self.rounding_mode(mode = nil)
+    return Thread.current[:money_rounding_mode] || @rounding_mode unless mode
+
+    warn "[DEPRECATION] calling `rounding_mode` with a block is deprecated. Please use `.with_rounding_mode` instead."
+    with_rounding_mode(mode) { yield }
+  end
+
+  # This method temporarily changes the rounding mode. It will then return the
+  # results of the block instead.
+  #
+  # @param [BigDecimal::ROUND_MODE] mode
+  #
+  # @return [BigDecimal::ROUND_MODE,Yield] block results
   #
   # @example
-  #   fee = Money.rounding_mode(BigDecimal::ROUND_HALF_UP) do
+  #   fee = Money.with_rounding_mode(BigDecimal::ROUND_HALF_UP) do
   #     Money.new(1200) * BigDecimal('0.029')
   #   end
-  def self.rounding_mode(mode = nil)
-    if mode.nil?
-      Thread.current[:money_rounding_mode] || @rounding_mode
-    else
-      begin
-        Thread.current[:money_rounding_mode] = mode
-        yield
-      ensure
-        Thread.current[:money_rounding_mode] = nil
-      end
-    end
+  def self.with_rounding_mode(mode)
+    Thread.current[:money_rounding_mode] = mode
+    yield
+  ensure
+    Thread.current[:money_rounding_mode] = nil
   end
 
-
   # Adds a new exchange rate to the default bank and return the rate.
   #
   # @param [Currency, String, Symbol] from_currency Currency to exchange from.

data/lib/money/money/arithmetic.rb

@@ -123,15 +123,25 @@ class Money
     # @example
     #   Money.new(100) - Money.new(99) #=> #<Money @fractional=1>
     [:+, :-].each do |op|
+      non_zero_message = lambda do |value|
+        "Can't add or subtract a non-zero #{value.class.name} value"
+      end
+
       define_method(op) do |other|
-        unless other.is_a?(Money)
-          if other.zero?
-            return other.is_a?(CoercedNumeric) ? Money.empty(currency).public_send(op, self) : self
-          end
-          raise TypeError
+        case other
+        when Money
+          other = other.exchange_to(currency)
+          new_fractional = fractional.public_send(op, other.fractional)
+          self.class.new(new_fractional, currency, bank)
+        when CoercedNumeric
+          raise TypeError, non_zero_message.call(other.value) unless other.zero?
+          self.class.new(other.value.public_send(op, fractional), currency)
+        when Numeric
+          raise TypeError, non_zero_message.call(other) unless other.zero?
+          self
+        else
+          raise TypeError, "Unsupported argument type: #{other.class.name}"
         end
-        other = other.exchange_to(currency)
-        self.class.new(fractional.public_send(op, other.fractional), currency, bank)
       end
     end
 

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.13.2'
+  VERSION = '6.13.3'
 end

data/money.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.name        = "money"
   s.version     = Money::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Shane Emmons"]
-  s.email       = ["shane@emmons.io"]
+  s.authors     = ['Shane Emmons', 'Anthony Dmitriyev']
+  s.email       = ['shane@emmons.io', 'anthony.dmitriyev@gmail.com']
   s.homepage    = "https://rubymoney.github.io/money"
   s.summary     = "A Ruby Library for dealing with money and currency conversion."
   s.description = "A Ruby Library for dealing with money and currency conversion."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard", "~> 0.9.11"
   s.add_development_dependency "kramdown", "~> 1.1"
 
-  s.files         = `git ls-files`.split($/)
+  s.files         = `git ls-files -z -- config/* lib/* CHANGELOG.md LICENSE money.gemspec README.md`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.13.2
+  version: 6.13.3
 platform: ruby
 authors:
 - Shane Emmons
+- Anthony Dmitriyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -103,21 +104,14 @@ dependencies:
 description: A Ruby Library for dealing with money and currency conversion.
 email:
 - shane@emmons.io
+- anthony.dmitriyev@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- AUTHORS
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - config/currency_backwards_compatible.json
 - config/currency_iso.json
 - config/currency_non_iso.json
@@ -143,24 +137,6 @@ files:
 - lib/money/rates_store/memory.rb
 - lib/money/version.rb
 - money.gemspec
-- spec/bank/base_spec.rb
-- spec/bank/single_currency_spec.rb
-- spec/bank/variable_exchange_spec.rb
-- spec/currency/heuristics_spec.rb
-- spec/currency/loader_spec.rb
-- spec/currency_spec.rb
-- spec/locale_backend/currency_spec.rb
-- spec/locale_backend/i18n_spec.rb
-- spec/locale_backend/legacy_spec.rb
-- spec/money/allocation_spec.rb
-- spec/money/arithmetic_spec.rb
-- spec/money/constructors_spec.rb
-- spec/money/formatting_spec.rb
-- spec/money/locale_backend_spec.rb
-- spec/money_spec.rb
-- spec/rates_store/memory_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples/money_examples.rb
 homepage: https://rubymoney.github.io/money
 licenses:
 - MIT
@@ -188,22 +164,4 @@ rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.
-test_files:
-- spec/bank/base_spec.rb
-- spec/bank/single_currency_spec.rb
-- spec/bank/variable_exchange_spec.rb
-- spec/currency/heuristics_spec.rb
-- spec/currency/loader_spec.rb
-- spec/currency_spec.rb
-- spec/locale_backend/currency_spec.rb
-- spec/locale_backend/i18n_spec.rb
-- spec/locale_backend/legacy_spec.rb
-- spec/money/allocation_spec.rb
-- spec/money/arithmetic_spec.rb
-- spec/money/constructors_spec.rb
-- spec/money/formatting_spec.rb
-- spec/money/locale_backend_spec.rb
-- spec/money_spec.rb
-- spec/rates_store/memory_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples/money_examples.rb
+test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: lUJ1iIe2hjtyIFZm413PZ38saqD5UOLXo

data/.gitignore

@@ -1,23 +0,0 @@
-# Bundler
-.bundle
-Gemfile.lock
-pkg/*
-bin/
-
-# Rubinius
-*.rbc
-
-# YARD
-.yardoc
-yardoc/
-doc/
-
-# Project
-.rbenv-version
-.rbx
-.rvmrc
-.ruby-version
-.ruby-gemset
-
-# Spec artifacts
-/coverage

data/.rspec

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

data/.travis.yml

@@ -1,32 +0,0 @@
----
-language: ruby
-sudo: false
-rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - 2.6.0
-  - rbx-3
-  - jruby-9.0.5.0
-  - jruby-9.1.17.0
-  - jruby-9.2.0.0
-  - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-3
-  fast_finish: true
-before_install:
-  - gem install bundler --version '~> 1.17'
-script: bundle exec rspec spec
-notifications:
-  email:
-    - semmons99@gmail.com
-    - andreas@aloop.org
-    - weppos@weppos.net

data/AUTHORS

@@ -1,131 +0,0 @@
-Abhay Kumar
-Adrian Longley
-Alexander Ross
-Alex Speller
-Andreas Loupasakis
-Andrei
-Andrew White
-Andrius Chamentauskas
-Anthony Hristov
-Anthony Sellitti
-banjerluke
-Bartosz Dz
-bbozo
-Benjamin Grössing
-Bill DeRusha
-Bodaniel Jeanes
-Brian Jones
-bUg.
-Cade Truitt
-Casper Thomsen
-Chad Boyd
-Choongmin Lee
-Chris Kampmeier
-Christian Billen
-Clarke Brunsdon
-Daniel Sherson
-Dave Kroondyk
-Doug Droper
-Douglas Miller
-Ed Saunders
-Edwin Vlieg
-Eloy
-Evan Alter
-Exoth
-Filipe Goncalves
-Francisco Trindade
-François Beausoleil
-François Klingler
-Fred Liang
-Gabriel Gilder
-Gee-Hsien Chuang
-George Millo
-Hakan Ensari
-Hongli Lai
-Ilia Lobsanov
-Ivan Shamatov
-Ingo Wichmann
-Jacob Atzen
-James Cotterill
-James Hunt
-Jean-Louis Giordano
-Jean-Philippe Doyle
-Jell
-Jérémy Lecour
-Jeremy McNevin
-Jesse Cooke
-Jim Kingdon
-John Duff
-John Gakos
-Jonathon M. Abbott
-Josh Delsman
-Josh Hepworth
-Joshua Clayton
-Julien Boyer
-Kaleem Ullah
-Kenichi Kamiya
-Kenn Ejima
-Kenneth Salomon
-kirillian
-Laurynas Butkus
-Marcel Scherf
-Marco Otte-Witte
-Mateus Gomes
-Mateusz Wolsza
-Matias Korhonen
-Matthew McEachen
-Matt Jankowski
-Max Melentiev
-Michael Irwin
-Michael J. Cohen
-Michael Reinsch
-Michael Rodrigues
-Mikael Wikman
-Mike Herrera
-Mike Połétyn
-Musannif Zahir
-Neil Middleton
-Nihad Abbasov
-Olek Janiszewski
-Orien Madgwick
-Paul McMahon
-Paulo Diniz
-Pavan Sudarshan
-Pavel Gabriel
-pconnor
-Pedro Nascimento
-Pelle Braendgaard
-Peter Rhoades
-Phil Cohen
-pivotal-cloudplanner
-Prathan Thananart
-Robert Starsi
-Romain Gérard
-Ryan Bigg
-sankaranarayanan
-Scott Pierce
-Semyon Perepelitsa
-Shane Emmons
-Simone Carletti
-Spencer Rinehart
-Steve Morris
-Thomas E Enebo
-Thomas Weymuth
-Ticean Bennett
-Tien Nguyen
-Tim Hart
-Tim Krins
-Tobias Luetke
-Tobias Schmidt
-Tom Lianza
-tommeier
-Troels Knak-Nielsen
-Tsyren Ochirov
-Victor Shcherbakov
-Wei Zhu
-Yok
-Yuri Sidorov
-Yuusuke Takizawa
-Zubin Henner
-Бродяной Александр
-Nicolay Hvidsten