money-rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1045d1d93a0e6e7f720ee329933a3f1821210f39
-  data.tar.gz: 9059b8e4f70988725a8009ec68fb7ac2548b0335
+  metadata.gz: 7f7362d98f56cc0f9a7e99d5aae5385d555786dd
+  data.tar.gz: fab18c41c2b15e4916400013a7b60e6b00ae39e7
 SHA512:
-  metadata.gz: c7b9b0c7492769ffcfac56971877b9c0a58821613c4a9401f0440ecb8358276b729a303678a9f1e3ba644d674fdec6e18cd3ee6dce6a6601998b9a6e2bd7059d
-  data.tar.gz: 02b1bd7f8bd5ee35cc6365f77bc2d1b571f117a261c7e2aa7416ad012964fd956acfc588751076ee83b7eae8072289afbeac254fe3aa52c640c0a058fd5cadb1
+  metadata.gz: c79ba8f99be3130f51e9b6d2f3092a6c5d4d2247f4325573e07e8e3b00c839a65b471f5937df5085b1cac396c7dbbb9e5f08d1b8aa027f80700fb141f87beb5f
+  data.tar.gz: 452e693682d7f1d45849c14ac44f78ba157cdcd85f9ede1f68a2f419084f666159ac4dd0c439abcf1429303e6256b6e044a04bacf72a15bad1fd0f438649d1fa

data/README.md

@@ -259,7 +259,7 @@ object using EUR as their currency, instead of the default USD.
 By passing the option ```:with_currency``` to the ```monetize``` macro call,
 with a currency code as its value, you can define a currency in a more granular
 way. This will you attach the given currency only to the specified monetized model
-attribute (allowing you tom for example, monetize different attributes of the same model with different currencyies.).
+attribute (allowing you to, for example, monetize different attributes of the same model with different currencies.).
 
 This allows you to override both the model level and the global
 default currencies:
@@ -321,16 +321,24 @@ MoneyRails.configure do |config|
 
   # To set the default currency
   #
-  config.default_currency = :usd
+  # config.default_currency = :usd
+
+  # Set default bank object
+  #
+  # Example:
+  # config.default_bank = EuCentralBank.new
 
-  # Add custom exchange rates
-  config.add_rate "USD", "CAD", 1.24515
-  config.add_rate "CAD", "USD", 0.803115
+  # Add exchange rates to current money bank object.
+  # (The conversion rate refers to one direction only)
+  #
+  # Example:
+  # config.add_rate "USD", "CAD", 1.24515
+  # config.add_rate "CAD", "USD", 0.803115
 
   # To handle the inclusion of validations for monetized fields
   # The default value is true
   #
-  config.include_validations = true
+  # config.include_validations = true
 
   # Default ActiveRecord migration configuration values for columns:
   #
@@ -354,6 +362,7 @@ MoneyRails.configure do |config|
 
   # Register a custom currency
   #
+  # Example:
   # config.register_currency = {
   #   :priority            => 1,
   #   :iso_code            => "EU4",
@@ -379,15 +388,17 @@ MoneyRails.configure do |config|
   # 
   # set to BigDecimal::ROUND_HALF_EVEN by default
   # 
-  config.rounding_mode = BigDecimal::ROUND_HALF_UP 
+  # config.rounding_mode = BigDecimal::ROUND_HALF_UP
 
-  # Set money formatted output globally.
+  # Set default money format globally.
   # Default value is nil meaning "ignore this option".
-  # Options are nil, true, false.
+  # Example:
   #
