money-rails 0.8.1 → 0.9.0

data/lib/money-rails/version.rb

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

data/money-rails.gemspec

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

data/spec/active_record/monetizable_spec.rb

@@ -5,11 +5,14 @@ class Sub < Product; end
 if defined? ActiveRecord
   describe MoneyRails::ActiveRecord::Monetizable do
     describe "monetize" do
-      before :each do
-        @product = Product.create(:price_cents => 3000, :discount => 150,
-                                  :bonus_cents => 200, :optional_price => 100,
-                                  :sale_price_amount => 1200)
-        @service = Service.create(:charge_cents => 2000, :discount_cents => 120)
+      let(:product) do
+        Product.create(:price_cents => 3000, :discount => 150,
+                       :bonus_cents => 200, :optional_price => 100,
+                       :sale_price_amount => 1200)
+      end
+
+      let(:service) do
+        Service.create(:charge_cents => 2000, :discount_cents => 120)
       end
 
       it "should be inherited by subclasses" do
@@ -17,114 +20,184 @@ if defined? ActiveRecord
       end
 
       it "attaches a Money object to model field" do
-        @product.price.should be_an_instance_of(Money)
-        @product.discount_value.should be_an_instance_of(Money)
-        @product.bonus.should be_an_instance_of(Money)
+        product.price.should be_an_instance_of(Money)
+        product.discount_value.should be_an_instance_of(Money)
+        product.bonus.should be_an_instance_of(Money)
       end
 
       it "returns the expected money amount as a Money object" do
-        @product.price.should == Money.new(3000, "USD")
+        product.price.should == Money.new(3000, "USD")
       end
 
       it "assigns the correct value from a Money object" do
-        @product.price = Money.new(3210, "USD")
-        @product.save.should be_true
-        @product.price_cents.should == 3210
+        product.price = Money.new(3210, "USD")
+        product.save.should be_true
+        product.price_cents.should == 3210
       end
 
       it "assigns the correct value from a Money object using create" do
