mongoid_money_field 4.0.8 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98301ef0d0c01eda3e2dfbb588e4b23649399c39
-  data.tar.gz: 253619673f52ee7d97c6a6efcb5e4a8e1315eade
+  metadata.gz: 9872f92a8e94961a24bfdc1555fec6dd83708eca
+  data.tar.gz: db2c1d912130b1f54bfbe4832c22a313f6515d4a
 SHA512:
-  metadata.gz: c809646376f3f0fb429df3dd700f8f378a77b3e82eb6e36cb3de61302727538470cbbdd6871848c4425a0dcf01165b16ef988fd49209130cf6f7c2d2682e51b3
-  data.tar.gz: 98f7746d6548bb709c25c5ae48841c19a50271158f0bb889a3afdf838b8ed28f0cdc5e4ef5d15e8dfb7b1dae28f387769417ea532bc4bde5257c0501b2806836
+  metadata.gz: 9b8205c61b1aa83a20809933df9cb4cf0dfe2976c922b7c85b47cf5d145d3abdc96e8ad5ea3eb4acd4cad15579a95f7f3c0e2bb7155f2bd5291aa1faf2458c94
+  data.tar.gz: bfdc740e907c52fe3aa3179124c06bdcd049eddd3ae801ede55c4bd64a41c38525b10c613c0777df85690df859e39dcb9a1dd64897403b7b65e7dadb15c6e953

data/.ruby-gemset

@@ -1 +1 @@
-moneyfield
+moneyfield

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.0.0-p247

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
+
 services: mongodb
 
+gemfile:
+  - gemfiles/money51-mongoid31.gemfile
+  - gemfiles/money51-mongoid4.gemfile
+  
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-
-notifications:
-  email: false
-
+  - jruby-19mode

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid_money_field.gemspec
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+
 gemspec

data/README.rdoc

@@ -19,9 +19,11 @@ Inspired by https://gist.github.com/840500
 
 https://github.com/RubyMoney/money-rails
 
-With v4 storage format of mongoid money field is identical to that of money-rails
+Since v4 storage format of mongoid money field is identical to that of money-rails
 
-== Updating
+== Changelog
+
+v5 drops compatibility with v3 storage format. Please use v4 until you upgraded your DB.
 
 v4 is a massive refactor. Storage format is now a hash, like money-rails, instead of two separate cents and currency fields
 Old values should be still accessible after you update. To migrate to new storage format do:
@@ -41,7 +43,7 @@ please avoid using v2, i realized that API was stupid after commiting it.
 
 Include the gem in your Gemfile
 
-    gem 'mongoid_money_field'
+    gem 'mongoid_money_field', '~> 5.0.0'
 
 == Usage
 

data/gemfiles/money51-mongoid31.gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 5.1.1"
+
+gemspec path: "../"

data/gemfiles/money51-mongoid4.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+gem "money", "~> 5.1.1"
+
+gemspec path: "../"

data/gemfiles/money6-mongoid31.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid", '~> 3.1.0'
+gem "money", "~> 6.0.0.pre5"
+
+gemspec path: "../"

data/gemfiles/money6-mongoid4.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+gem "money", "~> 6.0.0.pre5"
+
+gemspec path: "../"

data/lib/mongoid_money_field.rb

@@ -1,8 +1,8 @@
-#encoding: utf-8
+# coding: utf-8
 
 require "money"
-require 'monetize'
-require 'monetize/core_extensions'
+
+require "mongoid_money_field/type"
 require "mongoid_money_field/version"
 require "mongoid_money_field/field"
 
@@ -12,172 +12,20 @@ module Mongoid
 
     module ClassMethods
       def money_field(*columns)
-        opts = columns.last.is_a?( Hash ) ? columns.pop : {}
-        opts = {
-            fixed_currency: nil,
-            default: nil,
-            required: false,
-            default_currency: nil
-        }.merge( opts )
-
-        ensure_default = Proc.new do |currency|
-          if opts[:fixed_currency].nil?
-            if currency.nil?
-              if opts[:default_currency].nil?
-                Money.default_currency
-              else
-                opts[:default_currency]
-              end
-            else
-              currency
-            end
-          else
-            opts[:fixed_currency]
-          end
-        end
-
+        opts = columns.last.is_a?(Hash) ? columns.pop : {}
+        
         [columns].flatten.each do |name|
