@@ -230,9 +230,20 @@ module Riopro return [0,10,11].include?(valor) ? 1 : valor end + + def module11_2to7P(value = "") + dv = self.module11_2to7base(value) + return dv == 10 ? "P" : ( dv == 11 ? 0 : dv ) + end + + def module11_2to7(value = "") + dv = self.module11_2to7base(value) + return ([10, 11].include?(dv) ) ? 0 : dv + end + # Calculus Module 11 with multipliers 2 to 7 # returns nil if does not receive a only numbers string - def module11_2to7(value = "") + def module11_2to7base(value = "") return nil unless value && (value !~ /[^0-9]+/) multipliers = [2,3,4,5,6,7] lib/bank/base.rb @@ -59,7 +59,7 @@ module Riopro # Calculates our number check digit according to Bradesco criteria def calculate_our_number_cd - module11_2to7("#{self.portfolio}#{self.our_number}"); + module11_2to7P("#{self.portfolio}#{self.our_number}"); end # Calculates account check digit according to Bradesco criteria lib/bank/bradesco.rb @@ -157,26 +157,24 @@ describe Riopro::KillBill::Bank::Bradesco do before(:each) do @bank_bradesco.portfolio = "09" end - describe "portfolio 09" do - it "should call module11_2to7" do - @bank_bradesco.should_receive(:module11_2to7).with("#{@bank_bradesco.portfolio}#{@bank_bradesco.our_number}").and_return(1) - @bank_bradesco.calculate_our_number_cd.should == 1 - end - [ - ["02", "90960000533", 8], - ["02", "90700000300", 2], - ["02", "90840000416", 0], - ["02", "90510000304", "P"], - ["19", "00000000002", 8], - ["09", "00000000002", "P"], - ["19", "00000000006", 0], - ["09", "00606011457", "P"], - ].each do |portfolio, our_number, cd| - it "should return #{cd} as check digit for #{our_number} and portfolio #{portfolio}" do - @bank_bradesco.portfolio = portfolio - @bank_bradesco.our_number = our_number - @bank_bradesco.calculate_our_number_cd.should == cd - end + it "should call module11_2to7" do + @bank_bradesco.should_receive(:module11_2to7P).with("#{@bank_bradesco.portfolio}#{@bank_bradesco.our_number}").and_return(1) + @bank_bradesco.calculate_our_number_cd.should == 1 + end + [ + ["02", "90960000533", 8], + ["02", "90700000300", 2], + ["02", "90840000416", 0], + ["02", "90510000304", "P"], + ["19", "00000000002", 8], + ["09", "00000000002", "P"], + ["19", "00000000006", 0], + ["09", "00606011457", "P"], + ].each do |portfolio, our_number, cd| + it "should return #{cd} as check digit for #{our_number} and portfolio #{portfolio}" do + @bank_bradesco.portfolio = portfolio + @bank_bradesco.our_number = our_number + @bank_bradesco.calculate_our_number_cd.should == cd end end end spec/bank/bradesco_spec.rb f72c9567dbcba5e2656e75b2cb8bdc4b41eda1ab Otávio de Freitas e Castro Sampaio osampaio@riopro.com.br http://github.com/riopro/kill_bill/commit/1d197c1e65cea6c401693e81c6bbcb6c664a0ad2 1d197c1e65cea6c401693e81c6bbcb6c664a0ad2 2009-04-17T07:59:15-07:00 2009-04-17T07:59:15-07:00 melhorando a forma de calcular modulo 11 2 a 7 ce43b55c7c24052f21be59098c89d9bc54d61931 Otávio de Freitas e Castro Sampaio osampaio@riopro.com.br