-        @product = Product.create(:price => Money.new(3210, "USD"), :discount => 150,
+        product = Product.create(:price => Money.new(3210, "USD"), :discount => 150,
                                   :bonus_cents => 200, :optional_price => 100)
-        @product.valid?.should be_true
-        @product.price_cents.should == 3210
+        product.valid?.should be_true
+        product.price_cents.should == 3210
       end
 
       it "updates correctly from a Money object using update_attributes" do
-        @product.update_attributes(:price => Money.new(215, "USD")).should be_true
-        @product.price_cents.should == 215
+        product.update_attributes(:price => Money.new(215, "USD")).should be_true
+        product.price_cents.should == 215
       end
 
       it "respects :as argument" do
-        @product.discount_value.should == Money.new(150, "USD")
+        product.discount_value.should == Money.new(150, "USD")
       end
 
       it "uses numericality validation" do
-        @product.price_cents = "foo"
-        @product.save.should be_false
+        product.price_cents = "foo"
+        product.save.should be_false
 
-        @product.price_cents = 2000
-        @product.save.should be_true
+        product.price_cents = 2000
+        product.save.should be_true
+      end
+
+      it "skips numericality validation when disabled" do
+        product.invalid_price_cents = 'not_valid'
+        product.save.should be_true
       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
+        product.update_attributes(:price_cents => "some text").should be_false
+        product.update_attributes(:price_cents => 2000).should be_true
       end
 
       it "uses numericality validation on money attribute" do
-        @product.price = "some text"
-        @product.save.should be_false
+        product.price = "some text"
+        product.save.should be_false
 
-        @product.price = Money.new(320, "USD")
-        @product.save.should be_true
+        product.price = Money.new(320, "USD")
+        product.save.should be_true
 
-        @product.sale_price = "12.34"
-        @product.sale_price_currency_code = 'EUR'
-        @product.valid?.should be_true
+        product.sale_price = "12.34"
+        product.sale_price_currency_code = 'EUR'
+        product.valid?.should be_true
       end
 
       it "fails validation with the proper error message if money value is invalid decimal" do
-        @product.price = "12.23.24"
-        @product.save.should be_false
-        @product.errors[:price].first.should match(/Must be a valid/)
+        product.price = "12.23.24"
+        product.save.should be_false
+        product.errors[:price].first.should match(/Must be a valid/)
       end
 
       it "fails validation with the proper error message if money value is nothing but periods" do
-        @product.price = "..."
-        @product.save.should be_false
-        @product.errors[:price].first.should match(/Must be a valid/)
+        product.price = "..."
+        product.save.should be_false
+        product.errors[:price].first.should match(/Must be a valid/)
       end
 
       it "fails validation with the proper error message if money value has invalid thousands part" do
-        @product.price = "12,23.24"
-        @product.save.should be_false
-        @product.errors[:price].first.should match(/Must be a valid/)
+        product.price = "12,23.24"
+        product.save.should be_false
+        product.errors[:price].first.should match(/Must be a valid/)
+      end
+
+      it "passes validation if money value is a Float and the currency decimal mark is not period" do
+        # The corresponding String would be "12,34" euros
+        service.discount = 12.34
+        service.save.should be_true
+      end
+
+       it "passes validation if money value is a Float" do
+        product.price = 12.34
+        product.save.should be_true
+      end
+
+      it "passes validation if money value is an Integer" do
+        product.price = 12
+        product.save.should be_true
       end
 
       it "fails validation with the proper error message using numericality validations" do
-        @product.price_in_a_range = "-123"
-        @product.valid?.should be_false
-        @product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$10k/)
+        product.price_in_a_range = "-12"
+        product.valid?.should be_false
+        product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.price_in_a_range = Money.new(-1200, "USD")
+        product.valid?.should be_false
+        product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.price_in_a_range = "0"
+        product.valid?.should be_false
+        product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.price_in_a_range = "12"
+        product.valid?.should be_true
+
+        product.price_in_a_range = Money.new(1200, "USD")
+        product.valid?.should be_true
+
+        product.price_in_a_range = "101"
+        product.valid?.should be_false
+        product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$100/)
+
+        product.price_in_a_range = Money.new(10100, "USD")
+        product.valid?.should be_false
+        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 on the cents field " do
+        product.price_in_a_range = "-12"
+        product.valid?.should be_false
+        product.errors[:price_in_a_range_cents].first.should match(/greater than 0/)
 
-        @product.price_in_a_range = "123"
+        product.price_in_a_range = "0"
+        product.valid?.should be_false
+        product.errors[:price_in_a_range_cents].first.should match(/greater than 0/)
 
-        @product.valid?.should be_true
+        product.price_in_a_range = "12"
+        product.valid?.should be_true
 
-        @product.price_in_a_range = "10001"
-        @product.valid?.should be_false
-        @product.errors[:price_in_a_range].first.should match(/Must be greater than zero and less than \$10k/)
+        product.price_in_a_range = "101"
+        product.valid?.should be_false
+        product.errors[:price_in_a_range_cents].first.should match(/less than or equal to 10000/)
+      end
+
+      it "fails validation when a non number string is given" do
+        product = Product.create(:price_in_a_range => "asd")
+        product.valid?.should be_false
+        product.errors[:price_in_a_range].first.should match(/greater than zero/)
+
+        product = Product.create(:price_in_a_range => "asd23")
+        product.valid?.should be_false
+        product.errors[:price_in_a_range].first.should match(/greater than zero/)
+
+        product = Product.create(:price => "asd")
+        product.valid?.should be_false
+        product.errors[:price].first.should match(/is not a number/)
+
+        product = Product.create(:price => "asd23")
+        product.valid?.should be_false
+        product.errors[:price].first.should match(/is not a number/)
       end
 
       it "passes validation when amount contains spaces (99 999 999.99)" do
-        @product.price = "99 999 999.99"
-        @product.should be_valid
-        @product.price_cents.should == 9999999999
+        product.price = "99 999 999.99"
+        product.should be_valid
+        product.price_cents.should == 9999999999
       end
 
       it "passes validation when amount contains underscores (99_999_999.99)" do
-        @product.price = "99_999_999.99"
-        @product.should be_valid
-        @product.price_cents.should == 9999999999
+        product.price = "99_999_999.99"
+        product.should be_valid
+        product.price_cents.should == 9999999999
       end
 
       it "passes validation if money value has correct format" do
-        @product.price = "12,230.24"
-        @product.save.should be_true
+        product.price = "12,230.24"
+        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
+        product.update_attributes(:price => "some text").should be_false
+        product.update_attributes(:price => Money.new(320, 'USD')).should be_true
       end
 
       it "uses i18n currency format when validating" do
@@ -156,142 +229,145 @@ if defined? ActiveRecord
       end
 
       it "doesn't allow nil by default" do
-        @product.price_cents = nil
-        @product.save.should be_false
+        product.price_cents = nil
+        product.save.should be_false
       end
 
       it "allows nil if optioned" do
-        @product.optional_price = nil
-        @product.save.should be_true
-        @product.optional_price.should be_nil
+        product.optional_price = nil
+        product.save.should be_true
+        product.optional_price.should be_nil
       end
 
       it "doesn't raise exception if validation is used and nil is not allowed" do
-        expect { @product.price = nil }.to_not raise_error
+        expect { product.price = nil }.to_not raise_error
       end
 
       it "doesn't save nil values if validation is used and nil is not allowed" do
-        @product.price = nil
-        @product.save
-        @product.price_cents.should_not be_nil
+        product.price = nil
+        product.save
+        product.price_cents.should_not be_nil
       end
 
       it "resets money_before_type_cast attr every time a save operation occurs" do
         v = Money.new(100, :usd)
-        @product.price = v
-        @product.price_money_before_type_cast.should == v
-        @product.save
-        @product.price_money_before_type_cast.should be_nil
-        @product.price = 10
-        @product.price_money_before_type_cast.should == 10
-        @product.save
-        @product.price_money_before_type_cast.should be_nil
-        @product.bonus = ""
-        @product.bonus_money_before_type_cast.should == ""
-        @product.save.should be_false
-        @product.bonus_money_before_type_cast.should be_nil
+        product.price = v
+        product.price_money_before_type_cast.should == v
+        product.save
+        product.price_money_before_type_cast.should be_nil
+        product.price = 10
+        product.price_money_before_type_cast.should == 10
+        product.save
+        product.price_money_before_type_cast.should be_nil
+      end
+
+      it "does not reset money_before_type_cast attr if save operation fails" do
+        product.bonus = ""
+        product.bonus_money_before_type_cast.should == ""
+        product.save.should be_false
+        product.bonus_money_before_type_cast.should == ""
       end
 
       it "uses Money default currency if :with_currency has not been used" do
-        @service.discount.currency.should == Money::Currency.find(:eur)
+        service.discount.currency.should == Money::Currency.find(:eur)
       end
 
       it "overrides default currency with the currency registered for the model" do
-        @product.price.currency.should == Money::Currency.find(:usd)
+        product.price.currency.should == Money::Currency.find(:usd)
       end
 
       it "overrides default currency with the value of :with_currency argument" do
-        @service.charge.currency.should == Money::Currency.find(:usd)
-        @product.bonus.currency.should == Money::Currency.find(:gbp)
+        service.charge.currency.should == Money::Currency.find(:usd)
+        product.bonus.currency.should == Money::Currency.find(:gbp)
       end
 
       it "assigns correctly Money objects to the attribute" do
-        @product.price = Money.new(2500, :USD)
-        @product.save.should be_true
-        @product.price.cents.should == 2500
-        @product.price.currency_as_string.should == "USD"
+        product.price = Money.new(2500, :USD)
+        product.save.should be_true
+        product.price.cents.should == 2500
+        product.price.currency_as_string.should == "USD"
       end
 
       it "assigns correctly Fixnum objects to the attribute" do
-        @product.price = 25
-        @product.save.should be_true
-        @product.price.cents.should == 2500
-        @product.price.currency_as_string.should == "USD"
+        product.price = 25
+        product.save.should be_true
+        product.price.cents.should == 2500
+        product.price.currency_as_string.should == "USD"
 
