mongoid_money_field 4.0.7 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13fd2be521b2ea8721b0531787b531f57f3d7467
-  data.tar.gz: 3de18d51cfc1ce923353f25e68cabc840bf4c927
+  metadata.gz: 98301ef0d0c01eda3e2dfbb588e4b23649399c39
+  data.tar.gz: 253619673f52ee7d97c6a6efcb5e4a8e1315eade
 SHA512:
-  metadata.gz: 3d8f6dc6e7c7c7ca33a7dd84855b633f69a303535f34e7bfc3d34b381a4cbd2fdd33f08f7ef153375ed2fba7f0f0e3ceb1106fc2ce9c2bfa709a7766f6e032f9
-  data.tar.gz: 0e02e71d00c15d529ea6011278e960312d18d6d94713ea55c07ec9bed5155a77b279231950b234220170509ef8a83ed22f3b6d036043ee90c39943b660b236e7
+  metadata.gz: c809646376f3f0fb429df3dd700f8f378a77b3e82eb6e36cb3de61302727538470cbbdd6871848c4425a0dcf01165b16ef988fd49209130cf6f7c2d2682e51b3
+  data.tar.gz: 98f7746d6548bb709c25c5ae48841c19a50271158f0bb889a3afdf838b8ed28f0cdc5e4ef5d15e8dfb7b1dae28f387769417ea532bc4bde5257c0501b2806836

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.1.2

data/.travis.yml

@@ -4,5 +4,8 @@ services: mongodb
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
+
+notifications:
+  email: false
 

data/lib/mongoid_money_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidMoneyField
-  VERSION = "4.0.7"
+  VERSION = "4.0.8"
 end

data/mongoid_money_field.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mongoid", ">= 3.0.0"
-  spec.add_runtime_dependency "monetize"
-  spec.add_runtime_dependency "money", "~> 6.1.0.beta1"
+  spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
+  spec.add_dependency "monetize"
+  spec.add_dependency "money", "~> 6.1.1"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler"
@@ -30,3 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "mongoid-rspec"
 end
+

data/spec/model_spec.rb

@@ -3,6 +3,6 @@
 require 'spec_helper'
 
 describe DummyMoney do
-  it { should allow_mass_assignment_of(:description) }
-  it { should allow_mass_assignment_of(:price) }
+  it { is_expected.to allow_mass_assignment_of(:description) }
+  it { is_expected.to allow_mass_assignment_of(:price) }
 end

data/spec/money3_compat_spec.rb

@@ -3,121 +3,121 @@
 require 'spec_helper'
 
 describe Money3Compat do
-  it { should allow_mass_assignment_of(:description) }
-  it { should allow_mass_assignment_of(:price) }
+  it { is_expected.to allow_mass_assignment_of(:description) }
+  it { is_expected.to allow_mass_assignment_of(:price) }
 
   it 'correctly reads old fields data' do
     Money3.create!(price_currency: 'GBP', price_cents: '12000')
-    Money3Compat.first.price.cents.should eq 12000
-    Money3Compat.first.price.currency.iso_code.should eq 'GBP'
+    expect(Money3Compat.first.price.cents).to eq 12000
+    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
   end
 
   it 'correctly works after save' do
     Money3.create!(price_currency: 'GBP', price_cents: '12000')
-    Money3Compat.first.save.should be_true
+    expect(Money3Compat.first.save).to be_truthy
 
-    Money3Compat.first.price.cents.should eq 12000
-    Money3Compat.first.price.currency.iso_code.should eq 'GBP'
+    expect(Money3Compat.first.price.cents).to eq 12000
+    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
   end
 
   it 'correctly migrates data' do
     Money3.create!(price_currency: 'GBP', price_cents: '12000')
 
-    Money3.first.read_attribute(:price_currency).should_not be_nil
-    Money3.first.read_attribute(:price_cents).should_not be_nil
+    expect(Money3.first.read_attribute(:price_currency)).not_to be_nil
+    expect(Money3.first.read_attribute(:price_cents)).not_to be_nil
 
-    Money3.first.read_attribute(:price_currency).should eq 'GBP'
-    Money3.first.read_attribute(:price_cents).should eq 12000
+    expect(Money3.first.read_attribute(:price_currency)).to eq 'GBP'
+    expect(Money3.first.read_attribute(:price_cents)).to eq 12000
 
     Money3Compat.migrate_from_money_field_3!(:price)
 
-    Money3Compat.first.price.cents.should eq 12000
-    Money3Compat.first.price.currency.iso_code.should eq 'GBP'
+    expect(Money3Compat.first.price.cents).to eq 12000
+    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
 
