money-rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b727182c1db1168ce04b8ff16e96bfe4607b6c
-  data.tar.gz: e7ad11eca117fa5a7b7a1f8f941c4876d4b898eb
+  metadata.gz: f6d1b9abaf2dfb8fa5d9ede9509fe5dd3ef323a5
+  data.tar.gz: 34b2f71bba5a7773e2b85571fda0892f643cb0c0
 SHA512:
-  metadata.gz: bdccd1bba23586013586dab5460f136eb6fd5fbf72e531c935314cd1c9a243f4358cc8ed18fa5f29c08ebcc9372cc4c6e18eebcd303a957118fb74fb8d12425a
-  data.tar.gz: e4942ea49fd18149c4c414516a43c2d49ae978cbd32281bd6e4e2bc3a864b7c86e5084fd67e2508cab5ef0c2afb6dcb8e36d0a1e5e266bc347fbf0590fb89493
+  metadata.gz: f8038c315b04d1d026b2582c1ac76a1c904e4e9ec5a2462fcbfcdfcca283475e1ee778621a34dbd5acc7d28b608350f4a216cf1805bb669f99134cb340bca4b5
+  data.tar.gz: 9109fd349499fe439531743e309a6babd40e7bc1ca3a218a3955e4f87985e4046caeaef5f46ce705293f48a2b0544bb0865e5c9a81f8e072ce852f27f7bfd415

data/README.md

@@ -107,10 +107,17 @@ class MonetizeItem < ActiveRecord::Migration
 end
 ```
 
+Notice. Default value of currency field, generated by migration's helper, is USD. To override these defaults, you need change default_currency in money initializer and run migrations.
+
 The ```add_money``` helper is reversible, so you an use it inside ```change```
 migrations.  If you're writing separate ```up``` and ```down``` methods, you
 can use the ```remove_money``` helper.
 
+##### Notice for Rails >= 4.2 and PG adapter
+
+Due the adding `money` column type for postgres in Rails 4.2 you will need to use `add_monetize` for add money column,
+`t.monetize` for add column in `create_table` or `change_table` block and `remove_monetize` for removing column.
+
 #### Allow nil values
 
 If you want to allow nil and/or blank values to a specific
@@ -377,7 +384,7 @@ MoneyRails.configure do |config|
 
   # Specify a rounding mode
   # Any one of:
-  # 
+  #
   # BigDecimal::ROUND_UP,
   # BigDecimal::ROUND_DOWN,
   # BigDecimal::ROUND_HALF_UP,
@@ -385,9 +392,9 @@ MoneyRails.configure do |config|
   # BigDecimal::ROUND_HALF_EVEN,
   # BigDecimal::ROUND_CEILING,
   # BigDecimal::ROUND_FLOOR
-  # 
+  #
   # set to BigDecimal::ROUND_HALF_EVEN by default
-  # 
+  #
   # config.rounding_mode = BigDecimal::ROUND_HALF_UP
 
   # Set default money format globally.
@@ -434,6 +441,8 @@ _For examples below, `@money_object == <Money fractional:650 currency:USD>`_
 #### `no_cents_if_whole`
 
 `humanized_money` and `humanized_money_with_symbol` will not render the cents part if it contains only zeros, unless `config.no_cents_if_whole` is set to `false` in the `money.rb` configuration (default: true).
+Note that the `config.default_format` will be overwritten by `config.no_cents_if_whole`.
+So `humanized_money` will ignore `config.default_format = { no_cents_if_whole: false }` if you don't set `config.no_cents_if_whole = false`.
 
 ### Testing
 

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

@@ -6,21 +6,18 @@ module MoneyRails
         @record = record
         @attr = attr
 
-        # If subunit is not set then no need to validate as it is an
-        # indicator that no assignment has been done onto the virtual
-        # money field.
         subunit_attr = @record.class.monetized_attributes[@attr.to_sym]
-        return unless @record.changed_attributes.keys.include? subunit_attr
 
         # WARNING: Currently this is only defined in ActiveRecord extension!
         before_type_cast = :"#{@attr}_money_before_type_cast"
         @raw_value = @record.try(before_type_cast)
 
         # If raw value is nil and changed subunit is nil, then
-        # nil is a assigned value, elsewhere we should treat the
+        # nil is a assigned value, else we should treat the
         # subunit value as the one assigned.
-        if @raw_value.nil? && @record.send(subunit_attr)
-          @raw_value = @record.send(subunit_attr)
+        if @raw_value.nil? && @record.public_send(subunit_attr)
+          subunit_value = @record.public_send(subunit_attr)
+          @raw_value = subunit_value.to_f / currency.subunit_to_unit
         end
 
         return if options[:allow_nil] && @raw_value.nil?
@@ -51,7 +48,7 @@ module MoneyRails
       end
 
       def currency
-        @_currency ||= @record.send("currency_for_#{@attr}")
+        @_currency ||= @record.public_send("currency_for_#{@attr}")
       end
 
       def decimal_mark

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

@@ -0,0 +1,21 @@
+module MoneyRails
+  module ActiveRecord
+    module MigrationExtensions
+      module SchemaStatements
+        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
+          end
+        end
+
+        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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module MoneyRails
+  module ActiveRecord
+    module MigrationExtensions
+      module Table
+        def monetize(accessor, options={})
+          [:amount, :currency].each do |attribute|
+            column_present, _, *opts = OptionsExtractor.extract attribute, :no_table, accessor, options
+            column *opts if column_present
+          end
+        end
+
+        def remove_monetize(accessor, options={})
+          [:amount, :currency].each do |attribute|
+            column_present, _, column_name, _, _ =  OptionsExtractor.extract attribute, :no_table, accessor, options
+            remove column_name if column_present
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,224 +8,232 @@ module MoneyRails
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def monetize(field, *args)
-          options = args.extract_options!
-
-          # Stringify model field name
-          subunit_name = field.to_s
-
-          if options[:field_currency] || options[:target_name] ||
-            options[:model_currency]
-            ActiveSupport::Deprecation.warn("You are using the old " \
-              "argument keys of the monetize command! Instead use :as, " \
-              ":with_currency or :with_model_currency")
-          end
+        def monetize(*fields)
+          options = fields.extract_options!
+
+          fields.each do |field|
+            # Stringify model field name
+            subunit_name = field.to_s
+
+            if options[:field_currency] || options[:target_name] ||
+              options[:model_currency]
+              ActiveSupport::Deprecation.warn("You are using the old " \
+                "argument keys of the monetize command! Instead use :as, " \
+                ":with_currency or :with_model_currency")
+            end
 
-          # Optional accessor to be run on an instance to detect currency
-          instance_currency_name = options[:with_model_currency] ||
-            options[:model_currency] ||
-            MoneyRails::Configuration.currency_column[:column_name]
-
-          instance_currency_name = instance_currency_name &&
-            instance_currency_name.to_s
-
-          # This attribute allows per column currency values
-          # Overrides row and default currency
-          field_currency_name = options[:with_currency] ||
-            options[:field_currency] || nil
-
-          name = options[:as] || options[:target_name] || nil
-
-          # Form target name for the money backed ActiveModel field:
-          # if a target name is provided then use it
-          # if there is a "{column.postfix}" suffix then just remove it to create the target name
-          # if none of the previous is the case then use a default suffix
-          if name
-            name = name.to_s
-          elsif subunit_name =~ /#{MoneyRails::Configuration.amount_column[:postfix]}$/
-            name = subunit_name.sub(/#{MoneyRails::Configuration.amount_column[:postfix]}$/, "")
-          else
-            # FIXME: provide a better default
-            name = [subunit_name, "money"].join("_")
-          end
+            # Optional accessor to be run on an instance to detect currency
+            instance_currency_name = options[:with_model_currency] ||
+              options[:model_currency] ||
+              MoneyRails::Configuration.currency_column[:column_name]
+
+            instance_currency_name = instance_currency_name &&
+              instance_currency_name.to_s
+
+            # This attribute allows per column currency values
+            # Overrides row and default currency
+            field_currency_name = options[:with_currency] ||
+              options[:field_currency] || nil
+
+            name = options[:as] || options[:target_name] || nil
+
+            # Form target name for the money backed ActiveModel field:
+            # if a target name is provided then use it
+            # if there is a "{column.postfix}" suffix then just remove it to create the target name
+            # if none of the previous is the case then use a default suffix
+            if name
+              name = name.to_s
+            elsif subunit_name =~ /#{MoneyRails::Configuration.amount_column[:postfix]}$/
+              name = subunit_name.sub(/#{MoneyRails::Configuration.amount_column[:postfix]}$/, "")
+            else
+              # FIXME: provide a better default
+              name = [subunit_name, "money"].join("_")
+            end
 
-          # Create a reverse mapping of the monetized attributes
-          @monetized_attributes ||= {}.with_indifferent_access
-          if @monetized_attributes[name].present?
-            raise ArgumentError, "#{self} already has a monetized attribute called '#{name}'"
-          end
-          @monetized_attributes[name] = subunit_name
-          class << self
-            def monetized_attributes
-              @monetized_attributes || superclass.monetized_attributes
+            # Create a reverse mapping of the monetized attributes
+            @monetized_attributes ||= {}.with_indifferent_access
+            if @monetized_attributes[name].present?
+              raise ArgumentError, "#{self} already has a monetized attribute called '#{name}'"
             end
-          end unless respond_to? :monetized_attributes
-
-          # Include numericality validations if needed.
-          # There are two validation options:
-          #
-          # 1. Subunit field validation (e.g. cents should be > 100)
-          # 2. Money field validation (e.g. euros should be > 10)
-          #
-          # 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,
-          #     },
-          #     :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
-          if validation_enabled = MoneyRails.include_validations && !options[:disable_validation]
-
-            subunit_validation_options =
-              unless options.has_key? :subunit_numericality
-                true
-              else
-                options[:subunit_numericality]
+            @monetized_attributes[name] = subunit_name
+            class << self
+              def monetized_attributes
+                @monetized_attributes || superclass.monetized_attributes
               end
+            end unless respond_to? :monetized_attributes
+
+            # Include numericality validations if needed.
+            # There are two validation options:
+            #
+            # 1. Subunit field validation (e.g. cents should be > 100)
+            # 2. Money field validation (e.g. euros should be > 10)
+            #
+            # 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,
+            #     },
+            #     :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
+            if validation_enabled = MoneyRails.include_validations && !options[:disable_validation]
+
+              subunit_validation_options =
+                unless options.has_key? :subunit_numericality
+                  true
+                else
+                  options[:subunit_numericality]
+                end
 
-            money_validation_options =
-              unless options.has_key? :numericality
-                true
-              else
-                options[:numericality]
-              end
+              money_validation_options =
+                unless options.has_key? :numericality
+                  true
+                else
+                  options[:numericality]
+                end
 
-            # This is a validation for the subunit
-            validates subunit_name, {
-              :allow_nil => options[:allow_nil],
-              :numericality => subunit_validation_options
-            }
-
-            # Allow only Money objects or Numeric values!
-            validates name.to_sym, {
-              :allow_nil => options[:allow_nil],
-              'money_rails/active_model/money' => money_validation_options
-            }
-          end
+              # This is a validation for the subunit
+              validates subunit_name, {
+                :allow_nil => options[:allow_nil],
+                :numericality => subunit_validation_options
+              }
+
+              # Allow only Money objects or Numeric values!
+              validates name.to_sym, {
+                :allow_nil => options[:allow_nil],
+                'money_rails/active_model/money' => money_validation_options
+              }
+            end
 
 
-          define_method name do |*args|
+            define_method name do |*args|
 
-            # Get the cents
-            amount = send(subunit_name, *args)
+              # Get the cents
+              amount = public_send(subunit_name, *args)
 
-            # Get the currency object
-            attr_currency = send("currency_for_#{name}")
+              # Get the currency object
+              attr_currency = public_send("currency_for_#{name}")
 
-            # Get the cached value
-            memoized = instance_variable_get("@#{name}")
+              # Get the cached value
+              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 &&
-              memoized.currency == attr_currency
+              # Dont create a new Money instance if the values haven't been changed.
+              return memoized if memoized && memoized.cents == amount &&
+                memoized.currency == attr_currency
 
-            # If amount is NOT nil (or empty string) load the amount in a Money
-            amount = Money.new(amount, attr_currency) unless amount.blank?
+              # If amount is NOT nil (or empty string) load the amount in a Money
+              amount = Money.new(amount, attr_currency) unless amount.blank?
 
-            # Cache and return the value (it may be nil)
-            instance_variable_set "@#{name}", amount
-          end
+              # Cache and return the value (it may be nil)
+              instance_variable_set "@#{name}", amount
+            end
 
-          define_method "#{name}=" do |value|
+            define_method "#{name}=" do |value|
 
-            # Lets keep the before_type_cast value
-            instance_variable_set "@#{name}_money_before_type_cast", value
+              # Lets keep the before_type_cast value
+              instance_variable_set "@#{name}_money_before_type_cast", value
 
-            # Use nil or get a Money object
-            if options[:allow_nil] && value.blank?
-              money = nil
-            else
-              if value.is_a?(Money)
-                money = value
+              # Use nil or get a Money object
+              if options[:allow_nil] && value.blank?
+                money = nil
               else
-                begin
-                  money = value.to_money(send("currency_for_#{name}"))
-                rescue NoMethodError
-                  return nil
-                rescue ArgumentError
-                  raise if MoneyRails.raise_error_on_money_parsing
-                  return nil
-                rescue Money::Currency::UnknownCurrency
-                  raise if MoneyRails.raise_error_on_money_parsing
-                  return nil
+                if value.is_a?(Money)
+                  money = value
+                else
+                  begin
+                    money = value.to_money(public_send("currency_for_#{name}"))
+                  rescue NoMethodError
+                    return nil
+                  rescue ArgumentError
+                    raise if MoneyRails.raise_error_on_money_parsing
+                    return nil
+                  rescue Money::Currency::UnknownCurrency
+                    raise if MoneyRails.raise_error_on_money_parsing
+                    return nil
+                  end
                 end
               end
-            end
 
-            # Update cents
-            # If the attribute is aliased, make sure we write to the original
-            # attribute name or an error will be raised.
-            # (Note: 'attribute_aliases' doesn't exist in Rails 3.x, so we
-            # can't tell if the attribute was aliased.)
-            if self.class.respond_to?(:attribute_aliases) &&
-                  self.class.attribute_aliases.key?(subunit_name)
-              original_name = self.class.attribute_aliases[subunit_name.to_s]
-              write_attribute(original_name, money.try(:cents))
-            else
-              write_attribute(subunit_name, money.try(:cents))
-            end
+              # Update cents
+              if !validation_enabled
+                # We haven't defined our own subunit writer, so we can invoke
+                # the regular writer, which works with store_accessors
+                public_send("#{subunit_name}=", money.try(:cents))
+              elsif self.class.respond_to?(:attribute_aliases) &&
+                    self.class.attribute_aliases.key?(subunit_name)
+                # If the attribute is aliased, make sure we write to the original
+                # attribute name or an error will be raised.
+                # (Note: 'attribute_aliases' doesn't exist in Rails 3.x, so we
+                # can't tell if the attribute was aliased.)
+                original_name = self.class.attribute_aliases[subunit_name.to_s]
+                write_attribute(original_name, money.try(:cents))
+              else
+                write_attribute(subunit_name, money.try(:cents))
+              end
 
-            money_currency = money.try(:currency)
+              money_currency = money.try(:currency)
 
-            # Update currency iso value if there is an instance currency attribute
-            if instance_currency_name.present? &&
-              self.respond_to?("#{instance_currency_name}=")
+              # Update currency iso value if there is an instance currency attribute
+              if instance_currency_name.present? &&
+                respond_to?("#{instance_currency_name}=")
 
-              send("#{instance_currency_name}=", money_currency.try(:iso_code))
-            else
-              current_currency = send("currency_for_#{name}")
-              if money_currency && current_currency != money_currency.id
-                raise "Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'"
+                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 "Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'"
+                end
               end
-            end
 
-            # Save and return the new Money object
-            instance_variable_set "@#{name}", money
-          end
+              # Save and return the new Money object
+              instance_variable_set "@#{name}", money
+            end
 
-          if validation_enabled
-            # Ensure that the before_type_cast value is updated when setting
-            # the subunit value directly
-            define_method "#{subunit_name}=" do |value|
-              before_type_cast = value.to_f / send("currency_for_#{name}").subunit_to_unit
-              instance_variable_set "@#{name}_money_before_type_cast", before_type_cast
-              write_attribute(subunit_name, value)
+            if validation_enabled
+              # Ensure that the before_type_cast value is cleared when setting
+              # the subunit value directly
+              define_method "#{subunit_name}=" do |value|
+                instance_variable_set "@#{name}_money_before_type_cast", nil
+                write_attribute(subunit_name, value)
+              end
             end
-          end
 
-          define_method "currency_for_#{name}" do
-            if instance_currency_name.present? &&
-              self.respond_to?(instance_currency_name) &&
-              send(instance_currency_name).present? &&
-              Money::Currency.find(send(instance_currency_name))
-
-              Money::Currency.find(send(instance_currency_name))
-            elsif field_currency_name
-              Money::Currency.find(field_currency_name)
-            elsif self.class.respond_to?(:currency)
-              self.class.currency
-            else
-              Money.default_currency
+            define_method "currency_for_#{name}" do
+              instance_currency_name_with_postfix = "#{name}#{MoneyRails::Configuration.currency_column[:postfix]}"
+
+              if instance_currency_name.present? &&
+                respond_to?(instance_currency_name) &&
+                Money::Currency.find(public_send(instance_currency_name))
+
+                Money::Currency.find(public_send(instance_currency_name))
+              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))
+
+                Money::Currency.find(public_send(instance_currency_name_with_postfix))
+              elsif self.class.respond_to?(:currency)
+                self.class.currency
+              else
+                Money.default_currency
+              end
             end
-          end
 
-          define_method "#{name}_money_before_type_cast" do
-            instance_variable_get "@#{name}_money_before_type_cast"
-          end
+            attr_reader "#{name}_money_before_type_cast"
 
-          # Hook to ensure the reset of before_type_cast attr
-          # TODO: think of a better way to avoid this
-          after_save do
-            instance_variable_set "@#{name}_money_before_type_cast", nil
+            # Hook to ensure the reset of before_type_cast attr
+            # TODO: think of a better way to avoid this
+            after_save do
+              instance_variable_set "@#{name}_money_before_type_cast", nil
+            end
           end
         end
 

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

@@ -15,6 +15,7 @@ module MoneyRails
         :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]
 
       if value.is_a?(Money)
         value.format(options)

data/lib/money-rails/hooks.rb

@@ -6,8 +6,26 @@ module MoneyRails
         require 'money-rails/active_model/validator'
         require 'money-rails/active_record/monetizable'
         ::ActiveRecord::Base.send :include, MoneyRails::ActiveRecord::Monetizable
+        if ::Rails::VERSION::MAJOR >= 4
+          rails42               = case
+                                  when ::Rails::VERSION::MAJOR < 5 && ::Rails::VERSION::MINOR >= 2
+                                    true
+                                  when ::Rails::VERSION::MAJOR >= 5
+                                    true
+                                  else
+                                    false
+                                  end
+          postgresql_with_money = rails42 && ['activerecord-jdbcpostgresql-adapter', 'postgresql'].include?(::ActiveRecord::Base.connection.instance_values["config"][:adapter])
+        end
 
-        %w{options_extractor schema_statements table}.each { |file| require "money-rails/active_record/migration_extensions/#{file}" }
+        require "money-rails/active_record/migration_extensions/options_extractor"
+        %w{schema_statements table}.each do |file|
+          if postgresql_with_money
+            require "money-rails/active_record/migration_extensions/#{file}_pg_rails4"
+          else
+            require "money-rails/active_record/migration_extensions/#{file}"
+          end
+        end
         ::ActiveRecord::Migration.send :include, MoneyRails::ActiveRecord::MigrationExtensions::SchemaStatements
         ::ActiveRecord::ConnectionAdapters::TableDefinition.send :include, MoneyRails::ActiveRecord::MigrationExtensions::Table
         ::ActiveRecord::ConnectionAdapters::Table.send :include, MoneyRails::ActiveRecord::MigrationExtensions::Table

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

@@ -14,7 +14,11 @@ class Money
     # this custom class from it.
     def demongoize(object)
       if object.is_a?(Hash)
-        object = object.deep_symbolize_keys
+        if object.respond_to?(:deep_symbolize_keys)
+          object = object.deep_symbolize_keys
+        else
+          object = object.symbolize_keys
+        end
         object.has_key?(:cents) ? ::Money.new(object[:cents], object[:currency_iso]) : nil
       else
         nil
@@ -27,7 +31,11 @@ class Money
       case
       when object.is_a?(Money) then object.mongoize
       when object.is_a?(Hash) then
-        object.deep_symbolize_keys! if object.respond_to?(:deep_symbolize_keys!)
+        if object.respond_to?(:deep_symbolize_keys!)
+          object.deep_symbolize_keys!
+        elsif object.respond_to?(:symbolize_keys!)
+          object.symbolize_keys!
+        end
         ::Money.new(object[:cents], object[:currency_iso]).mongoize
       when object.respond_to?(:to_money) then
         begin

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
 end

data/money-rails.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rails",       ">= 3.0"
   s.add_development_dependency "rspec-rails", "~> 3.0"
-  s.add_development_dependency 'database_cleaner', ['>= 0.8.0']
+  s.add_development_dependency 'database_cleaner', ['>= 0.8.0', '< 1.4.0']
 end

data/spec/active_record/monetizable_spec.rb

@@ -8,7 +8,9 @@ if defined? ActiveRecord
       let(:product) do
         Product.create(:price_cents => 3000, :discount => 150,
                        :bonus_cents => 200, :optional_price => 100,
-                       :sale_price_amount => 1200)
+                       :sale_price_amount => 1200, :delivery_fee_cents => 100,
+                       :restock_fee_cents => 2000,
+                       :reduced_price_cents => 1500, :reduced_price_currency => :lvl)
       end
 
       let(:service) do
@@ -25,6 +27,11 @@ if defined? ActiveRecord
         expect(product.bonus).to be_an_instance_of(Money)
       end
 
+      it "attaches Money objects to multiple model fields" do
+        expect(product.delivery_fee).to be_an_instance_of(Money)
+        expect(product.restock_fee).to be_an_instance_of(Money)
+      end
+
       it "returns the expected money amount as a Money object" do
         expect(product.price).to eq(Money.new(3000, "USD"))
       end
@@ -75,7 +82,7 @@ if defined? ActiveRecord
       end
 
       it "skips numericality validation when disabled" do
-        product.invalid_price_cents = 'not_valid'
+        product.accessor_price_cents = 'not_valid'
         expect(product.save).to be_truthy
       end
 
@@ -91,13 +98,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.invalid_price = "10-235" }.to raise_error
+          expect { product.accessor_price = "10-235" }.to raise_error
         end
       end
 
       context "when MoneyRails.raise_error_on_money_parsing is false (default)" do
         it "does not raise exception when a String value with hyphen is assigned" do
-          expect { product.invalid_price = "10-235" }.not_to raise_error
+          expect { product.accessor_price = "10-235" }.not_to raise_error
         end
       end
 
@@ -193,6 +200,15 @@ if defined? ActiveRecord
         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
+        product = Product.create(:price => Money.new(3210, "USD"), :discount => 150,
+                                 :validates_method_amount => 100,
+                                 :bonus_cents => 200, :optional_price => 100)
+        expect(product.valid?).to be_truthy
+        product.optional_price = 50
+        expect(product.valid?).to be_falsey
+      end
+
       it "fails validation with the proper error message using validates :money" do
         product.validates_method_amount = "-12"
         expect(product.valid?).to be_falsey
@@ -297,20 +313,6 @@ if defined? ActiveRecord
         I18n.locale = old_locale
       end
 
-      it "defaults to Money::Currency format when no I18n information is present" do
-        old_locale = I18n.locale
-
-        I18n.locale = "zxsw"
-        Money.default_currency = Money::Currency.find('EUR')
-        expect("12,00".to_money).to eq(Money.new(1200, :eur))
-        transaction = Transaction.new(amount: "12,00", tax: "13,00")
-        expect(transaction.amount_cents).to eq(1200)
-        expect(transaction.valid?).to be_truthy
-
-        # reset locale setting
-        I18n.locale = old_locale
-      end
-
       it "doesn't allow nil by default" do
         product.price_cents = nil
         expect(product.save).to be_falsey
@@ -364,6 +366,10 @@ if defined? ActiveRecord
         expect(product.bonus.currency).to eq(Money::Currency.find(:gbp))
       end
 
+      it "uses currency postfix to determine attribute that stores currency" do
+        expect(product.reduced_price.currency).to eq(Money::Currency.find(:lvl))
+      end
+
       it "correctly assigns Money objects to the attribute" do
         product.price = Money.new(2500, :USD)
         expect(product.save).to be_truthy
@@ -395,6 +401,13 @@ if defined? ActiveRecord
         expect(service.discount.currency_as_string).to eq("EUR")
       end
 
+      it "correctly assigns objects to a accessor attribute" do
+        product.accessor_price = 1.23
+        expect(product.save).to be_truthy
+        expect(product.accessor_price.cents).to eq(123)
+        expect(product.accessor_price_cents).to eq(123)
+      end
+
       it "overrides default, model currency with the value of :with_currency in fixnum assignments" do
         product.bonus = 25
         expect(product.save).to be_truthy
@@ -467,7 +480,6 @@ if defined? ActiveRecord
         expect(product.optional_price).to be_nil
       end
 
-
       context "when the monetized field is an aliased attribute" do
         it "writes the subunits to the original (unaliased) column" do
           pending if Rails::VERSION::MAJOR < 4

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

@@ -5,6 +5,9 @@ class Product < ActiveRecord::Base
   # Use money-rails macros
   monetize :price_cents
 
+  # Use money-rails macro with multiple fields
+  monetize :delivery_fee_cents, :restock_fee_cents, :allow_nil => true
+
   # Use a custom name for the Money attribute
   monetize :discount, :as => "discount_value"
 
@@ -29,18 +32,21 @@ class Product < ActiveRecord::Base
       :message => "Must be greater than zero and less than $100"
     }
 
-  attr_accessor :invalid_price_cents
-  monetize :invalid_price_cents, disable_validation: true
+  attr_accessor :accessor_price_cents
+  monetize :accessor_price_cents, disable_validation: true
 
   monetize :validates_method_amount_cents, allow_nil: true
 
   validates :validates_method_amount, :money => {
     :greater_than => 0,
-    :less_than_or_equal_to => 100,
+    :less_than_or_equal_to => ->(product) { product.optional_price.to_f },
     :message => 'Must be greater than zero and less than $100',
-  }
+  }, allow_nil: true
 
   alias_attribute :renamed_cents, :aliased_cents
 
   monetize :renamed_cents, allow_nil: true
+
+  # Using postfix to determine currency column (reduced_price_currency)
+  monetize :reduced_price_cents, :allow_nil => true
 end

data/spec/dummy/db/migrate/20150107061030_add_delivery_fee_cents_and_restock_fee_cents_to_product.rb

@@ -0,0 +1,6 @@
+class AddDeliveryFeeCentsAndRestockFeeCentsToProduct < ActiveRecord::Migration
+  def change
+    add_column :products, :delivery_fee_cents, :integer
+    add_column :products, :restock_fee_cents, :integer
+  end
+end

data/spec/dummy/db/migrate/20150126231442_add_reduced_price_to_products.rb

@@ -0,0 +1,6 @@
+class AddReducedPriceToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :reduced_price_cents, :integer
+    add_column :products, :reduced_price_currency, :string
+  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: 20141005075025) do
+ActiveRecord::Schema.define(version: 20150126231442) do
 
   create_table "dummy_products", force: true do |t|
     t.string   "currency"
@@ -32,6 +32,10 @@ ActiveRecord::Schema.define(version: 20141005075025) do
     t.integer  "price_in_a_range_cents"
     t.integer  "validates_method_amount_cents"
     t.integer  "aliased_cents"
+    t.integer  "delivery_fee_cents"
+    t.integer  "restock_fee_cents"
+    t.integer  "reduced_price_cents"
+    t.string   "reduced_price_currency"
   end
 
   create_table "services", force: true do |t|

data/spec/helpers/action_view_extension_spec.rb

@@ -8,8 +8,9 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
   end
 
   describe '#humanized_money' do
+    let(:money_object){ Money.new(12500) }
     let(:options) { {} }
-    subject { helper.humanized_money Money.new(12500), options }
+    subject { helper.humanized_money money_object, options }
     it { is_expected.to be_a String }
     it { is_expected.not_to include Money.default_currency.symbol }
     it { is_expected.not_to include Money.default_currency.decimal_mark }
@@ -26,6 +27,20 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
       end
       it { is_expected.to include Money.default_currency.symbol }
     end
+
+    context 'with a currency with an alternate symbol' do
+      let(:money_object) { Money.new(125_00, 'SGD') }
+
+      context 'with symbol options' do
+        let(:options) { { :symbol => true } }
+        it { is_expected.to include Money::Currency.new(:sgd).symbol }
+
+        context 'with disambiguate options' do
+          let(:options) { { :symbol => true, :disambiguate => true } }
+          it { is_expected.to include Money::Currency.new(:sgd).disambiguate_symbol }
+        end
+      end
+    end
   end
 
   describe '#humanized_money_with_symbol' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -103,6 +103,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,6 +113,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -128,7 +134,9 @@ files:
 - lib/money-rails/active_model/validator.rb
 - lib/money-rails/active_record/migration_extensions/options_extractor.rb
 - lib/money-rails/active_record/migration_extensions/schema_statements.rb
+- lib/money-rails/active_record/migration_extensions/schema_statements_pg_rails4.rb
 - lib/money-rails/active_record/migration_extensions/table.rb
+- lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb
 - lib/money-rails/active_record/monetizable.rb
 - lib/money-rails/configuration.rb
 - lib/money-rails/engine.rb
@@ -187,6 +195,8 @@ files:
 - spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
 - spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb
 - spec/dummy/db/migrate/20141005075025_add_aliased_attr_to_products.rb
+- spec/dummy/db/migrate/20150107061030_add_delivery_fee_cents_and_restock_fee_cents_to_product.rb
+- spec/dummy/db/migrate/20150126231442_add_reduced_price_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/structure.sql
 - spec/dummy/public/404.html
@@ -273,6 +283,8 @@ test_files:
 - spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
 - spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb
 - spec/dummy/db/migrate/20141005075025_add_aliased_attr_to_products.rb
+- spec/dummy/db/migrate/20150107061030_add_delivery_fee_cents_and_restock_fee_cents_to_product.rb
+- spec/dummy/db/migrate/20150126231442_add_reduced_price_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/structure.sql
 - spec/dummy/public/404.html