money-rails 1.10.0 → 1.11.0

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

@@ -18,8 +18,8 @@ class Money
     case
     when object.is_a?(Money)
       {
-        :cents        => object.cents.is_a?(BigDecimal) ? object.cents.to_s : object.cents,
-        :currency_iso => object.currency.iso_code
+        cents:        object.cents.is_a?(BigDecimal) ? object.cents.to_s : object.cents,
+        currency_iso: object.currency.iso_code
       }
     when object.nil? then nil
     when object.respond_to?(:to_money)

data/lib/money-rails/test_helpers.rb

@@ -16,6 +16,11 @@ module MoneyRails
         self
       end
 
+      def with_model_currency(attribute)
+        @currency_attribute = attribute
+        self
+      end
+
       def as(virt_attr)
         @as = virt_attr
         self
@@ -39,7 +44,8 @@ module MoneyRails
         object_responds_to_attributes? &&
           test_allow_nil &&
           is_monetized? &&
-          test_currency_iso
+          test_currency_iso &&
+          test_currency_attribute
       end
 
 
@@ -75,21 +81,29 @@ module MoneyRails
 
       def test_allow_nil
         if @allow_nil
-          @actual.send(@money_attribute_setter, "")
-          @actual.send(@money_attribute).nil?
+          @actual.public_send(@money_attribute_setter, "")
+          @actual.public_send(@money_attribute).nil?
         else
           true
         end
       end
 
       def is_monetized?
-        @actual.send(@money_attribute_setter, 1)
-        @actual.send(@money_attribute).instance_of?(Money)
+        @actual.public_send(@money_attribute_setter, 1)
+        @actual.public_send(@money_attribute).instance_of?(Money)
       end
 
       def test_currency_iso
         if @currency_iso
-          @actual.send(@money_attribute).currency.id == @currency_iso
+          @actual.public_send(@money_attribute).currency.id == @currency_iso
+        else
+          true
+        end
+      end
+
+      def test_currency_attribute
+        if @currency_attribute
+          @actual.public_send(@money_attribute).currency == @actual.public_send(@currency_attribute)
         else
           true
         end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/money-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.10.0"
+  s.add_dependency "money",         "~> 6.11.0"
   s.add_dependency "monetize",      "~> 1.7.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"

data/spec/active_record/monetizable_spec.rb

@@ -7,17 +7,17 @@ class Sub < Product; end
 if defined? ActiveRecord
   describe MoneyRails::ActiveRecord::Monetizable do
     let(:product) do
-      Product.create(:price_cents => 3000, :discount => 150,
-                     :bonus_cents => 200, :optional_price => 100,
-                     :sale_price_amount => 1200, :delivery_fee_cents => 100,
-                     :restock_fee_cents => 2000,
-                     :reduced_price_cents => 1500, :reduced_price_currency => :lvl,
-                     :lambda_price_cents => 4000)
+      Product.create(price_cents: 3000, discount: 150,
+                     bonus_cents: 200, optional_price: 100,
+                     sale_price_amount: 1200, delivery_fee_cents: 100,
+                     restock_fee_cents: 2000,
+                     reduced_price_cents: 1500, reduced_price_currency: :lvl,
+                     lambda_price_cents: 4000)
     end
 
     describe ".monetize" do
       let(:service) do
-        Service.create(:charge_cents => 2000, :discount_cents => 120)
+        Service.create(charge_cents: 2000, discount_cents: 120)
       end
 
       context ".monetized_attributes" do
@@ -66,14 +66,14 @@ if defined? ActiveRecord
       end
 
       it "assigns the correct value from a Money object using create" do
-        product = Product.create(:price => Money.new(3210, "USD"), :discount => 150,
-                                 :bonus_cents => 200, :optional_price => 100)
+        product = Product.create(price: Money.new(3210, "USD"), discount: 150,
+                                 bonus_cents: 200, optional_price: 100)
         expect(product.valid?).to be_truthy
         expect(product.price_cents).to eq(3210)
       end
 
       it "correctly updates from a Money object using update_attributes" do