-  # config.no_cents_if_whole = nil
-  # config.symbol = nil
-  # config.sign_before_symbol = nil
+  # config.default_format = {
+  #   :no_cents_if_whole => nil,
+  #   :symbol => nil,
+  #   :sign_before_symbol => nil
+  # }
 end
 ```
 
@@ -403,56 +414,26 @@ end
   only! This rate is added to the attached bank object.
 * ```default_bank```: The default bank object holding exchange rates etc.
   (https://github.com/RubyMoney/money#currency-exchange)
-* ```no_cents_if_whole```: Force `Money#format` method to use its value as the default for ```no_cents_if_whole``` key.
-* ```symbol```: Use its value as the default for ```symbol``` key in
-  `Money#format` method.
-* ```sign_before_symbol```: Force `Money#format` to place the negative sign before the currency symbol.
+* ```default_format```: Force `Money#format` to use these options for formatting.
 * ```amount_column```: Provide values for the amount column (holding the fractional part of a money object).
 * ```currency_column```: Provide default values or even disable (`present: false`) the currency column.
 * ```rounding_mode```: Set Money.rounding_mode to one of the BigDecimal constants
 
 ### Helpers
 
-* the `currency_symbol` helper method
+_For examples below, `@money_object == <Money fractional:650 currency:USD>`_
 
-```
-<%= currency_symbol %>
-```
-This will render a `span` dom element with the default currency symbol.
-
-* the `humanized_money` helper method
-
-```
-<%= humanized_money @money_object %>
-```
-This will render a formatted money value without the currency symbol and
-without the cents part if it contains only zeros (uses
-`:no_cents_if_whole flag`).
+| Helper                                                | Result                                    |
+|:---	                                                |:---	                                    |
+| `currency_symbol`  	                                | `<span class="currency_symbol">$</span>`  |
+| `humanized_money @money_object`  	                    | 6.50                                      |
+| `humanized_money_with_symbol @money_object`           | $6.50                                     |
+| `money_without_cents @money_object`                   | 6                                         |
+| `money_without_cents_and_with_symbol @money_object`   | $6                                        |
 
-* humanize with symbol helper
+#### `no_cents_if_whole`
 
