money-rails 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43aea3acfffc9b52e9d127a1c40ff582b68fbe71
-  data.tar.gz: a7f43a08d717c6f786e94bbf33c6952001816b97
+  metadata.gz: 37b04a7be15864c3d863599f9459d060fb4438ee
+  data.tar.gz: 60663ea37c3f404e17af412b7243d7dfc1844c72
 SHA512:
-  metadata.gz: 2a104c9d3cb7ba768d8c627e4b34d77d5f31b35bb3a8f414b5a1f2d1548447fae817e2784f41e83acc0ff4a41cb56d7dc7c4b5b0b0f1b95a88ef936e4a735387
-  data.tar.gz: 5e6fe0700129072ff2b0f44276223b3540c90eb5d015f6b30b345f3397b7ae44e39cd9e8877075c3047ea63a9e24093589104d0fe874f56f4bf3849b14b0562c
+  metadata.gz: c0c1209bf5dbbae3363bd3ef19bd5dd0e4685357a874f8074e0a1948b40ebe55da05248aa90c335cdea61b5af0ab1a125239b1a275cbccff0ea0876a7d880de6
+  data.tar.gz: 110bd949e2b5077755d4f736e91e46167d6fc7e89ffadfd2f78cd6777b0730def9c9c2c811697a4eac059678a6ca73fe7c2220c0b058aeed250ac5aa8cdc75f0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.11.0
+
+- Bump money version to ~> 6.11.0
+- Add test helper for with_model_currency
+- Fix empty validation errors from being assigned
+
 ## 1.10.0
 
 - Bump money version to ~> 6.10.0

data/README.md

@@ -76,7 +76,7 @@ money attribute, then you can provide an ```as``` argument with a string
 value to the ```monetize``` macro:
 
 ```ruby
-monetize :discount_subunit, :as => "discount"
+monetize :discount_subunit, as: "discount"
 ```
 
 Now the model objects will have a ```discount``` attribute which is a `Money`
@@ -135,7 +135,7 @@ monetized field, you can use the `:allow_nil` parameter:
 
 ```ruby
 # in Product model
-monetize :optional_price_cents, :allow_nil => true
+monetize :optional_price_cents, allow_nil: true
 
 # in Migration
 def change
@@ -166,10 +166,10 @@ You can also pass along
 such as this:
 
 ```ruby
