money-rails 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8e694d77fe73ebc1b806d1aeb709f74c5e25c2
-  data.tar.gz: 2ed6d897d12f3ff13a08379e97404a9bfe54568f
+  metadata.gz: cadb127fbc12e2e400269dc9b0996c02f55c8cd6
+  data.tar.gz: c5e3dcc6f9d53d512927a91888b78ba996a0553e
 SHA512:
-  metadata.gz: de46c3822927fd875d5a7fdf8a778562fe501d7837d50ae746b035205f1463782672f6d32ede43271fb34fbf312770183354493d99e57cf2b8e027d7fccd7673
-  data.tar.gz: e3dee272257eaf62e7b631d2486d9bd2ae9ba9c6dfd0c3c04a0ff5e750b747a15a5acdc8544693c264983a220a66c9b034640eb1819fbe2e51ecbe6867c8fc0d
+  metadata.gz: 9c57f0377d92586e1cb7935cf780fadb16c204230dbc0b2a449bed4d94839e8d0013681aeb03530412cf0da5fc433900711a19378bb0caedfb20b58364a07b90
+  data.tar.gz: 43cf45749ad6a096ad3d83feb3004cc8d85546f28f0a8846b7eb98ba53313e75d401d0726c0811fd6a3b78798def69f2afdd77ff89b765843e335894159f2ff0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.6.2
+
+- Fix attribute order possibly affecting the value of monetized attribute
+- Add support for RailsAdmin (use :money type)
+- Raise error when gem was unable to infer monetized attribute name
+- Revert decimal mark and thousands separator addtion, since formatting should depend on country and locale, instead of currency
+
 ## 1.6.1
 
 - View helper now respects currency decimal mark and thousands separator

data/lib/generators/templates/money.rb

@@ -58,6 +58,21 @@ MoneyRails.configure do |config|
   #   :decimal_mark        => ","
   # }
 
+  # Specify a rounding mode
+  # Any one of:
+  #
+  # BigDecimal::ROUND_UP,
+  # BigDecimal::ROUND_DOWN,
+  # BigDecimal::ROUND_HALF_UP,
+  # BigDecimal::ROUND_HALF_DOWN,
+  # 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.
   # Default value is nil meaning "ignore this option".
   # Example:

data/lib/money-rails.rb

@@ -14,3 +14,7 @@ if defined? Rails
   require "money-rails/railtie"
   require "money-rails/engine"
 end
+
+if Object.const_defined?("RailsAdmin")
+  require "money-rails/rails_admin"
+end

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

@@ -50,8 +50,9 @@ module MoneyRails
             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("_")
+              raise ArgumentError, "Unable to infer the name of the monetizable attribute for '#{subunit_name}'. " \
+                                   "Expected amount column postfix is '#{MoneyRails::Configuration.amount_column[:postfix]}'. " \
+                                   "Use :as option to explicitly specify the name or change the amount column postfix in the initializer."
             end
 
             # Optional accessor to be run on an instance to detect currency
@@ -127,12 +128,18 @@ module MoneyRails
               memoized = instance_variable_get("@#{name}")
 
               # Dont create a new Money instance if the values haven't been changed.
-              if memoized && memoized.cents == amount &&
-                memoized.currency == attr_currency
-                result =  memoized
-              else
+              if memoized && memoized.cents == amount
+                if memoized.currency == attr_currency
+                  result =  memoized
+                else
+                  memoized_amount = memoized.amount.to_money(attr_currency)
+                  write_attribute subunit_name, memoized_amount.cents
+                  # Cache the value (it may be nil)
+                  result = instance_variable_set "@#{name}", memoized_amount
+                end
+              elsif amount.present?
                 # If amount is NOT nil (or empty string) load the amount in a Money
-                amount = Money.new(amount, attr_currency) unless amount.blank?
+                amount = Money.new(amount, attr_currency)
 
                 # Cache the value (it may be nil)
                 result = instance_variable_set "@#{name}", amount

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

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

data/lib/money-rails/rails_admin.rb

@@ -0,0 +1,21 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types/integer'
+require 'money-rails/helpers/action_view_extension'
+
+include MoneyRails::ActionViewExtension
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Money < RailsAdmin::Config::Fields::Types::Integer
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          register_instance_option :pretty_value do
+            humanized_money_with_symbol(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/money-rails/version.rb

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

data/spec/active_record/monetizable_spec.rb

@@ -77,6 +77,14 @@ if defined? ActiveRecord
         expect(product.price_cents).to eq(215)
       end
 
+      it "assigns the correct value from params" do
+        params_clp = { amount: '20000', tax: '1000', currency:  'CLP' }
+        product = Transaction.create(params_clp)
+        expect(product.valid?).to be_truthy
+        expect(product.amount.currency.subunit_to_unit).to eq(1)
+        expect(product.amount_cents).to eq(20000)
+      end
+
       it "raises an error if trying to create two attributes with the same name" do
         expect do
           class Product
@@ -93,6 +101,19 @@ if defined? ActiveRecord
         end.to raise_error ArgumentError
       end
 
+      it "raises an error when unable to infer attribute name" do
+        old_postfix = MoneyRails::Configuration.amount_column[:postfix]
+        MoneyRails::Configuration.amount_column[:postfix] = '_pennies'
+
+        expect do
+          class AnotherProduct < Product
+            monetize :price_cents
+          end
+        end.to raise_error ArgumentError
+
+        MoneyRails::Configuration.amount_column[:postfix] = old_postfix
+      end
+
       it "allows subclass to redefine attribute with the same name" do
         class SubProduct < Product
           monetize :discount, as: :discount_price, with_currency: :gbp

data/spec/helpers/action_view_extension_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe 'MoneyRails::ActionViewExtension', :type => :helper do
@@ -46,18 +44,10 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
   end
 
   describe '#humanized_money_with_symbol' do
-    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
+    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 }
   end
 
   describe '#money_without_cents' do
@@ -96,7 +86,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.to include Money.default_currency.decimal_mark }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
         it { is_expected.not_to include Money.default_currency.symbol }
         it { is_expected.to include "00" }
       end
@@ -104,7 +94,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.to include Money.default_currency.decimal_mark }
+        it { is_expected.not_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.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -159,6 +159,7 @@ files:
 - lib/money-rails/money.rb
 - lib/money-rails/mongoid/money.rb
 - lib/money-rails/mongoid/two.rb
+- lib/money-rails/rails_admin.rb
 - lib/money-rails/railtie.rb
 - lib/money-rails/test_helpers.rb
 - lib/money-rails/version.rb