money-rails 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da75b2a1634ec1a097db7c1349ee114d31719717
-  data.tar.gz: f379ae29deed8c86a05a3810f2c842194133aa5f
+  metadata.gz: 6c8b379f2b72435fdb82e4b5022a947ac6470ddb
+  data.tar.gz: 1a4286158053e24e3eac5da3475b014b6251518e
 SHA512:
-  metadata.gz: 9377d3b7acbbfa3d2929a42cbfc8e4144d29dc77bf5843b11728bdf74d33c1dc1aeb4d899935ec9ca7eca461d0a4f19467c7147f32ee83e3fc0392702e1346a3
-  data.tar.gz: 79b80154056efb1d9ed494a837c08f5251b018b3641e8e4e811645c86d2a9ca2826116d266216592718eb73c77f109b9e8766a02a199e5edaff54622944a1523
+  metadata.gz: f82ac9627b0e16100aa8d09fae383f86bc2398f632ff32e30af6f326636da2d183f863286d62b2ece83322eecc89f311cec63649d2b061191a7a1336b0ff182b
+  data.tar.gz: 79a411fa93a7a6a9ccda5ad9132b32b5973a9b2f991e116b1d05a6d86f0ba3358765f1b70375aa117f795fae0d9d5fc1d95abd2398c9af9e35457810dec02af1

data/README.md

@@ -465,6 +465,11 @@ monetize(:price_cents).should be_true
 ```
 This will ensure that a column called `price_cents` is being monetized.
 
+```
+monetize(:price_cents).allow_nil.should be_true
+```
+By using `allow_nil` you can specify money attributes that accept nil values.
+
 ```
 monetize(:price_cents).as(:discount_value).should be_true
 ```

data/Rakefile

@@ -44,6 +44,9 @@ namespace :spec do
   desc "Run Tests against mongoid (version 2)"
   task(:mongoid2) { run_with_gemfile 'gemfiles/mongoid2.gemfile' }
 
+  desc "Run Tests against rails 4.1"
+  task(:rails41) { run_with_gemfile 'gemfiles/rails41.gemfile' }
+
   desc "Run Tests against rails 4"
   task(:rails4) { run_with_gemfile 'gemfiles/rails4.gemfile' }
 
@@ -53,8 +56,8 @@ namespace :spec do
   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 rails 3 & 4 & 4.1"
+  task :rails => [:rails3, :rails4, :rails41]
 
   desc "Run Tests against all ORMs"
   task :all => [:rails, :mongoid]

data/lib/money-rails/test_helpers.rb

@@ -2,48 +2,81 @@ require 'rspec/expectations'
 
 module MoneyRails
   module TestHelpers
-    extend RSpec::Matchers::DSL
+    def monetize(attribute)
+      MonetizeMatcher.new(attribute)
+    end
 
-    matcher :monetize do |attr|
+    class MonetizeMatcher
+      def initialize(attribute)
+        @attribute = attribute
+      end
 
-      chain(:with_currency) do |currency|
+      def with_currency(currency)
         @currency_iso = currency
+        self
       end
 
-      chain(:as) do |virt_attr|
+      def as(virt_attr)
         @as = virt_attr
+        self
+      end
+
+      def allow_nil
+        @allow_nil = true
+        self
       end
 
-      match do |target|
+      def matches?(actual)
+        @actual = actual
+
+        money_attr = @as.presence || @attribute.to_s.sub(/_cents$/, "")
+
         matched = true
-        money_attr = @as.presence || attr.to_s.sub(/_cents$/, "")
-        matched = false if !target.respond_to?(money_attr) ||
-          !target.send(money_attr).instance_of?(Money) ||
-          (@currency_iso &&
-           target.send(money_attr.to_sym).currency.id != @currency_iso)
+
+        if actual.respond_to?(money_attr)
+          if @allow_nil
+            matched &&= actual.send(money_attr).nil?
+            actual.send("#{money_attr}=", 0)
+          end
+          matched &&= actual.send(money_attr).instance_of?(Money)
+
+          if @currency_iso
+            matched &&= actual.send(money_attr.to_sym).currency.id == @currency_iso
+          end
+        else
+          matched = false
+        end
+
         matched
       end
 
-      description do
-        description = "monetize #{attr}"
-        description << " as #{@as}" if @as
-        description << " with currency #{@currency_iso}" if @currency_iso
-        description
+      def description
+        desc = "monetize #{@attribute}"
+        desc << " as #{@as}" if @as
+        desc << " with currency #{@currency_iso}" if @currency_iso
+        desc
       end
 
-      failure_message_for_should do |actual|
-        msg = "expected that #{attr} of #{actual} would be monetized"
+      def failure_message # RSpec 3.x
+        msg = "expected that #{@attribute} of #{@actual} would be monetized"
         msg << " as #{@as}" if @as
         msg << " with currency #{@currency_iso}" if @currency_iso
         msg
       end
+      alias_method :failure_message_for_should, :failure_message # RSpec 1.2, 2.x, and minitest-matchers
 
-      failure_message_for_should_not do |actual|
-        msg = "expected that #{attr} of #{actual} would not be monetized"
+      def failure_message_when_negated # RSpec 3.x
+        msg = "expected that #{@attribute} of #{@actual} would not be monetized"
         msg << " as #{@as}" if @as
         msg << " with currency #{@currency_iso}" if @currency_iso
         msg
       end
+      alias_method :failure_message_for_should_not, :failure_message_when_negated # RSpec 1.2, 2.x, and minitest-matchers
+      alias_method :negative_failure_message,       :failure_message_when_negated # RSpec 1.1
     end
   end
 end
+
+RSpec.configure do |config|
+  config.include MoneyRails::TestHelpers
+end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
 end

data/spec/active_record/migration_extensions/schema_statements_spec.rb

@@ -36,19 +36,19 @@ if defined? ActiveRecord
         describe 'amount' do
           subject { Item.columns_hash['price_cents'] }
 
-          its (:default) { should eq 0 }
-          its (:null) { should be_false }
-          its (:type) { should eq :integer }
+          it { expect(subject.default).to eq(0) }
+          it { expect(subject.null).to be(false) }
+          it { expect(subject.type).to eq(:integer) }
         end
 
         describe 'currency' do
           subject { Item.columns_hash['price_currency'] }
 
           # set in spec/dummy/config/initializers/money.rb
-          its (:default) { should eq 'EUR' }
+          it { expect(subject.default).to eq('EUR') }
 
-          its (:null) { should be_false }
-          its (:type) { should eq :string }
+          it { expect(subject.null).to be(false) }
+          it { expect(subject.type).to eq(:string) }
         end
       end
 
@@ -61,11 +61,11 @@ if defined? ActiveRecord
         describe 'amount' do
           subject { Item.columns_hash['prefix_price_with_full_options_postfix'] }
 
-          its (:default) { should eq 1 }
-          its (:null) { should be_true }
-          its (:type) { should eq :decimal }
-          its (:precision) { should eq 4 }
-          its (:scale) { should eq 2 }
+          it { expect(subject.default).to eq(1) }
+          it { expect(subject.null).to be(true) }
+          it { expect(subject.type).to eq(:decimal) }
+          it { expect(subject.precision).to eq(4) }
+          it { expect(subject.scale).to eq(2) }
         end
 
         describe 'currency' do

data/spec/active_record/migration_extensions/table_spec.rb

@@ -37,19 +37,19 @@ if defined? ActiveRecord
         describe 'amount' do
           subject { Item.columns_hash['price_cents'] }
 
-          its (:default) { should eq 0 }
-          its (:null) { should be_false }
-          its (:type) { should eq :integer }
+          it { expect(subject.default).to eq(0) }
+          it { expect(subject.null).to be(false) }
+          it { expect(subject.type).to eq(:integer) }
         end
 
         describe 'currency' do
           subject { Item.columns_hash['price_currency'] }
 
           # set in spec/dummy/config/initializers/money.rb
-          its (:default) { should eq 'EUR' }
-          
-          its (:null) { should be_false }
-          its (:type) { should eq :string }
+          it { expect(subject.default).to eq('EUR') }
+
+          it { expect(subject.null).to be(false) }
+          it { expect(subject.type).to eq(:string) }
         end
       end
 
@@ -62,11 +62,11 @@ if defined? ActiveRecord
         describe 'amount' do
           subject { Item.columns_hash['prefix_price_with_full_options_postfix'] }
 
-          its (:default) { should eq 1 }
-          its (:null) { should be_true }
-          its (:type) { should eq :decimal }
-          its (:precision) { should eq 4 }
-          its (:scale) { should eq 2 }
+          it { expect(subject.default).to eq(1) }
+          it { expect(subject.null).to be(true) }
+          it { expect(subject.type).to eq(:decimal) }
+          it { expect(subject.precision).to eq(4) }
+          it { expect(subject.scale).to eq(2) }
         end
 
         describe 'currency' do

data/spec/active_record/monetizable_spec.rb

@@ -31,19 +31,19 @@ if defined? ActiveRecord
 
       it "assigns the correct value from a Money object" do
         product.price = Money.new(3210, "USD")
-        product.save.should be_true
+        product.save.should eq(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,
                                   :bonus_cents => 200, :optional_price => 100)
-        product.valid?.should be_true
+        product.valid?.should eq(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.update_attributes(:price => Money.new(215, "USD")).should eq(true)
         product.price_cents.should == 215
       end
 
@@ -60,15 +60,15 @@ if defined? ActiveRecord
 
       it "uses numericality validation" do
         product.price_cents = "foo"
-        product.save.should be_false
+        product.save.should eq(false)
 
         product.price_cents = 2000
-        product.save.should be_true
+        product.save.should eq(true)
       end
 
       it "skips numericality validation when disabled" do
         product.invalid_price_cents = 'not_valid'
-        product.save.should be_true
+        product.save.should eq(true)
       end
 
       context "when MoneyRails.raise_error_on_money_parsing is true" do
@@ -87,144 +87,144 @@ if defined? ActiveRecord
       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 eq(false)
+        product.update_attributes(:price_cents => 2000).should eq(true)
       end
 
       it "uses numericality validation on money attribute" do
         product.price = "some text"
-        product.save.should be_false
+        product.save.should eq(false)
 
         product.price = Money.new(320, "USD")
-        product.save.should be_true
+        product.save.should eq(true)
 
         product.sale_price = "12.34"
         product.sale_price_currency_code = 'EUR'
-        product.valid?.should be_true
+        product.valid?.should eq(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.save.should eq(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.save.should eq(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.save.should eq(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
+        service.save.should eq(true)
       end
 
        it "passes validation if money value is a Float" do
         product.price = 12.34
-        product.save.should be_true
+        product.save.should eq(true)
       end
 
       it "passes validation if money value is an Integer" do
         product.price = 12
-        product.save.should be_true
+        product.save.should eq(true)
       end
 
       it "fails validation with the proper error message using numericality validations" do
         product.price_in_a_range = "-12"
-        product.valid?.should be_false
+        product.valid?.should eq(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.valid?.should eq(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.valid?.should eq(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.valid?.should eq(true)
 
         product.price_in_a_range = Money.new(1200, "USD")
-        product.valid?.should be_true
+        product.valid?.should eq(true)
 
         product.price_in_a_range = "101"
-        product.valid?.should be_false
+        product.valid?.should eq(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.valid?.should eq(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 using validates :money" do
         product.validates_method_amount = "-12"
-        product.valid?.should be_false
+        product.valid?.should eq(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.valid?.should eq(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.valid?.should eq(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.valid?.should eq(true)
 
         product.validates_method_amount = Money.new(1200, "USD")
-        product.valid?.should be_true
+        product.valid?.should eq(true)
 
         product.validates_method_amount = "101"
-        product.valid?.should be_false
+        product.valid?.should eq(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.valid?.should eq(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
+        product.valid?.should eq(false)
         product.errors[:price_in_a_range_cents].first.should match(/greater than 0/)
 
         product.price_in_a_range = "0"
-        product.valid?.should be_false
+        product.valid?.should eq(false)
         product.errors[:price_in_a_range_cents].first.should match(/greater than 0/)
 
         product.price_in_a_range = "12"
-        product.valid?.should be_true
+        product.valid?.should eq(true)
 
         product.price_in_a_range = "101"
-        product.valid?.should be_false
+        product.valid?.should eq(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.valid?.should eq(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.valid?.should eq(false)
         product.errors[:price_in_a_range].first.should match(/greater than zero/)
 
         product = Product.create(:price => "asd")
-        product.valid?.should be_false
+        product.valid?.should eq(false)
         product.errors[:price].first.should match(/is not a number/)
 
         product = Product.create(:price => "asd23")
-        product.valid?.should be_false
+        product.valid?.should eq(false)
         product.errors[:price].first.should match(/is not a number/)
       end
 
@@ -242,17 +242,17 @@ if defined? ActiveRecord
 
       it "passes validation if money value has correct format" do
         product.price = "12,230.24"
-        product.save.should be_true
+        product.save.should eq(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
+        product.save.should eq(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 eq(false)
+        product.update_attributes(:price => Money.new(320, 'USD')).should eq(true)
       end
 
       it "uses i18n currency format when validating" do
@@ -263,7 +263,7 @@ if defined? ActiveRecord
         "12.00".to_money.should == Money.new(1200, :eur)
         transaction = Transaction.new(amount: "12.00", tax: "13.00")
         transaction.amount_cents.should == 1200
-        transaction.valid?.should be_true
+        transaction.valid?.should eq(true)
 
         # reset locale setting
         I18n.locale = old_locale
@@ -277,7 +277,7 @@ if defined? ActiveRecord
         "12,00".to_money.should == Money.new(1200, :eur)
         transaction = Transaction.new(amount: "12,00", tax: "13,00")
         transaction.amount_cents.should == 1200
-        transaction.valid?.should be_true
+        transaction.valid?.should eq(true)
 
         # reset locale setting
         I18n.locale = old_locale
@@ -285,12 +285,12 @@ if defined? ActiveRecord
 
       it "doesn't allow nil by default" do
         product.price_cents = nil
-        product.save.should be_false
+        product.save.should eq(false)
       end
 
       it "allows nil if optioned" do
         product.optional_price = nil
-        product.save.should be_true
+        product.save.should eq(true)
         product.optional_price.should be_nil
       end
 
@@ -319,7 +319,7 @@ if defined? ActiveRecord
       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.save.should eq(false)
         product.bonus_money_before_type_cast.should == ""
       end
 
@@ -338,90 +338,90 @@ if defined? ActiveRecord
 
       it "assigns correctly Money objects to the attribute" do
         product.price = Money.new(2500, :USD)
-        product.save.should be_true
+        product.save.should eq(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.save.should eq(true)
         product.price.cents.should == 2500
         product.price.currency_as_string.should == "USD"
 
         service.discount = 2
-        service.save.should be_true
+        service.save.should eq(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.save.should eq(true)
         product.price.cents.should == 2500
         product.price.currency_as_string.should == "USD"
 
         service.discount = "2"
-        service.save.should be_true
+        service.save.should eq(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.save.should eq(true)
         product.bonus.cents.should == 2500
         product.bonus.currency_as_string.should == "GBP"
 
         service.charge = 2
-        service.save.should be_true
+        service.save.should eq(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.save.should eq(true)
         product.bonus.cents.should == 2500
         product.bonus.currency_as_string.should == "GBP"
 
         service.charge = "2"
-        service.save.should be_true
+        service.save.should eq(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.save.should eq(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.save.should eq(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.save.should eq(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.save.should eq(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.save.should eq(true)
         product.optional_price.should be_nil
       end
 
@@ -429,13 +429,13 @@ if defined? ActiveRecord
         pr = Product.new(:optional_price => nil, :price_cents => 5320,
           :discount => 350, :bonus_cents => 320)
         pr.optional_price.should be_nil
-        pr.save.should be_true
+        pr.save.should eq(true)
         pr.optional_price.should be_nil
       end
 
       it "sets field to nil, in blank assignments if allow_nil is set" do
         product.optional_price = ""
-        product.save.should be_true
+        product.save.should eq(true)
         product.optional_price.should be_nil
       end
 
@@ -526,7 +526,7 @@ if defined? ActiveRecord
 
         it "assigns correctly Money objects to the attribute" do
           transaction.amount = Money.new(2500, :eur)
-          transaction.save.should be_true
+          transaction.save.should eq(true)
           transaction.amount.cents.should == Money.new(2500, :eur).cents
           transaction.amount.currency_as_string.should == "EUR"
         end

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

@@ -1,7 +1,4 @@
 class DummyProduct < ActiveRecord::Base
-
-  attr_accessible :currency, :price_cents, :price
-
   # Use  as model level currency
   register_currency :gbp
 

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

@@ -1,11 +1,4 @@
 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,
-    :validates_method_amount, :validates_method_amount_cents
-
   # Use USD as model level currency
   register_currency :usd
 

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

@@ -1,7 +1,4 @@
 class Service < ActiveRecord::Base
-
-  attr_accessible :charge_cents, :discount_cents, :charge, :discount
-
   monetize :charge_cents, :with_currency => :usd
 
   monetize :discount_cents

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

@@ -1,13 +1,11 @@
 class Transaction < ActiveRecord::Base
-
-  attr_accessible :amount_cents, :currency, :tax_cents, :amount, :tax
-
   monetize :amount_cents, :with_model_currency => :currency
+
   monetize :tax_cents, :with_model_currency => :currency
 
   monetize :total_cents, :with_model_currency => :currency
+
   def total_cents
     return amount_cents + tax_cents
   end
-
 end

data/spec/dummy/config/application.rb

@@ -52,12 +52,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

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

@@ -6,8 +6,8 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -22,13 +22,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

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

@@ -4,6 +4,12 @@ Dummy::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
@@ -60,8 +66,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

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

@@ -7,7 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to 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"
@@ -27,9 +31,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/db/schema.rb

@@ -9,43 +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 that you check this file into your version control system.
+# It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140110194016) 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"
-    t.datetime "updated_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   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"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
     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"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   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"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
 end

data/spec/spec_helper.rb

@@ -20,5 +20,6 @@ RSpec.configure do |config|
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
+  config.infer_spec_type_from_file_location!
   config.treat_symbols_as_metadata_keys_with_true_values = true
 end

data/spec/test_helpers_spec.rb

@@ -9,7 +9,7 @@ if defined? ActiveRecord
 
     let(:product) do
       Product.create(:price_cents => 3000, :discount => 150,
-                     :bonus_cents => 200, :optional_price => 100,
+                     :bonus_cents => 200,
                      :sale_price_amount => 1200)
     end
 
@@ -22,6 +22,10 @@ if defined? ActiveRecord
         product.should monetize(:discount).as(:discount_value)
       end
 
+      it "matches model attribute with nil value specified by :allow_nil chain" do
+        product.should monetize(:optional_price).allow_nil
+      end
+
       it "matches model attribute with currency specified by :with_currency chain" do
         product.should monetize(:bonus_cents).with_currency(:gbp)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,106 +10,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: money
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.1.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 6.1.1
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: monetize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.1.1
-- !ruby/object:Gem::Dependency
-  name: monetize
+        version: 0.3.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
+        version: '3.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: railties
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rspec-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
+        version: '2.10'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: database_cleaner
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
+        version: 0.8.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -209,12 +209,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -282,3 +282,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/test_helpers_spec.rb
+has_rdoc: