easy_rails_money 0.0.9.pre → 0.0.9.pre1

data/CHANGELOG.md

@@ -57,3 +57,29 @@
   holds true
   api is changed. previously #currency and #single_currency
   gave a Money::Currency object. now is is a String 
+
+## 0.0.9.pre
+- add ActiveRecord::Base.validates_money  
+  it validates that currency is in an allowed list  
+  and money is stored as a number or can be nil  
+- api change: if we set currency (when it is a single currency)  
+  as nil. the other money columns are set to nil  
+  this is done because technically, Money has a default_currency  
+  so we can persist a Money object without the currency  
+  but that can change over time and we want to be explicit  
+  
+## 0.0.9.pre1
+- https://github.com/deepak/easy_rails_money/pull/1
+  when currency is set to nil, the money columns are set to nil as
+  well (see changelog for 0.0.9.pre above)
+  that code was buggy. so is a column was named "amount_funded"
+  it would give the setter as "amountfunded=" rather than
+  "amount_funded=". 
+  git sha1: c1d9f6a8160d5a075e78f625f177f6716715c637
+- bugfix: validates_money was failing if allowed_currency was not passed
+  the syntax is
+  validates_money :principal, :repaid, :amount_funded, :allow_nil => false, :allowed_currency => %w[inr usd sgd]
+  if we do not pass the last argument allowed_currency then it should
+  validate that it is a legal Money::Currency
+  that was not happenning because the Rails includes validations
+  does not compare Symbols and strings

data/README.md

@@ -383,3 +383,5 @@ loan_usd.currency # equals Money::Currency.new(:usd)
 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
+17. a version of inclusion_in validator that can compare
+    Symbol and string

data/lib/easy_rails_money/active_record/money_dsl.rb

@@ -8,7 +8,7 @@ module EasyRailsMoney
 
       included do
         def money_attributes
-          attributes.keys.select {|x| x =~ /^(.+)_money/ }.map {|x| x.split('_')[0..-2].join }
+          attributes.keys.select {|x| x =~ /^(.+)_money/ }.map {|x| x.split('_')[0..-2].join('_') }
         end
       end
       
@@ -78,6 +78,11 @@ module EasyRailsMoney
 
             define_method "currency=" do |value|
               if value.nil?
+                # if we set currency (when it is a single currency)
+                # as nil. the other money columns are set to nil
+                # this is done because technically, Money has a default_currency
+                # so we can persist a Money object without the currency
+                # but that can change over time and we want to be explicit
                 money_attributes.map do |name|
                   send "#{name}=", nil
                 end

data/lib/easy_rails_money/active_record.rb

@@ -21,8 +21,10 @@ class ActiveRecord::Base
       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
+    allowed_currency = options[:allowed_currency] || EasyRailsMoney::MoneyValidator.currency_list
     if single_currency?
+      # TODO: a version of inclusion_in validator that can compare
+      # Symbol and string
       validates :currency, :inclusion => { in: allowed_currency }, :allow_nil => options[:allow_nil] 
     else
       args.each do |column_name|

data/lib/easy_rails_money/money_validator.rb

@@ -7,6 +7,15 @@ module EasyRailsMoney
   # only allow_nil is passed around (as it was needed). test for other
   # like if and unless as well
   class MoneyValidator < ActiveModel::EachValidator
+
+    class << self
+      attr_writer :currency_list
+
+      def currency_list
+        @currency_list ||= Money::Currency.table.keys.map(&:to_s)
+      end
+    end
+    
     def validate_each(record, attribute, value)
       if options[:allow_nil]
         return if value.nil?

data/lib/easy_rails_money/version.rb

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

data/spec/active_record/currency_persistence_spec.rb

@@ -48,7 +48,7 @@ describe "Currency Persistence" do
       loan = loan_model.new
       loan.principal = 100.to_money(@currency)
       loan.repaid    = 50.to_money(@currency)
-      loan.npa       = 10.to_money(@currency)
+      loan.amount_funded = 10.to_money(@currency)
       loan
     }
 
@@ -80,7 +80,7 @@ describe "Currency Persistence" do
       loan.currency = @currency
       loan.principal = 100 * 100
       loan.repaid    = 50 * 100
-      loan.npa       = 10 * 100
+      loan.amount_funded = 10 * 100
       loan
     }
 

data/spec/active_record/migration_spec.rb

@@ -36,7 +36,7 @@ EOF
     <<-EOF.strip_spaces
   create_table "loans", :force => true do |t|
     t.string  "name"
-    t.integer "npa_money"
+    t.integer "amount_funded_money"
     t.integer "principal_money"
     t.integer "repaid_money"
     t.string "currency"
@@ -48,8 +48,8 @@ EOF
     <<-EOF.strip_spaces
   create_table "loans", :force => true do |t|
     t.string  "name"
-    t.string  "npa_currency"
-    t.integer "npa_money"
+    t.string  "amount_funded_currency"
+    t.integer "amount_funded_money"
     t.string  "principal_currency"
     t.integer "principal_money"
     t.string  "repaid_currency"