-        expect(product.update_attributes(:price => Money.new(215, "USD"))).to be_truthy
+        expect(product.update_attributes(price: Money.new(215, "USD"))).to be_truthy
         expect(product.price_cents).to eq(215)
       end
 
@@ -187,8 +187,8 @@ if defined? ActiveRecord
       end
 
       it "respects numericality validation when using update_attributes" do
-        expect(product.update_attributes(:price_cents => "some text")).to be_falsey
-        expect(product.update_attributes(:price_cents => 2000)).to be_truthy
+        expect(product.update_attributes(price_cents: "some text")).to be_falsey
+        expect(product.update_attributes(price_cents: 2000)).to be_truthy
       end
 
       it "uses numericality validation on money attribute" do
@@ -213,6 +213,12 @@ if defined? ActiveRecord
         expect(product.save).to be_truthy
       end
 
+      it "shouldn't init empty key in errors" do
+        product.price = Money.new(320, "USD")
+        product.valid?
+        expect(product.errors.has_key?(:price)).to be_falsey
+      end
+
       it "fails validation with the proper error message if money value is invalid decimal" do
         product.price = "12.23.24"
         expect(product.save).to be_falsey
@@ -303,9 +309,9 @@ if defined? ActiveRecord
       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)
+        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
@@ -365,22 +371,22 @@ if defined? ActiveRecord
       end
 
       it "fails validation when a non number string is given" do
-        product = Product.create(:price_in_a_range => "asd")
+        product = Product.create(price_in_a_range: "asd")
         expect(product.valid?).to be_falsey
         expect(product.errors[:price_in_a_range].size).to eq(1)
         expect(product.errors[:price_in_a_range].first).to match(/greater than zero/)
 
-        product = Product.create(:price_in_a_range => "asd23")
+        product = Product.create(price_in_a_range: "asd23")
         expect(product.valid?).to be_falsey
         expect(product.errors[:price_in_a_range].size).to eq(1)
         expect(product.errors[:price_in_a_range].first).to match(/greater than zero/)
 
-        product = Product.create(:price => "asd")
+        product = Product.create(price: "asd")
         expect(product.valid?).to be_falsey
         expect(product.errors[:price].size).to eq(1)
         expect(product.errors[:price].first).to match(/is not a number/)
 
-        product = Product.create(:price => "asd23")
+        product = Product.create(price: "asd23")
         expect(product.valid?).to be_falsey
         expect(product.errors[:price].size).to eq(1)
         expect(product.errors[:price].first).to match(/is not a number/)
@@ -409,8 +415,8 @@ if defined? ActiveRecord
       end
 
       it "respects numericality validation when using update_attributes on money attribute" do
-        expect(product.update_attributes(:price => "some text")).to be_falsey
-        expect(product.update_attributes(:price => Money.new(320, 'USD'))).to be_truthy
+        expect(product.update_attributes(price: "some text")).to be_falsey
+        expect(product.update_attributes(price: Money.new(320, 'USD'))).to be_truthy
       end
 
       it "uses i18n currency format when validating" do
@@ -586,8 +592,8 @@ if defined? ActiveRecord
       end
 
       it "sets field to nil, in instantiation if allow_nil is set" do
-        pr = Product.new(:optional_price => nil, :price_cents => 5320,
-                         :discount => 350, :bonus_cents => 320)
+        pr = Product.new(optional_price: nil, price_cents: 5320,
+                         discount: 350, bonus_cents: 320)
         expect(pr.optional_price).to be_nil
         expect(pr.save).to be_truthy
         expect(pr.optional_price).to be_nil
@@ -609,23 +615,23 @@ if defined? ActiveRecord
 
       context "for column with model currency:" do
         it "has default currency if not specified" do
-          product = Product.create(:sale_price_amount => 1234)
+          product = Product.create(sale_price_amount: 1234)
           product.sale_price.currency_as_string == 'USD'
         end
 
         it "is overridden by instance currency column" do
