money-rails 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 039411253785e557d6b22b2ce90af40767ab9826
-  data.tar.gz: c2cbf81f1876b426f9706d93e28ed76d0fd1511e
+  metadata.gz: 9cdd1a96659e3e98f1e9b94ec3663d0a8aed3ebf
+  data.tar.gz: 24871846cddf01fcd19d237e0d5e76de2cf1ffc8
 SHA512:
-  metadata.gz: d941f2078bbff98816829f488d9c0603b0c8715b7d4fa810e2f4d45c60765f5e4e0a64a7e2d723cbf62624b110bf8d2248067a2d4e09de75e7abb248ce90c82e
-  data.tar.gz: 732c397e937951ba6b557a4d9bd4b4e83b5860dfd24093c576cba5afdc5e1b30a0906f70f12140f77da4205ee72e04d2efb2b270f4859ff3fb07233b5615cf23
+  metadata.gz: f7eb9f737b89fb5f8b04bd6658b856c54863aee31bf745972de8b46d3b5b3be9971389eae9c324e94ac015610f2ebee0a9e507e4e458307472cf1842941d4680
+  data.tar.gz: 80ef14207ac392151dec41179a975e5e14218a0fc7b3a2ddcacbe848afcc8df1592b7478b6a7454ad9ccbaf057e21c8b4b83d8cf59dbe4b0ffae0f6b96d80748

data/CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 
-## master (next release)
+## 1.5.0
+
+- Respect Money.use_i18n when validating.
+- Include attribute in validation messages like Rails does.
+- Respect `raise_error_on_money_parsing` before raising a MoneyRails::ActiveRecord::Monetizable::ReadOnlyCurrencyException.
+
+## 1.4.1
+
+ - validator was looking for monetizable_attributes using a symbol key, when the keys are all strings. Asserted string key values in rspec and changed validator to look for a string key.
+ - make monetized_attribute hash comparison order independent
+ - Isolate class used for the monetized_attributes tests to prevent cross-contamination
+ - add gem tasks
+
+## 1.4.0
+
+- Fix validation failing when both superclass and subclass use monetize macros and any of them validates any field
+- Extract db adapter without open connection on load
+- Add support for field currency values to be determined by lambda.
+- Simplify validation options
+- Test for skipping validations separately from each other
+- Instead of requiring either the PG version or the non, always require the PG version and only fail to require the non when using PG, that way monetize will always work and money is supported for backwards compat. This way you can have a system with sqlite for dev and pg for production, for instance, and things still work.
+- Refactor monetized_attributes
+- updating db/schema.rb
+- DRYing migration extensions
+- Testing against latest ruby version
+- Include postgres specific code also when adaptor = postgis.
+- chore(add read only exception class)
+- tiny schema change
 
 ## 1.3.0
 

data/README.md

@@ -1,4 +1,4 @@
-# RubyMoney - Money-Rails [![endorse](http://api.coderwall.com/alup/endorsecount.png)](http://coderwall.com/alup)
+# RubyMoney - Money-Rails
 
 [![Gem Version](https://badge.fury.io/rb/money-rails.svg)](http://badge.fury.io/rb/money-rails)
 [![Build Status](https://secure.travis-ci.org/RubyMoney/money-rails.svg?branch=master)](http://travis-ci.org/RubyMoney/money-rails)
@@ -268,7 +268,7 @@ end
 Now ```product.discount``` and ```product.bonus``` will return a `Money`
 object using EUR as their currency, instead of the default USD.
 
-(This is not availabe in  Mongoid).
+(This is not available in  Mongoid).
 
 #### Attribute Currency (:with_currency)
 
@@ -299,8 +299,8 @@ currency, whereas ```product.discount.currency_as_string # => EUR ```
 #### Instance Currencies
 
 All the previous options do not require any extra model fields to hold
-the currency values. If the currency of a field with vary from
-once model instance to another, then you should add a column called ```currency```
+the currency values. If the currency of a field will vary from
+one model instance to another, then you should add a column called ```currency```
 to your database table and pass the option ```with_model_currency```
 to the ```monetize``` macro.
 
@@ -317,8 +317,8 @@ class Transaction < ActiveRecord::Base
   # Use model level currency
   register_currency :gbp
 
-  monetize :amount_cents, with_model_currency: :amount_currency
-  monetize :tax_cents, with_model_currency: :tax_currency
+  monetize :amount_cents, with_model_currency: :currency
+  monetize :tax_cents, with_model_currency: :currency
 
 end
 
@@ -456,30 +456,28 @@ So `humanized_money` will ignore `config.default_format = { no_cents_if_whole: f
 ### Testing
 
 If you use Rspec there is an test helper implementation.
-Just write `require "money-rails/test_helpers"` in spec_helper.rb and
-`include MoneyRails::TestHelpers` inside a describe block you want to
-use the helper.
+Just write `require "money-rails/test_helpers"` in spec_helper.rb.
 
 * the `monetize` matcher
 
 ```ruby
-monetize(:price_cents).should be_true
+is_expected.to monetize(:price)
 ```
 This will ensure that a column called `price_cents` is being monetized.
 
 ```ruby
-monetize(:price_cents).allow_nil.should be_true
+is_expected.to monetize(:price).allow_nil
 ```
 By using `allow_nil` you can specify money attributes that accept nil values.
 
 ```ruby
-monetize(:price_cents).as(:discount_value).should be_true
+is_expected.to monetize(:price).as(:discount_value)
 ```
 By using `as` chain you can specify the exact name to which a monetized
 column is being mapped.
 
 ```ruby
-monetize(:price_cents).with_currency(:gbp).should be_true
+is_expected.to monetize(:price).with_currency(:gbp)
 ```
 
 By using the `with_currency` chain you can specify the expected currency

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
-load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
+load 'rails/tasks/engine.rake' if File.exist?(APP_RAKEFILE)
 
 require 'rake'
 require 'rspec/core/rake_task'

data/config/locales/money.en.yml

@@ -1,5 +1,5 @@
 en:
   errors:
     messages:
-      invalid_currency: Must be a valid currency (eg. '100', '5%{decimal}24', or '123%{thousands}456%{decimal}78'). Got %{currency}
+      invalid_currency: must be a valid currency (eg. '100', '5%{decimal}24', or '123%{thousands}456%{decimal}78'). Got %{currency}
 

data/lib/generators/templates/money.rb

@@ -67,4 +67,11 @@ MoneyRails.configure do |config|
   #   :symbol => nil,
   #   :sign_before_symbol => nil
   # }
+
+  # Set default raise_error_on_money_parsing option
+  # It will be raise error if assigned different currency
+  # The default value is false
+  #
+  # Example:
+  # config.raise_error_on_money_parsing = false
 end

data/lib/money-rails/active_model/validator.rb

@@ -1,7 +1,7 @@
 module MoneyRails
   module ActiveModel
     class MoneyValidator < ::ActiveModel::Validations::NumericalityValidator
-      def validate_each(record, attr, value)
+      def validate_each(record, attr, _value)
         reset_memoized_variables!
         @record = record
         @attr = attr
@@ -22,19 +22,23 @@ module MoneyRails
 
         return if options[:allow_nil] && @raw_value.nil?
 
-        # Skip normalization for Numeric values
-        # which can directly be handled by NumericalityValidator
-        if raw_value_is_non_numeric
-          # remove currency symbol, and negative sign
-          @raw_value = @raw_value.to_s.strip.gsub(symbol, "")
-
-          add_error and return if value_has_too_many_decimal_points
-          add_error if invalid_thousands_separation
+        # Set this before we modify @raw_value below.
+        stringy = @raw_value.present? && !@raw_value.is_a?(Numeric)
 
+        if stringy
+          # remove currency symbol
+          @raw_value = @raw_value.to_s.gsub(symbol, "")
         end
 
         normalize_raw_value!
         super(@record, @attr, @raw_value)
+
+        if stringy and not @record.errors.added?(@attr, :not_a_number)
+          add_error if
+            value_has_too_many_decimal_points or
+            thousand_separator_after_decimal_mark or
+            invalid_thousands_separation
+        end
       end
 
       private
@@ -43,7 +47,7 @@ module MoneyRails
         [:currency, :decimal_mark, :thousands_separator, :symbol,
           :abs_raw_value, :decimal_pieces, :pieces_array].each do |var_name|
           ivar_name = :"@_#{var_name}"
-          remove_instance_variable(ivar_name) if instance_variable_get(ivar_name)
+          remove_instance_variable(ivar_name) if instance_variable_defined?(ivar_name)
         end
       end
 
@@ -52,30 +56,32 @@ module MoneyRails
       end
 
       def decimal_mark
-        @_decimal_mark ||= I18n.t('number.currency.format.separator', default: currency.decimal_mark)
+        character = currency.decimal_mark || '.'
+        @_decimal_mark ||= Money.use_i18n ? I18n.t('number.currency.format.separator', default: character) : character
       end
 
       def thousands_separator
-        @_thousands_separator ||= I18n.t('number.currency.format.delimiter', default: currency.thousands_separator)
+        character = currency.thousands_separator || ','
+        @_thousands_separator ||= Money.use_i18n ? I18n.t('number.currency.format.delimiter', default: character) : character
       end
 
       def symbol
-        @_symbol ||= I18n.t('number.currency.format.unit', default: currency.symbol)
-      end
-
-      def raw_value_is_non_numeric
-        @raw_value.present? && !@raw_value.is_a?(Numeric)
+        @_symbol ||= Money.use_i18n ? I18n.t('number.currency.format.unit', default: currency.symbol) : currency.symbol
       end
 
       def abs_raw_value
-        @_abs_raw_value ||= @raw_value.strip.sub(/^-/, "")
+        @_abs_raw_value ||= @raw_value.to_s.sub(/^\s*-/, "").strip
       end
 
       def add_error
-        @record.errors.add(@attr, I18n.t('errors.messages.invalid_currency',
-                                       { :thousands => thousands_separator,
-                                         :decimal => decimal_mark,
-                                         :currency => abs_raw_value }))
+        attr_name = @attr.to_s.tr('.', '_').humanize
+        attr_name = @record.class.human_attribute_name(@attr, default: attr_name)
+
+        @record.errors.add(@attr, :invalid_currency,
+                           { :thousands => thousands_separator,
+                             :decimal => decimal_mark,
+                             :currency => abs_raw_value,
+                             :attribute => attr_name })
       end
 
       def decimal_pieces
@@ -90,6 +96,10 @@ module MoneyRails
         @_pieces_array ||= decimal_pieces[0].split(thousands_separator.presence)
       end
 
+      def thousand_separator_after_decimal_mark
+        thousands_separator.present? && decimal_pieces.length == 2 && decimal_pieces[1].include?(thousands_separator)
+      end
+
       def invalid_thousands_separation
         return false if pieces_array.length <= 1
         return true  if pieces_array[0].length > 3
@@ -101,6 +111,10 @@ module MoneyRails
       # Remove thousands separators, normalize decimal mark,
       # remove whitespaces and _ (E.g. 99 999 999 or 12_300_200.20)
       def normalize_raw_value!
+        # Cache abs_raw_value before normalizing because it's used in
+        # many places and relies on the original @raw_value.
+        abs_raw_value
+
         @raw_value = @raw_value.to_s
           .gsub(thousands_separator, '')
           .gsub(decimal_mark, '.')

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

@@ -9,7 +9,7 @@ module MoneyRails
           default[:table_name] = table_name
 
           excluded_keys = [:amount, :currency, :type, :prefix, :postfix, :present, :column_name, :table_name]
-          default[:options] = default.except *excluded_keys
+          default[:options] = default.except(*excluded_keys)
 
           default.slice(:present, :table_name, :column_name, :type, :options).values
         end

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

@@ -5,7 +5,7 @@ module MoneyRails
         def add_monetize(table_name, accessor, options={})
           [:amount, :currency].each do |attribute|
             column_present, *opts = OptionsExtractor.extract attribute, table_name, accessor, options
-            add_column *opts if column_present
+            add_column(*opts) if column_present
           end
         end
 

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

@@ -5,7 +5,7 @@ module MoneyRails
         def monetize(accessor, options={})
           [:amount, :currency].each do |attribute|
             column_present, _, *opts = OptionsExtractor.extract attribute, :no_table, accessor, options
-            column *opts if column_present
+            column(*opts) if column_present
           end
         end
 

data/lib/money-rails/active_record/monetizable.rb

@@ -80,15 +80,15 @@ module MoneyRails
             #     :numericality => {
             #       :greater_than_or_equal_to => 0,
             #       :less_than_or_equal_to => 100,
-            #       :message => "Must be greater than zero and less than $100"
+            #       :message => "must be greater than zero and less than $100"
             #     }
             #
             # To disable validation entirely, use :disable_validation, E.g:
             #   monetize :price_in_a_range_cents, :disable_validation => true
-            if validation_enabled = MoneyRails.include_validations && !options[:disable_validation]
+            if (validation_enabled = MoneyRails.include_validations && !options[:disable_validation])
 
               # This is a validation for the subunit
-              if subunit_numericality = options.fetch(:subunit_numericality, true)
+              if (subunit_numericality = options.fetch(:subunit_numericality, true))
                 validates subunit_name, {
                   :allow_nil => options[:allow_nil],
                   :numericality => subunit_numericality
@@ -96,7 +96,7 @@ module MoneyRails
               end
 
               # Allow only Money objects or Numeric values!
-              if numericality = options.fetch(:numericality, true)
+              if (numericality = options.fetch(:numericality, true))
                 validates name.to_sym, {
                   :allow_nil => options[:allow_nil],
                   'money_rails/active_model/money' => numericality
@@ -117,14 +117,26 @@ module MoneyRails
               memoized = instance_variable_get("@#{name}")
 
               # Dont create a new Money instance if the values haven't been changed.
-              return memoized if memoized && memoized.cents == amount &&
+              if memoized && memoized.cents == amount &&
                 memoized.currency == attr_currency
+                result =  memoized
+              else
+                # If amount is NOT nil (or empty string) load the amount in a Money
+                amount = Money.new(amount, attr_currency) unless amount.blank?
+
+                # Cache the value (it may be nil)
+                result = instance_variable_set "@#{name}", amount
+              end
 
-              # If amount is NOT nil (or empty string) load the amount in a Money
-              amount = Money.new(amount, attr_currency) unless amount.blank?
+              if MoneyRails::Configuration.preserve_user_input
+                value_before_type_cast = instance_variable_get "@#{name}_money_before_type_cast"
+                unless errors[name.to_sym].blank?
+                  result.define_singleton_method(:to_s) { value_before_type_cast }
+                  result.define_singleton_method(:format) { |_| value_before_type_cast }
+                end
+              end
 
-              # Cache and return the value (it may be nil)
-              instance_variable_set "@#{name}", amount
+              result
             end
 
             define_method "#{name}=" do |value|
@@ -173,12 +185,13 @@ module MoneyRails
               money_currency = money.try(:currency)
 
               # Update currency iso value if there is an instance currency attribute
-              if instance_currency_name.present? && respond_to?("#{instance_currency_name}=")
+              if instance_currency_name.present? && respond_to?("#{instance_currency_name}=") && money_currency
                 public_send("#{instance_currency_name}=", money_currency.try(:iso_code))
               else
                 current_currency = public_send("currency_for_#{name}")
                 if money_currency && current_currency != money_currency.id
-                  raise ReadOnlyCurrencyException.new("Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'")
+                  raise ReadOnlyCurrencyException.new("Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'") if MoneyRails.raise_error_on_money_parsing
+                  return nil
                 end
               end
 
@@ -196,7 +209,9 @@ module MoneyRails
             end
 
             define_method "currency_for_#{name}" do
-              instance_currency_name_with_postfix = "#{name}#{MoneyRails::Configuration.currency_column[:postfix]}"
+              if MoneyRails::Configuration.currency_column[:postfix].present?
+                instance_currency_name_with_postfix = "#{name}#{MoneyRails::Configuration.currency_column[:postfix]}"
+              end
 
               if instance_currency_name.present? && respond_to?(instance_currency_name) &&
                   Money::Currency.find(public_send(instance_currency_name))
@@ -206,8 +221,9 @@ module MoneyRails
                 Money::Currency.find(field_currency_name.call(self))
               elsif field_currency_name
                 Money::Currency.find(field_currency_name)
-              elsif respond_to?(instance_currency_name_with_postfix) &&
-                  Money::Currency.find(public_send(instance_currency_name_with_postfix))
+              elsif instance_currency_name_with_postfix.present? &&
+                     respond_to?(instance_currency_name_with_postfix) &&
+                     Money::Currency.find(public_send(instance_currency_name_with_postfix))
 
                 Money::Currency.find(public_send(instance_currency_name_with_postfix))
               elsif self.class.respond_to?(:currency)

data/lib/money-rails/configuration.rb

@@ -97,5 +97,9 @@ module MoneyRails
     # is going to be converted to a Money object.
     mattr_accessor :raise_error_on_money_parsing
     @@raise_error_on_money_parsing = false
+
+    #Configure whether to maintain invalid user input after validations
+    mattr_accessor :preserve_user_input
+    @@preserve_user_input = false
   end
 end

data/lib/money-rails/money.rb

@@ -2,8 +2,9 @@ require "active_support/core_ext/module/aliasing.rb"
 require "active_support/core_ext/hash/reverse_merge.rb"
 
 class Money
+  alias_method :orig_format, :format
 
-  def format_with_settings(*rules)
+  def format(*rules)
     rules = normalize_formatting_rules(rules)
 
     # Apply global defaults for money only for non-nil values
@@ -11,7 +12,7 @@ class Money
       no_cents_if_whole: MoneyRails::Configuration.no_cents_if_whole,
       symbol: MoneyRails::Configuration.symbol,
       sign_before_symbol: MoneyRails::Configuration.sign_before_symbol
-    }.reject { |k,v| v.nil? }
+    }.reject { |_k, v| v.nil? }
 
     rules.reverse_merge!(defaults)
 
@@ -19,9 +20,7 @@ class Money
       rules.reverse_merge!(MoneyRails::Configuration.default_format)
     end
 
-    format_without_settings(rules)
+    orig_format(rules)
   end
 
-  alias_method_chain :format, :settings
-
 end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-    VERSION = "1.4.1"
+    VERSION = "1.5.0"
 end

data/money-rails.gemspec

@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.5.0"
-  s.add_dependency "monetize",      "~> 1.1.0"
+  s.add_dependency "money",         "~> 6.6"
+  s.add_dependency "monetize",      "~> 1.3.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
 
   s.add_development_dependency "rails",       ">= 3.0"
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency 'database_cleaner', ['>= 0.8.0', '< 1.4.0']
-  s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION =~ /^2\.2/
+  s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
 end

data/spec/active_record/monetizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 class Sub < Product; end
@@ -75,19 +77,12 @@ if defined? ActiveRecord
         expect(product.price_cents).to eq(215)
       end
 
-      it "should raise error if can't change currency" do
-        product = Product.new
-        expect {
-          product.price = Money.new(10, "RUB")
-        }.to raise_error(MoneyRails::ActiveRecord::Monetizable::ReadOnlyCurrencyException, "Can't change readonly currency 'USD' to 'RUB' for field 'price'")
-      end
-
       it "raises an error if trying to create two attributes with the same name" do
         expect do
           class Product
             monetize :discount, as: :price
           end
-        end.to raise_error
+        end.to raise_error ArgumentError
       end
 
       it "allows subclass to redefine attribute with the same name" do
@@ -130,7 +125,13 @@ if defined? ActiveRecord
         after { MoneyRails.raise_error_on_money_parsing = false }
 
         it "raises exception when a String value with hyphen is assigned" do
-          expect { product.accessor_price = "10-235" }.to raise_error
+          expect { product.accessor_price = "10-235" }.to raise_error ArgumentError
+        end
+
+        it "raises an exception if it can't change currency" do
+          expect {
+            Product.new.price = Money.new(10, "RUB")
+          }.to raise_error(MoneyRails::ActiveRecord::Monetizable::ReadOnlyCurrencyException, "Can't change readonly currency 'USD' to 'RUB' for field 'price'")
         end
       end
 
@@ -138,6 +139,10 @@ if defined? ActiveRecord
         it "does not raise exception when a String value with hyphen is assigned" do
           expect { product.accessor_price = "10-235" }.not_to raise_error
         end
+
+        it "does not raise exception if it can't change currency" do
+          expect { Product.new.price = Money.new(10, "RUB") }.not_to raise_error
+        end
       end
 
       it "respects numericality validation when using update_attributes" do
@@ -170,24 +175,33 @@ if defined? ActiveRecord
       it "fails validation with the proper error message if money value is invalid decimal" do
         product.price = "12.23.24"
         expect(product.save).to be_falsey
-        expect(product.errors[:price].first).to match(/Must be a valid/)
-        expect(product.errors[:price].first).to match(/Got 12.23.24/)
+        expect(product.errors[:price].size).to eq(1)
+        expect(product.errors[:price].first).to match(/not a number/)
       end
 
       it "fails validation with the proper error message if money value is nothing but periods" do
         product.price = "..."
         expect(product.save).to be_falsey
-        expect(product.errors[:price].first).to match(/Must be a valid/)
-        expect(product.errors[:price].first).to match(/Got .../)
+        expect(product.errors[:price].size).to eq(1)
+        expect(product.errors[:price].first).to match(/not a number/)
       end
 
       it "fails validation with the proper error message if money value has invalid thousands part" do
         product.price = "12,23.24"
         expect(product.save).to be_falsey
-        expect(product.errors[:price].first).to match(/Must be a valid/)
+        expect(product.errors[:price].size).to eq(1)
+        expect(product.errors[:price].first).to match(/must be a valid/)
         expect(product.errors[:price].first).to match(/Got 12,23.24/)
       end
 
+      it "fails validation with the proper error message if money value has thousand char after decimal mark" do
+        product.price = "1.234,56"
+        expect(product.save).to be_falsey
+        expect(product.errors[:price].size).to eq(1)
+        expect(product.errors[:price].first).to match(/must be a valid/)
+        expect(product.errors[:price].first).to match(/Got 1.234,56/)
+      end
+
       it "allows an empty string as the thousands separator" do
         begin
           I18n.locale = 'en-US'
@@ -217,15 +231,18 @@ if defined? ActiveRecord
       it "fails validation with the proper error message using numericality validations" do
         product.price_in_a_range = "-12"
         expect(product.valid?).to be_falsey
-        expect(product.errors[:price_in_a_range].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:price_in_a_range].size).to eq(1)
+        expect(product.errors[:price_in_a_range].first).to match(/must be greater than zero and less than \$100/)
 
         product.price_in_a_range = Money.new(-1200, "USD")
         expect(product.valid?).to be_falsey
-        expect(product.errors[:price_in_a_range].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:price_in_a_range].size).to eq(1)
+        expect(product.errors[:price_in_a_range].first).to match(/must be greater than zero and less than \$100/)
 
         product.price_in_a_range = "0"
         expect(product.valid?).to be_falsey
-        expect(product.errors[:price_in_a_range].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:price_in_a_range].size).to eq(1)
+        expect(product.errors[:price_in_a_range].first).to match(/must be greater than zero and less than \$100/)
 
         product.price_in_a_range = "12"
         expect(product.valid?).to be_truthy
@@ -235,11 +252,13 @@ if defined? ActiveRecord
 
         product.price_in_a_range = "101"
         expect(product.valid?).to be_falsey
-        expect(product.errors[:price_in_a_range].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:price_in_a_range].size).to eq(1)
+        expect(product.errors[:price_in_a_range].first).to match(/must be greater than zero and less than \$100/)
 
         product.price_in_a_range = Money.new(10100, "USD")
         expect(product.valid?).to be_falsey
-        expect(product.errors[:price_in_a_range].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:price_in_a_range].size).to eq(1)
+        expect(product.errors[:price_in_a_range].first).to match(/must be greater than zero and less than \$100/)
       end
 
       it "fails validation if linked attribute changed" do
@@ -254,15 +273,18 @@ if defined? ActiveRecord
       it "fails validation with the proper error message using validates :money" do
         product.validates_method_amount = "-12"
         expect(product.valid?).to be_falsey
-        expect(product.errors[:validates_method_amount].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:validates_method_amount].size).to eq(1)
+        expect(product.errors[:validates_method_amount].first).to match(/must be greater than zero and less than \$100/)
 
         product.validates_method_amount = Money.new(-1200, "USD")
         expect(product.valid?).to be_falsey
-        expect(product.errors[:validates_method_amount].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:validates_method_amount].size).to eq(1)
+        expect(product.errors[:validates_method_amount].first).to match(/must be greater than zero and less than \$100/)
 
         product.validates_method_amount = "0"
         expect(product.valid?).to be_falsey
-        expect(product.errors[:validates_method_amount].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:validates_method_amount].size).to eq(1)
+        expect(product.errors[:validates_method_amount].first).to match(/must be greater than zero and less than \$100/)
 
         product.validates_method_amount = "12"
         expect(product.valid?).to be_truthy
@@ -272,20 +294,24 @@ if defined? ActiveRecord
 
         product.validates_method_amount = "101"
         expect(product.valid?).to be_falsey
-        expect(product.errors[:validates_method_amount].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:validates_method_amount].size).to eq(1)
+        expect(product.errors[:validates_method_amount].first).to match(/must be greater than zero and less than \$100/)
 
         product.validates_method_amount = Money.new(10100, "USD")
         expect(product.valid?).to be_falsey
-        expect(product.errors[:validates_method_amount].first).to match(/Must be greater than zero and less than \$100/)
+        expect(product.errors[:validates_method_amount].size).to eq(1)
+        expect(product.errors[:validates_method_amount].first).to match(/must be greater than zero and less than \$100/)
       end
 
       it "fails validation with the proper error message on the cents field " do
         product.price_in_a_range = "-12"
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price_in_a_range_cents].size).to eq(1)
         expect(product.errors[:price_in_a_range_cents].first).to match(/greater than 0/)
 
         product.price_in_a_range = "0"
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price_in_a_range_cents].size).to eq(1)
         expect(product.errors[:price_in_a_range_cents].first).to match(/greater than 0/)
 
         product.price_in_a_range = "12"
@@ -293,24 +319,29 @@ if defined? ActiveRecord
 
         product.price_in_a_range = "101"
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price_in_a_range_cents].size).to eq(1)
         expect(product.errors[:price_in_a_range_cents].first).to match(/less than or equal to 10000/)
       end
 
       it "fails validation when a non number string is given" do
         product = Product.create(:price_in_a_range => "asd")
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price_in_a_range].size).to eq(1)
         expect(product.errors[:price_in_a_range].first).to match(/greater than zero/)
 
         product = Product.create(:price_in_a_range => "asd23")
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price_in_a_range].size).to eq(1)
         expect(product.errors[:price_in_a_range].first).to match(/greater than zero/)
 
         product = Product.create(:price => "asd")
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price].size).to eq(1)
         expect(product.errors[:price].first).to match(/is not a number/)
 
         product = Product.create(:price => "asd23")
         expect(product.valid?).to be_falsey
+        expect(product.errors[:price].size).to eq(1)
         expect(product.errors[:price].first).to match(/is not a number/)
       end
 
@@ -336,6 +367,21 @@ if defined? ActiveRecord
         expect(product.save).to be_truthy
       end
 
+      describe "with preserve_user_input set" do
+        around(:each) do |example|
+          old_value = MoneyRails::Configuration.preserve_user_input
+          MoneyRails::Configuration.preserve_user_input = true
+          example.run
+          MoneyRails::Configuration.preserve_user_input = false
+        end
+
+        it "preserves user input if validation fails" do
+          product.price = "14,0"
+          expect(product.save).to be_falsy
+          expect(product.price.to_s).to eq("14,0")
+        end
+      end
+
       it "respects numericality validation when using update_attributes on money attribute" do
         expect(product.update_attributes(:price => "some text")).to be_falsey
         expect(product.update_attributes(:price => Money.new(320, 'USD'))).to be_truthy
@@ -639,6 +685,79 @@ if defined? ActiveRecord
           expect(transaction.total).to eq(Money.new(3000, :usd))
         end
 
+        it "allows currency column postfix to be blank" do
+          allow(MoneyRails::Configuration).to receive(:currency_column) { { postfix: nil, column_name: 'currency' } }
+          expect(dummy_product_with_nil_currency.price.currency).to eq(Money::Currency.find(:gbp))
+        end
+
+        context "and field with allow_nil: true" do
+          it "doesn't set currency to nil when setting the field to nil" do
+            t = Transaction.new(:amount_cents => 2500, :currency => "CAD")
+            t.optional_amount = nil
+            expect(t.currency).to eq("CAD")
+          end
+        end
+
+        context "and an Italian locale" do
+          around(:each) do |example|
+            I18n.with_locale(:it) do
+              example.run
+            end
+          end
+
+          context "when use_i18n is true" do
+            it "validates with the locale's decimal mark" do
+              transaction.amount = "123,45"
+              expect(transaction.valid?).to be_truthy
+            end
+
+            it "does not validate with the currency's decimal mark" do
+              transaction.amount = "123.45"
+              expect(transaction.valid?).to be_falsey
+            end
+
+            it "validates with the locale's currency symbol" do
+              transaction.amount = "€123"
+              expect(transaction.valid?).to be_truthy
+            end
+
+            it "does not validate with the transaction's currency symbol" do
+              transaction.amount = "$123.45"
+              expect(transaction.valid?).to be_falsey
+            end
+          end
+
+          context "when use_i18n is false" do
+            around(:each) do |example|
+              begin
+                Money.use_i18n = false
+                example.run
+              ensure
+                Money.use_i18n = true
+              end
+            end
+
+            it "does not validate with the locale's decimal mark" do
+              transaction.amount = "123,45"
+              expect(transaction.valid?).to be_falsey
+            end
+
+            it "validates with the currency's decimal mark" do
+              transaction.amount = "123.45"
+              expect(transaction.valid?).to be_truthy
+            end
+
+            it "does not validate with the locale's currency symbol" do
+              transaction.amount = "€123"
+              expect(transaction.valid?).to be_falsey
+            end
+
+            it "validates with the transaction's currency symbol" do
+              transaction.amount = "$123"
+              expect(transaction.valid?).to be_truthy
+            end
+          end
+        end
       end
     end
 

data/spec/configuration_spec.rb

@@ -13,8 +13,8 @@ describe "configuration" do
     end
 
     it "adds exchange rates given in config initializer" do
-      expect(Money.us_dollar(100).exchange_to("CAD")).to eq(Money.new(124, "CAD"))
-      expect(Money.ca_dollar(100).exchange_to("USD")).to eq(Money.new(80, "USD"))
+      expect(Money.us_dollar(100).bank.get_rate('USD', 'CAD')).to eq(1.24515)
+      expect(Money.ca_dollar(100).bank.get_rate('CAD', 'USD')).to eq(0.803115)
     end
 
     it "sets no_cents_if_whole value for formatted output globally" do

data/spec/dummy/app/models/product.rb

@@ -28,14 +28,14 @@ class Product < ActiveRecord::Base
   :numericality => {
     :greater_than => 0,
     :less_than_or_equal_to => 100,
-    :message => "Must be greater than zero and less than $100"
+    :message => "must be greater than zero and less than $100"
   }
 
   # Skip validations separately from each other
   monetize :skip_validation_price_cents, subunit_numericality: false, numericality: false, allow_nil: true
 
   # Override default currency (EUR) with a specific one (CAD) for this field only, from a lambda
-  monetize :lambda_price_cents, with_currency: ->(product) { Rails.configuration.lambda_test }, allow_nil: true
+  monetize :lambda_price_cents, with_currency: ->(_product) { Rails.configuration.lambda_test }, allow_nil: true
 
   attr_accessor :accessor_price_cents
   monetize :accessor_price_cents, disable_validation: true
@@ -45,7 +45,7 @@ class Product < ActiveRecord::Base
   validates :validates_method_amount, :money => {
     :greater_than => 0,
     :less_than_or_equal_to => ->(product) { product.optional_price.to_f },
-    :message => 'Must be greater than zero and less than $100',
+    :message => 'must be greater than zero and less than $100',
   }, allow_nil: true
 
   alias_attribute :renamed_cents, :aliased_cents

data/spec/dummy/app/models/transaction.rb

@@ -5,6 +5,8 @@ class Transaction < ActiveRecord::Base
 
   monetize :total_cents, :with_model_currency => :currency
 
+  monetize :optional_amount_cents, :with_model_currency => :currency, :allow_nil => true
+
   def total_cents
     return amount_cents + tax_cents
   end

data/spec/dummy/config/boot.rb

@@ -8,6 +8,6 @@ unless ENV['BUNDLE_GEMFILE']
 	ENV['BUNDLE_GEMFILE'] ||= gemfile
 end
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 $:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/production.rb

@@ -15,7 +15,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

data/spec/dummy/config/locales/it.yml

@@ -0,0 +1,11 @@
+it:
+  number:
+    currency:
+      format:
+        delimiter: "."
+        format: "%n %u"
+        precision: 2
+        separator: ","
+        significant: false
+        strip_insignificant_zeros: false
+        unit: "€"

data/spec/dummy/db/migrate/20151026220420_add_optional_amount_to_transactions.rb

@@ -0,0 +1,5 @@
+class AddOptionalAmountToTransactions < ActiveRecord::Migration
+  def change
+    add_column :transactions, :optional_amount_cents, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150303222230) do
+ActiveRecord::Schema.define(version: 20151026220420) do
 
   create_table "dummy_products", force: :cascade do |t|
     t.string   "currency"
@@ -54,6 +54,7 @@ ActiveRecord::Schema.define(version: 20150303222230) do
     t.string   "currency"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "optional_amount_cents"
   end
 
 end

data/spec/mongoid/four_spec.rb

@@ -41,11 +41,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
         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
+          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
         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
+          expect { priceable_from_string_with_unknown_currency }.to raise_error ArgumentError
         end
       end
 
@@ -96,9 +96,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
       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
+
+      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 => [])

data/spec/mongoid/three_spec.rb

@@ -41,11 +41,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
         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
+          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
         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
+          expect { priceable_from_string_with_unknown_currency }.to raise_error ArgumentError
         end
       end
 
@@ -96,9 +96,10 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
       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
+      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 => [])

data/spec/mongoid/two_spec.rb

@@ -45,7 +45,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
         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
+          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
         end
       end
 
@@ -60,9 +60,10 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
       subject { priceable.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
+      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 => [])

data/spec/test_helpers_spec.rb

@@ -18,7 +18,7 @@ if defined? ActiveRecord
       shared_context "monetize matcher" do
 
         it "matches model attribute without a '_cents' suffix by default" do
-          is_expected.to monetize(:price_cents)
+          is_expected.to monetize(:price)
         end
 
         it "matches model attribute specified by :as chain" do
@@ -34,7 +34,7 @@ if defined? ActiveRecord
         end
 
         it "matches model attribute with currency specified by :with_currency chain" do
-          is_expected.to monetize(:bonus_cents).with_currency(:gbp)
+          is_expected.to monetize(:bonus).with_currency(:gbp)
         end
 
         it "does not match non existed attribute" do
@@ -42,11 +42,11 @@ if defined? ActiveRecord
         end
 
         it "does not match wrong currency iso" do
-          is_expected.not_to monetize(:bonus_cents).with_currency(:usd)
+          is_expected.not_to monetize(:bonus).with_currency(:usd)
         end
 
         it "does not match wrong money attribute name" do
-          is_expected.not_to monetize(:bonus_cents).as(:bonussss)
+          is_expected.not_to monetize(:bonus).as(:bonussss)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: '6.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -183,6 +197,7 @@ files:
 - spec/dummy/config/locales/en-GB.yml
 - spec/dummy/config/locales/en-US.yml
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/it.yml
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20120331190108_create_products.rb
@@ -200,6 +215,7 @@ files:
 - spec/dummy/db/migrate/20150213234410_add_special_price_to_products.rb
 - spec/dummy/db/migrate/20150217222612_add_lambda_price_to_products.rb
 - spec/dummy/db/migrate/20150303222230_add_skip_validation_price_cents_to_products.rb
+- spec/dummy/db/migrate/20151026220420_add_optional_amount_to_transactions.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/structure.sql
 - spec/dummy/public/404.html
@@ -235,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Money gem integration with Rails
@@ -274,6 +290,7 @@ test_files:
 - spec/dummy/config/locales/en-GB.yml
 - spec/dummy/config/locales/en-US.yml
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/it.yml
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20120331190108_create_products.rb
@@ -291,6 +308,7 @@ test_files:
 - spec/dummy/db/migrate/20150213234410_add_special_price_to_products.rb
 - spec/dummy/db/migrate/20150217222612_add_lambda_price_to_products.rb
 - spec/dummy/db/migrate/20150303222230_add_skip_validation_price_cents_to_products.rb
+- spec/dummy/db/migrate/20151026220420_add_optional_amount_to_transactions.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/structure.sql
 - spec/dummy/public/404.html