mongoid_money_field 4.0.1 → 4.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 648dca24a6555a49ba84d6b8b008e80025bb9d5a
+  data.tar.gz: 90bb2ba95a27ae871f7767750ba139f97c8e7623
+SHA512:
+  metadata.gz: 50ec23241327e065e2e1ec88922bdd9c15c8986b99169c025101935feb0937a0f0631f92cdccdbf9b8c6315516c9d1fd5f80bdad53a45c2e1a18d77fb882489c
+  data.tar.gz: ccbe3ad7e69df98cccf1ae2809a56b9431be3e56258590d8bd94f371b6018f8203294ce2b661e5bbcf7bed02402c88f89f711a5198a91b41c20a4e8707dfc9c1

data/.ruby-gemset

@@ -0,0 +1 @@
+moneyfield

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p353

data/gemfiles/money4-mongoid31.gemfile

@@ -1,12 +1,12 @@
-source "http://rubygems.org"
-
-gem 'mongoid', '~> 3.1.0'
-gem "money", "~> 4.0.2"
-
-gem "rake"
-gem "bundler", "~> 1.3.4"
-gem "rspec", "~> 2.13.0"
-gem "rdoc", "~> 4.0.1"
-gem "simplecov", "~> 0.7.1", require: false
-gem "database_cleaner", "~> 0.9.1"
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 4.0.2"
+
+gem "rake"
+gem "bundler", "~> 1.3.4"
+gem "rspec", "~> 2.13.0"
+gem "rdoc", "~> 4.0.1"
+gem "simplecov", "~> 0.7.1", require: false
+gem "database_cleaner", "~> 0.9.1"
 gem "mongoid-rspec"

data/gemfiles/money50-mongoid31.gemfile

@@ -1,12 +1,12 @@
-source "http://rubygems.org"
-
-gem 'mongoid', '~> 3.1.0'
-gem "money", "~> 5.0.0"
-
-gem "rake"
-gem "bundler", "~> 1.3.4"
-gem "rspec", "~> 2.13.0"
-gem "rdoc", "~> 4.0.1"
-gem "simplecov", "~> 0.7.1", require: false
-gem "database_cleaner", "~> 0.9.1"
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 5.0.0"
+
+gem "rake"
+gem "bundler", "~> 1.3.4"
+gem "rspec", "~> 2.13.0"
+gem "rdoc", "~> 4.0.1"
+gem "simplecov", "~> 0.7.1", require: false
+gem "database_cleaner", "~> 0.9.1"
 gem "mongoid-rspec"

data/gemfiles/money51-mongoid31.gemfile

@@ -1,12 +1,12 @@
-source "http://rubygems.org"
-
-gem 'mongoid', '~> 3.1.0'
-gem "money", "~> 5.1.1"
-
-gem "rake"
-gem "bundler", "~> 1.3.4"
-gem "rspec", "~> 2.13.0"
-gem "rdoc", "~> 4.0.1"
-gem "simplecov", "~> 0.7.1", require: false
-gem "database_cleaner", "~> 0.9.1"
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 5.1.1"
+
+gem "rake"
+gem "bundler", "~> 1.3.4"
+gem "rspec", "~> 2.13.0"
+gem "rdoc", "~> 4.0.1"
+gem "simplecov", "~> 0.7.1", require: false
+gem "database_cleaner", "~> 0.9.1"
 gem "mongoid-rspec"

data/lib/mongoid_money_field.rb

@@ -1,6 +1,8 @@
 #encoding: utf-8
 
 require "money"
+require 'monetize'
+require 'monetize/core_extensions'
 require "mongoid_money_field/version"
 require "mongoid_money_field/field"
 
@@ -38,7 +40,7 @@ module Mongoid
           default = nil
           name = name.to_s
           unless opts[:default].nil?
-            default = Money.parse(opts[:default])
+            default = Monetize.parse(opts[:default])
           end
 
           field name, type: Money, default: default

data/lib/mongoid_money_field/field.rb