-          default = nil
-          name = name.to_s
-          unless opts[:default].nil?
-            default = Monetize.parse(opts[:default])
-          end
-
-          field name, type: Money, default: default
-          validates_presence_of name if opts[:required]
-
-          define_method("#{name}=") do |value|
-            instance_variable_set( "@#{name}_before_type_cast".to_sym, value)
-
-            if value.blank?
-              write_attribute(name, nil)
-            else
-              if opts[:default_currency].nil?
-                if value.is_a?(Hash)
-                  money = Money.new(value['cents'], value['currency_iso'])
-                else
-                  money = value.to_money
-                end
-              else
-                old_default = Money.default_currency
-                Money.default_currency = Money::Currency.new(opts[:default_currency])
-                money = value.to_money
-                Money.default_currency = old_default
-              end
-
-              unless opts[:fixed_currency].nil?
-                money = Money.new(money.cents, opts[:fixed_currency])
-              end
-
-              write_attribute(name, money)
-            end
-            remove_attribute("#{name}_currency")
-            remove_attribute("#{name}_cents")
-          end
-
-          # mongoid money field 2 compat
-          define_method(name) do
-            if read_attribute("#{name}").nil? && !read_attribute("#{name}_cents").nil?
-              currency = read_attribute("#{name}_currency")
-              currency = ensure_default.call(currency)
-              Money.new(read_attribute("#{name}_cents"), currency)
-            else
-              value = read_attribute(name)
-              if value.nil?
-                nil
-              else
-                if value.is_a?(Hash)
-                  value[:currency_iso] = ensure_default.call(value[:currency_iso])
-                end
-                Money.demongoize(value)
-              end
-            end
-          end
-
-          define_method("#{name}_before_type_cast") do
-            instance_variable_get( "@#{name}_before_type_cast".to_sym) || send(name).to_s
-          end
-
-          # deprecated
-          define_method("migrate_#{name}_from_money_3!") do
-            if read_attribute(name).nil?
-              cents = read_attribute("#{name}_cents")
-              if cents.nil?
-                send("#{name}=", nil)
-              else
-                currency = read_attribute("#{name}_currency")
-
-                if currency.nil?
-                  if opts[:default_currency].nil?
-                    currency = Money.default_currency
-                  else
-                    currency = opts[:default_currency]
-                  end
-                end
-
-                unless opts[:fixed_currency].nil?
-                  currency = opts[:fixed_currency]
-                end
-                send("#{name}=", Money.new(cents, currency))
-              end
-            end
-          end
-
-          # deprecated
-          define_method("#{name}_cents") do
-            send(name).nil? ? 0 : send(name).cents
-          end
-
-          # deprecated
-          define_method("#{name}_currency") do
-            if opts[:fixed_currency].nil?
-              send(name).nil? ? Money.default_currency : send(name).currency.iso_code
-            else
-              opts[:fixed_currency]
-            end
-          end
-
-          # deprecated
-          define_method("#{name}_cents=") do |val|
-            send("#{name}=", Money.new(val, send("#{name}_currency")))
-          end
-
-          # deprecated
-          define_method("#{name}_currency=") do |val|
-            send("#{name}=", Money.new(send("#{name}_cents"), val))
-          end
-
-          # deprecated
-          define_method("#{name}_plain=") do |val|
-            send("#{name}=", val)
-          end
-          # deprecated
-          define_method("#{name}_plain") do |val|
-            send("#{name}")
-          end
-        end
-      end
-
-      def migrate_from_money_field_3!(*columns)
-        each do |val|
-          [columns].flatten.each do |name|
-            val.send("migrate_#{name.to_s}_from_money_3!")
-            if val.save
-            else
-              puts "Error: model failed validation and needs to be updated manually:"
-              p val
-            end
+          field name, type: MoneyType.new(opts), default: opts[:default]
+          if opts[:required]
+            validates_presence_of name
           end
         end
       end
     end
+
   end
 end
 
 if Object.const_defined?("SimpleForm")
   require "mongoid_money_field/simple_form/money_input"
-end
-
-if Object.const_defined?("RailsAdmin")
-  require "mongoid_money_field/rails_admin"
-end
+end

data/lib/mongoid_money_field/field.rb

@@ -1,5 +1,4 @@
 # coding: utf-8
-
 # from https://github.com/RubyMoney/money-rails/blob/master/lib/money-rails/mongoid/money.rb
 
 class Money
@@ -48,3 +47,4 @@ class Money
     end
   end
 end
+

data/lib/mongoid_money_field/type.rb

