money-rails 1.10.0 → 1.11.0

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

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

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

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.

data/spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb

@@ -1,7 +1,7 @@
 class AddSalePriceCentsToProduct < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :sale_price_amount, :integer,
-               :default => 0, :null => false
+               default: 0, null: false
     add_column :products, :sale_price_currency_code, :string
   end
 end

data/spec/helpers/action_view_extension_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'MoneyRails::ActionViewExtension', :type => :helper do
+describe 'MoneyRails::ActionViewExtension', type: :helper do
   describe '#currency_symbol' do
     subject { helper.currency_symbol }
     it { is_expected.to be_a String }
@@ -16,7 +16,7 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
     it { is_expected.not_to include Money.default_currency.decimal_mark }
 
     context 'with symbol options' do
-      let(:options) { { :symbol => true } }
+      let(:options) { { symbol: true } }
       it { is_expected.to include Money.default_currency.symbol }
     end
 
@@ -32,11 +32,11 @@ describe 'MoneyRails::ActionViewExtension', :type => :helper do
       let(:money_object) { Money.new(125_00, 'SGD') }
 
       context 'with symbol options' do
-        let(:options) { { :symbol => true } }
+        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 } }
+          let(:options) { { symbol: true, disambiguate: true } }
           it { is_expected.to include Money::Currency.new(:sgd).disambiguate_symbol }
         end
       end

data/spec/helpers/form_helper_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 if defined? ActiveRecord
-  describe "Test helper in form blocks", :type => :helper do
+  describe "Test helper in form blocks", type: :helper do
 
     let :product do
-      Product.create(:price_cents => 3000, :discount => 150,
-                     :bonus_cents => 200, :optional_price => 100,
-                     :sale_price_amount => 1200)
+      Product.create(price_cents: 3000, discount: 150,
+                     bonus_cents: 200, optional_price: 100,
+                     sale_price_amount: 1200)
     end
 
     context "textfield" do

data/spec/mongoid/five_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 if defined?(Mongoid) && ::Mongoid::VERSION =~ /^5(.*)/
 
   describe Money do
-    let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
-    let!(:priceable_from_num) { Priceable.create(:price => 1) }
-    let!(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
-    let!(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
+    let!(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
+    let!(:priceable_from_num) { Priceable.create(price: 1) }
+    let!(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
+    let!(:priceable_from_hash) { Priceable.create(price: {cents: 100, currency_iso: "EUR"} )}
     let!(:priceable_from_hash_with_indifferent_access) {
-      Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
+      Priceable.create(price: {cents: 100, currency_iso: "EUR"}.with_indifferent_access)
     }
-    let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
-    let(:priceable_from_string_with_unknown_currency) { Priceable.create(:price => '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
+    let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
     let(:priceable_with_hash_field) {
-      Priceable.create(:price_hash => {
-        :key1 => Money.new(100, "EUR"),
-        :key2 => Money.new(200, "USD")
+      Priceable.create(price_hash: {
+        key1: Money.new(100, "EUR"),
+        key2: Money.new(200, "USD")
       })
     }
 
@@ -103,14 +103,14 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^5(.*)/
         expect(nil_priceable.price.currency).to eq(Money.default_currency)
       end
       it 'returns nil if an unknown value was stored' do
-        zero_priceable = Priceable.create(:price => [])
+        zero_priceable = Priceable.create(price: [])
         expect(zero_priceable.price).to be_nil
       end
     end
 
     context "evolve" do
       it "correctly transforms a Money object into a Mongo friendly value" do
-        expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
+        expect(Priceable.where(price: Money.new(100, 'EUR')).first).to eq(priceable)
       end
     end
   end

data/spec/mongoid/four_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
 
   describe Money do
-    let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
-    let(:priceable_from_nil) { Priceable.create(:price => nil) }
-    let(:priceable_from_num) { Priceable.create(:price => 1) }
-    let(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
-    let(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
+    let!(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
+    let(:priceable_from_nil) { Priceable.create(price: nil) }
+    let(:priceable_from_num) { Priceable.create(price: 1) }
+    let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
+    let(:priceable_from_hash) { Priceable.create(price: {cents: 100, currency_iso: "EUR"} )}
     let(:priceable_from_hash_with_indifferent_access) {
-      Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
+      Priceable.create(price: {cents: 100, currency_iso: "EUR"}.with_indifferent_access)
     }
-    let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
-    let(:priceable_from_string_with_unknown_currency) { Priceable.create(:price => '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
+    let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
     let(:priceable_with_hash_field) {
-      Priceable.create(:price_hash => {
-        :key1 => Money.new(100, "EUR"),
-        :key2 => Money.new(200, "USD")
+      Priceable.create(price_hash: {
+        key1: Money.new(100, "EUR"),
+        key2: Money.new(200, "USD")
       })
     }
 
@@ -109,14 +109,14 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
       end
 
       it 'returns nil if an unknown value was stored' do
-        zero_priceable = Priceable.create(:price => [])
+        zero_priceable = Priceable.create(price: [])
         expect(zero_priceable.price).to be_nil
       end
     end
 
     context "evolve" do
       it "correctly transforms a Money object into a Mongo friendly value" do
-        expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
+        expect(Priceable.where(price: Money.new(100, 'EUR')).first).to eq(priceable)
       end
     end
   end

data/spec/mongoid/three_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
 
   describe Money do
-    let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
-    let(:priceable_from_nil) { Priceable.create(:price => nil) }
-    let(:priceable_from_num) { Priceable.create(:price => 1) }
-    let(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
-    let(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
+    let!(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
+    let(:priceable_from_nil) { Priceable.create(price: nil) }
+    let(:priceable_from_num) { Priceable.create(price: 1) }
+    let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
+    let(:priceable_from_hash) { Priceable.create(price: {cents: 100, currency_iso: "EUR"} )}
     let(:priceable_from_hash_with_indifferent_access) {
-      Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
+      Priceable.create(price: {cents: 100, currency_iso: "EUR"}.with_indifferent_access)
     }
-    let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
-    let(:priceable_from_string_with_unknown_currency) { Priceable.create(:price => '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
+    let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
     let(:priceable_with_hash_field) {
-      Priceable.create(:price_hash => {
-        :key1 => Money.new(100, "EUR"),
-        :key2 => Money.new(200, "USD")
+      Priceable.create(price_hash: {
+        key1: Money.new(100, "EUR"),
+        key2: Money.new(200, "USD")
       })
     }
 
@@ -108,14 +108,14 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
       end
 
       it 'returns nil if an unknown value was stored' do
-        zero_priceable = Priceable.create(:price => [])
+        zero_priceable = Priceable.create(price: [])
         expect(zero_priceable.price).to be_nil
       end
     end
 
     context "evolve" do
       it "transforms correctly a Money object to a Mongo friendly value" do
-        expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
+        expect(Priceable.where(price: Money.new(100, 'EUR')).first).to eq(priceable)
       end
     end
   end

data/spec/mongoid/two_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
 
   describe Money do
-    let(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
-    let(:priceable_from_nil) { Priceable.create(:price => nil) }
-    let(:priceable_from_num) { Priceable.create(:price => 1) }
-    let(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
-    let(:priceable_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
-    let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
+    let(:priceable) { Priceable.create(price: Money.new(100, 'EUR')) }
+    let(:priceable_from_nil) { Priceable.create(price: nil) }
+    let(:priceable_from_num) { Priceable.create(price: 1) }
+    let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
 
     context "serialize" do
       it "mongoizes correctly nil to nil" do
@@ -72,7 +72,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
       end
 
       it 'returns nil if an unknown value was stored' do
-        zero_priceable = Priceable.create(:price => [])
+        zero_priceable = Priceable.create(price: [])
         expect(zero_priceable.price).to be_nil
       end
     end

data/spec/test_helpers_spec.rb

@@ -8,9 +8,9 @@ if defined? ActiveRecord
     include MoneyRails::TestHelpers
 
     let(:product) do
-      Product.create(:price_cents => 3000, :discount => 150,
-                     :bonus_cents => 200,
-                     :sale_price_amount => 1200)
+      Product.create(price_cents: 3000, discount: 150,
+                     bonus_cents: 200,
+                     sale_price_amount: 1200)
     end
 
     describe "monetize matcher" do
@@ -37,6 +37,14 @@ if defined? ActiveRecord
           is_expected.to monetize(:bonus).with_currency(:gbp)
         end
 
+        it "matches model attribute with currency attribute specified by :with_model_currency chain" do
+          is_expected.to(
+            monetize(:sale_price_amount)
+              .as(:sale_price)
+              .with_model_currency(:sale_price_currency_code)
+          )
+        end
+
         it "does not match non existed attribute" do
           is_expected.not_to monetize(:price_fake)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.10.0
+        version: 6.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.10.0
+        version: 6.11.0
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement