money-rails 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cadb127fbc12e2e400269dc9b0996c02f55c8cd6
-  data.tar.gz: c5e3dcc6f9d53d512927a91888b78ba996a0553e
+  metadata.gz: 248e9756e9e93e82ed71a92426635e8864412a66
+  data.tar.gz: b985a0e0926babc02c77bd3ece23927c261ccaab
 SHA512:
-  metadata.gz: 9c57f0377d92586e1cb7935cf780fadb16c204230dbc0b2a449bed4d94839e8d0013681aeb03530412cf0da5fc433900711a19378bb0caedfb20b58364a07b90
-  data.tar.gz: 43cf45749ad6a096ad3d83feb3004cc8d85546f28f0a8846b7eb98ba53313e75d401d0726c0811fd6a3b78798def69f2afdd77ff89b765843e335894159f2ff0
+  metadata.gz: ea054a49148d15a90b373c61df52d73e2598cd67d06e9ffc79dea67e515e6038a365d45f924b09133b90c804311cd9050432e39add9259354823f1f6e0950171
+  data.tar.gz: b53220b8d3e692f983f556a264a9045b5b09d5361a578fa12ce500df96853d58f71e01b927250528b7447a57b5d60be60fbc0d896eec4b3fc440efb2d839aee4

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.7.0
+
+- Rails 5 support
+- Mongoid 5 support
+- Do not convert Mongoid money fields from nil to zero
+- Refactor `#monetize` method
+
 ## 1.6.2
 
 - Fix attribute order possibly affecting the value of monetized attribute

data/Rakefile

@@ -28,17 +28,29 @@ task :spec => :prepare_test_env
 desc "Prepare money-rails engine test environment"
 task :prepare_test_env do
   Rake.application['app:db:drop:all'].invoke
+  Rake.application['app:db:create'].invoke if Rails::VERSION::MAJOR >= 5
   Rake.application['app:db:migrate'].invoke
   Rake.application['app:db:test:prepare'].invoke
 end
 
 def run_with_gemfile(gemfile)
-  sh "BUNDLE_GEMFILE='#{gemfile}' bundle install --quiet"
-  sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake -t spec"
+  Bundler.with_clean_env do
+    begin
+      sh "BUNDLE_GEMFILE='#{gemfile}' bundle install --quiet"
+      Rake.application['app:db:create'].invoke
+      Rake.application['app:db:test:prepare'].invoke
+      sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec"
+    ensure
+      Rake.application['app:db:drop:all'].execute
+    end
+  end
 end
 
 namespace :spec do
 
+  desc "Run Tests against mongoid (version 5)"
+  task(:mongoid5) { run_with_gemfile 'gemfiles/mongoid5.gemfile' }
+
   desc "Run Tests against mongoid (version 4)"
   task(:mongoid4) { run_with_gemfile 'gemfiles/mongoid4.gemfile' }
 
@@ -48,6 +60,9 @@ namespace :spec do
   desc "Run Tests against mongoid (version 2)"
   task(:mongoid2) { run_with_gemfile 'gemfiles/mongoid2.gemfile' }
 
+  desc "Run Tests against rails 5.0"
+  task(:rails50) { run_with_gemfile 'gemfiles/rails50.gemfile' }
+
   desc "Run Tests against rails 4.2"
   task(:rails42) { run_with_gemfile 'gemfiles/rails42.gemfile' }
 
@@ -60,11 +75,11 @@ namespace :spec do
   desc "Run Tests against rails 3"
   task(:rails3) { run_with_gemfile 'gemfiles/rails3.gemfile' }
 
-  desc "Run Tests against mongoid 2 & 3 & 4"
-  task :mongoid => [:mongoid2, :mongoid3, :mongoid4]
+  desc "Run Tests against mongoid 2 & 3 & 4, 5"
+  task :mongoid => [:mongoid2, :mongoid3, :mongoid4, :mongoid5]
 
-  desc "Run Tests against rails 3 & 4 & 4.1 & 4.2"
-  task :rails => [:rails3, :rails4, :rails41, :rails42]
+  desc "Run Tests against rails 3 & 4 & 4.1 & 4.2 & 5.0"
+  task :rails => [:rails3, :rails4, :rails41, :rails42, :rails50]
 
   desc "Run Tests against all ORMs"
   task :all => [:rails, :mongoid]

data/lib/money-rails/active_record/monetizable.rb

@@ -116,104 +116,15 @@ module MoneyRails
               end
             end
 
-            define_method name do |*args|
-
-              # Get the cents
-              amount = public_send(subunit_name, *args)
-
-              # Get the currency object
-              attr_currency = public_send("currency_for_#{name}")
-
-              # Get the cached value
-              memoized = instance_variable_get("@#{name}")
-
-              # Dont create a new Money instance if the values haven't been changed.
-              if memoized && memoized.cents == amount
-                if memoized.currency == attr_currency
-                  result =  memoized
-                else
-                  memoized_amount = memoized.amount.to_money(attr_currency)
-                  write_attribute subunit_name, memoized_amount.cents
-                  # Cache the value (it may be nil)
-                  result = instance_variable_set "@#{name}", memoized_amount
-                end
-              elsif amount.present?
-                # If amount is NOT nil (or empty string) load the amount in a Money
-                amount = Money.new(amount, attr_currency)
-
-                # Cache the value (it may be nil)
-                result = instance_variable_set "@#{name}", amount
-              end
 
-              if MoneyRails::Configuration.preserve_user_input
-                value_before_type_cast = instance_variable_get "@#{name}_money_before_type_cast"
-                unless errors[name.to_sym].blank?
-                  result.define_singleton_method(:to_s) { value_before_type_cast }
-                  result.define_singleton_method(:format) { |_| value_before_type_cast }
-                end
-              end
-
-              result
+            # Getter for monetized attribute
+            define_method name do |*args|
+              read_monetized name, subunit_name, *args
             end
 
+            # Setter for monetized attribute
             define_method "#{name}=" do |value|
-
-              # Lets keep the before_type_cast value
-              instance_variable_set "@#{name}_money_before_type_cast", value
-
-              # Use nil or get a Money object
-              if options[:allow_nil] && value.blank?
-                money = nil
-              else
-                if value.is_a?(Money)
-                  money = value
-                else
-                  begin
-                    money = value.to_money(public_send("currency_for_#{name}"))
-                  rescue NoMethodError
-                    return nil
-                  rescue ArgumentError
-                    raise if MoneyRails.raise_error_on_money_parsing
-                    return nil
-                  rescue Money::Currency::UnknownCurrency
-                    raise if MoneyRails.raise_error_on_money_parsing
-                    return nil
-                  end
-                end
-              end
-
-              # Update cents
-              if !validation_enabled
-                # We haven't defined our own subunit writer, so we can invoke
-                # the regular writer, which works with store_accessors
-                public_send("#{subunit_name}=", money.try(:cents))
-              elsif self.class.respond_to?(:attribute_aliases) &&
-                  self.class.attribute_aliases.key?(subunit_name)
-                # If the attribute is aliased, make sure we write to the original
-                # attribute name or an error will be raised.
-                # (Note: 'attribute_aliases' doesn't exist in Rails 3.x, so we
-                # can't tell if the attribute was aliased.)
-                original_name = self.class.attribute_aliases[subunit_name.to_s]
-                write_attribute(original_name, money.try(:cents))
-              else
-                write_attribute(subunit_name, money.try(:cents))
-              end
-
-              money_currency = money.try(:currency)
-
-              # Update currency iso value if there is an instance currency attribute
-              if instance_currency_name.present? && respond_to?("#{instance_currency_name}=") && money_currency
-                public_send("#{instance_currency_name}=", money_currency.try(:iso_code))
-              else
-                current_currency = public_send("currency_for_#{name}")
-                if money_currency && current_currency != money_currency.id
-                  raise ReadOnlyCurrencyException.new("Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'") if MoneyRails.raise_error_on_money_parsing
-                  return nil
-                end
-              end
-
-              # Save and return the new Money object
-              instance_variable_set "@#{name}", money
+              write_monetized name, subunit_name, value, validation_enabled, instance_currency_name, options
             end
 
             if validation_enabled
@@ -225,29 +136,9 @@ module MoneyRails
               end
             end
 
+            # Currency getter
             define_method "currency_for_#{name}" do
-              if MoneyRails::Configuration.currency_column[:postfix].present?
-                instance_currency_name_with_postfix = "#{name}#{MoneyRails::Configuration.currency_column[:postfix]}"
-              end
-
-              if instance_currency_name.present? && respond_to?(instance_currency_name) &&
-                  Money::Currency.find(public_send(instance_currency_name))
-
-                Money::Currency.find(public_send(instance_currency_name))
-              elsif field_currency_name.respond_to?(:call)
-                Money::Currency.find(field_currency_name.call(self))
-              elsif field_currency_name
-                Money::Currency.find(field_currency_name)
-              elsif instance_currency_name_with_postfix.present? &&
-                     respond_to?(instance_currency_name_with_postfix) &&
-                     Money::Currency.find(public_send(instance_currency_name_with_postfix))
-
-                Money::Currency.find(public_send(instance_currency_name_with_postfix))
-              elsif self.class.respond_to?(:currency)
-                self.class.currency
-              else
-                Money.default_currency
-              end
+              currency_for name, instance_currency_name, field_currency_name
             end
 
             attr_reader "#{name}_money_before_type_cast"
@@ -286,6 +177,120 @@ module MoneyRails
           @monetized_attributes[name] = value
         end
       end
+
+      def read_monetized(name, subunit_name, *args)
+        # Get the cents
+        amount = public_send(subunit_name, *args)
+
+        # Get the currency object
+        attr_currency = public_send("currency_for_#{name}")
+
+        # Get the cached value
+        memoized = instance_variable_get("@#{name}")
+
+        # Dont create a new Money instance if the values haven't been changed.
+        if memoized && memoized.cents == amount
+          if memoized.currency == attr_currency
+            result = memoized
+          else
+            memoized_amount = memoized.amount.to_money(attr_currency)
+            write_attribute subunit_name, memoized_amount.cents
+            # Cache the value (it may be nil)
+            result = instance_variable_set("@#{name}", memoized_amount)
+          end
+        elsif amount.present?
+          # If amount is NOT nil (or empty string) load the amount in a Money
+          amount = Money.new(amount, attr_currency)
+
+          # Cache the value (it may be nil)
+          result = instance_variable_set("@#{name}", amount)
+        end
+
+        if MoneyRails::Configuration.preserve_user_input
+          value_before_type_cast = instance_variable_get "@#{name}_money_before_type_cast"
+          if errors[name.to_sym].present?
+            result.define_singleton_method(:to_s) { value_before_type_cast }
+            result.define_singleton_method(:format) { |_| value_before_type_cast }
+          end
+        end
+
+        result
+      end
+
+      def write_monetized(name, subunit_name, value, validation_enabled, instance_currency_name, options)
+        # Keep before_type_cast value as a reference to original input
+        instance_variable_set "@#{name}_money_before_type_cast", value
+
+        # Use nil or get a Money object
+        if options[:allow_nil] && value.blank?
+          money = nil
+        else
+          if value.is_a?(Money)
+            money = value
+          else
+            begin
+              money = value.to_money(public_send("currency_for_#{name}"))
+            rescue NoMethodError
+              return nil
+            rescue ArgumentError
+              raise if MoneyRails.raise_error_on_money_parsing
+              return nil
+            rescue Money::Currency::UnknownCurrency
+              raise if MoneyRails.raise_error_on_money_parsing
+              return nil
+            end
+          end
+        end
+
+        # Update cents
+        if !validation_enabled
+          # We haven't defined our own subunit writer, so we can invoke
+          # the regular writer, which works with store_accessors
+          public_send("#{subunit_name}=", money.try(:cents))
+        elsif self.class.respond_to?(:attribute_aliases) &&
+            self.class.attribute_aliases.key?(subunit_name)
+          # If the attribute is aliased, make sure we write to the original
+          # attribute name or an error will be raised.
+          # (Note: 'attribute_aliases' doesn't exist in Rails 3.x, so we
+          # can't tell if the attribute was aliased.)
+          original_name = self.class.attribute_aliases[subunit_name.to_s]
+          write_attribute(original_name, money.try(:cents))
+        else
+          write_attribute(subunit_name, money.try(:cents))
+        end
+
+        if money_currency = money.try(:currency)
+          # Update currency iso value if there is an instance currency attribute
+          if instance_currency_name.present? && respond_to?("#{instance_currency_name}=")
+            public_send("#{instance_currency_name}=", money_currency.iso_code)
+          else
+            current_currency = public_send("currency_for_#{name}")
+            if current_currency != money_currency.id
+              raise ReadOnlyCurrencyException.new("Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'") if MoneyRails.raise_error_on_money_parsing
+              return nil
+            end
+          end
+        end
+
+        # Save and return the new Money object
+        instance_variable_set "@#{name}", money
+      end
+
+      def currency_for(name, instance_currency_name, field_currency_name)
+        if instance_currency_name.present? && respond_to?(instance_currency_name) &&
+            Money::Currency.find(public_send(instance_currency_name))
+
+          Money::Currency.find(public_send(instance_currency_name))
+        elsif field_currency_name.respond_to?(:call)
+          Money::Currency.find(field_currency_name.call(self))
+        elsif field_currency_name
+          Money::Currency.find(field_currency_name)
+        elsif self.class.respond_to?(:currency)
+          self.class.currency
+        else
+          Money.default_currency
+        end
+      end
     end
   end
 end