-monetize :price_in_a_range_cents, :allow_nil => true,
-  :numericality => {
-    :greater_than_or_equal_to => 0,
-    :less_than_or_equal_to => 10000
+monetize :price_in_a_range_cents, allow_nil: true,
+  numericality: {
+    greater_than_or_equal_to: 0,
+    less_than_or_equal_to: 10000
   }
 ```
 
@@ -177,14 +177,14 @@ Or, if you prefer, you can skip validations entirely for the attribute. This is
 are aggregate methods and you wish to avoid executing them on every record save.
 
 ```ruby
-monetize :price_in_a_range_cents, :disable_validation => true
+monetize :price_in_a_range_cents, disable_validation: true
 ```
 
 You can also skip validations independently from each other by simply passing `false`
 to the validation you are willing to skip, like this:
 
 ```ruby
-monetize :price_in_a_range_cents, :numericality => false
+monetize :price_in_a_range_cents, numericality: false
 ```
 
 ### Mongoid 2.x and 3.x
@@ -214,14 +214,14 @@ obj.save
 # => true
 
 obj
-# => #<Product _id: 4fe865699671383656000001, _type: nil, price: {:cents=>100, :currency_iso=>"EUR"}>
+# => #<Product _id: 4fe865699671383656000001, _type: nil, price: {cents: 100, currency_iso: "EUR"}>
 
 obj.price
 #=> #<Money cents:100 currency:EUR>
 
 ## You can access the money hash too:
 obj[:price]
-# => {:cents=>100, :currency_iso=>"EUR"}
+# => {cents: 100, currency_iso: "EUR"}
 ```
 
 The usual options on `field` as `index`, `default`, ..., are available.
@@ -292,7 +292,7 @@ class Product < ActiveRecord::Base
   # Use EUR as model level currency
   register_currency :eur
 
-  monetize :discount_subunit, :as => "discount"
+  monetize :discount_subunit, as: "discount"
   monetize :bonus_cents
 
 end
@@ -320,8 +320,8 @@ class Product < ActiveRecord::Base
   # Use EUR as the model level currency
   register_currency :eur
 
-  monetize :discount_subunit, :as => "discount"
-  monetize :bonus_cents, :with_currency => :gbp
+  monetize :discount_subunit, as: "discount"
+  monetize :bonus_cents, with_currency: :gbp
 
 end
 ```
@@ -357,7 +357,7 @@ end
 
 # Now instantiating with a specific currency overrides
 # the model and global currencies
-t = Transaction.new(:amount_cents => 2500, :currency => "CAD")
+t = Transaction.new(amount_cents: 2500, currency: "CAD")
 t.amount == Money.new(2500, "CAD") # true
 ```
 
@@ -413,15 +413,15 @@ MoneyRails.configure do |config|
   #
   # Example:
   # config.register_currency = {
-  #   :priority            => 1,
-  #   :iso_code            => "EU4",
-  #   :name                => "Euro with subunit of 4 digits",
-  #   :symbol              => "€",
-  #   :symbol_first        => true,
-  #   :subunit             => "Subcent",
-  #   :subunit_to_unit     => 10000,
-  #   :thousands_separator => ".",
-  #   :decimal_mark        => ","
+  #   priority:            1,
+  #   iso_code:            "EU4",
+  #   name:                "Euro with subunit of 4 digits",
+  #   symbol:              "€",
+  #   symbol_first:        true,
+  #   subunit:             "Subcent",
+  #   subunit_to_unit:     10000,
+  #   thousands_separator: ".",
+  #   decimal_mark:        ","
   # }
 
   # Specify a rounding mode
@@ -444,9 +444,9 @@ MoneyRails.configure do |config|
   # Example:
   #
   # config.default_format = {
-  #   :no_cents_if_whole => nil,
-  #   :symbol => nil,
-  #   :sign_before_symbol => nil
+  #   no_cents_if_whole: nil,
+  #   symbol: nil,
+  #   sign_before_symbol: nil
   # }
 end
 ```
@@ -516,6 +516,13 @@ is_expected.to monetize(:price).with_currency(:gbp)
 By using the `with_currency` chain you can specify the expected currency
 for the chosen money attribute. (You can also combine all the chains.)
 
+```ruby
+is_expected.to monetize(:price).with_model_currency(:currency)
+```
+
+By using the `with_model_currency` chain you can specify the attribute that
+contains the currency to be used for the chosen money attribute.
+
 For examples on using the test_helpers look at
 [test_helpers_spec.rb](https://github.com/RubyMoney/money-rails/blob/master/spec/test_helpers_spec.rb)
 

data/Rakefile

@@ -21,9 +21,9 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
-task :default => "spec:all"
-task :test => :spec
-task :spec => :prepare_test_env
+task default: "spec:all"
+task test: :spec
+task spec: :prepare_test_env
 
 desc "Prepare money-rails engine test environment"
 task :prepare_test_env do
@@ -79,13 +79,13 @@ namespace :spec do
   task(:rails3) { run_with_gemfile 'gemfiles/rails3.gemfile' }
 
   desc "Run Tests against mongoid 2 & 3 & 4, 5"
-  task :mongoid => [:mongoid2, :mongoid3, :mongoid4, :mongoid5]
+  task mongoid: [:mongoid2, :mongoid3, :mongoid4, :mongoid5]
 
   desc "Run Tests against rails 3 & 4 & 4.1 & 4.2 & 5.0"
-  task :rails => [:rails3, :rails4, :rails41, :rails42, :rails50, :rails51]
+  task rails: [:rails3, :rails4, :rails41, :rails42, :rails50, :rails51]
 
   desc "Run Tests against all ORMs"
-  task :all => [:rails, :mongoid]
+  task all: [:rails, :mongoid]
 
 end
 

data/lib/generators/templates/money.rb

@@ -47,15 +47,15 @@ MoneyRails.configure do |config|
   #
   # Example:
   # config.register_currency = {
-  #   :priority            => 1,
-  #   :iso_code            => "EU4",
-  #   :name                => "Euro with subunit of 4 digits",
-  #   :symbol              => "€",
-  #   :symbol_first        => true,
-  #   :subunit             => "Subcent",
-  #   :subunit_to_unit     => 10000,
-  #   :thousands_separator => ".",
-  #   :decimal_mark        => ","
+  #   priority:            1,
+  #   iso_code:            "EU4",
+  #   name:                "Euro with subunit of 4 digits",
+  #   symbol:              "€",
+  #   symbol_first:        true,
+  #   subunit:             "Subcent",
+  #   subunit_to_unit:     10000,
+  #   thousands_separator: ".",
+  #   decimal_mark:        ","
   # }
 
   # Specify a rounding mode
@@ -78,9 +78,9 @@ MoneyRails.configure do |config|
   # Example:
   #
   # config.default_format = {
-  #   :no_cents_if_whole => nil,
-  #   :symbol => nil,
-  #   :sign_before_symbol => nil
+  #   no_cents_if_whole: nil,
+  #   symbol: nil,
+  #   sign_before_symbol: nil
   # }
 
   # Set default raise_error_on_money_parsing option

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

@@ -23,7 +23,7 @@ module MoneyRails
         return if options[:allow_nil] && @raw_value.nil?
 
         # Set this before we modify @raw_value below.
-        stringy = @raw_value.present? && !@raw_value.is_a?(Numeric)
+        stringy = @raw_value.present? && !@raw_value.is_a?(Numeric) && !@raw_value.is_a?(Money)
 
         if stringy
           # remove currency symbol
@@ -33,7 +33,7 @@ module MoneyRails
         normalize_raw_value!
         super(@record, @attr, @raw_value)
 
-        if stringy and not @record.errors.added?(@attr, :not_a_number)
+        if stringy and record_does_not_have_error?
           add_error if
             value_has_too_many_decimal_points or
             thousand_separator_after_decimal_mark or
@@ -43,6 +43,11 @@ module MoneyRails
 
       private
 
+      def record_does_not_have_error?
+        return true unless @record.errors.has_key?(@attr)
+        !@record.errors.added?(@attr, :not_a_number)
+      end
+
       def reset_memoized_variables!
         [:currency, :decimal_mark, :thousands_separator, :symbol,
           :abs_raw_value, :decimal_pieces, :pieces_array].each do |var_name|
@@ -78,10 +83,10 @@ module MoneyRails
         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 })
+                           { thousands: thousands_separator,
+                             decimal: decimal_mark,
+                             currency: abs_raw_value,
+                             attribute: attr_name })
       end
 
       def decimal_pieces

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

@@ -84,33 +84,33 @@ module MoneyRails
             # All the options which are available for Rails numericality
             # validation, are also available for both types.
             # E.g.
-            #   monetize :price_in_a_range_cents, :allow_nil => true,
-            #     :subunit_numericality => {
-            #       :greater_than_or_equal_to => 0,
-            #       :less_than_or_equal_to => 10000,
+            #   monetize :price_in_a_range_cents, allow_nil: true,
+            #     subunit_numericality: {
+            #       greater_than_or_equal_to: 0,
+            #       less_than_or_equal_to: 10000,
             #     },
-            #     :numericality => {
-            #       :greater_than_or_equal_to => 0,
-            #       :less_than_or_equal_to => 100,
-            #       :message => "must be greater than zero and less than $100"
+            #     numericality: {
+            #       greater_than_or_equal_to: 0,
+            #       less_than_or_equal_to: 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
+            #   monetize :price_in_a_range_cents, disable_validation: true
             if (validation_enabled = MoneyRails.include_validations && !options[:disable_validation])
 
               # This is a validation for the subunit
               if (subunit_numericality = options.fetch(:subunit_numericality, true))
                 validates subunit_name, {
-                  :allow_nil => options[:allow_nil],
-                  :numericality => subunit_numericality
+                  allow_nil: options[:allow_nil],
+                  numericality: subunit_numericality
                 }
               end
 
               # Allow only Money objects or Numeric values!
               if (numericality = options.fetch(:numericality, true))
                 validates name.to_sym, {
-                  :allow_nil => options[:allow_nil],
+                  allow_nil: options[:allow_nil],
                   'money_rails/active_model/money' => numericality
                 }
               end

data/lib/money-rails/configuration.rb

@@ -59,10 +59,10 @@ module MoneyRails
     #   MoneyRails.configure do |config|
     #     config.default_bank = EuCentralBank.new
     #   end
-    delegate :default_bank=, :default_bank, :to => :Money
+    delegate :default_bank=, :default_bank, to: :Money
 
     # Provide exchange rates
-    delegate :add_rate, :to => :Money
+    delegate :add_rate, to: :Money
 
     # Use (by default) validation of numericality for each monetized field.
     mattr_accessor :include_validations

data/lib/money-rails/helpers/action_view_extension.rb

@@ -2,18 +2,18 @@ module MoneyRails
   module ActionViewExtension
 
     def currency_symbol
-      content_tag(:span, Money.default_currency.symbol, :class => "currency_symbol")
+      content_tag(:span, Money.default_currency.symbol, class: "currency_symbol")
     end
 
     def humanized_money(value, options={})
       if !options || !options.is_a?(Hash)
-        warn "humanized_money now takes a hash of formatting options, please specify { :symbol => true }"
-        options = { :symbol => options }
+        warn "humanized_money now takes a hash of formatting options, please specify { symbol: true }"
+        options = { symbol: options }
       end
 
       options = {
-        :no_cents_if_whole => MoneyRails::Configuration.no_cents_if_whole.nil? ? true : MoneyRails::Configuration.no_cents_if_whole,
-        :symbol => false
+        no_cents_if_whole: MoneyRails::Configuration.no_cents_if_whole.nil? ? true : MoneyRails::Configuration.no_cents_if_whole,
+        symbol: false
       }.merge(options)
       options.delete(:symbol) if options[:disambiguate]
 
@@ -27,26 +27,26 @@ module MoneyRails
     end
 
     def humanized_money_with_symbol(value, options={})
-      humanized_money(value, options.merge(:symbol => true))
+      humanized_money(value, options.merge(symbol: true))
     end
 
     def money_without_cents(value, options={})
       if !options || !options.is_a?(Hash)
-        warn "money_without_cents now takes a hash of formatting options, please specify { :symbol => true }"
-        options = { :symbol => options }
+        warn "money_without_cents now takes a hash of formatting options, please specify { symbol: true }"
+        options = { symbol: options }
       end
 
       options = {
-        :no_cents => true,
-        :no_cents_if_whole => false,
-        :symbol => false
+        no_cents: true,
+        no_cents_if_whole: false,
+        symbol: false
       }.merge(options)
 
       humanized_money(value, options)
     end
 
     def money_without_cents_and_with_symbol(value)
-      money_without_cents(value, :symbol => true)
+      money_without_cents(value, symbol: true)
     end
   end
 end

data/lib/money-rails/money.rb

@@ -2,25 +2,23 @@ require "active_support/core_ext/module/aliasing.rb"
 require "active_support/core_ext/hash/reverse_merge.rb"
 
 class Money
-  alias_method :orig_format, :format
+  class <<self
+    alias_method :orig_default_formatting_rules, :default_formatting_rules
 
-  def format(*rules)
-    rules = normalize_formatting_rules(rules)
+    def default_formatting_rules
+      rules = orig_default_formatting_rules || {}
+      defaults = {
+        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? }
 
-    # Apply global defaults for money only for non-nil values
-    defaults = {
-      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? }
+      rules.reverse_merge!(defaults)
 
-    rules.reverse_merge!(defaults)
-
-    unless MoneyRails::Configuration.default_format.nil?
-      rules.reverse_merge!(MoneyRails::Configuration.default_format)
+      unless MoneyRails::Configuration.default_format.nil?
+        rules.reverse_merge!(MoneyRails::Configuration.default_format)
+      end
+      rules
     end
-
-    orig_format(rules)
   end
-
 end

data/lib/money-rails/mongoid/money.rb

@@ -3,8 +3,8 @@ class Money
   # Converts an object of this instance into a database friendly value.
   def mongoize
     {
-      :cents        => cents.mongoize.to_f,
-      :currency_iso => currency.iso_code.mongoize
+      cents:        cents.mongoize.to_f,
+      currency_iso: currency.iso_code.mongoize
     }
   end