@@ -1,48 +1,50 @@
-# coding: utf-8
-
-class Money
-  # Converts an object of this instance into a database friendly value.
-  def mongoize
-    {
-        :cents => cents,
-        :currency_iso => currency.iso_code
-    }
-  end
-
-  class << self
-
-    # 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
-        object.has_key?(:cents) ? ::Money.new(object[:cents], object[:currency_iso]) : nil
-      else
-        nil
-      end
-    end
-
-    # Takes any possible object and converts it to how it would be
-    # stored in the database.
-    def mongoize(object)
-      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.respond_to?(:to_money) then
-          object.to_money.mongoize
-        else object
-      end
-    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
-end
+# coding: utf-8
+
+# from https://github.com/RubyMoney/money-rails/blob/master/lib/money-rails/mongoid/money.rb
+
+class Money
+  # Converts an object of this instance into a database friendly value.
+  def mongoize
+    {
+        :cents => cents,
+        :currency_iso => currency.iso_code
+    }
+  end
+
+  class << self
+
+    # 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
+        object.has_key?(:cents) ? ::Money.new(object[:cents], object[:currency_iso]) : nil
+      else
+        nil
+      end
+    end
+
+    # Takes any possible object and converts it to how it would be
+    # stored in the database.
+    def mongoize(object)
+      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.respond_to?(:to_money) then
+          object.to_money.mongoize
+        else object
+      end
+    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
+end

data/lib/mongoid_money_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidMoneyField
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/mongoid_money_field.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mongoid", ">= 3.0.0"
-  spec.add_runtime_dependency "money", ">= 5.0.0"
+  spec.add_runtime_dependency "monetize"
+  spec.add_runtime_dependency "money", "~> 6.1.0.beta1"
 
   spec.add_development_dependency "rake"
-  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"
+  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"
 end

data/spec/model_spec.rb

@@ -1,8 +1,8 @@
-# coding: utf-8
-
-require 'spec_helper'
-
-describe DummyMoney do
-  it { should allow_mass_assignment_of(:description) }
-  it { should allow_mass_assignment_of(:price) }
+# coding: utf-8
+
+require 'spec_helper'
+
+describe DummyMoney do
+  it { should allow_mass_assignment_of(:description) }
+  it { should allow_mass_assignment_of(:price) }
 end

data/spec/money3_compat_spec.rb