data/lib/money-rails/mongoid/money.rb

@@ -37,6 +37,7 @@ class Money
           object.symbolize_keys!
         end
         ::Money.new(object[:cents], object[:currency_iso]).mongoize
+      when object.nil? then nil
       when object.respond_to?(:to_money) then
         begin
           object.to_money.mongoize

data/lib/money-rails/mongoid/two.rb

@@ -21,6 +21,7 @@ class Money
         :cents        => object.cents.is_a?(BigDecimal) ? object.cents.to_s : object.cents,
         :currency_iso => object.currency.iso_code
       }
+    when object.nil? then nil
     when object.respond_to?(:to_money)
       begin
         serialize(object.to_money)

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.6.2'
+  VERSION = '1.7.0'
 end

data/spec/active_record/monetizable_spec.rb

@@ -6,21 +6,21 @@ class Sub < Product; end
 
 if defined? ActiveRecord
   describe MoneyRails::ActiveRecord::Monetizable do
-    describe "monetize" do
-      let(:product) do
-        Product.create(:price_cents => 3000, :discount => 150,
-                       :bonus_cents => 200, :optional_price => 100,
-                       :sale_price_amount => 1200, :delivery_fee_cents => 100,
-                       :restock_fee_cents => 2000,
-                       :reduced_price_cents => 1500, :reduced_price_currency => :lvl,
-                       :lambda_price_cents => 4000)
-      end
+    let(:product) do
+      Product.create(:price_cents => 3000, :discount => 150,
+                     :bonus_cents => 200, :optional_price => 100,
+                     :sale_price_amount => 1200, :delivery_fee_cents => 100,
+                     :restock_fee_cents => 2000,
+                     :reduced_price_cents => 1500, :reduced_price_currency => :lvl,
+                     :lambda_price_cents => 4000)
+    end
 
+    describe ".monetize" do
       let(:service) do
         Service.create(:charge_cents => 2000, :discount_cents => 120)
       end
 
-      context 'monetized_attributes' do
+      context ".monetized_attributes" do
 
         class InheritedMonetizeProduct < Product
           monetize :special_price_cents
@@ -396,21 +396,6 @@ if defined? ActiveRecord
         expect(product.save).to be_truthy
       end
 
-      describe "with preserve_user_input set" do
-        around(:each) do |example|
-          old_value = MoneyRails::Configuration.preserve_user_input
-          MoneyRails::Configuration.preserve_user_input = true
-          example.run
-          MoneyRails::Configuration.preserve_user_input = false
-        end
-
-        it "preserves user input if validation fails" do
-          product.price = "14,0"
-          expect(product.save).to be_falsy
-          expect(product.price.to_s).to eq("14,0")
-        end
-      end
-
       it "respects numericality validation when using update_attributes on money attribute" do
         expect(product.update_attributes(:price => "some text")).to be_falsey
         expect(product.update_attributes(:price => Money.new(320, 'USD'))).to be_truthy
@@ -798,11 +783,228 @@ if defined? ActiveRecord
       end
     end
 
-    describe "register_currency" do
+    describe ".register_currency" do
       it "attaches currency at model level" do
         expect(Product.currency).to eq(Money::Currency.find(:usd))
         expect(DummyProduct.currency).to eq(Money::Currency.find(:gbp))
       end
     end
+
+    describe "#read_monetized" do
+      it "returns monetized attribute's value" do
+        reduced_price = product.read_monetized(:reduced_price, :reduced_price_cents)
+
+        expect(reduced_price).to be_an_instance_of(Money)
+        expect(reduced_price).to eq(Money.new(product.reduced_price_cents, product.reduced_price_currency))
+      end
+
+      context "memoize" do
+        it "memoizes monetized attribute's value" do
+          product.instance_variable_set '@reduced_price', nil
+          reduced_price = product.read_monetized(:reduced_price, :reduced_price_cents)
+
+          expect(product.instance_variable_get('@reduced_price')).to eq(reduced_price)
+        end
+
+        it "resets memoized attribute's value if amount has changed" do
+          reduced_price = product.read_monetized(:reduced_price, :reduced_price_cents)
+          product.reduced_price_cents = 100
+
+          expect(product.read_monetized(:reduced_price, :reduced_price_cents)).not_to eq(reduced_price)
+        end
+
+        it "resets memoized attribute's value if currency has changed" do
+          reduced_price = product.read_monetized(:reduced_price, :reduced_price_cents)
+          product.reduced_price_currency = 'CAD'
+
+          expect(product.read_monetized(:reduced_price, :reduced_price_cents)).not_to eq(reduced_price)
+        end
+      end
+
+      context "with preserve_user_input set" do
+        around(:each) do |example|
+          MoneyRails::Configuration.preserve_user_input = true
+          example.run
+          MoneyRails::Configuration.preserve_user_input = false
+        end
+
+        it "has no effect if validation passes" do
+          product.price = '14'
+
+          expect(product.save).to be_truthy
+          expect(product.read_monetized(:price, :price_cents).to_s).to eq('14.00')
+        end
+
+        it "preserves user input if validation fails" do
+          product.price = '14,0'
+
+          expect(product.save).to be_falsy
+          expect(product.read_monetized(:price, :price_cents).to_s).to eq('14,0')
+        end
+      end
+    end
+
+    describe "#write_monetized" do
+      let(:value) { Money.new(1_000, 'LVL') }
+
+      it "sets monetized attribute's value to Money object" do
+        product.write_monetized :price, :price_cents, value, false, nil, {}
+
+        expect(product.price).to be_an_instance_of(Money)
+        expect(product.price_cents).to eq(value.cents)
+        # Because :price does not have a column for currency
+        expect(product.price.currency).to eq(Product.currency)
+      end
+
+      it "sets monetized attribute's value from a given Fixnum" do
+        product.write_monetized :price, :price_cents, 10, false, nil, {}
+
+        expect(product.price).to be_an_instance_of(Money)
+        expect(product.price_cents).to eq(1000)
+      end
+
+      it "sets monetized attribute's value from a given Float" do
+        product.write_monetized :price, :price_cents, 10.5, false, nil, {}
+
+        expect(product.price).to be_an_instance_of(Money)
+        expect(product.price_cents).to eq(1050)
+      end
+
+      it "resets monetized attribute when given blank input" do
+        product.write_monetized :price, :price_cents, nil, false, nil, { :allow_nil => true }
+
+        expect(product.price).to eq(nil)
+      end
+
+      it "sets monetized attribute to 0 when given a blank value" do
+        currency = product.price.currency
+        product.write_monetized :price, :price_cents, nil, false, nil, {}
+
+        expect(product.price.amount).to eq(0)
+        expect(product.price.currency).to eq(currency)
+      end
+
+      it "does not memoize monetized attribute's value if currency is read-only" do
+        product.write_monetized :price, :price_cents, value, false, nil, {}
+
+        price = product.instance_variable_get('@price')
+
+        expect(price).to be_an_instance_of(Money)
+        expect(price.amount).not_to eq(value.amount)
+      end
+
+      describe "instance_currency_name" do
+        it "updates instance_currency_name attribute" do
+          product.write_monetized :sale_price, :sale_price_amount, value, false, :sale_price_currency_code, {}
+
+          expect(product.sale_price).to eq(value)
+          expect(product.sale_price_currency_code).to eq('LVL')
+        end
+
+        it "memoizes monetized attribute's value with currency" do
+          product.write_monetized :sale_price, :sale_price_amount, value, false, :sale_price_currency_code, {}
+
+          expect(product.instance_variable_get('@sale_price')).to eq(value)
+        end
+
+        it "ignores empty instance_currency_name" do
+          product.write_monetized :sale_price, :sale_price_amount, value, false, '', {}
+
+          expect(product.sale_price.amount).to eq(value.amount)
+          expect(product.sale_price.currency).to eq(Product.currency)
+        end
+
+        it "ignores instance_currency_name that model does not respond to" do
+          product.write_monetized :sale_price, :sale_price_amount, value, false, :non_existing_currency, {}
+
+          expect(product.sale_price.amount).to eq(value.amount)
+          expect(product.sale_price.currency).to eq(Product.currency)
+        end
+      end
+
+      describe "error handling" do
+        let!(:old_price_value) { product.price }
+
+        it "ignores values that do not implement to_money method" do
+          product.write_monetized :price, :price_cents, [10], false, nil, {}
+
+          expect(product.price).to eq(old_price_value)
+        end
+
+        context "raise_error_on_money_parsing enabled" do
+          before { MoneyRails.raise_error_on_money_parsing = true }
+          after { MoneyRails.raise_error_on_money_parsing = false }
+
+          it "raises an ArgumentError when given an invalid value" do
+            expect {
+              product.write_monetized :price, :price_cents, '10-50', false, nil, {}
+            }.to raise_error(ArgumentError)
+          end
+
+          it "raises a Money::Currency::UnknownCurrency error when trying to set invalid currency" do
+            allow(product).to receive(:currency_for_price).and_return('INVALID_CURRENCY')
+            expect {
+              product.write_monetized :price, :price_cents, 10, false, nil, {}
+            }.to raise_error(Money::Currency::UnknownCurrency)
+          end
+        end
+
+        context "raise_error_on_money_parsing disabled" do
+          it "ignores when given invalid value" do
+            product.write_monetized :price, :price_cents, '10-50', false, nil, {}
+
+            expect(product.price).to eq(old_price_value)
+          end
+
+          it "raises a Money::Currency::UnknownCurrency error when trying to set invalid currency" do
+            allow(product).to receive(:currency_for_price).and_return('INVALID_CURRENCY')
+            product.write_monetized :price, :price_cents, 10, false, nil, {}
+
+            # Can not use public accessor here because currency_for_price is stubbed
+            expect(product.instance_variable_get('@price')).to eq(old_price_value)
+          end
+        end
+      end
+    end
+
+    describe "#currency_for" do
+      it "detects currency based on instance currency name" do
+        product = Product.new(:sale_price_currency_code => 'CAD')
+        currency = product.send(:currency_for, :sale_price, :sale_price_currency_code, nil)
+
+        expect(currency).to be_an_instance_of(Money::Currency)
+        expect(currency.iso_code).to eq('CAD')
+      end
+
+      it "detects currency based on currency passed as a block" do
+        product = Product.new
+        currency = product.send(:currency_for, :lambda_price, nil, ->(_) { 'CAD' })
+
+        expect(currency).to be_an_instance_of(Money::Currency)
+        expect(currency.iso_code).to eq('CAD')
+      end
+
+      it "detects currency based on currency passed explicitly" do
+        product = Product.new
+        currency = product.send(:currency_for, :bonus, nil, 'CAD')
+
+        expect(currency).to be_an_instance_of(Money::Currency)
+        expect(currency.iso_code).to eq('CAD')
+      end
+
+      it "falls back to a registered currency" do
+        product = Product.new
+        currency = product.send(:currency_for, :amount, nil, nil)
+
+        expect(currency).to eq(Product.currency)
+      end
+
+      it "falls back to a default currency" do
+        transaction = Transaction.new
+        currency = transaction.send(:currency_for, :amount, nil, nil)
+
+        expect(currency).to eq(Money.default_currency)
+      end
+    end
   end
 end

data/spec/dummy/config/application.rb

@@ -4,7 +4,7 @@ require File.expand_path('../boot', __FILE__)
 require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-unless Rails::VERSION::MAJOR == 4
+unless Rails::VERSION::MAJOR >= 4
   require "active_resource/railtie"
 end
 require "sprockets/railtie"

data/spec/dummy/config/mongoid.yml

@@ -21,3 +21,9 @@ test:
       database: dummy_test
       hosts:
         - localhost:27017
+
+  clients:                                                                                                    
+    default:                                                                                                  
+      database: dummy_test   
+      hosts:                                                                                                  
+        - localhost:27017  

data/spec/mongoid/five_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+if defined?(Mongoid) && ::Mongoid::VERSION =~ /^5(.*)/
+
+  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)
+    }
+    let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
+    let(:priceable_from_string_with_unknown_currency) { Priceable.create(:price => '1 TLDR') }
+    let(:priceable_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_with_hash_field) {
+      Priceable.create(:price_hash => {
+        :key1 => Money.new(100, "EUR"),
+        :key2 => Money.new(200, "USD")
+      })
+    }
+
+    context "mongoize" do
+      it "correctly mongoizes a Money object to a hash of cents and currency" do
+        expect(priceable.price.cents).to eq(100)
+        expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
+      end
+
+      it "correctly mongoizes a Numeric object to a hash of cents and currency" do
+        expect(priceable_from_num.price.cents).to eq(100)
+        expect(priceable_from_num.price.currency).to eq(Money.default_currency)
+      end
+
+      it "correctly mongoizes a String object to a hash of cents and currency" do
+        expect(priceable_from_string.price.cents).to eq(100)
+        expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
+      end
+
+      context "when MoneyRails.raise_error_on_money_parsing is true" do
+        before { MoneyRails.raise_error_on_money_parsing = true }
+        after { MoneyRails.raise_error_on_money_parsing = false }
+
+        it "raises exception if the mongoized value is a String with a hyphen" do
+          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
+        end
+
+        it "raises exception if the mongoized value is a String with an unknown currency" do
+          expect { priceable_from_string_with_unknown_currency }.to raise_error ArgumentError
+        end
+      end
+
+      context "when MoneyRails.raise_error_on_money_parsing is false" do
+        it "does not correctly mongoize a String with a hyphen in its middle" do
+          expect(priceable_from_string_with_hyphen.price).to eq(nil)
+        end
+
+        it "does not correctly mongoize a String with an unknown currency" do
+          expect(priceable_from_string_with_unknown_currency.price).to eq(nil)
+        end
+      end
+
+      it "correctly mongoizes a hash of cents and currency" do
+        expect(priceable_from_hash.price.cents).to eq(100)
+        expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
+      end
+
+      it "correctly mongoizes a HashWithIndifferentAccess of cents and currency" do
+        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
+
+      context "infinite_precision = true" do
+        before do
+          Money.infinite_precision = true
+        end
+
+        after do
+          Money.infinite_precision = false
+        end
+
+        it "correctly mongoizes a Money object to a hash of cents and currency" do
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
+        end
+      end
+    end
+
+    it "correctly serializes a Hash field containing Money objects" do
+      expect(priceable_with_hash_field.price_hash[:key1][:cents]).to eq(100)
+      expect(priceable_with_hash_field.price_hash[:key2][:cents]).to eq(200)
+      expect(priceable_with_hash_field.price_hash[:key1][:currency_iso]).to eq('EUR')
+      expect(priceable_with_hash_field.price_hash[:key2][:currency_iso]).to eq('USD')
+    end
+
+    context "demongoize" do
+      subject { Priceable.first.price }
+      it { is_expected.to be_an_instance_of(Money) }
+      it { is_expected.to eq(Money.new(100, 'EUR')) }
+
+      it "returns 0 cents in default_currency if a nil value was stored" do
+        nil_priceable = Priceable.create(price: nil)
+        expect(nil_priceable.price.cents).to eq(0)
+        expect(nil_priceable.price.currency).to eq(Money.default_currency)
+      end
+      it 'returns nil if an unknown value was stored' do
+        zero_priceable = Priceable.create(:price => [])
+        expect(zero_priceable.price).to be_nil
+      end
+    end
+
+    context "evolve" do
+      it "correctly transforms a Money object into a Mongo friendly value" do
+        expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
+      end
+    end
+  end
+end

