tagliala · tagliala · Mar 24, 2024 · Jun 28, 2024 · Jun 16, 2024
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.2', '3.3']
+        ruby-version: ['3.1', '3.2', '3.3', 'jruby-9.4']
 
     steps:
     - uses: actions/checkout@v4

diff --git a/Gemfile b/Gemfile
@@ -1,16 +1,10 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 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
-gem 'i18n', '<= 1.2.0' if RUBY_VERSION < '2.3'
+gem 'rbs', platforms: %i[mri mingw x64_mingw]
+gem 'typeprof', platforms: %i[mri mingw x64_mingw]
 
 gemspec
diff --git a/README.md b/README.md
@@ -40,8 +40,6 @@ A Ruby Library for dealing with money and currency conversion.
 
 - Your app must use UTF-8 to function with this library. There are a
   number of non-ASCII currency attributes.
-- This app requires JSON. If you're using JRuby < 1.7.0
-  you'll need to add `gem "json"` to your Gemfile or similar.
 
 ## Downloading
 
@@ -351,11 +349,11 @@ The following example implements a `Redis` store to save exchange rates to a red
 
 class RedisRateStore
   INDEX_KEY_SEPARATOR = '_TO_'.freeze
-  
+
   # Using second db of the redis instance
   # because sidekiq uses the first db
   REDIS_DATABASE = 1
-  
+
   # Using Hash to store rates data
   REDIS_STORE_KEY = 'rates'
 

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/clean"
 require "rspec/core/rake_task"

diff --git a/benchmarks/benchmark.rb b/benchmarks/benchmark.rb
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby -s
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'money'
+require 'benchmark'
+require_relative 'readme_examples'
+
+I18n.config.available_locales = :en
+Money.locale_backend = :i18n
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP
+
+Benchmark.bmbm(30) do |x|
+  x.report('README Examples') do
+    10_000.times do
+      ReadmeExamples.call
+    end
+  end
+
+  x.report('Money#from_cents') do
+    100_000.times do
+      Money.from_cents(100, "USD")
+    end
+  end
+
+  x.report('Money#format') do
+    50_000.times do
+      Money.from_cents(100, "USD").format
+    end
+  end
+end
diff --git a/benchmarks/profile.rb b/benchmarks/profile.rb
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby -s
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'money'
+require 'ruby-prof'
+require_relative 'readme_examples'
+
+I18n.config.available_locales = :en
+Money.locale_backend = :i18n
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP
+
+result = RubyProf::Profile.profile do
+  10.times do
+    ReadmeExamples.call
+  end
+end
+
+printer = RubyProf::FlatPrinter.new(result)
+printer.print($stdout, {})
diff --git a/benchmarks/profile_memory.rb b/benchmarks/profile_memory.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby -s
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'money'
+require 'memory_profiler'
+require_relative 'readme_examples'
+
+I18n.config.available_locales = :en
+Money.locale_backend = :i18n
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP
+
+report = MemoryProfiler.report(allow_files: 'money') do
+  10.times do
+    ReadmeExamples.call
+  end
+end
+
+report.pretty_print
diff --git a/benchmarks/readme_examples.rb b/benchmarks/readme_examples.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ReadmeExamples
+  def self.call
+    money = Money.from_cents(1000, "USD")
+    money.cents     #=> 1000
+    money.currency  #=> Currency.new("USD")
+
+    Money.from_cents(1000, "USD") == Money.from_cents(1000, "USD")   #=> true
+    Money.from_cents(1000, "USD") == Money.from_cents(100, "USD")    #=> false
+    Money.from_cents(1000, "USD") == Money.from_cents(1000, "EUR")   #=> false
+    Money.from_cents(1000, "USD") != Money.from_cents(1000, "EUR")   #=> true
+
+    Money.from_cents(1000, "USD") + Money.from_cents(500, "USD") == Money.from_cents(1500, "USD")
+    Money.from_cents(1000, "USD") - Money.from_cents(200, "USD") == Money.from_cents(800, "USD")
+    Money.from_cents(1000, "USD") / 5                            == Money.from_cents(200, "USD")
+    Money.from_cents(1000, "USD") * 5                            == Money.from_cents(5000, "USD")
+
+    Money.from_amount(5, "USD") == Money.from_cents(500, "USD")  # 5 USD
+    Money.from_amount(5, "JPY") == Money.from_cents(5, "JPY")    # 5 JPY
+    Money.from_amount(5, "TND") == Money.from_cents(5000, "TND") # 5 TND
+
+    Money.from_cents(1000, "USD").with_currency("EUR") == Money.from_cents(1000, "EUR")
+
+    Money.from_cents(100, "USD").format #=> "$1.00"
+    Money.from_cents(100, "GBP").format #=> "£1.00"
+    Money.from_cents(100, "EUR").format #=> "€1.00"
+  end
+end
diff --git a/lib/money.rb b/lib/money.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bigdecimal"
 require "bigdecimal/util"
 require "set"

diff --git a/lib/money/bank/base.rb b/lib/money/bank/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Money
   # Provides classes that aid in the ability of exchange one currency with
   # another.

diff --git a/lib/money/bank/single_currency.rb b/lib/money/bank/single_currency.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money/bank/base'
 
 class Money

diff --git a/lib/money/bank/variable_exchange.rb b/lib/money/bank/variable_exchange.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money/bank/base'
 require 'money/rates_store/memory'
 require 'json'

diff --git a/lib/money/currency.rb b/lib/money/currency.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "json"
 require "money/currency/loader"

diff --git a/lib/money/currency/heuristics.rb b/lib/money/currency/heuristics.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class Money
   class Currency

diff --git a/lib/money/currency/loader.rb b/lib/money/currency/loader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Money
   class Currency
     module Loader

diff --git a/lib/money/locale_backend/base.rb b/lib/money/locale_backend/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money/locale_backend/errors'
 
 class Money

diff --git a/lib/money/locale_backend/currency.rb b/lib/money/locale_backend/currency.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money/locale_backend/base'
 
 class Money

diff --git a/lib/money/locale_backend/errors.rb b/lib/money/locale_backend/errors.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Money
   module LocaleBackend
     class NotSupported < StandardError; end

diff --git a/lib/money/locale_backend/i18n.rb b/lib/money/locale_backend/i18n.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money/locale_backend/base'
 
 class Money

diff --git a/lib/money/locale_backend/legacy.rb b/lib/money/locale_backend/legacy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money/locale_backend/base'
 require 'money/locale_backend/i18n'
 

diff --git a/lib/money/money.rb b/lib/money/money.rb
@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require "money/bank/variable_exchange"
 require "money/bank/single_currency"
 require "money/money/arithmetic"

diff --git a/lib/money/money/allocation.rb b/lib/money/money/allocation.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class Money
   class Allocation

diff --git a/lib/money/money/arithmetic.rb b/lib/money/money/arithmetic.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Money
   module Arithmetic
     # Wrapper for coerced numeric values to distinguish

diff --git a/lib/money/money/constructors.rb b/lib/money/money/constructors.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Money
   module Constructors
 

diff --git a/lib/money/money/formatter.rb b/lib/money/money/formatter.rb
@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'money/money/formatting_rules'
 
 class Money

diff --git a/lib/money/money/formatting_rules.rb b/lib/money/money/formatting_rules.rb
@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 class Money
   class FormattingRules

diff --git a/lib/money/money/locale_backend.rb b/lib/money/money/locale_backend.rb
@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require 'money/locale_backend/errors'
 require 'money/locale_backend/legacy'

diff --git a/lib/money/rates_store/memory.rb b/lib/money/rates_store/memory.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'monitor'
 
 class Money

diff --git a/lib/money/version.rb b/lib/money/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Money
   VERSION = '6.19.0'
 end
diff --git a/money.gemspec b/money.gemspec
@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "money/version"
@@ -22,8 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "yard", "~> 0.9.11"
   s.add_development_dependency "kramdown", "~> 2.3"
-  s.add_development_dependency "rbs" if RUBY_VERSION >= "2.7.0"
-  s.add_development_dependency "typeprof" if RUBY_VERSION >= "2.7.0"
 
   s.required_ruby_version = '>= 3.1'
 

diff --git a/spec/bank/base_spec.rb b/spec/bank/base_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Money::Bank::Base do
 
   describe ".instance" do

diff --git a/spec/bank/single_currency_spec.rb b/spec/bank/single_currency_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Money::Bank::SingleCurrency do
   describe "#exchange_with" do
     it "raises when called" do

diff --git a/spec/bank/variable_exchange_spec.rb b/spec/bank/variable_exchange_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'yaml'
 

diff --git a/spec/currency/heuristics_spec.rb b/spec/currency/heuristics_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::Currency::Heuristics do
   describe "#analyze_string" do

diff --git a/spec/currency/loader_spec.rb b/spec/currency/loader_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::Currency::Loader do
   it "returns a currency table hash" do

diff --git a/spec/currency_spec.rb b/spec/currency_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::Currency do
   FOO = '{ "priority": 1, "iso_code": "FOO", "iso_numeric": "840", "name": "United States Dollar", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 1000, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": ",", "smallest_denomination": 1 }'

diff --git a/spec/locale_backend/currency_spec.rb b/spec/locale_backend/currency_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::LocaleBackend::Currency do
   describe '#lookup' do

diff --git a/spec/locale_backend/i18n_spec.rb b/spec/locale_backend/i18n_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::LocaleBackend::I18n do
   describe '#initialize' do

diff --git a/spec/locale_backend/legacy_spec.rb b/spec/locale_backend/legacy_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::LocaleBackend::Legacy do
   after { Money.use_i18n = true }

diff --git a/spec/money/allocation_spec.rb b/spec/money/allocation_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::Allocation do
    describe 'given number as argument' do

diff --git a/spec/money/arithmetic_spec.rb b/spec/money/arithmetic_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::Arithmetic do
   describe "-@" do

diff --git a/spec/money/constructors_spec.rb b/spec/money/constructors_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::Constructors do
 

diff --git a/spec/money/formatting_rules_spec.rb b/spec/money/formatting_rules_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::FormattingRules do
   it 'does not modify frozen rules in place' do

diff --git a/spec/money/formatting_spec.rb b/spec/money/formatting_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money, "formatting" do
 

diff --git a/spec/money/locale_backend_spec.rb b/spec/money/locale_backend_spec.rb
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Money::LocaleBackend do
   describe '.find' do