mongoid_money_field 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c013789b8fc6ec0dea62fe5c8ef03f16b191494a
-  data.tar.gz: 9539349f4618d4ea474b30bcc28c205d88d3163f
+  metadata.gz: 8d597501e969ab92ffc3a6958e242515f734da04
+  data.tar.gz: 8605ccc7c7666f68cd05f37937f206e5f8e61430
 SHA512:
-  metadata.gz: 61494ba8db66c0a7a1c188be267252841b10bc11f7b6b43c466aa97f279f4cf47842caaf3af7724ff793550d6247ddc1d44ec6ebc8f8be0890f13061d86f5745
-  data.tar.gz: e32c8a2b55208786e65b7ace7bd09ef1b0e689d6e0ac1b9dd608a034efb75bca61ee21c42748205239da26508e86542234dc2c580b46e2cee8c2d7d0df5cc728
+  metadata.gz: 61a4e7253dc18ff0f3e05edc1385a03ec3fe5f684b2f9b9757070429d4c5dc0025e41d47c0fe4a520f34de1ce0a6e0ff8b7bc0a7e4a5c7efd344717cf1e3191f
+  data.tar.gz: f61ba0e48c01a9a32eeac0f5bf5e272790e4288c558de3f0926094d27f562300a45eeea770918af3a64356ac339fe1e84352dc75e7ca9010deac6872d9a5dbf0

data/Gemfile

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

data/Gemfile.lock

@@ -1,19 +1,9 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: a94c2f43573e58f973913c881ad9d11d62bf857c
-  branch: master
-  specs:
-    mongoid (4.0.0.alpha2)
-      activemodel (>= 4.0.0)
-      moped (~> 2.0.beta5)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-
 PATH
   remote: .
   specs:
-    mongoid_money_field (5.0.3)
-      money (>= 5.0.0)
+    mongoid_money_field (5.0.4)
+      monetize
+      money (~> 6.1.0.beta1)
       mongoid (>= 3.0.0)
 
 GEM
@@ -29,39 +19,46 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.14)
-    bson (2.1.0)
+    bson (2.2.0)
     builder (3.1.4)
     connection_pool (1.2.0)
     database_cleaner (1.2.0)
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.3)
     i18n (0.6.9)
     json (1.8.1)
     minitest (4.7.5)
-    money (6.0.0)
+    monetize (0.2.0)
+      money (~> 6.1.0.beta1)
+    money (6.1.0.beta1)
       i18n (~> 0.6.4)
+    mongoid (4.0.0.beta1)
+      activemodel (>= 4.0.0)
+      moped (~> 2.0.beta6)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
     mongoid-rspec (1.10.0)
       mongoid (>= 3.0.1)
       rake
       rspec (>= 2.14)
-    moped (2.0.0.beta5)
-      bson (~> 2.1)
+    moped (2.0.0.beta6)
+      bson (~> 2.2)
       connection_pool (~> 1.2)
       optionable (~> 0.2.0)
     multi_json (1.8.4)
     optionable (0.2.0)
     origin (2.1.0)
     rake (10.1.1)
-    rdoc (4.0.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.5)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -76,11 +73,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  database_cleaner (~> 1.2.0)
-  mongoid!
-  mongoid-rspec (~> 1.10.0)
+  database_cleaner
+  mongoid (~> 4.0.0.beta1)
+  mongoid-rspec
   mongoid_money_field!
   rake
-  rdoc (~> 4.0.1)
-  rspec (~> 2.14.0)
-  simplecov (~> 0.8.2)
+  rdoc
+  rspec
+  simplecov

data/lib/mongoid_money_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidMoneyField
-  VERSION = "5.0.4"
+  VERSION = "5.1.0"
 end

data/lib/mongoid_money_field.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 
 require "money"
+require 'monetize'
+require 'monetize/core_extensions'
 
 require "mongoid_money_field/type"
 require "mongoid_money_field/version"

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 "money", "~> 6.1.0.beta1"
+  spec.add_runtime_dependency "monetize"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec", "~> 2.14.0"
-  spec.add_development_dependency "rdoc", "~> 4.0.1"
-  spec.add_development_dependency "simplecov", "~> 0.8.2"
-  spec.add_development_dependency "database_cleaner", "~> 1.2.0"
-  spec.add_development_dependency "mongoid-rspec", "~> 1.10.0"
+  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/money_spec.rb

@@ -151,17 +151,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
@@ -176,14 +176,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
 
@@ -195,7 +195,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
@@ -253,7 +253,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 'works for other field' do
@@ -268,7 +268,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
 
@@ -278,7 +278,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
@@ -286,7 +286,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
 
@@ -332,12 +332,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
 
@@ -348,15 +348,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_money_field
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.0
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -26,18 +26,32 @@ dependencies:
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.1.0.beta1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.1.0.beta1
+- !ruby/object:Gem::Dependency
+  name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,72 +84,72 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '0'
 description: Use RubyMoney with mongoid
 email:
 - glebtv@gmail.com
@@ -203,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Use RubyMoney with mongoid