mongoid_money_field 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 447b45a00144769201cfd7519b2b0c1e7f8640bd
-  data.tar.gz: 3c34a7db0ba4090d6935943c084ee85d1aef50d6
+  metadata.gz: cb761ef70afdee8017350111c75542a7a4e9765c
+  data.tar.gz: 8c0b7e56938556f2719985fa9824074d05c2d725
 SHA512:
-  metadata.gz: 1f5e6392c26675796016c3c6dd7fe38b11f6f20cc3ac06cd71c22bcbdf5ab8ae0e9d27151ce37b541f95679f43533493f2acf2fc832c4a940c2de539116fe943
-  data.tar.gz: c14d2d9014cbb292f6aaa9a5550c3d6b6d97745e66631ea138d2f426a7a706cb84d41cff3f37950dcc2b60019849d552f5b01d00a84a3e8c3f990fdf9d2e27d4
+  metadata.gz: 5c72d777540e4a3844e451aa26c91664afcaa841b7424bf70404313748e2a4141661a10cb5cddac9a1a1a3f8d66eb08fa597507d45f5479b5722ef2bdfde84a8
+  data.tar.gz: c29933f33e22c2391553b1a266ad16b5096fd1c4e165c76c126d37d4c257c155aa0cf728bb99886552b5e6d8505c2485c75934f80daace556b0f8370d0bfce5a

data/.travis.yml

@@ -3,5 +3,6 @@ services: mongodb
 
 rvm:
   - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
+  - 2.0.0
+  - 2.1.1
+

data/lib/mongoid_money_field.rb

@@ -66,14 +66,18 @@ module Mongoid
               end
 
               write_attribute(name, money)
-              remove_attribute("#{name}_currency")
-              remove_attribute("#{name}_cents")
             end
+            remove_attribute("#{name}_currency")
+            remove_attribute("#{name}_cents")
           end
 
           # mongoid money field 2 compat
           define_method(name) do
-            if read_attribute("#{name}_cents").nil?
+            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
@@ -83,11 +87,6 @@ module Mongoid
                 end
                 Money.demongoize(value)
               end
-
-            else
-              currency = read_attribute("#{name}_currency")
-              currency = ensure_default.call(currency)
-              Money.new(read_attribute("#{name}_cents"), currency)
             end
           end
 

data/lib/mongoid_money_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidMoneyField
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
 end

data/spec/support/money3.rb

@@ -24,7 +24,7 @@ class Money3Compat
 
   field :description
 
-  money_field :price, default: 0
+  money_field :price
   money_field :price_no_default
   money_field :price_with_fix, fixed_currency: 'GBP'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_money_field
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid