money 6.9.0 → 6.16.0

data/lib/money/rates_store/memory.rb

@@ -1,3 +1,5 @@
+require 'monitor'
+
 class Money
   module RatesStore
 
@@ -17,11 +19,11 @@ class Money
       #
       # @param [Hash] opts Optional store options.
       # @option opts [Boolean] :without_mutex disables the usage of a mutex
-      # @param [Hash] rt Optional initial exchange rate data.
-      def initialize(opts = {}, rt = {})
-        @options, @index = opts, rt
-        @mutex = Mutex.new
-        @in_transaction = false
+      # @param [Hash] rates Optional initial exchange rate data.
+      def initialize(opts = {}, rates = {})
+        @rates = rates
+        @options = opts
+        @guard = Monitor.new
       end
 
       # Registers a conversion rate and returns it. Uses +Mutex+ to synchronize data access.
@@ -37,7 +39,9 @@ class Money
       #   store.add_rate("USD", "CAD", 1.24515)
       #   store.add_rate("CAD", "USD", 0.803115)
       def add_rate(currency_iso_from, currency_iso_to, rate)
-        transaction { index[rate_key_for(currency_iso_from, currency_iso_to)] = rate }
+        guard.synchronize do
+          rates[rate_key_for(currency_iso_from, currency_iso_to)] = rate
+        end
       end
 
       # Retrieve the rate for the given currencies. Uses +Mutex+ to synchronize data access.
@@ -54,25 +58,21 @@ class Money
       #
       #   store.get_rate("USD", "CAD") #=> 1.24515
       def get_rate(currency_iso_from, currency_iso_to)
-        transaction { index[rate_key_for(currency_iso_from, currency_iso_to)] }
+        guard.synchronize do
+          rates[rate_key_for(currency_iso_from, currency_iso_to)]
+        end
       end
 
       def marshal_dump
-        [self.class, index, options]
+        guard.synchronize do
+          return [self.class, options, rates.dup]
+        end
       end
 
-
       # Wraps block execution in a thread-safe transaction
       def transaction(&block)
-        if @in_transaction || options[:without_mutex]
-          block.call self
-        else
-          @mutex.synchronize do
-            @in_transaction = true
-            result = block.call
-            @in_transaction = false
-            result
-          end
+        guard.synchronize do
+          yield
         end
       end
 
@@ -89,19 +89,19 @@ class Money
       #     puts [iso_from, iso_to, rate].join
       #   end
       def each_rate(&block)
-        enum = Enumerator.new do |yielder|
-          index.each do |key, rate|
+        return to_enum(:each_rate) unless block_given?
+
+        guard.synchronize do
+          rates.each do |key, rate|
             iso_from, iso_to = key.split(INDEX_KEY_SEPARATOR)
-            yielder.yield iso_from, iso_to, rate                  
+            yield iso_from, iso_to, rate
           end
         end
-
-        block_given? ? enum.each(&block) : enum
       end
 
       private
 
-      attr_reader :index, :options
+      attr_reader :rates, :options, :guard
 
       # Return the rate hashkey for the given currencies.
       #

data/lib/money/version.rb

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

data/money.gemspec

@@ -7,23 +7,29 @@ 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."
   s.license     = "MIT"
 
-  s.add_dependency 'i18n', ['>= 0.6.4', '< 0.9']
+  s.add_dependency 'i18n', [">= 0.6.4", '<= 2']
 
-  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 3.4.0"
-  s.add_development_dependency "yard", "~> 0.8"
-  s.add_development_dependency "kramdown", "~> 1.1"
+  s.add_development_dependency "rspec", "~> 3.4"
+  s.add_development_dependency "yard", "~> 0.9.11"
+  s.add_development_dependency "kramdown", "~> 2.3"
 
-  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"]
+
+  if s.respond_to?(:metadata)
+    s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money/blob/master/CHANGELOG.md'
+    s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money/'
+    s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money/issues'
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.16.0
 platform: ruby
 authors:
 - Shane Emmons