-          product = Product.create(:sale_price_amount => 1234,
-                                   :sale_price_currency_code => 'CAD')
+          product = Product.create(sale_price_amount: 1234,
+                                   sale_price_currency_code: 'CAD')
           expect(product.sale_price.currency_as_string).to eq('CAD')
         end
 
         it 'can change currency of custom column' do
           product = Product.create!(
-            :price => Money.new(10,'USD'),
-            :bonus => Money.new(10,'GBP'),
-            :discount => 10,
-            :sale_price_amount => 1234,
-            :sale_price_currency_code => 'USD'
+            price: Money.new(10,'USD'),
+            bonus: Money.new(10,'GBP'),
+            discount: 10,
+            sale_price_amount: 1234,
+            sale_price_currency_code: 'USD'
           )
 
           expect(product.sale_price.currency_as_string).to eq('USD')
@@ -641,21 +647,21 @@ if defined? ActiveRecord
 
       context "for model with currency column:" do
         let(:transaction) do
-          Transaction.create(:amount_cents => 2400, :tax_cents => 600,
-                             :currency => :usd)
+          Transaction.create(amount_cents: 2400, tax_cents: 600,
+                             currency: :usd)
         end
 
         let(:dummy_product) do
-          DummyProduct.create(:price_cents => 2400, :currency => :usd)
+          DummyProduct.create(price_cents: 2400, currency: :usd)
         end
 
         let(:dummy_product_with_nil_currency) do
-          DummyProduct.create(:price_cents => 2600) # nil currency
+          DummyProduct.create(price_cents: 2600) # nil currency
         end
 
         let(:dummy_product_with_invalid_currency) do
           # invalid currency
-          DummyProduct.create(:price_cents => 2600, :currency => :foo)
+          DummyProduct.create(price_cents: 2600, currency: :foo)
         end
 
         it "correctly serializes the currency to a new instance of model" do
@@ -691,7 +697,7 @@ if defined? ActiveRecord
         end
 
         it "correctly instantiates Money objects from the mapped attributes" do
-          t = Transaction.new(:amount_cents => 2500, :currency => "CAD")
+          t = Transaction.new(amount_cents: 2500, currency: "CAD")
           expect(t.amount).to eq(Money.new(2500, "CAD"))
         end
 
@@ -726,7 +732,7 @@ if defined? ActiveRecord
 
         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")
+            t = Transaction.new(amount_cents: 2500, currency: "CAD")
             t.optional_amount = nil
             expect(t.currency).to eq("CAD")
           end
@@ -907,7 +913,7 @@ if defined? ActiveRecord
       end
 
       it "resets monetized attribute when given blank input" do
-        product.write_monetized :price, :price_cents, nil, false, nil, { :allow_nil => true }
+        product.write_monetized :price, :price_cents, nil, false, nil, { allow_nil: true }
 
         expect(product.price).to eq(nil)
       end
@@ -1005,7 +1011,7 @@ if defined? ActiveRecord
 
     describe "#currency_for" do
       it "detects currency based on instance currency name" do
-        product = Product.new(:sale_price_currency_code => 'CAD')
+        product = Product.new(sale_price_currency_code: 'CAD')
         currency = product.send(:currency_for, :sale_price, :sale_price_currency_code, nil)
 
         expect(currency).to be_an_instance_of(Money::Currency)

data/spec/configuration_spec.rb

@@ -76,11 +76,11 @@ describe "configuration" do
       value = Money.new(-12345600, "EUR")
       symbol = Money::Currency.find(:eur).symbol
 