-    Money3.first.read_attribute(:price_currency).should be_nil
-    Money3.first.read_attribute(:price_cents).should be_nil
+    expect(Money3.first.read_attribute(:price_currency)).to be_nil
+    expect(Money3.first.read_attribute(:price_cents)).to be_nil
 
-    Money3Compat.first.read_attribute(:price_currency).should be_nil
-    Money3Compat.first.read_attribute(:price_cents).should be_nil
+    expect(Money3Compat.first.read_attribute(:price_currency)).to be_nil
+    expect(Money3Compat.first.read_attribute(:price_cents)).to be_nil
 
     f = Money3Compat.first
     f.price = '32.00 GBP'
-    f.save.should be_true
+    expect(f.save).to be_truthy
 
-    Money3Compat.first.price.cents.should eq 3200
-    Money3Compat.first.price.currency.iso_code.should eq 'GBP'
+    expect(Money3Compat.first.price.cents).to eq 3200
+    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
   end
 
   describe 'with fixed currency' do
     it 'correctly reads old' do
       Money3.create!(price_with_fix_cents: '12000')
-      Money3Compat.first.price_with_fix.cents.should eq 12000
-      Money3Compat.first.price_with_fix.currency.iso_code.should eq 'GBP'
+      expect(Money3Compat.first.price_with_fix.cents).to eq 12000
+      expect(Money3Compat.first.price_with_fix.currency.iso_code).to eq 'GBP'
     end
 
     it 'correctly works after save' do
       Money3.create!(price_with_fix_cents: '12000')
-      Money3Compat.first.save.should be_true
-      Money3Compat.first.price_with_fix.cents.should eq 12000
-      Money3Compat.first.price_with_fix.currency.iso_code.should eq 'GBP'
+      expect(Money3Compat.first.save).to be_truthy
+      expect(Money3Compat.first.price_with_fix.cents).to eq 12000
+      expect(Money3Compat.first.price_with_fix.currency.iso_code).to eq 'GBP'
     end
 
     it 'correctly migrates data' do
       Money3.create!(price_with_fix_cents: '12000')
       Money3Compat.migrate_from_money_field_3!(:price_with_fix)
 
-      Money3Compat.first.read_attribute(:price_with_fix_currency).should be_nil
-      Money3Compat.first.read_attribute(:price_with_fix_cents).should be_nil
+      expect(Money3Compat.first.read_attribute(:price_with_fix_currency)).to be_nil
+      expect(Money3Compat.first.read_attribute(:price_with_fix_cents)).to be_nil
 
-      Money3Compat.first.price_with_fix.cents.should eq 12000
-      Money3Compat.first.price_with_fix.currency.iso_code.should eq 'GBP'
+      expect(Money3Compat.first.price_with_fix.cents).to eq 12000
+      expect(Money3Compat.first.price_with_fix.currency.iso_code).to eq 'GBP'
     end
   end
 
   describe 'with no default' do
     it 'correctly reads old' do
       Money3.create!(price_no_default_currency: 'GBP', price_no_default_cents: '12000')
-      Money3Compat.first.price_no_default.cents.should eq 12000
-      Money3Compat.first.price_no_default.currency.iso_code.should eq 'GBP'
+      expect(Money3Compat.first.price_no_default.cents).to eq 12000
+      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'GBP'
     end
 
     it 'correctly works after save' do
       Money3.create!(price_no_default_currency: 'GBP', price_no_default_cents: '12000')
-      Money3Compat.first.save.should be_true
-      Money3Compat.first.price_no_default.cents.should eq 12000
-      Money3Compat.first.price_no_default.currency.iso_code.should eq 'GBP'
+      expect(Money3Compat.first.save).to be_truthy
+      expect(Money3Compat.first.price_no_default.cents).to eq 12000
+      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'GBP'
     end
 
     it 'correctly migrates data' do
       Money3.create!(price_no_default_currency: 'GBP', price_no_default_cents: '12000')
       Money3Compat.migrate_from_money_field_3!(:price_no_default)
 
-      Money3Compat.first.read_attribute(:price_no_default_currency).should be_nil
-      Money3Compat.first.read_attribute(:price_no_default_cents).should be_nil
+      expect(Money3Compat.first.read_attribute(:price_no_default_currency)).to be_nil
+      expect(Money3Compat.first.read_attribute(:price_no_default_cents)).to be_nil
 