-```
-<%= humanized_money_with_symbol @money_object %>
-```
-This will render a formatted money value including the currency symbol and
-without the cents part if it contains only zeros.
-
-* get the money value without the cents part
-
-```
-<%= money_without_cents @money_object %>
-```
-This will render a formatted money value without the currency symbol and
-without the cents part.
-
-* get the money value without the cents part and including the currency
-  symbol
-
-```
-<%= money_without_cents_and_with_symbol @money_object %>
-```
-This will render a formatted money value including the currency symbol and
-without the cents part.
+`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).
 
 ### Testing
 

data/lib/generators/templates/money.rb

@@ -58,10 +58,13 @@ MoneyRails.configure do |config|
   #   :decimal_mark        => ","
   # }
 
-  # Set money formatted output globally.
+  # Set default money format globally.
   # Default value is nil meaning "ignore this option".
-  # Options are nil, true, false.
+  # Example:
   #
-  # config.no_cents_if_whole = nil
-  # config.symbol = nil
+  # config.default_format = {
+  #   :no_cents_if_whole => nil,
+  #   :symbol => nil,
+  #   :sign_before_symbol => nil
+  # }
 end

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

@@ -90,7 +90,7 @@ module MoneyRails
       end
 
       def pieces_array
-        @_pieces_array ||= decimal_pieces[0].split(thousands_separator)
+        @_pieces_array ||= decimal_pieces[0].split(thousands_separator.presence)
       end
 
       def invalid_thousands_separation

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

@@ -17,7 +17,7 @@ module MoneyRails
           if options[:field_currency] || options[:target_name] ||
             options[:model_currency]
             ActiveSupport::Deprecation.warn("You are using the old " \
-              "argument keys of monetize command! Instead use :as, " \
+              "argument keys of the monetize command! Instead use :as, " \
               ":with_currency or :with_model_currency")
           end
 
@@ -38,7 +38,7 @@ module MoneyRails
 
           # 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 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
@@ -50,8 +50,11 @@ module MoneyRails
           end
 
           # Create a reverse mapping of the monetized attributes
-          @monetized_attributes ||= {}
-          @monetized_attributes[name.to_sym] = subunit_name
+          @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
@@ -151,12 +154,25 @@ module MoneyRails
                 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
 
             # Update cents
-            write_attribute(subunit_name, money.try(: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
 
             money_currency = money.try(:currency)
 
@@ -167,7 +183,7 @@ module MoneyRails
               send("#{instance_currency_name}=", money_currency.try(:iso_code))
             else
               current_currency = send("currency_for_#{name}")
-              if money_currency && current_currency != money_currency
+              if money_currency && current_currency != money_currency.id
                 raise "Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'"
               end
             end
@@ -177,7 +193,7 @@ module MoneyRails
           end
 
           if validation_enabled
-            # Ensure that the before_type_cast value is updated when settin
+            # 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

data/lib/money-rails/configuration.rb

@@ -21,12 +21,12 @@ module MoneyRails
     # Configuration parameters
 
     def default_currency
-      Money.default_currency
+      Money::Currency.new(Money.default_currency)
     end
 
     # Set default currency of money library
     def default_currency=(currency_name)
-      Money.default_currency = Money::Currency.new(currency_name)
+      Money.default_currency = currency_name
       set_amount_column_for_default_currency!
       set_currency_column_for_default_currency!
     end
@@ -90,6 +90,9 @@ module MoneyRails
     mattr_accessor :sign_before_symbol
     @@sign_before_symbol = nil
 
+    mattr_accessor :default_format
+    @@default_format = nil
+
     # Configure whether to raise exception when an improper value
     # is going to be converted to a Money object.
     mattr_accessor :raise_error_on_money_parsing

data/lib/money-rails/money.rb

@@ -7,7 +7,6 @@ class Money
     rules = normalize_formatting_rules(rules)
 
     # Apply global defaults for money only for non-nil values
-    # TODO: Add here more setting options
     defaults = {
       no_cents_if_whole: MoneyRails::Configuration.no_cents_if_whole,
       symbol: MoneyRails::Configuration.symbol,
@@ -16,6 +15,10 @@ class Money
 
     rules.reverse_merge!(defaults)
 
+    unless MoneyRails::Configuration.default_format.nil?
+      rules.reverse_merge!(MoneyRails::Configuration.default_format)
+    end
+
     format_without_settings(rules)
   end
 

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

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

data/lib/money-rails/test_helpers.rb

@@ -27,29 +27,22 @@ module MoneyRails
       end
 
       def matches?(actual)
-        @actual = actual
-
-        money_attr = @as.presence || @attribute.to_s.sub(/_cents$/, "")
-
-        matched = true
-
-        if actual.respond_to?(money_attr)
-          if @allow_nil
-            matched &&= actual.send(money_attr).nil?
-            actual.send("#{money_attr}=", 0)
-          end
-          matched &&= actual.send(money_attr).instance_of?(Money)
-
-          if @currency_iso
-            matched &&= actual.send(money_attr.to_sym).currency.id == @currency_iso
-          end
+        if actual.is_a?(Class)
+          @actual = actual.new
         else
-          matched = false
+          @actual = actual.class.new
         end
 
-        matched
+        @money_attribute = @as.presence || @attribute.to_s.sub(/_cents$/, "")
+        @money_attribute_setter = "#{@money_attribute}="
+
+        object_responds_to_attributes? &&
+          test_allow_nil &&
+          is_monetized? &&
+          test_currency_iso
       end
 
+
       def description
         desc = "monetize #{@attribute}"
         desc << " as #{@as}" if @as
@@ -73,6 +66,35 @@ module MoneyRails
       end
       alias_method :failure_message_for_should_not, :failure_message_when_negated # RSpec 1.2, 2.x, and minitest-matchers
       alias_method :negative_failure_message,       :failure_message_when_negated # RSpec 1.1
+
+      private
+
+      def object_responds_to_attributes?
+        @actual.respond_to?(@attribute) && @actual.respond_to?(@money_attribute)
+      end
+
+      def test_allow_nil
+        if @allow_nil
+          @actual.send(@money_attribute_setter, "")
+          @actual.send(@money_attribute).nil?
+        else
+          true
+        end
+      end
+
+      def is_monetized?
+        @actual.send(@money_attribute_setter, 1)
+        @actual.send(@money_attribute).instance_of?(Money)
+      end
+
+      def test_currency_iso
+        if @currency_iso
+          @actual.send(@money_attribute).currency.id == @currency_iso
+        else
+          true
+        end
+      end
+
     end
   end
 end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
 end

data/money-rails.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |s|
   s.add_dependency "railties",      ">= 3.0"
 
   s.add_development_dependency "rails",       ">= 3.0"
-  s.add_development_dependency "rspec-rails", "~> 2.10"
+  s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency 'database_cleaner', ['>= 0.8.0']
 end

data/spec/active_record/migration_extensions/schema_statements_spec.rb

@@ -53,8 +53,8 @@ if defined? ActiveRecord
       end
 
       context 'without currency column' do
-        it { Item.columns_hash['price_without_currency_cents'].should_not be nil }
-        it { Item.columns_hash['price_without_currency_currency'].should be nil }
+        it { expect(Item.columns_hash['price_without_currency_cents']).not_to be nil }
+        it { expect(Item.columns_hash['price_without_currency_currency']).to be nil }
       end
 
       context 'full options' do
@@ -69,7 +69,7 @@ if defined? ActiveRecord
         end
 
         describe 'currency' do
-          it { Item.columns_hash['currency'].should_not be nil }
+          it { expect(Item.columns_hash['currency']).not_to be nil }
         end
       end
     end
@@ -87,13 +87,13 @@ if defined? ActiveRecord
         Item.reset_column_information
       end
 
-      it { Item.columns_hash['price_cents'].should be nil }
-      it { Item.columns_hash['price_currency'].should be nil }
+      it { expect(Item.columns_hash['price_cents']).to be nil }
+      it { expect(Item.columns_hash['price_currency']).to be nil }
 
-      it { Item.columns_hash['price_without_currency_cents'].should be nil }
+      it { expect(Item.columns_hash['price_without_currency_cents']).to be nil }
 
-      it { Item.columns_hash['prefix_price_with_full_options_postfix'].should be nil }
-      it { Item.columns_hash['currency'].should be nil }
+      it { expect(Item.columns_hash['prefix_price_with_full_options_postfix']).to be nil }
+      it { expect(Item.columns_hash['currency']).to be nil }
     end
   end
 end

data/spec/active_record/migration_extensions/table_spec.rb

@@ -54,8 +54,8 @@ if defined? ActiveRecord
       end
 
       context 'without currency column' do
-        it { Item.columns_hash['price_without_currency_cents'].should_not be nil }
-        it { Item.columns_hash['price_without_currency_currency'].should be nil }
+        it { expect(Item.columns_hash['price_without_currency_cents']).not_to be nil }
+        it { expect(Item.columns_hash['price_without_currency_currency']).to be nil }
       end
 
       context 'full options' do
@@ -70,7 +70,7 @@ if defined? ActiveRecord
         end
 
         describe 'currency' do
-          it { Item.columns_hash['currency'].should_not be nil }
+          it { expect(Item.columns_hash['currency']).not_to be nil }
         end
       end
     end
@@ -90,13 +90,13 @@ if defined? ActiveRecord
         Item.reset_column_information
       end
 
-      it { Item.columns_hash['price_cents'].should be nil }
-      it { Item.columns_hash['price_currency'].should be nil }
+      it { expect(Item.columns_hash['price_cents']).to be nil }
+      it { expect(Item.columns_hash['price_currency']).to be nil }
 
-      it { Item.columns_hash['price_without_currency_cents'].should be nil }
+      it { expect(Item.columns_hash['price_without_currency_cents']).to be nil }
 
-      it { Item.columns_hash['prefix_price_with_full_options_postfix'].should be nil }
-      it { Item.columns_hash['currency'].should be nil }
+      it { expect(Item.columns_hash['prefix_price_with_full_options_postfix']).to be nil }
+      it { expect(Item.columns_hash['currency']).to be nil }
     end
   end
 end