-autorequire: 
+- Anthony Dmitriyev
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -17,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +28,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,60 +65,53 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
 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
@@ -128,30 +122,29 @@ files:
 - lib/money/currency.rb
 - lib/money/currency/heuristics.rb
 - lib/money/currency/loader.rb
+- lib/money/locale_backend/base.rb
+- lib/money/locale_backend/currency.rb
+- lib/money/locale_backend/errors.rb
+- lib/money/locale_backend/i18n.rb
+- lib/money/locale_backend/legacy.rb
 - lib/money/money.rb
+- lib/money/money/allocation.rb
 - lib/money/money/arithmetic.rb
 - lib/money/money/constructors.rb
-- lib/money/money/formatting.rb
+- lib/money/money/formatter.rb
+- lib/money/money/formatting_rules.rb
+- lib/money/money/locale_backend.rb
 - 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/money/arithmetic_spec.rb
-- spec/money/constructors_spec.rb
-- spec/money/formatting_spec.rb
-- spec/money_spec.rb
-- spec/rates_store/memory_spec.rb
-- spec/spec_helper.rb
 homepage: https://rubymoney.github.io/money
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/RubyMoney/money/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/RubyMoney/money/
+  bug_tracker_uri: https://github.com/RubyMoney/money/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,21 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+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/money/arithmetic_spec.rb
-- spec/money/constructors_spec.rb
-- spec/money/formatting_spec.rb
-- spec/money_spec.rb
-- spec/rates_store/memory_spec.rb
-- spec/spec_helper.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 +0,0 @@
---require spec_helper

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
-  - rbx-2
-  - jruby-9.0.5.0
-  - jruby-9.1.2.0
-  - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2
-  fast_finish: true
-script: bundle exec rspec spec
-notifications:
-  email:
-    - semmons99@gmail.com
-    - andreas@aloop.org
-    - weppos@weppos.net

data/AUTHORS

@@ -1,126 +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
-Gabriel Gilder
-Gee-Hsien Chuang
-George Millo
-Hakan Ensari
-Hongli Lai
-Ilia Lobsanov
-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
-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
-Tobias Luetke
-Tobias Schmidt
-Tom Lianza
-tommeier
-Troels Knak-Nielsen
-Tsyren Ochirov
-Victor Shcherbakov
-Wei Zhu
-Yok
-Yuri Sidorov
-Yuusuke Takizawa
-Zubin Henner
-Бродяной Александр

data/CONTRIBUTING.md

@@ -1,17 +0,0 @@
-# Contribution Guidelines
-
-## Steps
-
-1. Fork [the repo](https://github.com/RubyMoney/money)
-2. Grab dependencies: `bundle install`
-3. Make sure everything is working: `bundle exec rake spec`
-4. Make your changes
-5. Test your changes
-5. Create a Pull Request
-6. Celebrate!!!!!
-
-## Notes
-
-When contributing, please make sure to update the CHANGELOG and AUTHORS files
-when you submit your pull request. Upon merging of your first pull request,
-you will be given commit access to the repository.

data/Gemfile

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'coveralls', '>= 0.8.17', :require => false
-gem 'pry', :require => false
-
-# JSON gem no longer supports ruby < 2.0.0
-if defined?(JRUBY_VERSION)
-  gem 'json'
-elsif RUBY_VERSION =~ /^1/
-  # Legacy gem locks for ruby 1.9.x
-  gem 'json',           '~> 1.8.3'
-  gem 'tins',           '~> 1.6.0'
-  gem 'term-ansicolor', '< 1.4'
-end
-
-gemspec

data/Rakefile

@@ -1,17 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/clean"
-require "rspec/core/rake_task"
-
-CLOBBER.include('doc', '.yardoc')
-
-require "yard"
-
-YARD::Rake::YardocTask.new do |t|
-  t.options << "--files" << "CHANGELOG.md,LICENSE"
-end
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.fail_on_error = false
-end
-
-task default: :spec