money-rails 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9cc6171cefe133272f52265e75b57fee9bc6afd
-  data.tar.gz: 49e42579e90c5cf1db2d1bcbf22cfaeff6e44b10
+  metadata.gz: 1a8e694d77fe73ebc1b806d1aeb709f74c5e25c2
+  data.tar.gz: 2ed6d897d12f3ff13a08379e97404a9bfe54568f
 SHA512:
-  metadata.gz: 5be950ff213f992cadc6e8592dc73c0effdef3b9638743fee263758e670706fc7c4a3be29048d6e60d84a34dfe7e97552ea6deb712536a4d962a10cce063e8c6
-  data.tar.gz: 0dbb19839209c7434f11804d6b2f0d642d1230ea0029b3a63f4035e2a1601495c1aef1703235e82fefca2b9aa9093f9af3324816d7d3a6fa67bf313752c3033e
+  metadata.gz: de46c3822927fd875d5a7fdf8a778562fe501d7837d50ae746b035205f1463782672f6d32ede43271fb34fbf312770183354493d99e57cf2b8e027d7fccd7673
+  data.tar.gz: e3dee272257eaf62e7b631d2486d9bd2ae9ba9c6dfd0c3c04a0ff5e750b747a15a5acdc8544693c264983a220a66c9b034640eb1819fbe2e51ecbe6867c8fc0d

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.6.1
+
+- View helper now respects currency decimal mark and thousands separator
+- Fix error when monetizing with attribute's name
+- Fix mime-types dependency issue with ruby 1.9
+- Fix issue with gem not updating automatically inferred currency column
+
 ## 1.6.0
 
 - Update Money and Monetize gem reqs.
@@ -15,6 +22,7 @@
  - 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
+ - rename `format_with_settings` method to `format`
  - add gem tasks
 
 ## 1.4.0

data/README.md

@@ -455,7 +455,7 @@ So `humanized_money` will ignore `config.default_format = { no_cents_if_whole: f
 
 ### Testing
 
-If you use Rspec there is an test helper implementation.
+If you use Rspec there is a test helper implementation.
 Just write `require "money-rails/test_helpers"` in spec_helper.rb.
 
 * the `monetize` matcher

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

@@ -32,19 +32,6 @@ module MoneyRails
                                               ":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:
@@ -53,6 +40,13 @@ module MoneyRails
             # if none of the previous is the case then use a default suffix
             if name
               name = name.to_s
+
+              # Check if the options[:as] parameter is not the same as subunit_name
+              # which would result in stack overflow
+              if name == subunit_name
+                raise ArgumentError, "monetizable attribute name cannot be the same as options[:as] parameter"
+              end
+
             elsif subunit_name =~ /#{MoneyRails::Configuration.amount_column[:postfix]}$/
               name = subunit_name.sub(/#{MoneyRails::Configuration.amount_column[:postfix]}$/, "")
             else
@@ -60,6 +54,23 @@ module MoneyRails
               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]
+
+            # Infer currency column from name and postfix
+            if !instance_currency_name && MoneyRails::Configuration.currency_column[:postfix].present?
+              instance_currency_name = "#{name}#{MoneyRails::Configuration.currency_column[:postfix]}"
+            end
+
+            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
+
             # Create a reverse mapping of the monetized attributes
             track_monetized_attribute name, subunit_name
 
@@ -104,7 +115,6 @@ module MoneyRails
               end
             end
 
-
             define_method name do |*args|
 
               # Get the cents

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

@@ -11,19 +11,23 @@ module MoneyRails
         options = { :symbol => options }
       end
 
+      unless value.is_a?(Money)
+        if value.respond_to?(:to_money)
+          value = value.to_money
+        else
+          return ''
+        end
+      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,
+        :decimal_mark        => value.currency.decimal_mark,
+        :thousands_separator => value.currency.thousands_separator
       }.merge(options)
       options.delete(:symbol) if options[:disambiguate]
 
-      if value.is_a?(Money)
-        value.format(options)
-      elsif value.respond_to?(:to_money)
-        value.to_money.format(options)
-      else
-        ""
-      end
+      value.format(options)
     end
 
     def humanized_money_with_symbol(value, options={})

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-    VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/money-rails.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency "monetize",      "~> 1.4.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
+  s.add_dependency "mime-types",    "< 3" if RUBY_VERSION < '2.0' # mime-types > 3 depends on mime-types-data, which doesn't support ruby 1.9
 
   s.add_development_dependency "rails",       ">= 3.0"
   s.add_development_dependency "rspec-rails", "~> 3.0"

data/spec/active_record/monetizable_spec.rb

@@ -85,6 +85,14 @@ if defined? ActiveRecord
         end.to raise_error ArgumentError
       end
 
+      it "raises an error if Money object has the same attribute name as the monetizable attribute" do
+        expect do
+          class AnotherProduct < Product
+            monetize :price_cents, as: :price_cents
+          end
+        end.to raise_error ArgumentError
+      end
+
       it "allows subclass to redefine attribute with the same name" do
         class SubProduct < Product
           monetize :discount, as: :discount_price, with_currency: :gbp
@@ -690,6 +698,14 @@ if defined? ActiveRecord
           expect(dummy_product_with_nil_currency.price.currency).to eq(Money::Currency.find(:gbp))
         end
 
+        it "updates inferred currency column based on currency column postfix" do
+          product.reduced_price = Money.new(999_00, 'CAD')
+          product.save
+
+          expect(product.reduced_price_cents).to eq(999_00)
+          expect(product.reduced_price_currency).to eq('CAD')
+        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")

data/spec/helpers/action_view_extension_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe 'MoneyRails::ActionViewExtension', :type => :helper do
@@ -44,10 +46,18 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
   end
 
   describe '#humanized_money_with_symbol' do
-    subject { helper.humanized_money_with_symbol Money.new(12500) }
-    it { is_expected.to be_a String }
-    it { is_expected.not_to include Money.default_currency.decimal_mark }
-    it { is_expected.to include Money.default_currency.symbol }
+    let(:amount) { 125_010 }
+    let(:expected_values) { {
+      :eur => '€1.250,10',
+      :usd => '$1,250.10',
+      :sek => '1 250,10 kr'
+    } }
+
+    it 'returns the correctly formatted values' do
+      expected_values.each do |currency, result|
+        expect(helper.humanized_money_with_symbol(Money.new(amount, currency))).to eq result
+      end
+    end
   end
 
   describe '#money_without_cents' do
@@ -86,7 +96,7 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
       describe '#humanized_money' do
         subject { helper.humanized_money Money.new(12500) }
         it { is_expected.to be_a String }
-        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.to include Money.default_currency.decimal_mark }
         it { is_expected.not_to include Money.default_currency.symbol }
         it { is_expected.to include "00" }
       end
@@ -94,7 +104,7 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
       describe '#humanized_money_with_symbol' do
         subject { helper.humanized_money_with_symbol Money.new(12500) }
         it { is_expected.to be_a String }
-        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.to include Money.default_currency.decimal_mark }
         it { is_expected.to include Money.default_currency.symbol }
         it { is_expected.to include "00" }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Money gem integration with Rails