money-rails 0.7.1 → 0.8.1

data/lib/money-rails/money.rb

@@ -0,0 +1,23 @@
+require "active_support/core_ext/module/aliasing.rb"
+require "active_support/core_ext/hash/reverse_merge.rb"
+
+class Money
+
+  def format_with_settings(*rules)
+    rules = normalize_formatting_rules(rules)
+
+    # Apply global defaults for money only for non-nil values
+    # TODO: Add here more setting options
+    defaults = {
+      no_cents_if_whole: MoneyRails::Configuration.no_cents_if_whole,
+      symbol: MoneyRails::Configuration.symbol
+    }.reject { |k,v| v.nil? }
+
+    rules.reverse_merge!(defaults)
+
+    format_without_settings(rules)
+  end
+
+  alias_method_chain :format, :settings
+
+end

data/lib/money-rails/mongoid/{three.rb → money.rb}

@@ -27,7 +27,7 @@ class Money
       case
       when object.is_a?(Money) then object.mongoize
       when object.is_a?(Hash) then
-        object.symbolize_keys!
+        object.symbolize_keys! if object.respond_to?(:symbolize_keys!)
         ::Money.new(object[:cents], object[:currency_iso]).mongoize
       when object.respond_to?(:to_money) then
           object.to_money.mongoize

data/lib/money-rails/test_helpers.rb

@@ -0,0 +1,49 @@
+require 'rspec/expectations'
+
+module MoneyRails
+  module TestHelpers
+    extend RSpec::Matchers::DSL
+
+    matcher :monetize do |attr|
+
+      chain(:with_currency) do |currency|
+        @currency_iso = currency
+      end
+
+      chain(:as) do |virt_attr|
+        @as = virt_attr
+      end
+
+      match do |target|
+        matched = true
+        money_attr = @as.presence || attr.to_s.sub(/_cents$/, "")
+        matched = false unless target.send(money_attr).instance_of? Money
+        if @currency_iso
+          matched = false unless target.send(money_attr.to_sym).currency.id == @currency_iso
+        end
+        matched
+      end
+
+      description do
+        description = "monetize #{expected}"
+        description << " as #{@as}" if @as
+        description << " with currency #{@currency_iso}" if @currency_iso
+        description
+      end
+
+      failure_message_for_should do |actual|
+        msg = "expected that #{actual} would be monetized"
+        msg << " as #{@as}" if @as
+        msg << " with currency #{@currency_iso}" if @currency_iso
+        msg
+      end
+
+      failure_message_for_should_not do |actual|
+        msg = "expected that #{actual} would not be monetized"
+        msg << " as #{@as}" if @as
+        msg << " with currency #{@currency_iso}" if @currency_iso
+        msg
+      end
+    end
+  end
+end

data/lib/money-rails/version.rb

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

data/money-rails.gemspec

@@ -16,15 +16,21 @@ Gem::Specification.new do |s|
   s.files         += %w(CHANGELOG.md LICENSE README.md)
   s.files         += %w(Rakefile money-rails.gemspec)
 
+  s.files.delete("spec/dummy/log")
+  s.files.delete("spec/dummy/log/development.log")
+  s.files.delete("spec/dummy/log/test.log")
+  s.files.delete("spec/dummy/db/development.sqlite3")
+  s.files.delete("spec/dummy/db/test.sqlite3")
+
   s.test_files    = s.files.grep(/^spec\//)
 
   s.require_path = "lib"
 
   s.add_dependency "money",         "~> 5.1.0"
-  s.add_dependency "activesupport", "~> 3.0"
-  s.add_dependency "railties",      "~> 3.0"
+  s.add_dependency "activesupport", ">= 3.0"
+  s.add_dependency "railties",      ">= 3.0"
 
-  s.add_development_dependency "rails",       "~> 3.0"
+  s.add_development_dependency "rails",       ">= 3.0"
   s.add_development_dependency "rspec-rails", "~> 2.10"
   s.add_development_dependency 'database_cleaner', ['>= 0.8.0']
 end

data/spec/active_record/migration_extensions/schema_statements_spec.rb

@@ -44,7 +44,9 @@ if defined? ActiveRecord
         describe 'currency' do
           subject { Item.columns_hash['price_currency'] }
 
-          its (:default) { should eq 'USD' }
+          # set in spec/dummy/config/initializers/money.rb
+          its (:default) { should eq 'EUR' }
+
           its (:null) { should be_false }
           its (:type) { should eq :string }
         end

data/spec/active_record/migration_extensions/table_spec.rb

@@ -45,7 +45,9 @@ if defined? ActiveRecord
         describe 'currency' do
           subject { Item.columns_hash['price_currency'] }
 
-          its (:default) { should eq 'USD' }
+          # set in spec/dummy/config/initializers/money.rb
+          its (:default) { should eq 'EUR' }
+          
           its (:null) { should be_false }
           its (:type) { should eq :string }
         end

data/spec/active_record/monetizable_spec.rb

@@ -67,7 +67,7 @@ if defined? ActiveRecord
 
         @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
@@ -79,12 +79,44 @@ if defined? ActiveRecord
         @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/)
+      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/)
       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 = "123"
+
+        @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/)
+      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
+      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
+      end
+
       it "passes validation if money value has correct format" do
         @product.price = "12,230.24"
         @product.save.should be_true
@@ -96,21 +128,31 @@ if defined? ActiveRecord
       end
 
       it "uses i18n currency format when validating" do
+        old_locale = I18n.locale
+
         I18n.locale = "en-GB"
         Money.default_currency = Money::Currency.find('EUR')
         "12.00".to_money.should == Money.new(1200, :eur)
         transaction = Transaction.new(amount: "12.00", tax: "13.00")
-        transaction.amount_cents.should == 1200        
+        transaction.amount_cents.should == 1200
         transaction.valid?.should be_true
+
+        # reset locale setting
+        I18n.locale = old_locale
       end
 
       it "defaults to Money::Currency format when no I18n information is present" do
+        old_locale = I18n.locale
+
         I18n.locale = "zxsw"
         Money.default_currency = Money::Currency.find('EUR')
         "12,00".to_money.should == Money.new(1200, :eur)
         transaction = Transaction.new(amount: "12,00", tax: "13,00")
-        transaction.amount_cents.should == 1200        
+        transaction.amount_cents.should == 1200
         transaction.valid?.should be_true
+
+        # reset locale setting
+        I18n.locale = old_locale
       end
 
       it "doesn't allow nil by default" do
@@ -247,7 +289,7 @@ if defined? ActiveRecord
       end
 
       it "sets field to nil, in nil assignments if allow_nil is set" do
-        @product.optional_price = nil 
+        @product.optional_price = nil
         @product.save.should be_true
         @product.optional_price.should be_nil
       end

data/spec/configuration_spec.rb

@@ -16,5 +16,68 @@ describe "configuration" do
       Money.us_dollar(100).exchange_to("CAD").should == Money.new(124, "CAD")
       Money.ca_dollar(100).exchange_to("USD").should == Money.new(80, "USD")
     end
+
+    it "sets no_cents_if_whole value for formatted output globally" do
+      # Disable the usage of I18n (to avoid default symbols for :en)
+      Money.use_i18n = false
+
+      value = Money.new(12345600, "EUR")
+      mark = Money::Currency.find(:eur).decimal_mark
+      value.format.should =~ /#{mark}/
+
+      MoneyRails.no_cents_if_whole = true
+      value.format.should_not =~ /#{mark}/
+      value.format(no_cents_if_whole: false).should =~ /#{mark}/
+
+      MoneyRails.no_cents_if_whole = false
+      value.format.should =~ /#{mark}/
+      value.format(no_cents_if_whole: true).should_not =~ /#{mark}/
+
+      # Reset global settings
+      MoneyRails.no_cents_if_whole = nil
+      Money.use_i18n = true
+    end
+
+    it "sets symbol for formatted output globally" do
+      value = Money.new(12345600, "EUR")
+      symbol = Money::Currency.find(:eur).symbol
+      value.format.should =~ /#{symbol}/
+
+      MoneyRails.symbol = false
+      value.format.should_not =~ /#{symbol}/
+      value.format(symbol: true).should =~ /#{symbol}/
+
+      MoneyRails.symbol = true
+      value.format.should =~ /#{symbol}/
+      value.format(symbol: false).should_not =~ /#{symbol}/
+
+      # Reset global setting
+      MoneyRails.symbol = nil
+    end
+
+    it "changes the amount and currency column settings based on the default currency" do
+      old_currency = MoneyRails.default_currency
+      MoneyRails.default_currency = :inr
+
+      MoneyRails.amount_column[:postfix].should == "_#{MoneyRails.default_currency.subunit.downcase.pluralize}"
+      MoneyRails.currency_column[:default].should == MoneyRails.default_currency.iso_code
+
+      # Reset global setting
+      MoneyRails.default_currency = old_currency
+    end
+
+    it "accepts default currency which doesn't have minor unit" do
+      old_currency = MoneyRails.default_currency
+
+      expect {
+        MoneyRails.default_currency = :jpy
+      }.to_not raise_error
+
+      MoneyRails.amount_column[:postfix].should == "_cents"
+
+      # Reset global setting
+      MoneyRails.default_currency = old_currency
+    end
+
   end
 end

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

@@ -23,4 +23,11 @@ class Product < ActiveRecord::Base
   monetize :sale_price_amount, :as => :sale_price,
              :with_model_currency => :sale_price_currency_code
 
+  monetize :price_in_a_range_cents, :allow_nil => true,
+    :numericality => {
+      :greater_than_or_equal_to => 0,
+      :less_than_or_equal_to => 10000,
+      :message => "Must be greater than zero and less than $10k"
+    }
+
 end

data/spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb

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

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120712202655) do
+ActiveRecord::Schema.define(:version => 20130124023419) do
 
   create_table "dummy_products", :force => true do |t|
     t.string   "currency"
@@ -20,6 +20,9 @@ ActiveRecord::Schema.define(:version => 20120712202655) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "items", :force => true do |t|
+  end
+
   create_table "products", :force => true do |t|
     t.integer  "price_cents"
     t.integer  "discount"
@@ -29,6 +32,7 @@ ActiveRecord::Schema.define(:version => 20120712202655) do
     t.integer  "optional_price_cents"
     t.integer  "sale_price_amount",        :default => 0, :null => false
     t.string   "sale_price_currency_code"
+    t.integer  "price_in_a_range_cents"
   end
 
   create_table "services", :force => true do |t|

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);
+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 "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);
@@ -14,4 +14,6 @@ INSERT INTO schema_migrations (version) VALUES ('20120528181002');
 
 INSERT INTO schema_migrations (version) VALUES ('20120528210103');
 
-INSERT INTO schema_migrations (version) VALUES ('20120607210247');
+INSERT INTO schema_migrations (version) VALUES ('20120607210247');
+
+INSERT INTO schema_migrations (version) VALUES ('20130124023419');

data/spec/helpers/action_view_extension_spec.rb

@@ -8,10 +8,24 @@ describe 'MoneyRails::ActionViewExtension' do
   end
 
   describe '#humanized_money' do
-    subject { helper.humanized_money Money.new(12500) }
+    let(:options) { {} }
+    subject { helper.humanized_money Money.new(12500), options }
     it { should be_a String }
     it { should_not include Money.default_currency.symbol }
     it { should_not include Money.default_currency.decimal_mark }
+
+    context 'with symbol options' do
+      let(:options) { { :symbol => true } }
+      it { should include Money.default_currency.symbol }
+    end
+
+    context 'with deprecated symbol' do
+      let(:options) { true }
+      before(:each) do
+        helper.should_receive(:warn)
+      end
+      it { should include Money.default_currency.symbol }
+    end
   end
 
   describe '#humanized_money_with_symbol' do
@@ -22,10 +36,19 @@ describe 'MoneyRails::ActionViewExtension' do
   end
 
   describe '#money_without_cents' do
-    subject { helper.money_without_cents Money.new(12500) }
+    let(:options) { {} }
+    subject { helper.money_without_cents Money.new(12500), options }
     it { should be_a String }
     it { should_not include Money.default_currency.symbol }
     it { should_not include Money.default_currency.decimal_mark }
+
+    context 'with deprecated symbol' do
+      let(:options) { true }
+      before(:each) do
+        helper.should_receive(:warn)
+      end
+      it { should include Money.default_currency.symbol }
+    end
   end
 
   describe '#money_without_cents_and_with_symbol' do

data/spec/mongoid/three_spec.rb

@@ -6,6 +6,10 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
     let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
     let!(:priceable_from_num) { Priceable.create(:price => 1) }
     let!(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
+    let!(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
+    let!(:priceable_from_hash_with_indifferent_access) {
+      Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
+    }
 
     context "mongoize" do
       it "mongoizes correctly a Money object to a hash of cents and currency" do
@@ -22,6 +26,16 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
         priceable_from_string.price.cents.should == 100
         priceable_from_string.price.currency.should == Money::Currency.find('EUR')
       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')
+      end
+
+      it "mongoizes correctly a HashWithIndifferentAccess of cents and currency" do
+        priceable_from_hash_with_indifferent_access.price.cents.should == 100
+        priceable_from_hash_with_indifferent_access.price.currency.should == Money::Currency.find('EUR')
+      end
     end
 
     context "demongoize" do

data/spec/test_helpers_spec.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+if defined? ActiveRecord
+  describe 'TestHelpers' do
+
+    require "money-rails/test_helpers"
+    include MoneyRails::TestHelpers
+
+    let(:product) do
+      Product.create(:price_cents => 3000, :discount => 150,
+                     :bonus_cents => 200, :optional_price => 100,
+                     :sale_price_amount => 1200)
+    end
+
+    describe "monetize matcher" do
+
+      it "matches model attribute without a '_cents' suffix by default" do
+        monetize(:price_cents).should be_true
+      end
+
+      it "matches model attribute specified by :as chain" do
+        monetize(:price_cents).as(:discount_value).should be_true
+      end
+
+      it "matches model attribute with currency specified by :with_currency chain" do
+        monetize(:price_cents).with_currency(:gbp).should be_true
+      end
+    end
+  end
+end