-      Money3Compat.first.price_no_default.cents.should eq 12000
-      Money3Compat.first.price_no_default.currency.iso_code.should eq 'GBP'
+      expect(Money3Compat.first.price_no_default.cents).to eq 12000
+      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'GBP'
     end
 
     it 'correctly migrates data with no currency' do
       Money3.create!(price_no_default_cents: '12000')
       Money3Compat.migrate_from_money_field_3!(:price_no_default)
 
-      Money3Compat.first.read_attribute(:price_no_default_currency).should be_nil
-      Money3Compat.first.read_attribute(:price_no_default_cents).should be_nil
+      expect(Money3Compat.first.read_attribute(:price_no_default_currency)).to be_nil
+      expect(Money3Compat.first.read_attribute(:price_no_default_cents)).to be_nil
 
-      Money3Compat.first.price_no_default.cents.should eq 12000
-      Money3Compat.first.price_no_default.currency.iso_code.should eq 'RUB'
+      expect(Money3Compat.first.price_no_default.cents).to eq 12000
+      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'RUB'
     end
 
     it 'correctly migrates data with no cents' do
       Money3.create!()
       Money3Compat.migrate_from_money_field_3!(:price_no_default)
 
-      Money3Compat.first.read_attribute(:price_no_default_currency).should be_nil
-      Money3Compat.first.read_attribute(:price_no_default_cents).should be_nil
+      expect(Money3Compat.first.read_attribute(:price_no_default_currency)).to be_nil
+      expect(Money3Compat.first.read_attribute(:price_no_default_cents)).to be_nil
 
-      Money3Compat.first.price_no_default.should be_nil
+      expect(Money3Compat.first.price_no_default).to be_nil
     end
   end
 end

data/spec/money3_spec.rb

@@ -8,24 +8,24 @@ describe Mongoid::MoneyField do
     it 'should be valid to save when field is filled in' do
       dummy = DummyMoneyRequired.new
       dummy.price = '$10'
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
 
     it 'should be not valid to save when field is not filled in' do
       dummy = DummyMoneyRequired.new
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "can't be blank"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "can't be blank"
+      expect(dummy.save).to eq false
     end
 
     it 'should be valid to save when field is filled in but currency is not' do
       dummy = DummyMoneyRequired.new
       dummy.price_cents = 123
-      dummy.should be_valid
-      dummy.save.should eq true
-      dummy.price_currency.should eq Money.default_currency.iso_code
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
+      expect(dummy.price_currency).to eq Money.default_currency.iso_code
     end
   end
 
@@ -33,35 +33,35 @@ describe Mongoid::MoneyField do
     it 'should raise the error when value consists non digits' do
       dummy = DummyNotANumber.new
       dummy.price = 'incorrect1'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value consists more then one decimal separator' do
       dummy = DummyNotANumber.new
       dummy.price = '121,212,22'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value is not present' do
       dummy = DummyNotANumber.new
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value is not present' do
       dummy = DummyNotANumber.new( price: '' )
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
   end
 
@@ -69,65 +69,65 @@ describe Mongoid::MoneyField do
     it 'should raise the error when value consists non digits' do
       dummy = DummyNotANumber.new
       dummy.price_plain = 'incorrect1'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value consists more then one decimal separator' do
       dummy = DummyNotANumber.new
       dummy.price_plain = '121,212,22'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
   end
 
   describe 'when value should be a positive number' do
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new( price: '-10' )
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "must be greater than 1"
-      dummy.save.should eq false
-      dummy.price_cents.should eq -1000
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "must be greater than 1"
+      expect(dummy.save).to eq false
+      expect(dummy.price_cents).to eq -1000
     end
 
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new( price: '0' )
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "must be greater than 1"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "must be greater than 1"
+      expect(dummy.save).to eq false
     end
 
     it 'should be ok when value is greater than 1' do
       dummy = DummyPositiveNumber.new( price: '10' )
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
 
     it 'should be ok when value is not present' do
       dummy = DummyPositiveNumber.new( price: '' )
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
   end
 
   describe 'when both default currency and fixed currency is specified' do
     it 'should use fixed currency instead of default' do
       DummyOverrideDefaultCurrency.create!(price: '1.23')
-      DummyOverrideDefaultCurrency.first.price.currency.iso_code.should eq 'GBP'
+      expect(DummyOverrideDefaultCurrency.first.price.currency.iso_code).to eq 'GBP'
     end
   end
 
   describe 'when default currency is specified' do
     it 'should use it instead of Money.default_currency' do
       DummyWithDefaultCurrency.create!(price: '1.23')
-      DummyWithDefaultCurrency.first.price.currency.iso_code.should eq 'EUR'
-      Money.default_currency.iso_code.should eq 'RUB'
+      expect(DummyWithDefaultCurrency.first.price.currency.iso_code).to eq 'EUR'
+      expect(Money.default_currency.iso_code).to eq 'RUB'
     end
   end
 
@@ -135,32 +135,32 @@ describe Mongoid::MoneyField do
     it 'should be persisted normally when set as dollars' do
       dummy = DummyMoney.new
       dummy.price = '$10'
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
     end
     
     it 'should be persisted normally when set as cents' do
       dummy = DummyMoney.new
       dummy.price = '$9.99'
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
     end
     
     it 'should be persisted normally when set as Money' do
       dummy = DummyMoney.new
       dummy.price = Monetize.parse(1.23)
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
     end
 
     it 'should be possible to set value to nil' do
       dummy = DummyMoney.new
       dummy.price = Monetize.parse(1.23)
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
 
       dummy = DummyMoney.first
-      dummy.price.should eq Monetize.parse(1.23)
+      expect(dummy.price).to eq Monetize.parse(1.23)
       dummy.price = nil
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoney.first
-      dummy.price.should be_nil
+      expect(dummy.price).to be_nil
     end
   end
   
@@ -171,7 +171,7 @@ describe Mongoid::MoneyField do
     
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      dummy.price.should eq Monetize.parse('9.99')
+      expect(dummy.price).to eq Monetize.parse('9.99')
     end
   end
   
@@ -184,7 +184,7 @@ describe Mongoid::MoneyField do
     
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      dummy.price.cents.should eq 123
+      expect(dummy.price.cents).to eq 123
     end
   end
   
@@ -195,50 +195,50 @@ describe Mongoid::MoneyField do
     
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      dummy.price.cents.should eq 123
+      expect(dummy.price.cents).to eq 123
     end
   end
   
   describe 'when accessing a document from the datastore with a Money datatype and empty value' do
     it 'should be nil' do
       dummy = DummyMoneyWithoutDefault.new
-      dummy.save.should eq true
-      DummyMoneyWithoutDefault.first.price.should be_nil
+      expect(dummy.save).to eq true
+      expect(DummyMoneyWithoutDefault.first.price).to be_nil
     end
     
       it 'should be 0 when used with default' do
       dummy = DummyMoney.new
-      dummy.save.should eq true
-      DummyMoney.first.price.cents.should eq 0
+      expect(dummy.save).to eq true
+      expect(DummyMoney.first.price.cents).to eq 0
     end
 
     it 'should set money to default currency if money is given without it' do
       dummy = DummyMoneyWithDefault.new
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoneyWithDefault.first
-      dummy.price.currency.iso_code.should eq Money.default_currency.iso_code
-      dummy.price.cents.should eq 100
+      expect(dummy.price.currency.iso_code).to eq Money.default_currency.iso_code
+      expect(dummy.price.cents).to eq 100
     end
 
     it 'should set money to default currency if money is given without it on a document with multiple money fields' do
       dummy = DummyPrices.new
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyPrices.first
-      dummy.price.currency.iso_code.should eq Money.default_currency.iso_code
-      dummy.price.cents.should eq 100
+      expect(dummy.price.currency.iso_code).to eq Money.default_currency.iso_code
+      expect(dummy.price.cents).to eq 100
       
-      dummy.price2.should be_nil
+      expect(dummy.price2).to be_nil
 
-      dummy.price1.cents.should eq 0
+      expect(dummy.price1.cents).to eq 0
     end
 
 
     it 'should set money to correct currency if money is given with it' do
       dummy = DummyMoneyWithDefaultWithCurrency.new
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoneyWithDefaultWithCurrency.first
-      dummy.price.currency.iso_code.should eq 'GBP'
-      dummy.price.cents.should eq 100
+      expect(dummy.price.currency.iso_code).to eq 'GBP'
+      expect(dummy.price.cents).to eq 100
     end
   end
 
@@ -246,17 +246,17 @@ describe Mongoid::MoneyField do
     it 'should have correct currency when value is set to 5$' do
       DummyMoneyWithFixedCurrency.create!(price: '5$')
       dummy = DummyMoneyWithFixedCurrency.first
-      dummy.price.currency.iso_code.should eq 'GBP'
-      dummy.price.cents.should eq 500
-      dummy.price.should eq Monetize.parse('5 GBP')
+      expect(dummy.price.currency.iso_code).to eq 'GBP'
+      expect(dummy.price.cents).to eq 500
+      expect(dummy.price).to eq Monetize.parse('5 GBP')
     end
 
     it 'should have correct currency when value is set to 100 RUB' do
       DummyMoneyWithFixedCurrency.create!(price: '100 RUB')
       dummy = DummyMoneyWithFixedCurrency.first
-      dummy.price.currency.iso_code.should eq 'GBP'
-      dummy.price.cents.should eq 100_00
-      dummy.price.should eq Monetize.parse('100 GBP')
+      expect(dummy.price.currency.iso_code).to eq 'GBP'
+      expect(dummy.price.cents).to eq 100_00
+      expect(dummy.price).to eq Monetize.parse('100 GBP')
     end
   end
 
@@ -264,17 +264,17 @@ describe Mongoid::MoneyField do
     it 'should handle RUB' do
       DummyMoney.create(description: "Test", price: '1.23 RUB')
       dummy = DummyMoney.first
-      dummy.price.currency.iso_code.should eq 'RUB'
-      dummy.price.cents.should eq 123
-      dummy.price.should eq Monetize.parse('1.23 RUB')
+      expect(dummy.price.currency.iso_code).to eq 'RUB'
+      expect(dummy.price.cents).to eq 123
+      expect(dummy.price).to eq Monetize.parse('1.23 RUB')
     end
 
     it 'should handle $' do
       DummyMoney.create(description: "Test", price: '1.23 USD')
       dummy = DummyMoney.first
-      dummy.price.currency.iso_code.should eq 'USD'
-      dummy.price.cents.should eq 123
-      dummy.price.should eq Monetize.parse('1.23 USD')
+      expect(dummy.price.currency.iso_code).to eq 'USD'
+      expect(dummy.price.cents).to eq 123
+      expect(dummy.price).to eq Monetize.parse('1.23 USD')
     end
   end
   
@@ -285,17 +285,17 @@ describe Mongoid::MoneyField do
     
     it 'should be nil' do
       dummy = DummyMoney.first
-      dummy.price.should be_nil
+      expect(dummy.price).to be_nil
     end
 
     it 'should be updated correctly' do
       dummy = DummyMoney.first
-      dummy.price.should be_nil
+      expect(dummy.price).to be_nil
       dummy.price = '1.23 USD'
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoney.first
-      dummy.price.currency.iso_code.should eq 'USD'
-      dummy.price.cents.should eq 123
+      expect(dummy.price.currency.iso_code).to eq 'USD'
+      expect(dummy.price.cents).to eq 123
     end
   end
   
@@ -312,12 +312,12 @@ describe Mongoid::MoneyField do
     
     it 'should have correct value for first item' do
       o = DummyOrder.first
-      o.dummy_line_items.first.price.should eq Monetize.parse('12.99')
+      expect(o.dummy_line_items.first.price).to eq Monetize.parse('12.99')
     end
     
     it 'should have correct value for first item' do
       o = DummyOrder.first
-      o.dummy_line_items.last.price.should eq Monetize.parse('14.99')
+      expect(o.dummy_line_items.last.price).to eq Monetize.parse('14.99')
     end    
   end
   
@@ -328,15 +328,15 @@ describe Mongoid::MoneyField do
     
     it 'should have correct Money value for field 1' do
       dummy = DummyPrices.first
-      dummy.price1.should eq Monetize.parse('1.23')
+      expect(dummy.price1).to eq Monetize.parse('1.23')
     end
     it 'should have correct Money value for field 2' do
       dummy = DummyPrices.first
-      dummy.price2.should eq Monetize.parse('2.33')
+      expect(dummy.price2).to eq Monetize.parse('2.33')
     end
     it 'should have correct Money value for field 3' do
       dummy = DummyPrices.first
-      dummy.price3.should eq Monetize.parse('1')
+      expect(dummy.price3).to eq Monetize.parse('1')
     end
   end
 end

data/spec/money_spec.rb

@@ -8,16 +8,16 @@ describe Mongoid::MoneyField do
     it 'should be valid to save when field is filled in' do
       dummy       = DummyMoneyRequired.new
       dummy.price = '$10'
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
 
     it 'should be not valid to save when field is not filled in' do
       dummy = DummyMoneyRequired.new
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "can't be blank"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "can't be blank"
+      expect(dummy.save).to eq false
     end
   end
 
@@ -25,35 +25,35 @@ describe Mongoid::MoneyField do
     it 'should raise the error when value consists non digits' do
       dummy       = DummyNotANumber.new
       dummy.price = 'incorrect1'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value consists more then one decimal separator' do
       dummy       = DummyNotANumber.new
       dummy.price = '121,212,22'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value is not present' do
       dummy = DummyNotANumber.new
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value is not present' do
       dummy = DummyNotANumber.new(price: '')
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
   end
 
