shopify-money 0.13.0 → 0.14.3

data/spec/allocator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe "Allocator" do
@@ -67,6 +68,12 @@ RSpec.describe "Allocator" do
     specify "#allocate raise ArgumentError when invalid strategy is provided" do
       expect { new_allocator(0.03).allocate([0.5, 0.5], :bad_strategy_name) }.to raise_error(ArgumentError, "Invalid strategy. Valid options: :roundrobin, :roundrobin_reverse")
     end
+
+    specify "#allocate does not raise ArgumentError when invalid splits types are provided" do
+      moneys = new_allocator(0.03).allocate([0.5, 0.5], :roundrobin)
+      expect(moneys[0]).to eq(Money.new(0.02))
+      expect(moneys[1]).to eq(Money.new(0.01))
+    end
   end
 
   describe 'allocate_max_amounts' do
@@ -127,6 +134,12 @@ RSpec.describe "Allocator" do
         new_allocator(3).allocate_max_amounts([Money.empty, Money.empty, Money.empty]),
       ).to eq([Money.empty, Money.empty, Money.empty])
     end
+
+    specify "#allocate_max_amounts allocates the right amount without rounding error" do
+      expect(
+        new_allocator(24.2).allocate_max_amounts([Money.new(46), Money.new(46), Money.new(50), Money.new(50),Money.new(50)]),
+        ).to eq([Money.new(4.6), Money.new(4.6), Money.new(5), Money.new(5), Money.new(5)])
+    end
   end
 
   def new_allocator(amount, currency = nil)

data/spec/core_extensions_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.shared_examples_for "an object supporting to_money" do
@@ -56,6 +57,6 @@ RSpec.describe BigDecimal do
   it_should_behave_like "an object supporting to_money"
 
   it "parses a zero BigDecimal to Money.zero" do
-    expect(BigDecimal.new("-0.000").to_money).to eq(Money.zero)
+    expect(BigDecimal("-0.000").to_money).to eq(Money.zero)
   end
 end

data/spec/currency/loader_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Money::Currency::Loader do

data/spec/currency_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe "Currency" do

data/spec/helpers_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Money::Helpers do
@@ -49,12 +50,6 @@ RSpec.describe Money::Helpers do
       expect(subject.value_to_decimal('invalid')).to eq(0)
     end
 
-    it 'returns the bigdecimal representation of numbers while they are deprecated' do
-      expect(Money).to receive(:deprecate).exactly(2).times
-      expect(subject.value_to_decimal('1.23abc')).to eq(amount)
-      expect(subject.value_to_decimal("1.23\n23")).to eq(amount)
-    end
-
     it 'raises on invalid object' do
       expect { subject.value_to_decimal(OpenStruct.new(amount: 1)) }.to raise_error(ArgumentError)
     end

data/spec/money_accessor_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class NormalObject

data/spec/money_column_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class MoneyRecord < ActiveRecord::Base

data/spec/money_parser_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe MoneyParser do

data/spec/money_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'yaml'
 
@@ -744,8 +745,8 @@ RSpec.describe "Money" do
     end
 
     it "accepts Rational number" do
-      expect(Money.from_amount(Rational("999999999999999999.999")).value).to eql(BigDecimal.new("1000000000000000000", Money::Helpers::MAX_DECIMAL))
-      expect(Money.from_amount(Rational("999999999999999999.99")).value).to eql(BigDecimal.new("999999999999999999.99", Money::Helpers::MAX_DECIMAL))
+      expect(Money.from_amount(Rational("999999999999999999.999")).value).to eql(BigDecimal("1000000000000000000", Money::Helpers::MAX_DECIMAL))
+      expect(Money.from_amount(Rational("999999999999999999.99")).value).to eql(BigDecimal("999999999999999999.99", Money::Helpers::MAX_DECIMAL))
     end
 
     it "raises ArgumentError with unsupported argument" do

data/spec/null_currency_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe "NullCurrency" do

data/spec/rubocop/cop/money/missing_currency_spec.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require_relative '../../../rubocop_helper'
+require 'rubocop/cop/money/missing_currency'
+
+RSpec.describe RuboCop::Cop::Money::MissingCurrency do
+  subject(:cop) { described_class.new(config) }
+
+  let(:config) { RuboCop::Config.new }
+
+  describe '#on_send' do
+    it 'registers an offense for Money.new without a currency argument' do
+      expect_offense(<<~RUBY)
+        Money.new(1)
+        ^^^^^^^^^^^^ Money is missing currency argument
+      RUBY
+    end
+
+    it 'does not register an offense for Money.new with currency argument' do
+      expect_no_offenses(<<~RUBY)
+        Money.new(1, 'CAD')
+      RUBY
+    end
+
+    it 'registers an offense for Money.new without a currency argument' do
+      expect_offense(<<~RUBY)
+        Money.new
+        ^^^^^^^^^ Money is missing currency argument
+      RUBY
+    end
+
+    it 'registers an offense for Money.from_amount without a currency argument' do
+      expect_offense(<<~RUBY)
+        Money.from_amount(1)
+        ^^^^^^^^^^^^^^^^^^^^ Money is missing currency argument
+      RUBY
+    end
+
+    it 'does not register an offense for Money.from_amount with currency argument' do
+      expect_no_offenses(<<~RUBY)
+        Money.from_amount(1, 'CAD')
+      RUBY
+    end
+
+    it 'registers an offense for Money.from_cents without a currency argument' do
+      expect_offense(<<~RUBY)
+        Money.from_cents(1)
+        ^^^^^^^^^^^^^^^^^^^ Money is missing currency argument
+      RUBY
+    end
+
+    it 'does not register an offense for Money.from_cents with currency argument' do
+      expect_no_offenses(<<~RUBY)
+        Money.from_cents(1, 'CAD')
+      RUBY
+    end
+
+    it 'registers an offense for to_money without a currency argument' do
+      expect_offense(<<~RUBY)
+        '1'.to_money
+        ^^^^^^^^^^^^ to_money is missing currency argument
+      RUBY
+    end
+
+    it 'does not register an offense for to_money with currency argument' do
+      expect_no_offenses(<<~RUBY)
+        '1'.to_money('CAD')
+      RUBY
+    end
+
+    it 'registers an offense for to_money block pass form' do
+      expect_offense(<<~RUBY)
+        ['1'].map(&:to_money)
+        ^^^^^^^^^^^^^^^^^^^^^ to_money is missing currency argument
+      RUBY
+    end
+  end
+
+  describe '#autocorrect' do
+    let(:config) do
+      RuboCop::Config.new(
+        'Money/MissingCurrency' => {
+          'ReplacementCurrency' => 'CAD'
+        }
+      )
+    end
+
+    it 'corrects Money.new without currency' do
+      new_source = autocorrect_source('Money.new(1)')
+      expect(new_source).to eq("Money.new(1, 'CAD')")
+    end
+
+    it 'corrects Money.new without amount or currency' do
+      new_source = autocorrect_source('Money.new')
+      expect(new_source).to eq("Money.new(0, 'CAD')")
+    end
+
+    it 'corrects to_money without currency' do
+      new_source = autocorrect_source('1.to_money')
+      expect(new_source).to eq("1.to_money('CAD')")
+    end
+
+    it 'corrects to_money block pass form' do
+      new_source = autocorrect_source("['1'].map(&:to_money)")
+      expect(new_source).to eq("['1'].map { |x| x.to_money('CAD') }")
+    end
+  end
+end

data/spec/rubocop_helper.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+require 'rubocop'
+require 'rubocop/rspec/support'
+
+RSpec.configure do |config|
+  config.include RuboCop::RSpec::ExpectOffense
+end

data/spec/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveRecord::Schema.define do
   create_table "money_records", :force => true do |t|
     t.decimal  "price", precision: 20, scale: 3, default: '0.000'

data/spec/spec_helper.rb

@@ -1,14 +1,10 @@
+# frozen_string_literal: true
 require 'simplecov'
 SimpleCov.minimum_coverage 100
 SimpleCov.start do
   add_filter "/spec/"
 end
 
-if ENV['CI'] == 'true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.3
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: bigdecimal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.2
 description: Manage money in Shopify with a class that wont lose pennies during division!
 email: gems@shopify.com
 executables:
@@ -125,9 +111,9 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- config/currency_historic.json
-- config/currency_iso.json
-- config/currency_non_iso.json
+- config/currency_historic.yml
+- config/currency_iso.yml
+- config/currency_non_iso.yml
 - dev.yml
 - lib/money.rb
 - lib/money/accounting_money_parser.rb
@@ -147,6 +133,9 @@ files:
 - lib/money_column/active_record_hooks.rb
 - lib/money_column/active_record_type.rb
 - lib/money_column/railtie.rb
+- lib/rubocop/cop/money.rb
+- lib/rubocop/cop/money/missing_currency.rb
+- lib/shopify-money.rb
 - money.gemspec
 - spec/accounting_money_parser_spec.rb
 - spec/allocator_spec.rb
@@ -159,12 +148,15 @@ files:
 - spec/money_parser_spec.rb
 - spec/money_spec.rb
 - spec/null_currency_spec.rb
+- spec/rubocop/cop/money/missing_currency_spec.rb
+- spec/rubocop_helper.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Shopify/money
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -173,15 +165,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Shopify's money gem
@@ -197,5 +188,7 @@ test_files:
 - spec/money_parser_spec.rb
 - spec/money_spec.rb
 - spec/null_currency_spec.rb
+- spec/rubocop/cop/money/missing_currency_spec.rb
+- spec/rubocop_helper.rb
 - spec/schema.rb
 - spec/spec_helper.rb

data/config/currency_historic.json

@@ -1,157 +0,0 @@
-{
-  "cyp": {
-    "priority": 100,
-    "iso_code": "CYP",
-    "name": "Cypriot pound",
-    "symbol": "£",
-    "alternate_symbols": [],
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "£",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "196",
-    "smallest_denomination": 1
-  },
-  "eek": {
-    "priority": 100,
-    "iso_code": "EEK",
-    "name": "Estonian Kroon",
-    "symbol": "KR",
-    "alternate_symbols": [],
-    "subunit": "Sent",
-    "subunit_to_unit": 100,
-    "symbol_first": false,
-    "html_entity": "",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "233",
-    "smallest_denomination": 5
-  },
-  "ghc": {
-    "priority": 100,
-    "iso_code": "GHS",
-    "name": "Ghanaian Cedi",
-    "symbol": "₵",
-    "disambiguate_symbol": "GH₵",
-    "alternate_symbols": ["GH₵"],
-    "subunit": "Pesewa",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "₵",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "288",
-    "smallest_denomination": 1
-  },
-  "mtl": {
-    "priority": 100,
-    "iso_code": "MTL",
-    "name": "Maltese Lira",
-    "symbol": "₤",
-    "alternate_symbols": ["Lm"],
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "£",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "470",
-    "smallest_denomination": 1
-  },
-  "tmm": {
-    "priority": 100,
-    "iso_code": "TMM",
-    "name": "Turkmenistani Manat",
-    "symbol": "m",
-    "alternate_symbols": [],
-    "subunit": "Tennesi",
-    "subunit_to_unit": 100,
-    "symbol_first": false,
-    "html_entity": "",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "795",
-    "smallest_denomination": 1
-  },
-  "VEB": {
-    "priority": 100,
-    "iso_code": "VEB",
-    "name": "Venezuelan Bolívar",
-    "symbol": "Bs.",
-    "alternate_symbols": [],
-    "subunit": "Céntimo",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "",
-    "decimal_mark": ",",
-    "thousands_separator": ".",
-    "iso_numeric": "862",
-    "smallest_denomination": 1
-  },
-  "zwd": {
-    "priority": 100,
-    "iso_code": "ZWD",
-    "name": "Zimbabwean Dollar",
-    "symbol": "$",
-    "disambiguate_symbol": "ZWD",
-    "alternate_symbols": ["Z$"],
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "$",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "716",
-    "smallest_denomination": 100
-  },
-  "zwl": {
-    "priority": 100,
-    "iso_code": "ZWL",
-    "name": "Zimbabwean Dollar",
-    "symbol": "$",
-    "disambiguate_symbol": "ZWL",
-    "alternate_symbols": ["Z$"],
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "$",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "932",
-    "smallest_denomination": 100
-  },
-  "zwn": {
-    "priority": 100,
-    "iso_code": "ZWN",
-    "name": "Zimbabwean Dollar",
-    "symbol": "$",
-    "disambiguate_symbol": "ZWN",
-    "alternate_symbols": ["Z$"],
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "$",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "942",
-    "smallest_denomination": 100
-  },
-  "zwr": {
-    "priority": 100,
-    "iso_code": "ZWR",
-    "name": "Zimbabwean Dollar",
-    "symbol": "$",
-    "disambiguate_symbol": "ZWR",
-    "alternate_symbols": ["Z$"],
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "$",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "935",
-    "smallest_denomination": 100
-  }
-}