data/spec/active_record/validates_money_spec.rb

@@ -18,21 +18,21 @@ describe "Validation" do
 
       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)
+      EasyRailsMoney::MoneyValidator.any_instance.should_receive(:validate_each).with(subject, :amount_funded, subject.amount_funded)
     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]
+          validates_money :principal, :repaid, :amount_funded, :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.amount_funded = 10 * 100
         loan
       end
 
@@ -54,8 +54,7 @@ describe "Validation" do
         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"])
+        expect(subject.errors.messages).to eq(:principal_money=>["is not a number"], :repaid_money=>["is not a number"], :amount_funded_money=>["is not a number"], :currency=>["is not included in the list"])
       end
     end # context "do not allow nil"
 
@@ -63,14 +62,14 @@ describe "Validation" do
       let(:subject) do
         model = loan_model
         model.instance_eval {
-          validates_money :principal, :repaid, :npa, :allow_nil => true, :allowed_currency => %w[inr usd sgd]
+          validates_money :principal, :repaid, :amount_funded, :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.amount_funded = nil
         loan
       end
       
@@ -90,6 +89,27 @@ describe "Validation" do
       end
     end # context "allow nil"
 
+    context "no allowed currency" do
+      let(:subject) do
+        model = loan_model
+        model.instance_eval {
+          validates_money :principal, :repaid, :amount_funded, :allow_nil => false
+        }
+        
+        loan = model.new
+        loan.name = "loan having some values and all currencies allowed"
+        loan.principal = 100 * 100
+        loan.repaid    = 50 * 100
+        loan.amount_funded = 10 * 100
+        loan
+      end
+
+      it "is valid when it is a Money object" do
+        add_expectations subject, false
+        expect(subject).to be_valid
+      end
+    end
+
     pending "check lower-level validations"
   end
 end

data/spec/active_record_spec_helper.rb

@@ -9,7 +9,7 @@ module CreateTableDefinition
           t.string :name
           t.money  :principal
           t.money  :repaid
-          t.money  :npa
+          t.money  :amount_funded
           t.currency
         end
       end
@@ -23,7 +23,7 @@ module CreateTableDefinition
           t.string :name
           t.money  :principal
           t.money  :repaid
-          t.money  :npa
+          t.money  :amount_funded
         end
       end
     end

data/spec/loan_model_spec_helper.rb

@@ -2,5 +2,5 @@ class Loan < ActiveRecord::Base
   attr_accessible :name
   money :principal
   money :repaid
-  money :npa
+  money :amount_funded
 end

data/spec/loan_with_currency_model_spec_helper.rb

@@ -5,6 +5,6 @@ class LoanWithCurrency < ActiveRecord::Base
   with_currency(:inr) do
     money :principal
     money :repaid
-    money :npa
+    money :amount_funded
   end
 end

data/spec/migration_factory_spec_helper.rb

@@ -22,7 +22,7 @@ module SchemaStatements
           t.string :name
           t.currency
         end
-        add_money :loans, :principal, :repaid, :npa
+        add_money :loans, :principal, :repaid, :amount_funded
       end
     end
   end
@@ -30,7 +30,7 @@ module SchemaStatements
   class RemoveMoneyColumnsFromLoan  < ActiveRecord::Migration
     def change
       suppress_messages do
-        remove_money :loans, :principal, :repaid, :npa
+        remove_money :loans, :principal, :repaid, :amount_funded
       end
     end
   end
@@ -38,7 +38,7 @@ module SchemaStatements
   class RemoveMoneyColumnsExceptPrincipalFromLoan < ActiveRecord::Migration
     def change
       suppress_messages do
-        remove_money :loans, :repaid, :npa
+        remove_money :loans, :repaid, :amount_funded
       end
     end
   end
@@ -105,7 +105,7 @@ module ChangeTable
     def change
       suppress_messages do
         change_table :loans, force: true do |t|
-          t.remove_money :principal, :repaid, :npa
+          t.remove_money :principal, :repaid, :amount_funded
         end
       end
     end
@@ -115,7 +115,7 @@ module ChangeTable
     def change
       suppress_messages do
         change_table :loans, force: true do |t|
-          t.remove_money :repaid, :npa
+          t.remove_money :repaid, :amount_funded
         end
       end
     end
@@ -164,7 +164,7 @@ module CreateTableDefinition
           t.currency
           t.money  :principal
           t.money  :repaid
-          t.money  :npa
+          t.money  :amount_funded
         end
       end
     end
@@ -178,7 +178,7 @@ module CreateTableDefinition
           t.money  :principal
           t.money  :repaid
           t.currency
-          t.money  :npa
+          t.money  :amount_funded
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_rails_money
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre
+  version: 0.0.9.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -204,7 +204,6 @@ files:
 - 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
@@ -247,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4030965021580027687
+      hash: 176891542328036616
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -268,7 +267,6 @@ test_files:
 - 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

data/spec/loan_with_currency_and_validation_model_spec_helper.rb

@@ -1,12 +0,0 @@
-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