@@ -61,79 +61,79 @@ describe Mongoid::MoneyField do
     it 'should raise the error when value consists non digits' do
       dummy       = DummyNotANumber.new
       dummy.price = 'incorrect1'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value consists more then one decimal separator' do
       dummy       = DummyNotANumber.new
       dummy.price = '121,212,22'
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "is not a number"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "is not a number"
+      expect(dummy.save).to eq false
     end
   end
 
   describe 'when value should be a positive number' do
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new(price: '-10')
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "must be greater than 1"
-      dummy.save.should eq false
-      dummy.price_cents.should eq -1000
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "must be greater than 1"
+      expect(dummy.save).to eq false
+      expect(dummy.price_cents).to eq -1000
     end
 
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new(price: '-1000')
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "must be greater than 1"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "must be greater than 1"
+      expect(dummy.save).to eq false
     end
 
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new(price: '0')
-      dummy.should_not be_valid
-      dummy.errors.count.should eq 1
-      dummy.errors.messages[:price][0].should eq "must be greater than 1"
-      dummy.save.should eq false
+      expect(dummy).not_to be_valid
+      expect(dummy.errors.count).to eq 1
+      expect(dummy.errors.messages[:price][0]).to eq "must be greater than 1"
+      expect(dummy.save).to eq false
     end
 
     it 'should be ok when value is greater than 1' do
       dummy = DummyPositiveNumber.new(price: '10')
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
 
     it 'should be ok when value is greater than 1' do
       dummy = DummyPositiveNumber.new(price: '1000')
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
 
     it 'should be ok when value is not present' do
       dummy = DummyPositiveNumber.new(price: '')
-      dummy.should be_valid
-      dummy.save.should eq true
+      expect(dummy).to be_valid
+      expect(dummy.save).to eq true
     end
   end
 
   describe 'when both default currency and fixed currency is specified' do
     it 'should use fixed currency instead of default' do
       DummyOverrideDefaultCurrency.create!(price: '1.23')
-      DummyOverrideDefaultCurrency.first.price.currency.iso_code.should eq 'GBP'
+      expect(DummyOverrideDefaultCurrency.first.price.currency.iso_code).to eq 'GBP'
     end
   end
 
   describe 'when default currency is specified' do
     it 'should use it instead of Money.default_currency' do
       DummyWithDefaultCurrency.create!(price: '1.23')
-      DummyWithDefaultCurrency.first.price.currency.iso_code.should eq 'EUR'
-      Money.default_currency.iso_code.should eq 'RUB'
+      expect(DummyWithDefaultCurrency.first.price.currency.iso_code).to eq 'EUR'
+      expect(Money.default_currency.iso_code).to eq 'RUB'
     end
   end
 
@@ -141,32 +141,32 @@ describe Mongoid::MoneyField do
     it 'should be persisted normally when set as dollars' do
       dummy       = DummyMoney.new
       dummy.price = '$10'
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
     end
 
     it 'should be persisted normally when set as cents' do
       dummy       = DummyMoney.new
       dummy.price = '$9.99'
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
     end
 
     it 'should be persisted normally when set as Money' do
       dummy       = DummyMoney.new
       dummy.price = Monetize.parse(1.23)
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
     end
 
     it 'should be possible to set value to nil' do
       dummy       = DummyMoney.new
       dummy.price = Monetize.parse(1.23)
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
 
       dummy = DummyMoney.first
-      dummy.price.should eq Monetize.parse(1.23)
+      expect(dummy.price).to eq Monetize.parse(1.23)
       dummy.price = nil
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoney.first
-      dummy.price.should be_nil
+      expect(dummy.price).to be_nil
     end
   end
 
@@ -177,7 +177,7 @@ describe Mongoid::MoneyField do
 
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      dummy.price.should eq Monetize.parse('9.99')
+      expect(dummy.price).to eq Monetize.parse('9.99')
     end
   end
 
@@ -190,7 +190,7 @@ describe Mongoid::MoneyField do
 
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      dummy.price.cents.should eq 123
+      expect(dummy.price.cents).to eq 123
     end
   end
 
@@ -201,50 +201,50 @@ describe Mongoid::MoneyField do
 
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      dummy.price.cents.should eq 123
+      expect(dummy.price.cents).to eq 123
     end
   end
 
   describe 'when accessing a document from the datastore with a Money datatype and empty value' do
     it 'should be nil' do
       dummy = DummyMoneyWithoutDefault.new
-      dummy.save.should eq true
-      DummyMoneyWithoutDefault.first.price.should be_nil
+      expect(dummy.save).to eq true
+      expect(DummyMoneyWithoutDefault.first.price).to be_nil
     end
 
     it 'should be 0 when used with default' do
       dummy = DummyMoney.new
-      dummy.save.should eq true
-      DummyMoney.first.price.cents.should eq 0
+      expect(dummy.save).to eq true
+      expect(DummyMoney.first.price.cents).to eq 0
     end
 
     it 'should set money to default currency if money is given without it' do
       dummy = DummyMoneyWithDefault.new
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoneyWithDefault.first
-      dummy.price.currency.iso_code.should eq Money.default_currency.iso_code
-      dummy.price.cents.should eq 100
+      expect(dummy.price.currency.iso_code).to eq Money.default_currency.iso_code
+      expect(dummy.price.cents).to eq 100
     end
 
     it 'should set money to default currency if money is given without it on a document with multiple money fields' do
       dummy = DummyPrices.new
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyPrices.first
-      dummy.price.currency.iso_code.should eq Money.default_currency.iso_code
-      dummy.price.cents.should eq 100
+      expect(dummy.price.currency.iso_code).to eq Money.default_currency.iso_code
+      expect(dummy.price.cents).to eq 100
 
-      dummy.price2.should be_nil
+      expect(dummy.price2).to be_nil
 
-      dummy.price1.cents.should eq 0
+      expect(dummy.price1.cents).to eq 0
     end
 
 
     it 'should set money to correct currency if money is given with it' do
       dummy = DummyMoneyWithDefaultWithCurrency.new
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoneyWithDefaultWithCurrency.first
-      dummy.price.currency.iso_code.should eq 'GBP'
-      dummy.price.cents.should eq 100
+      expect(dummy.price.currency.iso_code).to eq 'GBP'
+      expect(dummy.price.cents).to eq 100
     end
   end
 
@@ -252,17 +252,17 @@ describe Mongoid::MoneyField do
     it 'should have correct currency when value is set to 5$' do
       DummyMoneyWithFixedCurrency.create!(price: '5$')
       dummy = DummyMoneyWithFixedCurrency.first
-      dummy.price.currency.iso_code.should eq 'GBP'
-      dummy.price.cents.should eq 500
-      dummy.price.should eq Monetize.parse('5 GBP')
+      expect(dummy.price.currency.iso_code).to eq 'GBP'
+      expect(dummy.price.cents).to eq 500
+      expect(dummy.price).to eq Monetize.parse('5 GBP')
     end
 
     it 'should have correct currency when value is set to 100 RUB' do
       DummyMoneyWithFixedCurrency.create!(price: '100 RUB')
       dummy = DummyMoneyWithFixedCurrency.first
-      dummy.price.currency.iso_code.should eq 'GBP'
-      dummy.price.cents.should eq 100_00
-      dummy.price.should eq Monetize.parse('100 GBP')
+      expect(dummy.price.currency.iso_code).to eq 'GBP'
+      expect(dummy.price.cents).to eq 100_00
+      expect(dummy.price).to eq Monetize.parse('100 GBP')
     end
   end
 
@@ -270,17 +270,17 @@ describe Mongoid::MoneyField do
     it 'should handle RUB' do
       DummyMoney.create(description: "Test", price: '1.23 RUB')
       dummy = DummyMoney.first
-      dummy.price.currency.iso_code.should eq 'RUB'
-      dummy.price.cents.should eq 123
-      dummy.price.should eq Monetize.parse('1.23 RUB')
+      expect(dummy.price.currency.iso_code).to eq 'RUB'
+      expect(dummy.price.cents).to eq 123
+      expect(dummy.price).to eq Monetize.parse('1.23 RUB')
     end
 
     it 'should handle $' do
       DummyMoney.create(description: "Test", price: '1.23 USD')
       dummy = DummyMoney.first
-      dummy.price.currency.iso_code.should eq 'USD'
-      dummy.price.cents.should eq 123
-      dummy.price.should eq Monetize.parse('1.23 USD')
+      expect(dummy.price.currency.iso_code).to eq 'USD'
+      expect(dummy.price.cents).to eq 123
+      expect(dummy.price).to eq Monetize.parse('1.23 USD')
     end
   end
 
@@ -291,25 +291,25 @@ describe Mongoid::MoneyField do
 
     it 'should be nil' do
       dummy = DummyMoney.first
-      dummy.price.should be_nil
+      expect(dummy.price).to be_nil
     end
 
     it 'stays nil' do
       dummy = DummyMoney.first
       dummy.price = ''