data/spec/mongoid/four_spec.rb

@@ -4,6 +4,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
 
   describe Money do
     let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
+    let!(:priceable_from_nil) { Priceable.create(:price => nil) }
     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"} )}
@@ -21,6 +22,10 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
     }
 
     context "mongoize" do
+      it "correctly mongoizes nil to nil" do
+        expect(priceable_from_nil.price).to be_nil
+      end
+
       it "correctly mongoizes a Money object to a hash of cents and currency" do
         expect(priceable.price.cents).to eq(100)
         expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
@@ -97,11 +102,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
       it { is_expected.to be_an_instance_of(Money) }
       it { is_expected.to eq(Money.new(100, 'EUR')) }
 
-      it "returns 0 cents in default_currency if a nil value was stored" do
+      it "returns nil if a nil value was stored" do
         nil_priceable = Priceable.create(price: nil)
-        expect(nil_priceable.price.cents).to eq(0)
-        expect(nil_priceable.price.currency).to eq(Money.default_currency)
+        expect(nil_priceable.price).to be_nil
       end
+
       it 'returns nil if an unknown value was stored' do
         zero_priceable = Priceable.create(:price => [])
         expect(zero_priceable.price).to be_nil

data/spec/mongoid/three_spec.rb

@@ -4,6 +4,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
 
   describe Money do
     let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