@@ -1,123 +1,123 @@
-# coding: utf-8
-
-require 'spec_helper'
-
-describe Money3Compat do
-  it { should allow_mass_assignment_of(:description) }
-  it { should 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'
-  end
-
-  it 'correctly works after save' do
-    Money3.create!(price_currency: 'GBP', price_cents: '12000')
-    Money3Compat.first.save.should be_true
-
-    Money3Compat.first.price.cents.should eq 12000
-    Money3Compat.first.price.currency.iso_code.should 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
-
-    Money3.first.read_attribute(:price_currency).should eq 'GBP'
-    Money3.first.read_attribute(:price_cents).should 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'
-
-    Money3.first.read_attribute(:price_currency).should be_nil
-    Money3.first.read_attribute(:price_cents).should be_nil
-
-    Money3Compat.first.read_attribute(:price_currency).should be_nil
-    Money3Compat.first.read_attribute(:price_cents).should be_nil
-
-    f = Money3Compat.first
-    f.price = '32.00 GBP'
-    f.save.should be_true
-
-    Money3Compat.first.price.cents.should eq 3200
-    Money3Compat.first.price.currency.iso_code.should 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'
-    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'
-    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
-
-      Money3Compat.first.price_with_fix.cents.should eq 12000
-      Money3Compat.first.price_with_fix.currency.iso_code.should 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'
-    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'
-    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
-
-      Money3Compat.first.price_no_default.cents.should eq 12000
-      Money3Compat.first.price_no_default.currency.iso_code.should 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
-
-      Money3Compat.first.price_no_default.cents.should eq 12000
-      Money3Compat.first.price_no_default.currency.iso_code.should 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
-
-      Money3Compat.first.price_no_default.should be_nil
-    end
-  end
+# coding: utf-8
+
+require 'spec_helper'
+
+describe Money3Compat do
+  it { should allow_mass_assignment_of(:description) }
+  it { should 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'
+  end
+
+  it 'correctly works after save' do
+    Money3.create!(price_currency: 'GBP', price_cents: '12000')
+    Money3Compat.first.save.should be_true
+
+    Money3Compat.first.price.cents.should eq 12000
+    Money3Compat.first.price.currency.iso_code.should 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
+
+    Money3.first.read_attribute(:price_currency).should eq 'GBP'
+    Money3.first.read_attribute(:price_cents).should 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'
+
+    Money3.first.read_attribute(:price_currency).should be_nil
+    Money3.first.read_attribute(:price_cents).should be_nil
+
+    Money3Compat.first.read_attribute(:price_currency).should be_nil
+    Money3Compat.first.read_attribute(:price_cents).should be_nil
+
+    f = Money3Compat.first
+    f.price = '32.00 GBP'
+    f.save.should be_true
+
+    Money3Compat.first.price.cents.should eq 3200
+    Money3Compat.first.price.currency.iso_code.should 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'
+    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'
+    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
+
+      Money3Compat.first.price_with_fix.cents.should eq 12000
+      Money3Compat.first.price_with_fix.currency.iso_code.should 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'
+    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'
+    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
+
+      Money3Compat.first.price_no_default.cents.should eq 12000
+      Money3Compat.first.price_no_default.currency.iso_code.should 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
+
+      Money3Compat.first.price_no_default.cents.should eq 12000
+      Money3Compat.first.price_no_default.currency.iso_code.should 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
+
+      Money3Compat.first.price_no_default.should be_nil
+    end
+  end
 end

data/spec/money3_spec.rb

@@ -146,17 +146,17 @@ describe Mongoid::MoneyField do
     
     it 'should be persisted normally when set as Money' do
       dummy = DummyMoney.new
-      dummy.price = Money.parse(1.23)
+      dummy.price = Monetize.parse(1.23)
       dummy.save.should eq true
     end
 
     it 'should be possible to set value to nil' do
       dummy = DummyMoney.new
-      dummy.price = Money.parse(1.23)
+      dummy.price = Monetize.parse(1.23)
       dummy.save.should eq true
 
       dummy = DummyMoney.first
-      dummy.price.should eq Money.parse(1.23)
+      dummy.price.should eq Monetize.parse(1.23)
       dummy.price = nil
       dummy.save.should eq true
       dummy = DummyMoney.first
@@ -171,14 +171,14 @@ 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 Money.parse('9.99')
+      dummy.price.should eq Monetize.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 = Money.parse('1.23')
+      dm.price = Monetize.parse('1.23')
       dm.save!
     end
     
@@ -190,7 +190,7 @@ describe Mongoid::MoneyField do
   
   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 => Money.parse('1.23'))
+      DummyMoney.create(:description => "Test", :price => Monetize.parse('1.23'))
     end
     
     it 'should have a Money value that matches the money value that was initially persisted' do
@@ -248,7 +248,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoneyWithFixedCurrency.first
       dummy.price.currency.iso_code.should eq 'GBP'
       dummy.price.cents.should eq 500
-      dummy.price.should eq Money.parse('5 GBP')
+      dummy.price.should eq Monetize.parse('5 GBP')
     end
 
     it 'should have correct currency when value is set to 100 RUB' do
@@ -256,7 +256,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoneyWithFixedCurrency.first
       dummy.price.currency.iso_code.should eq 'GBP'
       dummy.price.cents.should eq 100_00
-      dummy.price.should eq Money.parse('100 GBP')
+      dummy.price.should eq Monetize.parse('100 GBP')
     end
   end
 
@@ -266,7 +266,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoney.first
       dummy.price.currency.iso_code.should eq 'RUB'
       dummy.price.cents.should eq 123
-      dummy.price.should eq Money.parse('1.23 RUB')
+      dummy.price.should eq Monetize.parse('1.23 RUB')
     end
 
     it 'should handle $' do
@@ -274,7 +274,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoney.first
       dummy.price.currency.iso_code.should eq 'USD'
       dummy.price.cents.should eq 123
-      dummy.price.should eq Money.parse('1.23 USD')
+      dummy.price.should eq Monetize.parse('1.23 USD')
     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 Money.parse('12.99')
+      o.dummy_line_items.first.price.should 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 Money.parse('14.99')
+      o.dummy_line_items.last.price.should 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 Money.parse('1.23')
+      dummy.price1.should eq Monetize.parse('1.23')
     end
     it 'should have correct Money value for field 2' do
       dummy = DummyPrices.first
-      dummy.price2.should eq Money.parse('2.33')
+      dummy.price2.should eq Monetize.parse('2.33')
     end
     it 'should have correct Money value for field 3' do
       dummy = DummyPrices.first
-      dummy.price3.should eq Money.parse('1')
+      dummy.price3.should eq Monetize.parse('1')
     end
   end
 end

data/spec/money_spec.rb

@@ -152,17 +152,17 @@ describe Mongoid::MoneyField do
 
     it 'should be persisted normally when set as Money' do
       dummy       = DummyMoney.new
-      dummy.price = Money.parse(1.23)
+      dummy.price = Monetize.parse(1.23)
       dummy.save.should eq true
     end
 
     it 'should be possible to set value to nil' do
       dummy       = DummyMoney.new
-      dummy.price = Money.parse(1.23)
+      dummy.price = Monetize.parse(1.23)
       dummy.save.should eq true
 
       dummy = DummyMoney.first
-      dummy.price.should eq Money.parse(1.23)
+      dummy.price.should eq Monetize.parse(1.23)
       dummy.price = nil
       dummy.save.should eq true
       dummy = DummyMoney.first
@@ -177,14 +177,14 @@ 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 Money.parse('9.99')
+      dummy.price.should eq Monetize.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 = Money.parse('1.23')
+      dm.price = Monetize.parse('1.23')
       dm.save!
     end
 
@@ -196,7 +196,7 @@ describe Mongoid::MoneyField do
 
   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 => Money.parse('1.23'))
