money-rails 0.9.0 → 0.10.0

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## master (next release)
+- Raise error when trying to change model based currency
 - Add testing tasks for rails 4.x
 - Fix issue with Numeric values in MoneyValidator (GH-83).
 - Fix test helper

data/README.md

@@ -1,8 +1,10 @@
 # RubyMoney - Money-Rails [![endorse](http://api.coderwall.com/alup/endorsecount.png)](http://coderwall.com/alup)
 
+[![Gem Version](https://badge.fury.io/rb/money-rails.png)](http://badge.fury.io/rb/money-rails)
 [![Build Status](https://secure.travis-ci.org/RubyMoney/money-rails.png?branch=master)](http://travis-ci.org/RubyMoney/money-rails)
 [![Dependency Status](https://gemnasium.com/RubyMoney/money-rails.png)](https://gemnasium.com/RubyMoney/money-rails)
 [![Code Climate](https://codeclimate.com/github/RubyMoney/money-rails.png)](https://codeclimate.com/github/RubyMoney/money-rails)
+[![License](http://img.shields.io/license/MIT.png?color=green)](http://opensource.org/licenses/MIT)
 
 ## Introduction
 
@@ -40,17 +42,6 @@ $ rails g money_rails:initializer
 There, you can define the default currency value and set other
 configuration parameters for the rails app.
 
-### Setup for money-rails development
-
-Our tests are executed with several ORMs - see `Rakefile` for details. To install all required gems run these:
-
-    bundle install --gemfile=gemfiles/mongoid2.gemfile
-    bundle install --gemfile=gemfiles/mongoid3.gemfile
-    bundle install --gemfile=gemfiles/rails3.gemfile
-    bundle install --gemfile=gemfiles/rails4.gemfile
-
-Then you can run the test suite with `rake`,
-
 ## Usage
 
 ### ActiveRecord
@@ -292,8 +283,9 @@ currency, whereas ```product.discount.currency_as_string # => EUR ```
 All the previous options do not require any extra model field to hold
 currency values. If you need to provide differrent currency per model
 instance, then you need to add a column with the name ```currency```
-in your db table. Money-rails will discover this automatically,
-and will use this knowledge to override the model level and global
+in your db table. You should specify ```with_model_currency``` as an argument
+to the ```monetize``` macro.
+Money-rails will use this knowledge to override the model level and global
 default values. Non-nil instance currency values also override attribute
 currency values, so they have the highest precedence.
 
@@ -306,8 +298,8 @@ class Transaction < ActiveRecord::Base
   # Use model level currency
   register_currency :gbp
 
-  monetize :amount_cents
-  monetize :tax_cents
+  monetize :amount_cents, with_model_currency: :amount_currency
+  monetize :tax_cents, with_model_currency: :tax_currency
 
 end
 
@@ -371,6 +363,21 @@ MoneyRails.configure do |config|
   #   :decimal_mark        => ","
   # }
 
+  # Specify a rounding mode
+  # Any one of:
+  # 
+  # BigDecimal::ROUND_UP,
+  # BigDecimal::ROUND_DOWN,
+  # BigDecimal::ROUND_HALF_UP,
+  # BigDecimal::ROUND_HALF_DOWN,
+  # BigDecimal::ROUND_HALF_EVEN,
+  # BigDecimal::ROUND_CEILING,
+  # BigDecimal::ROUND_FLOOR
+  # 
+  # set to BigDecimal::ROUND_HALF_EVEN by default
+  # 
+  config.rounding_mode = BigDecimal::ROUND_HALF_UP 
+
   # Set money formatted output globally.
   # Default value is nil meaning "ignore this option".
   # Options are nil, true, false.
@@ -399,6 +406,7 @@ end
 * ```sign_before_symbol```: Force `Money#format` to place the negative sign before the currency symbol.
 * ```amount_column```: Provide values for the amount column (holding the fractional part of a money object).
 * ```currency_column```: Provide default values or even disable (`present: false`) the currency column.
+* ```rounding_mode```: Set Money.rounding_mode to one of the BigDecimal constants
 
 ### Helpers
 
@@ -484,6 +492,24 @@ For examples on using the test_helpers look at
 
 You can see a full list of the currently supported interpreters in [travis.yml](http://github.com/RubyMoney/money-rails/blob/master/.travis.yml)
 
+## Contributing
+
+### Steps
+
+1. Fork the repo
+2. Run the tests
+3. Make your changes
+4. Test your changes
+5. Create a Pull Request
+
+### How to run the tests
+
+Our tests are executed with several ORMs - see `Rakefile` for details. To install all required gems run `rake spec:all` That command will take care of installing all required gems for all the different Gemfiles and then running the test suite with the installed bundle.
+
+You can also run the test suite against a specific ORM or Rails version, `rake -T` will give you an idea of the possible task (take a look at the tasks under the spec: namespace).
+
+If you are testing against mongoid, make sure to have the mongod process running before executing the suite,  (E.g. `sudo mongod --quiet`)
+
 ## Maintainers
 
 * Andreas Loupasakis (https://github.com/alup)
@@ -492,4 +518,4 @@ You can see a full list of the currently supported interpreters in [travis.yml](
 
 ## License
 
-MIT License. Copyright 2012-2013 RubyMoney.
+MIT License. Copyright 2012-2014 RubyMoney.

data/Rakefile

@@ -11,6 +11,10 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+
+load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
+
 require 'rake'
 require 'rspec/core/rake_task'
 
@@ -18,56 +22,43 @@ RSpec::Core::RakeTask.new
 
 task :default => "spec:all"
 task :test => :spec
+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: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"
+end
 
 namespace :spec do
+
   desc "Run Tests against mongoid (version 3)"
-  task :mongoid3 do
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid3.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid3.gemfile' bundle exec rake -t spec"
-  end
+  task(:mongoid3) { run_with_gemfile 'gemfiles/mongoid3.gemfile' }
 
   desc "Run Tests against mongoid (version 2)"
-  task :mongoid2 do
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid2.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid2.gemfile' bundle exec rake -t spec"
-  end
+  task(:mongoid2) { run_with_gemfile 'gemfiles/mongoid2.gemfile' }
 
   desc "Run Tests against rails 4"
-  task :rails4 do
-    sh "BUNDLE_GEMFILE='gemfiles/rails4.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/rails4.gemfile' bundle exec rake -t spec"
-  end
+  task(:rails4) { run_with_gemfile 'gemfiles/rails4.gemfile' }
 
   desc "Run Tests against rails 3"
-  task :rails3 do
-    sh "BUNDLE_GEMFILE='gemfiles/rails3.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/rails3.gemfile' bundle exec rake -t spec"
-  end
+  task(:rails3) { run_with_gemfile 'gemfiles/rails3.gemfile' }
 
-  desc "Run Tests against activerecord"
-  task :activerecord do
-    sh "bundle --quiet"
-    sh "bundle exec rake -t spec"
-  end
+  desc "Run Tests against mongoid 2 & 3"
+  task :mongoid => [:mongoid2, :mongoid3]
+
+  desc "Run Tests against rails 3 & 4"
+  task :rails => [:rails3, :rails4]
 
   desc "Run Tests against all ORMs"
-  task :all do
-    # Mongoid 3
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid3.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid3.gemfile' bundle exec rake -t spec"
-
-    # Mongoid 2
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid2.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/mongoid2.gemfile' bundle exec rake -t spec"
-
-    # rails 4
-    sh "BUNDLE_GEMFILE='gemfiles/rails4.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/rails4.gemfile' bundle exec rake -t spec"
-
-    # rails 3
-    sh "BUNDLE_GEMFILE='gemfiles/rails3.gemfile' bundle --quiet"
-    sh "BUNDLE_GEMFILE='gemfiles/rails3.gemfile' bundle exec rake -t spec"
-  end
+  task :all => [:rails, :mongoid]
+
 end
 
 desc "Update CONTRIBUTORS file"

data/lib/money-rails.rb

@@ -1,4 +1,6 @@
 require "money"
+require "monetize"
+require "monetize/core_extensions"
 require "money-rails/configuration"
 require "money-rails/money"
 require "money-rails/version"

data/lib/money-rails/active_model/validator.rb

@@ -39,7 +39,7 @@ module MoneyRails
           symbol = I18n.t('number.currency.format.unit', default: currency.symbol)
 
           raw_value = raw_value.to_s.strip.gsub(symbol, "")
-          abs_raw_value = raw_value.gsub(/^-/, "")
+          abs_raw_value = raw_value.strip.gsub(/^-/, "")
 
           decimal_pieces = abs_raw_value.split(decimal_mark)
 
@@ -78,3 +78,6 @@ module MoneyRails
     end
   end
 end
+
+# Compatibility with ActiveModel validates method which matches option keys to their validator class
+ActiveModel::Validations::MoneyValidator = MoneyRails::ActiveModel::MoneyValidator

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

@@ -140,22 +140,35 @@ module MoneyRails
             if options[:allow_nil] && value.blank?
               money = nil
             else
-              begin
-                money = value.is_a?(Money) ? value : value.to_money(send("currency_for_#{name}"))
-              rescue NoMethodError
-                return nil
+              if value.is_a?(Money)
+                money = value
+              else
+                begin
+                  money = value.to_money(send("currency_for_#{name}"))
+                rescue NoMethodError
+                  return nil
+                rescue ArgumentError
+                  raise if MoneyRails.raise_error_on_money_parsing
+                  return nil
+                end
               end
             end
 
             # Update cents
             send("#{subunit_name}=", money.try(:cents))
 
+            money_currency = money.try(:currency)
+
             # Update currency iso value if there is an instance currency attribute
             if instance_currency_name.present? &&
               self.respond_to?("#{instance_currency_name}=")
 
-              send("#{instance_currency_name}=",
-                   money.try(:currency).try(:iso_code))
+              send("#{instance_currency_name}=", money_currency.try(:iso_code))
+            else
+              current_currency = send("currency_for_#{name}")
+              if money_currency && current_currency != money_currency
+                raise "Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'"
+              end
             end
 
             # Save and return the new Money object

data/lib/money-rails/configuration.rb

@@ -45,6 +45,19 @@ module MoneyRails
       currency_column.merge! default: iso_code
     end
 
+    def rounding_mode=(mode)
+      valid_modes = [
+        BigDecimal::ROUND_UP,
+        BigDecimal::ROUND_DOWN,
+        BigDecimal::ROUND_HALF_UP,
+        BigDecimal::ROUND_HALF_DOWN,
+        BigDecimal::ROUND_HALF_EVEN,
+        BigDecimal::ROUND_CEILING,
+        BigDecimal::ROUND_FLOOR
+      ]
+      raise ArgumentError, "#{mode} is not a valid rounding mode" unless valid_modes.include?(mode)
+      Money.rounding_mode = mode
+    end
     # Set default bank object
     #
     # example (given that eu_central_bank is in Gemfile):
@@ -76,5 +89,10 @@ module MoneyRails
 
     mattr_accessor :sign_before_symbol
     @@sign_before_symbol = nil
+
+    # Configure whether to raise exception when an improper value
+    # is going to be converted to a Money object.
+    mattr_accessor :raise_error_on_money_parsing
+    @@raise_error_on_money_parsing = false
   end
 end

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

@@ -3,7 +3,7 @@ class Money
   # Converts an object of this instance into a database friendly value.
   def mongoize
     {
-      :cents        => cents.mongoize,
+      :cents        => cents.mongoize.to_f,
       :currency_iso => currency.iso_code.mongoize
     }
   end
@@ -30,7 +30,12 @@ class Money
         object.symbolize_keys! if object.respond_to?(:symbolize_keys!)
         ::Money.new(object[:cents], object[:currency_iso]).mongoize
       when object.respond_to?(:to_money) then
+        begin
           object.to_money.mongoize
+        rescue ArgumentError
+          raise if MoneyRails.raise_error_on_money_parsing
+          nil
+        end
       else object
       end
     end

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

@@ -22,7 +22,12 @@ class Money
         :currency_iso => object.currency.iso_code
       }
     when object.respond_to?(:to_money)
-      serialize(object.to_money)
+      begin
+        serialize(object.to_money)
+      rescue ArgumentError
+        raise if MoneyRails.raise_error_on_money_parsing
+        nil
+      end
     else nil
     end
   end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-    VERSION = "0.9.0"
+    VERSION = "0.10.0"
 end

data/money-rails.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.0.0"
+  s.add_dependency "money",         "~> 6.1.1"
+  s.add_dependency "monetize",      "~> 0.3.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
 

data/spec/active_record/monetizable_spec.rb

@@ -47,6 +47,13 @@ if defined? ActiveRecord
         product.price_cents.should == 215
       end
 
+      it "should raise error if can't change currency" do
+        product = Product.new
+        expect {
+          product.price = Money.new(10, "RUB")
+        }.to raise_error("Can't change readonly currency 'USD' to 'RUB' for field 'price'")
+      end
+
       it "respects :as argument" do
         product.discount_value.should == Money.new(150, "USD")
       end
@@ -64,6 +71,21 @@ if defined? ActiveRecord
         product.save.should be_true
       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 when a String value with hyphen is assigned" do
+          expect { product.invalid_price = "10-235" }.to raise_error
+        end
+      end
+
+      context "when MoneyRails.raise_error_on_money_parsing is false (default)" do
+        it "does not raise exception when a String value with hyphen is assigned" do
+          expect { product.invalid_price = "10-235" }.not_to raise_error
+        end
+      end
+
       it "respects numericality validation when using update_attributes" do
         product.update_attributes(:price_cents => "some text").should be_false
         product.update_attributes(:price_cents => 2000).should be_true
@@ -143,6 +165,34 @@ if defined? ActiveRecord
         product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$100/)
       end
 
+      it "fails validation with the proper error message using validates :money" do
+        product.validates_method_amount = "-12"
+        product.valid?.should be_false
+        product.errors[:validates_method_amount].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.validates_method_amount = Money.new(-1200, "USD")
+        product.valid?.should be_false
+        product.errors[:validates_method_amount].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.validates_method_amount = "0"
+        product.valid?.should be_false
+        product.errors[:validates_method_amount].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.validates_method_amount = "12"
+        product.valid?.should be_true
+
+        product.validates_method_amount = Money.new(1200, "USD")
+        product.valid?.should be_true
+
+        product.validates_method_amount = "101"
+        product.valid?.should be_false
+        product.errors[:validates_method_amount].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.validates_method_amount = Money.new(10100, "USD")
+        product.valid?.should be_false
+        product.errors[:validates_method_amount].first.should match(/Must be greater than zero and less than \$100/)
+      end
+
       it "fails validation with the proper error message on the cents field " do
         product.price_in_a_range = "-12"
         product.valid?.should be_false
@@ -195,6 +245,11 @@ if defined? ActiveRecord
         product.save.should be_true
       end
 
+      it "passes validation if there is a whitespace between the currency symbol and amount" do
+        product.price = "$ 123,456.78"
+        product.save.should be_true
+      end
+
       it "respects numericality validation when using update_attributes on money attribute" do
         product.update_attributes(:price => "some text").should be_false
         product.update_attributes(:price => Money.new(320, 'USD')).should be_true
@@ -389,11 +444,30 @@ if defined? ActiveRecord
           product = Product.create(:sale_price_amount => 1234)
           product.sale_price.currency_as_string == 'USD'
         end
+
         it "is overridden by instance currency column" do
           product = Product.create(:sale_price_amount => 1234,
                                    :sale_price_currency_code => 'CAD')
           product.sale_price.currency_as_string.should == 'CAD'
         end
+
+        it 'can change currency of custom column' do
+          product = Product.create!(
+            :price => Money.new(10,'USD'),
+            :bonus => Money.new(10,'GBP'),
+            :discount => 10,
+            :sale_price_amount => 1234,
+            :sale_price_currency_code => 'USD')
+
+          product.sale_price.currency_as_string.should == 'USD'
+
+          product.sale_price = Money.new 456, 'CAD'
+          product.save
+          product.reload
+
+          product.sale_price.currency_as_string.should == 'CAD'
+          product.discount_value.currency_as_string.should == 'USD'
+        end
       end
 
       context "for model with currency column:" do

data/spec/configuration_spec.rb

@@ -106,5 +106,23 @@ describe "configuration" do
       MoneyRails.default_bank = old_bank
     end
 
+    describe "rounding mode" do
+      [BigDecimal::ROUND_UP, BigDecimal::ROUND_DOWN, BigDecimal::ROUND_HALF_UP, BigDecimal::ROUND_HALF_DOWN,
+       BigDecimal::ROUND_HALF_EVEN, BigDecimal::ROUND_CEILING, BigDecimal::ROUND_FLOOR].each do |mode|
+        context "when set to #{mode}" do
+          it "sets Money.rounding mode to #{mode}" do
+            MoneyRails.rounding_mode = mode
+            expect(Money.rounding_mode).to eq(mode)
+          end
+        end
+      end
+
+      context "when passed an invalid value" do
+        it "should raise an ArgumentError" do
+          expect(lambda{MoneyRails.rounding_mode = "booyakasha"}).to raise_error(ArgumentError, 'booyakasha is not a valid rounding mode')
+        end
+      end
+    end
+
   end
 end

data/spec/dummy/app/models/product.rb

@@ -3,7 +3,8 @@ class Product < ActiveRecord::Base
   attr_accessible :price_cents, :discount, :bonus_cents,
     :price, :discount_value, :bonus, :optional_price_cents, :optional_price,
     :sale_price, :sale_price_amount, :sale_price_currency_code,
-    :price_in_a_range_cents, :price_in_a_range, :invalid_price_cents
+    :price_in_a_range_cents, :price_in_a_range, :invalid_price_cents,
+    :validates_method_amount, :validates_method_amount_cents
 
   # Use USD as model level currency
   register_currency :usd
@@ -38,4 +39,11 @@ class Product < ActiveRecord::Base
   attr_accessor :invalid_price_cents
   monetize :invalid_price_cents, disable_validation: true
 
+  monetize :validates_method_amount_cents, allow_nil: true
+
+  validates :validates_method_amount, :money => {
+    :greater_than => 0,
+    :less_than_or_equal_to => 100,
+    :message => 'Must be greater than zero and less than $100',
+  }
 end

data/spec/dummy/config/application.rb

@@ -14,6 +14,9 @@ require "money-rails"
 
 module Dummy
   class Application < Rails::Application
+
+    I18n.enforce_available_locales = false # removes deprecation warning
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -39,6 +42,8 @@ module Dummy
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
+    config.secret_key_base = "1234567890" # removes deprecation warning
+
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 

data/spec/dummy/config/boot.rb

@@ -1,10 +1,13 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
+# The default gemfile is rails4
+gemfile = File.expand_path('../../../../gemfiles/rails4.gemfile', __FILE__)
+
+unless ENV['BUNDLE_GEMFILE']
+	puts "No Gemfile specified, booting rails env with rails4.gemfile (default)"
+	ENV['BUNDLE_GEMFILE'] ||= gemfile
 end
 
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
 $:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/test.rb

@@ -7,6 +7,7 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  config.eager_load = false
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"

data/spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb

@@ -0,0 +1,5 @@
+class AddValidatesMethodAmountCentsToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :validates_method_amount_cents, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -9,45 +9,43 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130124023419) do
+ActiveRecord::Schema.define(version: 20140110194016) do
 
-  create_table "dummy_products", :force => true do |t|
+  create_table "dummy_products", force: true do |t|
     t.string   "currency"
     t.integer  "price_cents"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "items", :force => true do |t|
-  end
-
-  create_table "products", :force => true do |t|
+  create_table "products", force: true do |t|
     t.integer  "price_cents"
     t.integer  "discount"
-    t.datetime "created_at",                              :null => false
-    t.datetime "updated_at",                              :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "bonus_cents"
     t.integer  "optional_price_cents"
-    t.integer  "sale_price_amount",        :default => 0, :null => false
+    t.integer  "sale_price_amount",             default: 0, null: false
     t.string   "sale_price_currency_code"
     t.integer  "price_in_a_range_cents"
+    t.integer  "validates_method_amount_cents"
   end
 
-  create_table "services", :force => true do |t|
+  create_table "services", force: true do |t|
     t.integer  "charge_cents"
     t.integer  "discount_cents"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "transactions", :force => true do |t|
+  create_table "transactions", force: true do |t|
     t.integer  "amount_cents"
     t.integer  "tax_cents"
     t.string   "currency"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end

data/spec/dummy/db/structure.sql

@@ -1,5 +1,5 @@
 CREATE TABLE "dummy_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "currency" varchar(255), "price_cents" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE TABLE "products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "price_cents" integer, "discount" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "bonus_cents" integer, "optional_price_cents" integer, "price_in_a_range_cents" integer);
+CREATE TABLE "products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "price_cents" integer, "discount" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "bonus_cents" integer, "optional_price_cents" integer, "sale_price_amount" integer DEFAULT 0 NOT NULL, "sale_price_currency_code" varchar(255), "price_in_a_range_cents" integer);
 CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
 CREATE TABLE "services" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "charge_cents" integer, "discount_cents" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
 CREATE TABLE "transactions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "amount_cents" integer, "tax_cents" integer, "currency" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
@@ -16,4 +16,6 @@ INSERT INTO schema_migrations (version) VALUES ('20120528210103');
 
 INSERT INTO schema_migrations (version) VALUES ('20120607210247');
 
+INSERT INTO schema_migrations (version) VALUES ('20120712202655');
+
 INSERT INTO schema_migrations (version) VALUES ('20130124023419');

data/spec/mongoid/three_spec.rb

@@ -10,6 +10,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
     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_with_infinite_precision) { Priceable.create(:price => Money.new(BigDecimal.new('100.1'), 'EUR')) }
     let(:priceable_with_hash_field) {
       Priceable.create(:price_hash => {
@@ -34,6 +35,21 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
         priceable_from_string.price.currency.should == 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
+        end
+      end
+
+      context "when MoneyRails.raise_error_on_money_parsing is false" do
+        it "does not mongoizes correctly a String with hyphen in its middle" do
+          priceable_from_string_with_hyphen.price.should == nil
+        end
+      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')

data/spec/mongoid/two_spec.rb

@@ -7,6 +7,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
     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 "serializes correctly a Money object to a hash of cents and currency" do
@@ -38,6 +39,21 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
           priceable_with_infinite_precision.price.currency.should == Money::Currency.find('EUR')
         end
       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
+        end
+      end
+
+      context "when MoneyRails.raise_error_on_money_parsing is false" do
+        it "does not mongoizes correctly a String with hyphen in its middle" do
+          priceable_from_string_with_hyphen.price.should == nil
+        end
+      end
     end
 
     context "deserialize" do

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 ENV["RAILS_ENV"] = 'test'
-
 # Require dummy Rails app
 require File.expand_path("../../spec/dummy/config/environment", __FILE__)
 
@@ -11,6 +10,11 @@ require 'rspec/autorun'
 # in spec/support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+# Silence warnings
+if Money.respond_to?(:silence_core_extensions_deprecations=)
+  Money.silence_core_extensions_deprecations = true
+end
+
 RSpec.configure do |config|
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.1
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -119,77 +135,78 @@ files:
 - lib/money-rails.rb
 - lib/generators/templates/money.rb
 - lib/generators/money_rails/initializer_generator.rb
-- lib/money-rails/helpers/action_view_extension.rb
-- lib/money-rails/version.rb
-- lib/money-rails/money.rb
-- lib/money-rails/active_record/monetizable.rb
-- lib/money-rails/active_record/migration_extensions/schema_statements.rb
-- lib/money-rails/active_record/migration_extensions/options_extractor.rb
-- lib/money-rails/active_record/migration_extensions/table.rb
-- lib/money-rails/hooks.rb
-- lib/money-rails/mongoid/money.rb
-- lib/money-rails/mongoid/two.rb
 - lib/money-rails/railtie.rb
-- lib/money-rails/configuration.rb
+- lib/money-rails/active_model/validator.rb
+- lib/money-rails/helpers/action_view_extension.rb
 - lib/money-rails/test_helpers.rb
 - lib/money-rails/engine.rb
-- lib/money-rails/active_model/validator.rb
-- spec/spec_helper.rb
-- spec/helpers/form_helper_spec.rb
+- lib/money-rails/mongoid/two.rb
+- lib/money-rails/mongoid/money.rb
+- lib/money-rails/hooks.rb
+- lib/money-rails/configuration.rb
+- lib/money-rails/active_record/migration_extensions/options_extractor.rb
+- lib/money-rails/active_record/migration_extensions/schema_statements.rb
+- lib/money-rails/active_record/migration_extensions/table.rb
+- lib/money-rails/active_record/monetizable.rb
+- lib/money-rails/money.rb
+- lib/money-rails/version.rb
 - spec/helpers/action_view_extension_spec.rb
-- spec/configuration_spec.rb
+- spec/helpers/form_helper_spec.rb
 - spec/support/database_cleaner.rb
-- spec/active_record/migration_extensions/schema_statements_spec.rb
-- spec/active_record/migration_extensions/table_spec.rb
-- spec/active_record/monetizable_spec.rb
-- spec/mongoid/three_spec.rb
+- spec/spec_helper.rb
 - spec/mongoid/two_spec.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/dummy_product.rb
-- spec/dummy/app/models/service.rb
-- spec/dummy/app/models/transaction.rb
-- spec/dummy/app/models/priceable.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/Rakefile
+- spec/mongoid/three_spec.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20120528181002_create_transactions.rb
+- spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb
+- spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
+- spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb
+- spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
+- spec/dummy/db/migrate/20120528210103_create_dummy_products.rb
+- spec/dummy/db/migrate/20120524052716_create_services.rb
+- spec/dummy/db/migrate/20120331190108_create_products.rb
+- spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb
+- spec/dummy/db/structure.sql
 - spec/dummy/config/environment.rb
-- spec/dummy/config/locales/en-GB.yml
-- spec/dummy/config/locales/en.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/application.rb
-- spec/dummy/config/initializers/money.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/en-GB.yml
 - spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/money.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/mongoid.yml
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config/boot.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/database.yml
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/transaction.rb
+- spec/dummy/app/models/dummy_product.rb
+- spec/dummy/app/models/product.rb
+- spec/dummy/app/models/priceable.rb
+- spec/dummy/app/models/service.rb
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/script/rails
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20120524052716_create_services.rb
-- spec/dummy/db/migrate/20120528210103_create_dummy_products.rb
-- spec/dummy/db/migrate/20120331190108_create_products.rb
-- spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
-- spec/dummy/db/migrate/20120528181002_create_transactions.rb
-- spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb
-- spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb
-- spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
-- spec/dummy/db/structure.sql
 - spec/dummy/config.ru
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/active_record/monetizable_spec.rb
+- spec/active_record/migration_extensions/table_spec.rb
+- spec/active_record/migration_extensions/schema_statements_spec.rb
+- spec/configuration_spec.rb
 - spec/test_helpers_spec.rb
 - config/locales/money.en.yml
 - CHANGELOG.md
@@ -223,61 +240,61 @@ signing_key:
 specification_version: 3
 summary: Money gem integration with Rails
 test_files:
-- spec/spec_helper.rb
-- spec/helpers/form_helper_spec.rb
 - spec/helpers/action_view_extension_spec.rb
-- spec/configuration_spec.rb
+- spec/helpers/form_helper_spec.rb
 - spec/support/database_cleaner.rb
-- spec/active_record/migration_extensions/schema_statements_spec.rb
-- spec/active_record/migration_extensions/table_spec.rb
-- spec/active_record/monetizable_spec.rb
-- spec/mongoid/three_spec.rb
+- spec/spec_helper.rb
 - spec/mongoid/two_spec.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/dummy_product.rb
-- spec/dummy/app/models/service.rb
-- spec/dummy/app/models/transaction.rb
-- spec/dummy/app/models/priceable.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/Rakefile
+- spec/mongoid/three_spec.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20120528181002_create_transactions.rb
+- spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb
+- spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
+- spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb
+- spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
+- spec/dummy/db/migrate/20120528210103_create_dummy_products.rb
+- spec/dummy/db/migrate/20120524052716_create_services.rb
+- spec/dummy/db/migrate/20120331190108_create_products.rb
+- spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb
+- spec/dummy/db/structure.sql
 - spec/dummy/config/environment.rb
-- spec/dummy/config/locales/en-GB.yml
-- spec/dummy/config/locales/en.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/application.rb
-- spec/dummy/config/initializers/money.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/en-GB.yml
 - spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/money.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/mongoid.yml
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config/boot.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/database.yml
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/transaction.rb
+- spec/dummy/app/models/dummy_product.rb
+- spec/dummy/app/models/product.rb
+- spec/dummy/app/models/priceable.rb
+- spec/dummy/app/models/service.rb
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/script/rails
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20120524052716_create_services.rb
-- spec/dummy/db/migrate/20120528210103_create_dummy_products.rb
-- spec/dummy/db/migrate/20120331190108_create_products.rb
-- spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
-- spec/dummy/db/migrate/20120528181002_create_transactions.rb
-- spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb
-- spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb
-- spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
-- spec/dummy/db/structure.sql
 - spec/dummy/config.ru
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/active_record/monetizable_spec.rb
+- spec/active_record/migration_extensions/table_spec.rb
+- spec/active_record/migration_extensions/schema_statements_spec.rb
+- spec/configuration_spec.rb
 - spec/test_helpers_spec.rb
-has_rdoc: