easy_rails_money 0.0.8 → 0.0.9.pre

data/README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/deepak/easy_rails_money.png?branch=master)](https://travis-ci.org/deepak/easy_rails_money)
 [![Dependency Status](https://gemnasium.com/deepak/easy_rails_money.png)](https://gemnasium.com/deepak/easy_rails_money)
 [![Code Climate](https://codeclimate.com/github/deepak/easy_rails_money.png)](https://codeclimate.com/github/deepak/easy_rails_money)
+[![Gem Version](https://badge.fury.io/rb/easy_rails_money.png)](http://badge.fury.io/rb/easy_rails_money)
 
 # EasyRailsMoney
 
@@ -377,3 +378,8 @@ loan_usd.currency # equals Money::Currency.new(:usd)
     do we want a Money::Currency object back?  
     not decided  
     see currency_persistence_spec.rb
+14. make sure re-opening and redefining money dsl methods work
+    eg. moving from individual currencies to single currency
+15. document. methods defined inside activerecord's scope
+    move to a helper, no that its namespace is not polluted
+16. two specs tagged with fixme in validates_money_spec failing

data/lib/easy_rails_money/active_record.rb

@@ -2,6 +2,7 @@ require "easy_rails_money/active_record/money_dsl"
 require "easy_rails_money/active_record/migration/schema_statements"
 require "easy_rails_money/active_record/migration/table"
 require "easy_rails_money/active_record/migration/table_definition"
+require "easy_rails_money/money_validator"
 
 ActiveRecord::Base.send :include, EasyRailsMoney::ActiveRecord::MoneyDsl
 
@@ -9,4 +10,24 @@ ActiveRecord::Migration.send :include, EasyRailsMoney::ActiveRecord::Migration::
 
 ActiveRecord::ConnectionAdapters::TableDefinition.send :include, EasyRailsMoney::ActiveRecord::Migration::TableDefinition
 ActiveRecord::ConnectionAdapters::Table.send :include, EasyRailsMoney::ActiveRecord::Migration::Table
+  
+class ActiveRecord::Base
+  def self.validates_money *args
+    options = args.extract_options!
+    validates_with EasyRailsMoney::MoneyValidator, options.merge(:attributes => args)
 
+    # validates lower-level columns
+    args.each do |column_name|
+      validates "#{column_name}_money", :numericality => { only_integer: true, greater_than_or_equal_to: 0 }, :allow_nil => options[:allow_nil] 
+    end
+
+    allowed_currency = options[:allowed_currency] || Money::Currency.table.keys
+    if single_currency?
+      validates :currency, :inclusion => { in: allowed_currency }, :allow_nil => options[:allow_nil] 
+    else
+      args.each do |column_name|
+        validates "#{column_name}_currency", :presence => true, :inclusion => { in: allowed_currency }, :allow_nil => options[:allow_nil] 
+      end
+    end
+  end
+end

data/lib/easy_rails_money/active_record/money_dsl.rb

@@ -5,6 +5,12 @@ module EasyRailsMoney
   module ActiveRecord
     module MoneyDsl
       extend ActiveSupport::Concern
+
+      included do
+        def money_attributes
+          attributes.keys.select {|x| x =~ /^(.+)_money/ }.map {|x| x.split('_')[0..-2].join }
+        end
+      end
       
       module ClassMethods
         attr_accessor :single_currency
@@ -69,6 +75,15 @@ module EasyRailsMoney
               # currency is stored in a seperate common column
               return Money.new(value, self.currency)
             end # define_method setter
+
+            define_method "currency=" do |value|
+              if value.nil?
+                money_attributes.map do |name|
+                  send "#{name}=", nil
+                end
+              end
+              super value
+            end
           else
             # TODO: test if Memoization will make any difference
             define_method column_name do |*args|

data/lib/easy_rails_money/money_validator.rb

@@ -0,0 +1,25 @@
+require 'active_support/core_ext/array/extract_options'
+
+module EasyRailsMoney
+  # TODO: there are a lot of validations here. customizing the messages
+  # for all of them seems cumbersome. if needed write your own. or even patch
+  # also while calling the individual validators in validates_money
+  # only allow_nil is passed around (as it was needed). test for other
+  # like if and unless as well
+  class MoneyValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      if options[:allow_nil]
+        return if value.nil?
+      else
+        if value.nil?
+          record.errors[attribute] << "cannot be nil" 
+          return
+        end
+      end
+      
+      if value.fractional < 0
+        record.errors[attribute] << "cannot be negative"
+      end
+    end
+  end
+end

data/lib/easy_rails_money/version.rb

@@ -1,3 +1,3 @@
 module EasyRailsMoney
-  VERSION = "0.0.8"
+  VERSION = "0.0.9.pre"
 end

data/spec/active_record/validates_money_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+require 'active_record_spec_helper'
+
+describe "Validation" do  
+  context "single currency" do    
+    def loan_model
+      Object.send(:remove_const, "LoanWithCurrency") if defined? LoanWithCurrency
+      migrate CreateTableDefinition::CreateLoanWithCurrency
+      load 'loan_with_currency_model_spec_helper.rb'
+      LoanWithCurrency
+    end
+
+    # subject can be delayed bound ie. after some changes
+    def add_expectations subject, allow_nil      
+      expect(subject.class.validators.length).to eq 5
+      expect(subject.class.validators.select {|x| x.is_a? EasyRailsMoney::MoneyValidator }.length).to eq 1
+      expect(subject.class.validators.map {|x| x.options[:allow_nil] }.uniq).to eq [allow_nil]
+
+      EasyRailsMoney::MoneyValidator.any_instance.should_receive(:validate_each).with(subject, :principal, subject.principal)
+      EasyRailsMoney::MoneyValidator.any_instance.should_receive(:validate_each).with(subject, :repaid, subject.repaid)
+      EasyRailsMoney::MoneyValidator.any_instance.should_receive(:validate_each).with(subject, :npa, subject.npa)
+    end
+
+    context "do not allow nil" do
+      let(:subject) do
+        model = loan_model
+        model.instance_eval {
+          validates_money :principal, :repaid, :npa, :allow_nil => false, :allowed_currency => %w[inr usd sgd]
+        }
+        
+        loan = model.new
+        loan.name = "loan having some values"
+        loan.principal = 100 * 100
+        loan.repaid    = 50 * 100
+        loan.npa       = 10 * 100
+        loan
+      end
+
+      it "is valid when it is a Money object" do
+        add_expectations subject, false
+        expect(subject).to be_valid
+      end
+
+      it "is in-valid if values are nil and allow_nil is false" do      
+        subject.principal = nil
+        add_expectations subject, false
+        expect(subject).not_to be_valid
+        expect(subject.errors.messages).to eq :principal_money=>["is not a number"]
+      end
+
+      it "is in-valid if currency is nil and allow_nil is false"  do
+        old = subject.principal
+        expect { subject.currency = nil }.to change { subject.principal }.from(old).to(nil) 
+        expect(subject.attributes["currency"]).to be_nil
+        add_expectations subject, false
+        expect(subject).not_to be_valid
+        puts subject.errors.messages
+        expect(subject.errors.messages).to eq(:principal_money=>["is not a number"], :repaid_money=>["is not a number"], :npa_money=>["is not a number"], :currency=>["is not included in the list"])
+      end
+    end # context "do not allow nil"
+
+    context "allow nil", :fixme do
+      let(:subject) do
+        model = loan_model
+        model.instance_eval {
+          validates_money :principal, :repaid, :npa, :allow_nil => true, :allowed_currency => %w[inr usd sgd]
+        }
+        
+        loan = model.new
+        loan.name = "loan having nil values"
+        loan.principal = nil
+        loan.repaid    = nil
+        loan.npa       = nil
+        loan
+      end
+      
+      it "is valid if currency is nil and allow_nil is true" do
+        subject.currency = nil
+        expect(subject.principal).to be_nil
+        expect(subject.attributes["currency"]).to be_nil
+        
+        add_expectations subject, true
+        expect(subject).to be_valid
+      end
+
+      it "is in-valid if currency is not allowed" do
+        subject.currency = "foo"
+        add_expectations subject, true
+        expect(subject).not_to be_valid
+      end
+    end # context "allow nil"
+
+    pending "check lower-level validations"
+  end
+end

data/spec/loan_with_currency_and_validation_model_spec_helper.rb

@@ -0,0 +1,12 @@
+class LoanWithCurrencyAndValidation < ActiveRecord::Base
+  self.table_name = "loans"
+  attr_accessible :name
+
+  with_currency(:inr) do
+    money :principal
+    money :repaid
+    money :npa
+  end
+
+  validates_money :principal, :repaid, :npa, :allow_nil => true, :allowed_currency => %w[inr usd sgd]
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: easy_rails_money
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Deepak Kannan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -195,13 +195,16 @@ files:
 - lib/easy_rails_money/active_record/money_dsl.rb
 - lib/easy_rails_money/configuration.rb
 - lib/easy_rails_money/money_dsl_helper.rb
+- lib/easy_rails_money/money_validator.rb
 - lib/easy_rails_money/version.rb
 - spec/active_record/currency_persistence_spec.rb
 - spec/active_record/migration_spec.rb
 - spec/active_record/money_dsl_spec.rb
+- spec/active_record/validates_money_spec.rb
 - spec/active_record_spec_helper.rb
 - spec/configuration_spec.rb
 - spec/loan_model_spec_helper.rb
+- spec/loan_with_currency_and_validation_model_spec_helper.rb
 - spec/loan_with_currency_model_spec_helper.rb
 - spec/migration_factory_spec_helper.rb
 - spec/simplecov_helper.rb
@@ -244,16 +247,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3822270686044656207
+      hash: 4030965021580027687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3822270686044656207
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -264,9 +264,11 @@ test_files:
 - spec/active_record/currency_persistence_spec.rb
 - spec/active_record/migration_spec.rb
 - spec/active_record/money_dsl_spec.rb
+- spec/active_record/validates_money_spec.rb
 - spec/active_record_spec_helper.rb
 - spec/configuration_spec.rb
 - spec/loan_model_spec_helper.rb
+- spec/loan_with_currency_and_validation_model_spec_helper.rb
 - spec/loan_with_currency_model_spec_helper.rb
 - spec/migration_factory_spec_helper.rb
 - spec/simplecov_helper.rb