@@ -0,0 +1,82 @@
+class MoneyType
+    attr_accessor :options
+
+    def initialize(options = {})
+      @options = {
+          fixed_currency: nil,
+          default: nil,
+          required: false,
+          default_currency: nil
+      }.merge(options)
+    end
+
+    # Get the object as it was stored in the database, and instantiate
+    # this custom class from it.
+    def demongoize(object)
+      if object.is_a?(Hash)
+        object = object.symbolize_keys
+
+        if object.has_key?(:cents)
+          if @options[:fixed_currency]
+            ::Money.new(object[:cents], @options[:fixed_currency])
+          else
+            if object.has_key?(:currency_iso)
+              ::Money.new(object[:cents], object[:currency_iso])
+            else
+              ::Money.new(object[:cents], @options[:default_currency])
+            end
+          end
+        else
+          nil
+        end
+      elsif object.is_a?(Fixnum) || object.is_a?(Float)
+        if @options[:fixed_currency]
+          ::Money.new(object, @options[:fixed_currency])
+        else
+          ::Money.new(object, @options[:default_currency])
+        end
+      else
+        nil
+      end
+    end
+
+    # Takes any possible object and converts it to how it would be
+    # stored in the database.
+    def mongoize(object)
+      unless @options[:default_currency].nil?
+        old_default = Money.default_currency
+        Money.default_currency = Money::Currency.new(@options[:default_currency])
+      end
+
+      ret = case
+        when object.is_a?(Money) then object.mongoize
+        when object.is_a?(Hash) then
+          object.symbolize_keys! if object.respond_to?(:symbolize_keys!)
+          ::Money.new(object[:cents], object[:currency_iso]).mongoize
+        when object.blank? then
+          if !@options[:default].nil?
+            @options[:default].to_money.mongoize
+          else
+            nil
+          end
+        when object.respond_to?(:to_money) then
+          object.to_money.mongoize
+        else object
+      end
+
+      unless @options[:default_currency].nil?
+        Money.default_currency = old_default
+      end
+
+      ret
+    end
+
+    # Converts the object that was supplied to a criteria and converts it
+    # into a database friendly form.
+    def evolve(object)
+      case object
+        when Money then object.mongoize
+        else object
+      end
+    end
+end

data/lib/mongoid_money_field/version.rb

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

data/mongoid_money_field.gemspec

@@ -18,16 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
-  spec.add_dependency "monetize"
-  spec.add_dependency "money", "~> 6.1.1"
+  spec.add_runtime_dependency "mongoid", ">= 3.0.0"
+  spec.add_runtime_dependency "money", ">= 5.0.0"
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rdoc"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "mongoid-rspec"
+  spec.add_development_dependency "bundler", "~> 1.3.4"
+  spec.add_development_dependency "rspec", "~> 2.13.0"
+  spec.add_development_dependency "rdoc", "~> 4.0.1"
+  spec.add_development_dependency "simplecov", "~> 0.7.1"
+  spec.add_development_dependency "database_cleaner", "~> 0.9.1"
+  spec.add_development_dependency "mongoid-rspec", "~> 1.7.0"
 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'
-      expect(dummy).to be_valid
-      expect(dummy.save).to eq true
+      dummy.should be_valid
+      dummy.save.should eq true
     end
 
     it 'should be not valid to save when field is not filled in' do
       dummy = DummyMoneyRequired.new
-      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
+      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
     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'
-      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
+      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
     end
 
     it 'should raise the error when value consists more then one decimal separator' do
       dummy       = DummyNotANumber.new
       dummy.price = '121,212,22'
-      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
+      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
     end
 
     it 'should raise the error when value is not present' do
       dummy = DummyNotANumber.new
-      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
+      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
     end
 
     it 'should raise the error when value is not present' do
       dummy = DummyNotANumber.new(price: '')
-      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
+      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
     end
   end
 
@@ -61,79 +61,78 @@ describe Mongoid::MoneyField do
     it 'should raise the error when value consists non digits' do
       dummy       = DummyNotANumber.new
       dummy.price = 'incorrect1'
-      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
+      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
     end
 
     it 'should raise the error when value consists more then one decimal separator' do
       dummy       = DummyNotANumber.new
       dummy.price = '121,212,22'
-      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
+      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
     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')
