Addendum records respect eol param h/t @sumahiremath, rubyritasGH-59

Author: jm81

lib/ach.rb

@@ -20,6 +20,12 @@ module ACH
     225, # ACH Debits Only
     280  # ACH Automated Accounting Advices
   ]
+
+  DEFAULT_EOL = "\r\n"
+
+  def self.eol
+    DEFAULT_EOL
+  end
 end
 
 require 'time'

lib/ach/ach_file.rb

@@ -24,7 +24,7 @@ def initialize data=nil
 
 
     # @param eol [String] Line ending, default to CRLF
-    def to_s eol = "\r\n"
+    def to_s eol = ACH.eol
       records = []
       records << @header
 
@@ -55,10 +55,10 @@ def to_s eol = "\r\n"
         @control.entry_hash += batch.control.entry_hash
       end
 
-      records.collect { |r| r.to_ach }.join(eol) + eol
+      records.collect { |r| r.to_ach(eol: eol) }.join(eol) + eol
     end
 
-    def report
+    def report eol: ACH.eol
       to_s # To ensure correct records
       lines = []
 
@@ -74,7 +74,7 @@ def report
       lines << left_justify("Credit Total: ", 25) +
           sprintf("% 7d.%02d", @control.credit_total / 100, @control.credit_total % 100)
 
-      lines.join("\r\n")
+      lines.join(eol)
     end
 
     def parse_fixed data

lib/ach/batch.rb

@@ -58,9 +58,9 @@ def to_ach
 
       [@header] + @entries + @addendas + [@control]
     end
-    
+
     private
-    
+
     def last_entry
       @last_entry ||= @entries.last
     end

lib/ach/records/entry_detail.rb

@@ -54,15 +54,15 @@ def addenda_records?
       return !self.addenda.empty?
     end
 
-    def to_ach
+    def to_ach eol: ACH.eol
       self.addenda_record_indicator = (self.addenda.empty? ? 0 : 1) if self.respond_to?(:addenda_record_indicator)
       self.number_of_addenda_records = self.addenda.length if self.respond_to?(:number_of_addenda_records)
 
       ach_string = super
 
       self.addenda.each {|a|
         a.entry_detail_sequence_number = self.trace_number
-        ach_string << "\r\n" + a.to_ach
+        ach_string << eol + a.to_ach
       }
       return ach_string
     end

lib/ach/records/record.rb

@@ -13,7 +13,7 @@ def fields
 
       attr_accessor :case_sensitive
 
-      def to_ach
+      def to_ach eol: nil
         to_ach = self.class.fields.collect { |f| send("#{f}_to_ach") }.join('')
         case_sensitive ? to_ach : to_ach.upcase
       end

spec/ach/ach_file_spec.rb

@@ -92,6 +92,7 @@ def add_balancing_entry_detail(batch)
       it 'shows the offset line' do
         expect(ach_file.to_s.split("\r\n")[6]).to eq(full_file[6])
       end
+
       it 'shows the debit and credit on line 7' do
         expect(ach_file.to_s.split("\r\n")[7]).to eq(full_file[7])
       end
@@ -198,6 +199,10 @@ def add_balancing_entry_detail(batch)
     end
 
     describe 'eol param' do
+      before(:each) do
+        add_batch ach_file, 3
+      end
+
       context 'default' do
         subject(:output) { ach_file.to_s }
 
@@ -215,6 +220,17 @@ def add_balancing_entry_detail(batch)
           expect(output[-2..-1]).to_not eq("\r\n")
           expect(output[-1]).to eq("\n")
         end
+
+        context 'has addendum records' do
+          it 'accounts for addendum records' do
+            addendum = ACH::Addendum.new
+            addendum.sequence_number = 1
+            addendum.payment_data = 'Data'
+
+            ach_file.batches.first.entries.last.addenda << addendum
+            expect(ach_file.to_s("\n").include?("\r")).to be(false)
+          end
+        end
       end
     end
   end