-        @service.discount = 2
-        @service.save.should be_true
-        @service.discount.cents.should == 200
-        @service.discount.currency_as_string.should == "EUR"
+        service.discount = 2
+        service.save.should be_true
+        service.discount.cents.should == 200
+        service.discount.currency_as_string.should == "EUR"
       end
 
       it "assigns correctly String objects to the attribute" do
-        @product.price = "25"
-        @product.save.should be_true
-        @product.price.cents.should == 2500
-        @product.price.currency_as_string.should == "USD"
+        product.price = "25"
+        product.save.should be_true
+        product.price.cents.should == 2500
+        product.price.currency_as_string.should == "USD"
 
-        @service.discount = "2"
-        @service.save.should be_true
-        @service.discount.cents.should == 200
-        @service.discount.currency_as_string.should == "EUR"
+        service.discount = "2"
+        service.save.should be_true
+        service.discount.cents.should == 200
+        service.discount.currency_as_string.should == "EUR"
       end
 
       it "overrides default, model currency with the value of :with_currency in fixnum assignments" do
-        @product.bonus = 25
-        @product.save.should be_true
-        @product.bonus.cents.should == 2500
-        @product.bonus.currency_as_string.should == "GBP"
+        product.bonus = 25
+        product.save.should be_true
+        product.bonus.cents.should == 2500
+        product.bonus.currency_as_string.should == "GBP"
 
-        @service.charge = 2
-        @service.save.should be_true
-        @service.charge.cents.should == 200
-        @service.charge.currency_as_string.should == "USD"
+        service.charge = 2
+        service.save.should be_true
+        service.charge.cents.should == 200
+        service.charge.currency_as_string.should == "USD"
       end
 
       it "overrides default, model currency with the value of :with_currency in string assignments" do
-        @product.bonus = "25"
-        @product.save.should be_true
-        @product.bonus.cents.should == 2500
-        @product.bonus.currency_as_string.should == "GBP"
+        product.bonus = "25"
+        product.save.should be_true
+        product.bonus.cents.should == 2500
+        product.bonus.currency_as_string.should == "GBP"
 
-        @service.charge = "2"
-        @service.save.should be_true
-        @service.charge.cents.should == 200
-        @service.charge.currency_as_string.should == "USD"
+        service.charge = "2"
+        service.save.should be_true
+        service.charge.cents.should == 200
+        service.charge.currency_as_string.should == "USD"
       end
 
       it "overrides default currency with model currency, in fixnum assignments" do
-        @product.discount_value = 5
-        @product.save.should be_true
-        @product.discount_value.cents.should == 500
-        @product.discount_value.currency_as_string.should == "USD"
+        product.discount_value = 5
+        product.save.should be_true
+        product.discount_value.cents.should == 500
+        product.discount_value.currency_as_string.should == "USD"
       end
 
       it "overrides default currency with model currency, in string assignments" do
-        @product.discount_value = "5"
-        @product.save.should be_true
-        @product.discount_value.cents.should == 500
-        @product.discount_value.currency_as_string.should == "USD"
+        product.discount_value = "5"
+        product.save.should be_true
+        product.discount_value.cents.should == 500
+        product.discount_value.currency_as_string.should == "USD"
       end
 
       it "falls back to default currency, in fixnum assignments" do
-        @service.discount = 5
-        @service.save.should be_true
-        @service.discount.cents.should == 500
-        @service.discount.currency_as_string.should == "EUR"
+        service.discount = 5
+        service.save.should be_true
+        service.discount.cents.should == 500
+        service.discount.currency_as_string.should == "EUR"
       end
 
       it "falls back to default currency, in string assignments" do
-        @service.discount = "5"
-        @service.save.should be_true
-        @service.discount.cents.should == 500
-        @service.discount.currency_as_string.should == "EUR"
+        service.discount = "5"
+        service.save.should be_true
+        service.discount.cents.should == 500
+        service.discount.currency_as_string.should == "EUR"
       end
 
       it "sets field to nil, in nil assignments if allow_nil is set" do
-        @product.optional_price = nil
-        @product.save.should be_true
-        @product.optional_price.should be_nil
+        product.optional_price = nil
+        product.save.should be_true
+        product.optional_price.should be_nil
       end
 
       it "sets field to nil, in instantiation if allow_nil is set" do
@@ -303,17 +379,9 @@ if defined? ActiveRecord
       end
 
       it "sets field to nil, in blank assignments if allow_nil is set" do
-        @product.optional_price = ""
-        @product.save.should be_true
-        @product.optional_price.should be_nil
-      end
-
-      context "for column with currency:" do
-        it "is overridden by instance currency" do
-          product = Product.create(:price_cents => 5320, :discount => 350, :bonus_cents => 320)
-          product.stub(:currency) { "EUR" }
-          product.bonus.currency_as_string.should == "EUR"
-        end
+        product.optional_price = ""
+        product.save.should be_true
+        product.optional_price.should be_nil
       end
 
       context "for column with model currency:" do
@@ -329,11 +397,22 @@ if defined? ActiveRecord
       end
 
       context "for model with currency column:" do
-        before :each do
-          @transaction = Transaction.create(:amount_cents => 2400, :tax_cents => 600,
-                                            :currency => :usd)
-          @dummy_product1 = DummyProduct.create(:price_cents => 2400, :currency => :usd)
-          @dummy_product2 = DummyProduct.create(:price_cents => 2600) # nil currency
+        let(:transaction) do
+          Transaction.create(:amount_cents => 2400, :tax_cents => 600,
+                             :currency => :usd)
+        end
+
+        let(:dummy_product) do
+          DummyProduct.create(:price_cents => 2400, :currency => :usd)
+        end
+
+        let(:dummy_product_with_nil_currency) do
+          DummyProduct.create(:price_cents => 2600) # nil currency
+        end
+
+        let(:dummy_product_with_invalid_currency) do
+          # invalid currency
+          DummyProduct.create(:price_cents => 2600, :currency => :foo)
         end
 
         it "serializes correctly the currency to a new instance of model" do
@@ -345,19 +424,25 @@ if defined? ActiveRecord
         end
 
         it "overrides default currency with the value of row currency" do
-          @transaction.amount.currency.should == Money::Currency.find(:usd)
+          transaction.amount.currency.should == Money::Currency.find(:usd)
         end
 
         it "overrides default currency with the currency registered for the model" do
-          @dummy_product2.price.currency.should == Money::Currency.find(:gbp)
+          dummy_product_with_nil_currency.price.currency.should ==
+            Money::Currency.find(:gbp)
+        end
+
+        it "overrides default currency with the currency registered for the model if currency is invalid" do
+          dummy_product_with_invalid_currency.price.currency.should ==
+            Money::Currency.find(:gbp)
         end
 
         it "overrides default and model currency with the row currency" do
-          @dummy_product1.price.currency.should == Money::Currency.find(:usd)
+          dummy_product.price.currency.should == Money::Currency.find(:usd)
         end
 
         it "constructs the money attribute from the stored mapped attribute values" do
-          @transaction.amount.should == Money.new(2400, :usd)
+          transaction.amount.should == Money.new(2400, :usd)
         end
 
         it "instantiates correctly Money objects from the mapped attributes" do
@@ -366,19 +451,19 @@ if defined? ActiveRecord
         end
 
         it "assigns correctly Money objects to the attribute" do
-          @transaction.amount = Money.new(2500, :eur)
-          @transaction.save.should be_true
-          @transaction.amount.cents.should == Money.new(2500, :eur).cents
-          @transaction.amount.currency_as_string.should == "EUR"
+          transaction.amount = Money.new(2500, :eur)
+          transaction.save.should be_true
+          transaction.amount.cents.should == Money.new(2500, :eur).cents
+          transaction.amount.currency_as_string.should == "EUR"
         end
 
         it "uses default currency if a non Money object is assigned to the attribute" do
-          @transaction.amount = 234
-          @transaction.amount.currency_as_string.should == "USD"
+          transaction.amount = 234
+          transaction.amount.currency_as_string.should == "USD"
         end
 
         it "constructs the money object from the mapped method value" do
-          @transaction.total.should == Money.new(3000, :usd)
+          transaction.total.should == Money.new(3000, :usd)
         end
 
       end