-      dummy.price.should be_nil
-      dummy.save.should be_true
-      DummyMoney.first.price.should be_nil
+      expect(dummy.price).to be_nil
+      expect(dummy.save).to be_truthy
+      expect(DummyMoney.first.price).to be_nil
     end
 
     it 'should be updated correctly' do
       dummy = DummyMoney.first
-      dummy.price.should be_nil
+      expect(dummy.price).to be_nil
       dummy.price = '1.23 USD'
-      dummy.save.should eq true
+      expect(dummy.save).to eq true
       dummy = DummyMoney.first
-      dummy.price.currency.iso_code.should eq 'USD'
-      dummy.price.cents.should eq 123
+      expect(dummy.price.currency.iso_code).to eq 'USD'
+      expect(dummy.price.cents).to eq 123
     end
   end
 
@@ -326,12 +326,12 @@ describe Mongoid::MoneyField do
 
     it 'should have correct value for first item' do
       o = DummyOrder.first
-      o.dummy_line_items.first.price.should eq Monetize.parse('12.99')
+      expect(o.dummy_line_items.first.price).to eq Monetize.parse('12.99')
     end
 
     it 'should have correct value for first item' do
       o = DummyOrder.first
-      o.dummy_line_items.last.price.should eq Monetize.parse('14.99')
+      expect(o.dummy_line_items.last.price).to eq Monetize.parse('14.99')
     end
   end
 
@@ -342,15 +342,15 @@ describe Mongoid::MoneyField do
 
     it 'should have correct Money value for field 1' do
       dummy = DummyPrices.first
-      dummy.price1.should eq Monetize.parse('1.23')
+      expect(dummy.price1).to eq Monetize.parse('1.23')
     end
     it 'should have correct Money value for field 2' do
       dummy = DummyPrices.first
-      dummy.price2.should eq Monetize.parse('2.33')
+      expect(dummy.price2).to eq Monetize.parse('2.33')
     end
     it 'should have correct Money value for field 3' do
       dummy = DummyPrices.first
-      dummy.price3.should eq Monetize.parse('1')
+      expect(dummy.price3).to eq Monetize.parse('1')
     end
   end
 end

data/spec/ruby_money_spec.rb

@@ -15,48 +15,48 @@ describe Money do
 
   context "mongoize" do
     it "mongoizes correctly a Money object to a hash of cents and currency" do
-      priceable.price.cents.should == 100
-      priceable.price.currency.should == Money::Currency.find('EUR')
+      expect(priceable.price.cents).to eq(100)
+      expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
     end
 
     it "mongoizes correctly a Numeric object to a hash of cents and currency" do
-      priceable_from_num.price.cents.should == 100
-      priceable_from_num.price.currency.should == Money.default_currency
+      expect(priceable_from_num.price.cents).to eq(100)
+      expect(priceable_from_num.price.currency).to eq(Money.default_currency)
     end
 
     it "mongoizes correctly a String object to a hash of cents and currency" do
-      priceable_from_string.price.cents.should == 100
-      priceable_from_string.price.currency.should == Money::Currency.find('EUR')
+      expect(priceable_from_string.price.cents).to eq(100)
+      expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
     end
 
     it "mongoizes correctly a hash of cents and currency" do
-      priceable_from_hash.price.cents.should == 100
-      priceable_from_hash.price.currency.should == Money::Currency.find('EUR')
+      expect(priceable_from_hash.price.cents).to eq(100)
+      expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
     end
 
     it "mongoizes correctly a HashWithIndifferentAccess of cents and currency" do
-      priceable_from_hash_with_indifferent_access.price.cents.should == 100
-      priceable_from_hash_with_indifferent_access.price.currency.should == Money::Currency.find('EUR')
+      expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
+      expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
     end
   end
 
   context "demongoize" do
     subject { Priceable.first.price }
-    it { should be_an_instance_of(Money) }
-    it { should == Money.new(100, 'EUR') }
+    it { is_expected.to be_an_instance_of(Money) }
+    it { is_expected.to eq(Money.new(100, 'EUR')) }
     it "returns nil if a nil value was stored" do
       nil_priceable = Priceable.create(:price => nil)
-      nil_priceable.price.should be_nil
+      expect(nil_priceable.price).to be_nil
     end
     it 'returns nil if an unknown value was stored' do
       zero_priceable = Priceable.create(:price => [])
-      zero_priceable.price.should be_nil
+      expect(zero_priceable.price).to be_nil
     end
   end
 
   context "evolve" do
     it "transforms correctly a Money object to a Mongo friendly value" do
-      Priceable.where(:price => Money.new(100, 'EUR')).first.should == priceable
+      expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_money_field
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0.beta1
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0.beta1
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement