money-rails 1.12.0 → 1.13.4

data/spec/money_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Money overrides' do
+  describe '.default_formatting_rules' do
+    it 'uses defauts set as individual options' do
+      allow(MoneyRails::Configuration).to receive(:symbol).and_return('£')
+
+      expect(Money.default_formatting_rules).to include(symbol: '£')
+    end
+
+    it 'ignores individual options that are nil' do
+      allow(MoneyRails::Configuration).to receive(:symbol).and_return(nil)
+
+      expect(Money.default_formatting_rules.keys).not_to include(:symbol)
+    end
+
+    it 'includes default_format options' do
+      allow(MoneyRails::Configuration).to receive(:default_format).and_return(symbol: '£')
+
+      expect(Money.default_formatting_rules).to include(symbol: '£')
+    end
+
+    it 'gives priority to original defaults' do
+      allow(Money).to receive(:orig_default_formatting_rules).and_return(symbol: '£')
+      allow(MoneyRails::Configuration).to receive(:symbol).and_return('€')
+      allow(MoneyRails::Configuration).to receive(:default_format).and_return(symbol: '€')
+
+      expect(Money.default_formatting_rules).to include(symbol: '£')
+    end
+  end
+
+  describe '#to_hash' do
+    it 'returns a hash with JSON representation' do
+      expect(Money.new(9_99, 'EUR').to_hash).to eq(cents: 9_99, currency_iso: 'EUR')
+      expect(Money.zero('USD').to_hash).to eq(cents: 0, currency_iso: 'USD')
+    end
+  end
+end

data/spec/mongoid/{four_spec.rb → mongoid_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
+if defined?(Mongoid) && ::Mongoid::VERSION.split('.').first.to_i > 2
 
   describe Money do
     let!(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
@@ -8,12 +8,15 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
     let(:priceable_from_num) { Priceable.create(price: 1) }
     let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
     let(:priceable_from_hash) { Priceable.create(price: {cents: 100, currency_iso: "EUR"} )}
+    let(:priceable_from_blank_strings_hash) {
+      Priceable.create(price: {cents: '', currency_iso: ''})
+    }
     let(:priceable_from_hash_with_indifferent_access) {
       Priceable.create(price: {cents: 100, currency_iso: "EUR"}.with_indifferent_access)
     }
     let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
     let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal('100.1'), 'EUR')) }
     let(:priceable_with_hash_field) {
       Priceable.create(price_hash: {
         key1: Money.new(100, "EUR"),
@@ -69,6 +72,10 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
         expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
+      it "mongoizes a hash of blank strings for cents and currency to nil" do
+        expect(priceable_from_blank_strings_hash.price).to eq(nil)
+      end
+
       it "correctly mongoizes a HashWithIndifferentAccess of cents and currency" do
         expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
         expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
@@ -84,7 +91,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
         end
 
         it "correctly mongoizes a Money object to a hash of cents and currency" do
-          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal('100.1'))
           expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end

data/spec/mongoid/two_spec.rb

@@ -7,7 +7,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
     let(:priceable_from_nil) { Priceable.create(price: nil) }
     let(:priceable_from_num) { Priceable.create(price: 1) }
     let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
-    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal('100.1'), 'EUR')) }
     let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
 
     context "serialize" do
@@ -40,7 +40,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
         end
 
         it "mongoizes correctly a Money object to a hash of cents and currency" do
-          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal('100.1'))
           expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.4
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-16 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.12.0
+        version: 6.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.12.0
+        version: 6.13.2
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/locales/money.da.yml
 - config/locales/money.en.yml
 - lib/generators/money_rails/initializer_generator.rb
 - lib/generators/templates/money.rb
@@ -165,6 +166,7 @@ files:
 - spec/configuration_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -221,9 +223,8 @@ files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
-- spec/mongoid/five_spec.rb
-- spec/mongoid/four_spec.rb
-- spec/mongoid/three_spec.rb
+- spec/money_spec.rb
+- spec/mongoid/mongoid_spec.rb
 - spec/mongoid/two_spec.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
@@ -231,7 +232,10 @@ files:
 homepage: https://github.com/RubyMoney/money-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/RubyMoney/money-rails/
+  bug_tracker_uri: https://github.com/RubyMoney/money-rails/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -247,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Money gem integration with Rails
@@ -259,6 +262,7 @@ test_files:
 - spec/configuration_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -315,9 +319,8 @@ test_files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
-- spec/mongoid/five_spec.rb
-- spec/mongoid/four_spec.rb
-- spec/mongoid/three_spec.rb
+- spec/money_spec.rb
+- spec/mongoid/mongoid_spec.rb
 - spec/mongoid/two_spec.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb

data/spec/mongoid/five_spec.rb

@@ -1,117 +0,0 @@
-require 'spec_helper'
-
-if defined?(Mongoid) && ::Mongoid::VERSION =~ /^5(.*)/
-
-  describe Money do
-    let!(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
-    let!(:priceable_from_num) { Priceable.create(price: 1) }
-    let!(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
-    let!(:priceable_from_hash) { Priceable.create(price: {cents: 100, currency_iso: "EUR"} )}
-    let!(:priceable_from_hash_with_indifferent_access) {
-      Priceable.create(price: {cents: 100, currency_iso: "EUR"}.with_indifferent_access)
-    }
-    let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
-    let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
-    let(:priceable_with_hash_field) {
-      Priceable.create(price_hash: {
-        key1: Money.new(100, "EUR"),
-        key2: Money.new(200, "USD")
-      })
-    }
-
-    context "mongoize" do
-      it "correctly mongoizes a Money object to a hash of cents and currency" do
-        expect(priceable.price.cents).to eq(100)
-        expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      it "correctly mongoizes a Numeric object to a hash of cents and currency" do
-        expect(priceable_from_num.price.cents).to eq(100)
-        expect(priceable_from_num.price.currency).to eq(Money.default_currency)
-      end
-
-      it "correctly mongoizes a String object to a hash of cents and currency" do
-        expect(priceable_from_string.price.cents).to eq(100)
-        expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      context "when MoneyRails.raise_error_on_money_parsing is true" do
-        before { MoneyRails.raise_error_on_money_parsing = true }
-        after { MoneyRails.raise_error_on_money_parsing = false }
-
-        it "raises exception if the mongoized value is a String with a hyphen" do
-          expect { priceable_from_string_with_hyphen }.to raise_error MoneyRails::Error
-        end
-
-        it "raises exception if the mongoized value is a String with an unknown currency" do
-          expect { priceable_from_string_with_unknown_currency }.to raise_error MoneyRails::Error
-        end
-      end
-
-      context "when MoneyRails.raise_error_on_money_parsing is false" do
-        it "does not correctly mongoize a String with a hyphen in its middle" do
-          expect(priceable_from_string_with_hyphen.price).to eq(nil)
-        end
-
-        it "does not correctly mongoize a String with an unknown currency" do
-          expect(priceable_from_string_with_unknown_currency.price).to eq(nil)
-        end
-      end
-
-      it "correctly mongoizes a hash of cents and currency" do
-        expect(priceable_from_hash.price.cents).to eq(100)
-        expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      it "correctly mongoizes a HashWithIndifferentAccess of cents and currency" do
-        expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
-        expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      context "infinite_precision = true" do
-        before do
-          Money.infinite_precision = true
-        end
-
-        after do
-          Money.infinite_precision = false
-        end
-
-        it "correctly mongoizes a Money object to a hash of cents and currency" do
-          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
-          expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
-        end
-      end
-    end
-
-    it "correctly serializes a Hash field containing Money objects" do
-      expect(priceable_with_hash_field.price_hash[:key1][:cents]).to eq(100)
-      expect(priceable_with_hash_field.price_hash[:key2][:cents]).to eq(200)
-      expect(priceable_with_hash_field.price_hash[:key1][:currency_iso]).to eq('EUR')
-      expect(priceable_with_hash_field.price_hash[:key2][:currency_iso]).to eq('USD')
-    end
-
-    context "demongoize" do
-      subject { Priceable.first.price }
-      it { is_expected.to be_an_instance_of(Money) }
-      it { is_expected.to eq(Money.new(100, 'EUR')) }
-
-      it "returns 0 cents in default_currency if a nil value was stored" do
-        nil_priceable = Priceable.create(price: nil)
-        expect(nil_priceable.price.cents).to eq(0)
-        expect(nil_priceable.price.currency).to eq(Money.default_currency)
-      end
-      it 'returns nil if an unknown value was stored' do
-        zero_priceable = Priceable.create(price: [])
-        expect(zero_priceable.price).to be_nil
-      end
-    end
-
-    context "evolve" do
-      it "correctly transforms a Money object into a Mongo friendly value" do
-        expect(Priceable.where(price: Money.new(100, 'EUR')).first).to eq(priceable)
-      end
-    end
-  end
-end

data/spec/mongoid/three_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
-
-  describe Money do
-    let!(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
-    let(:priceable_from_nil) { Priceable.create(price: nil) }
-    let(:priceable_from_num) { Priceable.create(price: 1) }
-    let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
-    let(:priceable_from_hash) { Priceable.create(price: {cents: 100, currency_iso: "EUR"} )}
-    let(:priceable_from_hash_with_indifferent_access) {
-      Priceable.create(price: {cents: 100, currency_iso: "EUR"}.with_indifferent_access)
-    }
-    let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
-    let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
-    let(:priceable_with_hash_field) {
-      Priceable.create(price_hash: {
-        key1: Money.new(100, "EUR"),
-        key2: Money.new(200, "USD")
-      })
-    }
-
-    context "mongoize" do
-      it "mongoizes correctly nil to nil" do
-        expect(priceable_from_nil.price).to be_nil
-      end
-
-      it "mongoizes correctly a Money object to a hash of cents and currency" do
-        expect(priceable.price.cents).to eq(100)
-        expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      it "mongoizes correctly a Numeric object to a hash of cents and currency" do
-        expect(priceable_from_num.price.cents).to eq(100)
-        expect(priceable_from_num.price.currency).to eq(Money.default_currency)
-      end
-
-      it "mongoizes correctly a String object to a hash of cents and currency" do
-        expect(priceable_from_string.price.cents).to eq(100)
-        expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      context "when MoneyRails.raise_error_on_money_parsing is true" do
-        before { MoneyRails.raise_error_on_money_parsing = true }
-        after { MoneyRails.raise_error_on_money_parsing = false }
-
-        it "raises exception if the mongoized value is a String with a hyphen" do
-          expect { priceable_from_string_with_hyphen }.to raise_error MoneyRails::Error
-        end
-
-        it "raises exception if the mongoized value is a String with an unknown currency" do
-          expect { priceable_from_string_with_unknown_currency }.to raise_error MoneyRails::Error
-        end
-      end
-
-      context "when MoneyRails.raise_error_on_money_parsing is false" do
-        it "does not mongoizes correctly a String with hyphen in its middle" do
-          expect(priceable_from_string_with_hyphen.price).to eq(nil)
-        end
-
-        it "does not mongoize correctly a String with an unknown currency" do
-          expect(priceable_from_string_with_unknown_currency.price).to eq(nil)
-        end
-      end
-
-      it "mongoizes correctly a hash of cents and currency" do
-        expect(priceable_from_hash.price.cents).to eq(100)
-        expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      it "mongoizes correctly a HashWithIndifferentAccess of cents and currency" do
-        expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
-        expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
-      end
-
-      context "infinite_precision = true" do
-        before do
-          Money.infinite_precision = true
-        end
-
-        after do
-          Money.infinite_precision = false
-        end
-
-        it "mongoizes correctly a Money object to a hash of cents and currency" do
-          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
-          expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
-        end
-      end
-    end
-
-    it "serializes correctly a Hash field containing Money objects" do
-      expect(priceable_with_hash_field.price_hash[:key1][:cents]).to eq(100)
-      expect(priceable_with_hash_field.price_hash[:key2][:cents]).to eq(200)
-      expect(priceable_with_hash_field.price_hash[:key1][:currency_iso]).to eq('EUR')
-      expect(priceable_with_hash_field.price_hash[:key2][:currency_iso]).to eq('USD')
-    end
-
-    context "demongoize" do
-      subject { Priceable.first.price }
-      it { is_expected.to be_an_instance_of(Money) }
-      it { is_expected.to eq(Money.new(100, 'EUR')) }
-
-      it "returns nil if a nil value was stored" do
-        nil_priceable = Priceable.create(price: nil)
-        expect(nil_priceable.price).to be_nil
-      end
-
-      it 'returns nil if an unknown value was stored' do
-        zero_priceable = Priceable.create(price: [])
-        expect(zero_priceable.price).to be_nil
-      end
-    end
-
-    context "evolve" do
-      it "transforms correctly a Money object to a Mongo friendly value" do
-        expect(Priceable.where(price: Money.new(100, 'EUR')).first).to eq(priceable)
-      end
-    end
-  end
-end