-      MoneyRails.default_format = {:symbol_position => :after}
+      MoneyRails.default_format = {symbol_position: :after}
       expect(value.format).to match(/#{symbol}\z/)
 
       # Override with "classic" format options for backward compatibility
-      MoneyRails.default_format = {:sign_before_symbol => :false}
+      MoneyRails.default_format = {sign_before_symbol: :false}
       MoneyRails.sign_before_symbol = true
       expect(value.format).to match(/-#{symbol}/)
 

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

@@ -3,6 +3,6 @@ class DummyProduct < ActiveRecord::Base
   register_currency :gbp
 
   # Use money-rails macros
-  monetize :price_cents, :with_model_currency => :currency
+  monetize :price_cents, with_model_currency: :currency
 end
 

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

@@ -2,7 +2,7 @@ if defined? Mongoid
   class Priceable
     include Mongoid::Document
 
-    field :price, :type => Money
-    field :price_hash, :type => Hash
+    field :price, type: Money
+    field :price_hash, type: Hash
   end
 end

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

@@ -6,30 +6,31 @@ class Product < ActiveRecord::Base
   monetize :price_cents
 
   # Use money-rails macro with multiple fields
-  monetize :delivery_fee_cents, :restock_fee_cents, :allow_nil => true
+  monetize :delivery_fee_cents, :restock_fee_cents, allow_nil: true
 
   # Use a custom name for the Money attribute
-  monetize :discount, :as => "discount_value"
+  monetize :discount, as: "discount_value"
 
   # Allow nil
-  monetize :optional_price_cents, :allow_nil => true
+  monetize :optional_price_cents, allow_nil: true
 
   # Override default currency (EUR) with a specific one (GBP) for this field only
-  monetize :bonus_cents, :with_currency => :gbp
+  monetize :bonus_cents, with_currency: :gbp
 
   # Use currency column to determine currency for this field only
-  monetize :sale_price_amount, :as => :sale_price,
-    :with_model_currency => :sale_price_currency_code
-
-  monetize :price_in_a_range_cents, :allow_nil => true,
-  :subunit_numericality => {
-    :greater_than => 0,
-  :less_than_or_equal_to => 10000 },
-  :numericality => {
-    :greater_than => 0,
-    :less_than_or_equal_to => 100,
-    :message => "must be greater than zero and less than $100"
-  }
+  monetize :sale_price_amount, as: :sale_price,
+    with_model_currency: :sale_price_currency_code
+
+  monetize :price_in_a_range_cents, allow_nil: true,
+                                    subunit_numericality: {
+                                      greater_than: 0,
+                                      less_than_or_equal_to: 10000
+                                    },
+                                    numericality: {
+                                      greater_than: 0,
+                                      less_than_or_equal_to: 100,
+                                      message: "must be greater than zero and less than $100"
+                                    }
 
   # Skip validations separately from each other
   monetize :skip_validation_price_cents, subunit_numericality: false, numericality: false, allow_nil: true
@@ -42,16 +43,17 @@ class Product < ActiveRecord::Base
 
   monetize :validates_method_amount_cents, allow_nil: true
 
-  validates :validates_method_amount, :money => {
-    :greater_than => 0,
-    :less_than_or_equal_to => ->(product) { product.optional_price.to_f },
-    :message => 'must be greater than zero and less than $100',
-  }, allow_nil: true
+  validates :validates_method_amount, money: {
+                                        greater_than: 0,
+                                        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
+  monetize :reduced_price_cents, allow_nil: true
 end

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

@@ -1,5 +1,5 @@
 class Service < ActiveRecord::Base
-  monetize :charge_cents, :with_currency => :usd
+  monetize :charge_cents, with_currency: :usd
 
   monetize :discount_cents
 end

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

@@ -1,11 +1,11 @@
 class Transaction < ActiveRecord::Base
-  monetize :amount_cents, :with_model_currency => :currency
+  monetize :amount_cents, with_model_currency: :currency
 
-  monetize :tax_cents, :with_model_currency => :currency
+  monetize :tax_cents, with_model_currency: :currency
 
-  monetize :total_cents, :with_model_currency => :currency
+  monetize :total_cents, with_model_currency: :currency
 
-  monetize :optional_amount_cents, :with_model_currency => :currency, :allow_nil => true
+  monetize :optional_amount_cents, with_model_currency: :currency, allow_nil: true
 
   def total_cents
     return amount_cents + tax_cents

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= stylesheet_link_tag    "application", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>

data/spec/dummy/config/initializers/money.rb

@@ -18,14 +18,14 @@ MoneyRails.configure do |config|
   # Register a custom currency
   #
   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:        ","
   }
 end