+      DummyMoney.create(:description => "Test", :price => Monetize.parse('1.23'))
     end
 
     it 'should have a Money value that matches the money value that was initially persisted' do
@@ -254,7 +254,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoneyWithFixedCurrency.first
       dummy.price.currency.iso_code.should eq 'GBP'
       dummy.price.cents.should eq 500
-      dummy.price.should eq Money.parse('5 GBP')
+      dummy.price.should eq Monetize.parse('5 GBP')
     end
 
     it 'should have correct currency when value is set to 100 RUB' do
@@ -262,7 +262,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoneyWithFixedCurrency.first
       dummy.price.currency.iso_code.should eq 'GBP'
       dummy.price.cents.should eq 100_00
-      dummy.price.should eq Money.parse('100 GBP')
+      dummy.price.should eq Monetize.parse('100 GBP')
     end
   end
 
@@ -272,7 +272,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoney.first
       dummy.price.currency.iso_code.should eq 'RUB'
       dummy.price.cents.should eq 123
-      dummy.price.should eq Money.parse('1.23 RUB')
+      dummy.price.should eq Monetize.parse('1.23 RUB')
     end
 
     it 'should handle $' do
@@ -280,7 +280,7 @@ describe Mongoid::MoneyField do
       dummy = DummyMoney.first
       dummy.price.currency.iso_code.should eq 'USD'
       dummy.price.cents.should eq 123
-      dummy.price.should eq Money.parse('1.23 USD')
+      dummy.price.should eq Monetize.parse('1.23 USD')
     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 Money.parse('12.99')
+      o.dummy_line_items.first.price.should 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 Money.parse('14.99')
+      o.dummy_line_items.last.price.should 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 Money.parse('1.23')
+      dummy.price1.should eq Monetize.parse('1.23')
     end
     it 'should have correct Money value for field 2' do
       dummy = DummyPrices.first
-      dummy.price2.should eq Money.parse('2.33')
+      dummy.price2.should eq Monetize.parse('2.33')
     end
     it 'should have correct Money value for field 3' do
       dummy = DummyPrices.first
-      dummy.price3.should eq Money.parse('1')
+      dummy.price3.should eq Monetize.parse('1')
     end
   end
 end

data/spec/ruby_money_spec.rb

@@ -1,62 +1,62 @@
-# coding: utf-8
-
-require 'spec_helper'
-
-# from https://github.com/RubyMoney/money-rails/blob/master/spec/mongoid/three_spec.rb
-
-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_from_hash_with_indifferent_access) {
-    Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
-  }
-
-  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')
-    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
-    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')
-    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')
-    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')
-    end
-  end
-
-  context "demongoize" do
-    subject { Priceable.first.price }
-    it { should be_an_instance_of(Money) }
-    it { should == 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
-    end
-    it 'returns nil if an unknown value was stored' do
-      zero_priceable = Priceable.create(:price => [])
-      zero_priceable.price.should 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
-    end
-  end
+# coding: utf-8
+
+require 'spec_helper'
+
+# from https://github.com/RubyMoney/money-rails/blob/master/spec/mongoid/three_spec.rb
+
+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_from_hash_with_indifferent_access) {
+    Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
+  }
+
+  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')
+    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
+    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')
+    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')
+    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')
+    end
+  end
+
+  context "demongoize" do
+    subject { Priceable.first.price }
+    it { should be_an_instance_of(Money) }
+    it { should == 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
+    end
+    it 'returns nil if an unknown value was stored' do
+      zero_priceable = Priceable.create(:price => [])
+      zero_priceable.price.should 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
+    end
+  end
 end

metadata

@@ -1,160 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_money_field
 version: !ruby/object:Gem::Version
-  version: 4.0.1
-  prerelease: 
+  version: 4.0.2
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
 description: Use RubyMoney with mongoid
 email:
 - glebtv@gmail.com
@@ -165,7 +160,8 @@ files:
 - .document
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -207,33 +203,26 @@ files:
 homepage: http://github.com/glebtv/mongoid_money_field
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1051362847442743993
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1051362847442743993
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use RubyMoney with mongoid
 test_files:
 - spec/model_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3@moneyfield --create