embratel 1.1.0 → 1.1.1

data/CHANGELOG.org

@@ -1,10 +1,19 @@
+* 1.1.1
+#+BEGIN_SRC
+042f50e Version bump.
+0e6d44b Improved exception message for parse errors.
+bde08e2 Handle parsing mangled number calleds.
+#+END_SRC
+
 * 1.1.0
 #+BEGIN_SRC
-ecbfb6a Improved cost regexp, made fixture reflect moar reality.
-b9140a4 Don't require relative
-492dd1c Implemented the CSVParser.
-c122e79 Make PhoneBill use CSVParser.
-7d83b31 Better exception message for parsing errors.
-37170f0 Parse and treat fees from phone bills files, too.
+f770897 Version bump.
+b80e49b Added CHANGELOG.
 41d0a5e Reflect latest changes in the README.
+37170f0 Parse and treat fees from phone bills files, too.
+7d83b31 Better exception message for parsing errors.
+c122e79 Make PhoneBill use CSVParser.
+492dd1c Implemented the CSVParser.
+b9140a4 Don't require relative
+ecbfb6a Improved cost regexp, made fixture reflect moar reality.
 #+END_SRC

data/lib/embratel.rb

@@ -12,7 +12,7 @@ require File.expand_path('../embratel/csv_parser', __FILE__)
 require File.expand_path('../embratel/phone_bill', __FILE__)
 
 module Embratel
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   class InvalidPhoneBillFileError < StandardError; end
   class InvalidRowsError < StandardError; end

data/lib/embratel/call.rb

@@ -1,6 +1,8 @@
 module Embratel
   class Call < Payable
-    NUMBER_CALLED_REGEXP = /^\d{10}$/
+    MANGLED_PHONE_NUMBER_REGEXP = '\d{5}-{5}'
+    REGULAR_PHONE_NUMBER_REGEXP = '\d{10}'
+    NUMBER_CALLED_REGEXP = /^(?:#{MANGLED_PHONE_NUMBER_REGEXP}|#{REGULAR_PHONE_NUMBER_REGEXP})$/
 
     def valid?
       super && !!(number_called =~ NUMBER_CALLED_REGEXP)

data/lib/embratel/csv_parser.rb

@@ -21,15 +21,23 @@ module Embratel
           elsif (fee = Fee.new(row)).valid?
             fees << fee
           else
-            invalid_rows << index + 1
+            invalid_rows << index + 4
           end
         end
         if invalid_rows.empty?
           calls + fees
         else
-          raise InvalidRowsError, "Erro nas linhas #{invalid_rows.join(', ')}"
+          raise InvalidRowsError, invalid_rows_error_message(invalid_rows)
         end
       end
     end
+
+    private
+
+    def invalid_rows_error_message(rows)
+      rows.
+        join(', ').
+        insert(0, rows.size == 1 ? 'Erro na linha ' : 'Erro nas linhas ')
+    end
   end
 end

data/test/embratel/call_test.rb

@@ -18,9 +18,27 @@ class CallTest < Test::Unit::TestCase
                                     'MIN',
                                      '0.73']
 
+  ROW_WITH_MANGLED_NUMBER_CALLED = ['1',
+                                    '1634125644-FRANQUIA 01',
+                                    '04 - LIGACOES DDD PARA CELULARES',
+                                    '11/08/10 A  99/99/99',
+                                    '19936-----',
+                                    'SCL -SP',
+                                    'CAS -SP',
+                                    '02:56:29 AM',
+                                    '',
+                                    'E',
+                                    '',
+                                    '500',
+                                    'MIN',
+                                     '0.73']
+
   def test_valid_with_a_row_with_invalid_number_called
-    call = Embratel::Call.new(ROW_WITH_INVALID_NUMBER_CALLED)
-    assert(!call.valid?)
+    assert(!Embratel::Call.new(ROW_WITH_INVALID_NUMBER_CALLED).valid?)
+  end
+
+  def test_valid_with_a_row_with_mangled_number_called
+    assert(Embratel::Call.new(ROW_WITH_MANGLED_NUMBER_CALLED).valid?)
   end
 
   def test_valid_with_a_valid_fee_row

data/test/embratel/csv_parser_test.rb

@@ -42,8 +42,8 @@ class Embratel::CSVParserTest < Test::Unit::TestCase
     payables = Embratel::CSVParser.parse(VALID_CSV_PHONE_BILL_FILE_PATH)
     calls = payables.select(&:call?)
     fees = payables.select(&:fee?)
-    assert_equal(4, payables.size)
-    assert_equal(3, calls.size)
+    assert_equal(5, payables.size)
+    assert_equal(4, calls.size)
     assert_equal(1, fees.size)
   end
 end

data/test/embratel/phone_bill_test.rb

@@ -7,7 +7,7 @@ class Embratel::PhoneBillTest < Test::Unit::TestCase
 
   def test_calls
     phone_bill = Embratel::PhoneBill.new(VALID_CSV_PHONE_BILL_FILE_PATH)
-    assert_equal(3, phone_bill.calls.size)
+    assert_equal(4, phone_bill.calls.size)
     phone_bill.calls.each { |call| assert(call.is_a?(Embratel::Call)) }
   end
 
@@ -19,6 +19,6 @@ class Embratel::PhoneBillTest < Test::Unit::TestCase
 
   def test_total
     phone_bill = Embratel::PhoneBill.new(VALID_CSV_PHONE_BILL_FILE_PATH)
-    assert_equal(11.59, phone_bill.total)
+    assert_equal(11.7, phone_bill.total)
   end
 end

data/test/fixtures/valid_phone_bill_file.csv

@@ -5,3 +5,4 @@ Detalhes da fatura
 2,"1634125644-FRANQUIA 01                            ","04 - LIGACOES DDD PARA CELULARES                  ","11/08/10 A  99/99/99     ",1993696666,"SCL -SP   ","CAS -SP             ",02:59:03 AM,"                    ","E   ","          ",900,"MIN     ",1.3
 3,"1634125644-FRANQUIA 01                            ","04 - LIGACOES DDD PARA CELULARES                  ","13/08/10 A  99/99/99     ",1992566666,"SCL -SP   ","CAS -SP             ",09:07:55 PM,"                    ","E   ","          ",5800,"MIN     ",8.47
 "0000004   ","10/10/91647303                                    ","ENCARGOS POR ATRASO REFERENTE A C.P.S.            ","25/10/10 A  10/11/10     ","                    ","SCL -SP   ","    -               ","               ","                    ","N   ","          ","1000    ","UNID    "," 1.09"
+"0000032   ","1634125644-FRANQUIA 01                            ","04 - LIGACOES LOCAIS PARA TELEFONES FIXOS - DURACA","99/99/99 A  99/99/99     ","16130-----          ","SCL -SP   ","SCL -SP             ","               ","                    ","E   ","          ","1000    ","MIN     "," 0.11"

metadata

@@ -2,7 +2,7 @@
 name: embratel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Murilo Pereira