-      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
+      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
     end
 
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new(price: '-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
+      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
     end
 
     it 'should raise the error when value lesser than 1' do
       dummy = DummyPositiveNumber.new(price: '0')
-      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
+      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
     end
 
     it 'should be ok when value is greater than 1' do
       dummy = DummyPositiveNumber.new(price: '10')
-      expect(dummy).to be_valid
-      expect(dummy.save).to eq true
+      dummy.should be_valid
+      dummy.save.should eq true
     end
 
     it 'should be ok when value is greater than 1' do
       dummy = DummyPositiveNumber.new(price: '1000')
-      expect(dummy).to be_valid
-      expect(dummy.save).to eq true
+      dummy.should be_valid
+      dummy.save.should eq true
     end
 
     it 'should be ok when value is not present' do
       dummy = DummyPositiveNumber.new(price: '')
-      expect(dummy).to be_valid
-      expect(dummy.save).to eq true
+      dummy.should be_valid
+      dummy.save.should 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')
-      expect(DummyOverrideDefaultCurrency.first.price.currency.iso_code).to eq 'GBP'
+      DummyOverrideDefaultCurrency.first.price.currency.iso_code.should 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')
-      expect(DummyWithDefaultCurrency.first.price.currency.iso_code).to eq 'EUR'
-      expect(Money.default_currency.iso_code).to eq 'RUB'
+      DummyWithDefaultCurrency.first.price.currency.iso_code.should eq 'EUR'
+      Money.default_currency.iso_code.should eq 'RUB'
     end
   end
 
@@ -141,32 +140,32 @@ describe Mongoid::MoneyField do
     it 'should be persisted normally when set as dollars' do
       dummy       = DummyMoney.new
       dummy.price = '$10'
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
     end
 
     it 'should be persisted normally when set as cents' do
       dummy       = DummyMoney.new
       dummy.price = '$9.99'
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
     end
 
     it 'should be persisted normally when set as Money' do
       dummy       = DummyMoney.new
-      dummy.price = Monetize.parse(1.23)
-      expect(dummy.save).to eq true
+      dummy.price = Money.parse(1.23)
+      dummy.save.should eq true
     end
 
     it 'should be possible to set value to nil' do
       dummy       = DummyMoney.new
-      dummy.price = Monetize.parse(1.23)
-      expect(dummy.save).to eq true
+      dummy.price = Money.parse(1.23)
+      dummy.save.should eq true
 
       dummy = DummyMoney.first
-      expect(dummy.price).to eq Monetize.parse(1.23)
+      dummy.price.should eq Money.parse(1.23)
       dummy.price = nil
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
       dummy = DummyMoney.first
-      expect(dummy.price).to be_nil
+      dummy.price.should be_nil
     end
   end
 
@@ -177,74 +176,74 @@ describe Mongoid::MoneyField do
 
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      expect(dummy.price).to eq Monetize.parse('9.99')
+      dummy.price.should eq Money.parse('9.99')
     end
   end
 
   describe 'when accessing a document from the datastore with a Money datatype set as money' do
     before(:each) do
       dm       = DummyMoney.create(:description => "Test")
-      dm.price = Monetize.parse('1.23')
+      dm.price = Money.parse('1.23')
       dm.save!
     end
 
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      expect(dummy.price.cents).to eq 123
+      dummy.price.cents.should eq 123
     end
   end
 
   describe 'when accessing a document from the datastore with a Money datatype set as money with mass asignment' do
     before(:each) do
-      DummyMoney.create(:description => "Test", :price => Monetize.parse('1.23'))
+      DummyMoney.create(:description => "Test", :price => Money.parse('1.23'))
     end
 
     it 'should have a Money value that matches the money value that was initially persisted' do
       dummy = DummyMoney.first
-      expect(dummy.price.cents).to eq 123
+      dummy.price.cents.should 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
-      expect(dummy.save).to eq true
-      expect(DummyMoneyWithoutDefault.first.price).to be_nil
+      dummy.save.should eq true
+      DummyMoneyWithoutDefault.first.price.should be_nil
     end
 
     it 'should be 0 when used with default' do
-      dummy = DummyMoney.new
-      expect(dummy.save).to eq true
-      expect(DummyMoney.first.price.cents).to eq 0
+      dummy = DummyMoneyWithDefault.new
+      dummy.save.should eq true
+      DummyMoneyWithDefault.first.price.cents.should eq 100
     end
 
     it 'should set money to default currency if money is given without it' do
       dummy = DummyMoneyWithDefault.new
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
       dummy = DummyMoneyWithDefault.first
-      expect(dummy.price.currency.iso_code).to eq Money.default_currency.iso_code
-      expect(dummy.price.cents).to eq 100
+      dummy.price.currency.iso_code.should eq Money.default_currency.iso_code
+      dummy.price.cents.should 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
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
       dummy = DummyPrices.first
-      expect(dummy.price.currency.iso_code).to eq Money.default_currency.iso_code
-      expect(dummy.price.cents).to eq 100
+      dummy.price.currency.iso_code.should eq Money.default_currency.iso_code
+      dummy.price.cents.should eq 100
 
-      expect(dummy.price2).to be_nil
+      dummy.price2.should be_nil
 
-      expect(dummy.price1.cents).to eq 0
+      dummy.price1.cents.should eq 0
     end
 
 
     it 'should set money to correct currency if money is given with it' do
       dummy = DummyMoneyWithDefaultWithCurrency.new
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
       dummy = DummyMoneyWithDefaultWithCurrency.first
-      expect(dummy.price.currency.iso_code).to eq 'GBP'
-      expect(dummy.price.cents).to eq 100
+      dummy.price.currency.iso_code.should eq 'GBP'
+      dummy.price.cents.should eq 100
     end
   end
 
@@ -252,17 +251,17 @@ describe Mongoid::MoneyField do
     it 'should have correct currency when value is set to 5$' do
       DummyMoneyWithFixedCurrency.create!(price: '5$')
       dummy = DummyMoneyWithFixedCurrency.first
-      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')
+      dummy.price.currency.iso_code.should eq 'GBP'
+      dummy.price.cents.should eq 500
+      dummy.price.should eq Money.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
-      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')
+      dummy.price.currency.iso_code.should eq 'GBP'
+      dummy.price.cents.should eq 100_00
+      dummy.price.should eq Money.parse('100 GBP')
     end
   end
 
@@ -270,17 +269,17 @@ describe Mongoid::MoneyField do
     it 'should handle RUB' do
       DummyMoney.create(description: "Test", price: '1.23 RUB')
       dummy = DummyMoney.first
-      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')
+      dummy.price.currency.iso_code.should eq 'RUB'
+      dummy.price.cents.should eq 123
+      dummy.price.should eq Money.parse('1.23 RUB')
     end
 
     it 'should handle $' do
       DummyMoney.create(description: "Test", price: '1.23 USD')
       dummy = DummyMoney.first
-      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')
+      dummy.price.currency.iso_code.should eq 'USD'
+      dummy.price.cents.should eq 123
+      dummy.price.should eq Money.parse('1.23 USD')
     end
   end
 
@@ -291,25 +290,25 @@ describe Mongoid::MoneyField do
 
     it 'should be nil' do
       dummy = DummyMoney.first
-      expect(dummy.price).to be_nil
+      dummy.price.should be_nil
     end
 
     it 'stays nil' do
       dummy = DummyMoney.first
       dummy.price = ''
-      expect(dummy.price).to be_nil
-      expect(dummy.save).to be_truthy
-      expect(DummyMoney.first.price).to be_nil
+      dummy.price.should be_nil
+      dummy.save.should be_true
+      DummyMoney.first.price.should be_nil
     end
 
     it 'should be updated correctly' do
       dummy = DummyMoney.first
-      expect(dummy.price).to be_nil
+      dummy.price.should be_nil
       dummy.price = '1.23 USD'
-      expect(dummy.save).to eq true
+      dummy.save.should eq true
       dummy = DummyMoney.first
-      expect(dummy.price.currency.iso_code).to eq 'USD'
-      expect(dummy.price.cents).to eq 123
+      dummy.price.currency.iso_code.should eq 'USD'
+      dummy.price.cents.should eq 123
     end
   end
 
@@ -326,12 +325,12 @@ describe Mongoid::MoneyField do
 
     it 'should have correct value for first item' do
       o = DummyOrder.first
-      expect(o.dummy_line_items.first.price).to eq Monetize.parse('12.99')
+      o.dummy_line_items.first.price.should eq Money.parse('12.99')
     end
 
     it 'should have correct value for first item' do
       o = DummyOrder.first
-      expect(o.dummy_line_items.last.price).to eq Monetize.parse('14.99')
+      o.dummy_line_items.last.price.should eq Money.parse('14.99')
     end
   end
 
@@ -342,15 +341,15 @@ describe Mongoid::MoneyField do
 
     it 'should have correct Money value for field 1' do
       dummy = DummyPrices.first
-      expect(dummy.price1).to eq Monetize.parse('1.23')
+      dummy.price1.should eq Money.parse('1.23')
     end
     it 'should have correct Money value for field 2' do
       dummy = DummyPrices.first
-      expect(dummy.price2).to eq Monetize.parse('2.33')
+      dummy.price2.should eq Money.parse('2.33')
     end
     it 'should have correct Money value for field 3' do
       dummy = DummyPrices.first
-      expect(dummy.price3).to eq Monetize.parse('1')
+      dummy.price3.should eq Money.parse('1')
     end
   end
 end