+    let!(:priceable_from_nil) { Priceable.create(:price => nil) }
     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"} )}
@@ -21,6 +22,10 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
     }
 
     context "mongoize" do
+      it "mongoizes correctly nil to nil" do
+        expect(priceable_from_nil.price).to be_nil
+      end
+
       it "mongoizes correctly a Money object to a hash of cents and currency" do
         expect(priceable.price.cents).to eq(100)
         expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
@@ -96,11 +101,12 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
       subject { Priceable.first.price }
       it { is_expected.to be_an_instance_of(Money) }
       it { is_expected.to eq(Money.new(100, 'EUR')) }
-      it "returns 0 cents in default_currency if a nil value was stored" do
+
+      it "returns nil if a nil value was stored" do
         nil_priceable = Priceable.create(price: nil)
-        expect(nil_priceable.price.cents).to eq(0)
-        expect(nil_priceable.price.currency).to eq(Money.default_currency)
+        expect(nil_priceable.price).to be_nil
       end
+
       it 'returns nil if an unknown value was stored' do
         zero_priceable = Priceable.create(:price => [])
         expect(zero_priceable.price).to be_nil

data/spec/mongoid/two_spec.rb

@@ -4,12 +4,17 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
 
   describe Money do
     let(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
+    let(:priceable_from_nil) { Priceable.create(:price => nil) }
     let(:priceable_from_num) { Priceable.create(:price => 1) }
     let(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
     let(:priceable_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
     let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
 
     context "serialize" do
+      it "mongoizes correctly nil to nil" do
+        expect(priceable_from_nil.price).to be_nil
+      end
+
       it "serializes correctly a Money object to a hash of cents and currency" do
         expect(priceable.price.cents).to eq(100)
         expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
@@ -60,11 +65,12 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
       subject { priceable.price }
       it { is_expected.to be_an_instance_of(Money) }
       it { is_expected.to eq(Money.new(100, 'EUR')) }
-      it "returns 0 cents in default_currency if a nil value was stored" do
+
+      it "returns nil if a nil value was stored" do
         nil_priceable = Priceable.create(price: nil)
-        expect(nil_priceable.price.cents).to eq(0)
-        expect(nil_priceable.price.currency).to eq(Money.default_currency)
+        expect(nil_priceable.price).to be_nil
       end
+
       it 'returns nil if an unknown value was stored' do
         zero_priceable = Priceable.create(:price => [])
         expect(zero_priceable.price).to be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -226,6 +226,7 @@ files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/mongoid/five_spec.rb
 - spec/mongoid/four_spec.rb
 - spec/mongoid/three_spec.rb
 - spec/mongoid/two_spec.rb
@@ -319,6 +320,7 @@ test_files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/mongoid/five_spec.rb
 - spec/mongoid/four_spec.rb
 - spec/mongoid/three_spec.rb
 - spec/mongoid/two_spec.rb