money-rails 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afde9881744906b6e1095808941f25c35882a6cf
-  data.tar.gz: 8124dc1db10118638c59fbd573d5169a10c856a7
+SHA256:
+  metadata.gz: 94253df4c6ac9ec75bfc1b569d6d05a96082846df1c7e2ab61d65cc56cf10183
+  data.tar.gz: 8fbcf7e06595b836c03d12d77bba6db42fbf40abc5b1de44e7c6311ffca4f01f
 SHA512:
-  metadata.gz: db46b687d7785a6003671c6303256b67a7e97f8eba7ae56ef80839a3b0bd09ec8b01b12131e1cf959066b3b59c31d9812fcd3ab31a551a926f83335909c0458b
-  data.tar.gz: d40ce1a07d6a8af402c61336b999d8bb41460ec1802df4016fe915613be1e41c6ede7fef65ec8bc711e15b0983dd8a661466a8401e29b15ee581f6734fffb0fe
+  metadata.gz: a3f73a3833288cc529da04343d58ce82dabaa3563c61281712a8e5d975f3c60cacce5ff37b9b5422bacbf6f6c0606468643145376521925b9db26281748150fb
+  data.tar.gz: 035af0f28d1aae1e28a970938f402a32c5de2eb1abd62bc2d36808f366dfe60f92f06aa4c5dddf9f940f85b20776deb9707def03b65544aedb6c9883dd8c67ac

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.13.3
+
+- Add Money#to_hash for JSON serialization
+- Update initializer template with #locale_backend config
+- Rollback support for remove_monetize / remove_money DB helpers
+- Rails 6 support
+
 ## 1.13.2
 
 - Make validation compatible with Money.locale_backend

data/lib/generators/templates/money.rb

@@ -83,6 +83,29 @@ MoneyRails.configure do |config|
   #   sign_before_symbol: nil
   # }
 
+  # If you would like to use I18n localization (formatting depends on the
+  # locale):
+  # config.locale_backend = :i18n
+  #
+  # Example (using default localization from rails-i18n):
+  #
+  # I18n.locale = :en
+  # Money.new(10_000_00, 'USD').format # => $10,000.00
+  # I18n.locale = :es
+  # Money.new(10_000_00, 'USD').format # => $10.000,00
+  #
+  # For the legacy behaviour of "per currency" localization (formatting depends
+  # only on currency):
+  # config.locale_backend = :currency
+  #
+  # Example:
+  # Money.new(10_000_00, 'USD').format # => $10,000.00
+  # Money.new(10_000_00, 'EUR').format # => €10.000,00
+  #
+  # In case you don't need localization and would like to use default values
+  # (can be redefined using config.default_format):
+  # config.locale_backend = nil
+
   # Set default raise_error_on_money_parsing option
   # It will be raise error if assigned different currency
   # The default value is false

data/lib/money-rails/active_record/migration_extensions/schema_statements_pg_rails4.rb

@@ -11,8 +11,8 @@ module MoneyRails
 
         def remove_monetize(table_name, accessor, options={})
           [:amount, :currency].each do |attribute|
-            column_present, table_name, column_name, _, _ =  OptionsExtractor.extract attribute, table_name, accessor, options
-            remove_column table_name, column_name if column_present
+            column_present, table_name, column_name, type, _ =  OptionsExtractor.extract attribute, table_name, accessor, options
+            remove_column table_name, column_name, type if column_present
           end
         end
       end

data/lib/money-rails/money.rb

@@ -21,4 +21,9 @@ class Money
       rules
     end
   end
+
+  # This is expected to be called by ActiveSupport when calling as_json an Money object
+  def to_hash
+    { cents: cents, currency_iso: currency.iso_code.to_s }
+  end
 end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.13.2'
+  VERSION = '1.13.3'
 end

data/money-rails.gemspec

@@ -36,4 +36,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency 'database_cleaner', '~> 1.6.1'
   s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
+
+  if s.respond_to?(:metadata)
+    s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md'
+    s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money-rails/'
+    s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money-rails/issues'
+  end
 end

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/mongoid_spec.rb

@@ -16,7 +16,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION.split('.').first.to_i > 2
     }
     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"),
@@ -91,7 +91,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION.split('.').first.to_i > 2
         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.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -165,6 +165,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,6 +222,7 @@ files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/money_spec.rb
 - spec/mongoid/mongoid_spec.rb
 - spec/mongoid/two_spec.rb
 - spec/spec_helper.rb
@@ -229,7 +231,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:
@@ -245,8 +250,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.0.3
 signing_key: 
 specification_version: 4
 summary: Money gem integration with Rails
@@ -257,6 +261,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
@@ -313,6 +318,7 @@ test_files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/money_spec.rb
 - spec/mongoid/mongoid_spec.rb
 - spec/mongoid/two_spec.rb
 - spec/spec_helper.rb