ach 0.4.7 → 0.4.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTg0YjlhNzMwY2RkODJlY2VlYjY3MjU2NmRmZmQ0ZDMyNTFiOGEzNA==
+    NzUzNDkyMzc0ZDk4ODk2MzhjZTY0MGE5Y2ZlMmFkNmE0NjZiNjVjNw==
   data.tar.gz: !binary |-
-    OTg5OTQ1MjYzNDM4YjJjNjhkMTYzZGVkZmI2NGNjNGJhMzNhNWI5YQ==
+    YzQ4ZGQ1MTAwNGYwOTAxZTFlZDk1OGFkMjJhNDgzNGNiNzBjNWJiYQ==
 SHA512:
   metadata.gz: !binary |-
-    YTM0ZDNmMWM2ZjBkMDdiNmUxNWVmOWJhMGE2OGYyNmM1ZmRjOTRiOWJiM2Ez
-    NDMwNzA4YjEwYzI1MTg3MWYwZmY2OWU2YmY4MGQwMDcwZmYyMmI1ZmZmNjg5
-    ZDVmYTE4NTRmMDU2YmJmOTcwNTY4ZWM2YjU4ZTAyMGExOGYxODI=
+    MjUwMTUwM2U4NmFkZDI3ZGVjMTgzMDRhZWZkNWMzY2IwYTJiNjU4MjA3YjU2
+    MzYwYjVhYzdkMDVmZDVlMzEyZDEwNWM0YmY4YTU3ODhiMjhmZTgxMWYwOGQ5
+    NmE0NjQxN2RjNTNhODIyYTg4ZWJjYTE5N2NlZTJiNmRhYjYyOGI=
   data.tar.gz: !binary |-
-    ZDAyNmExZjE2NjFkY2Q1ZjJlZmUwZGI0NjE5OWYwNzJkNWQxNjI1N2MxZTVm
-    NzJhYTgzN2VjOGViMDFlMmM0MDgxZGM1ODk5YmFhNmI0MDM2NzBkY2JiNjQy
-    ZWIzOGM3ZDQ4OTkxZjZjMTY1NjFiYmRjNWY5ODIzMGE1YjkxMWM=
+    ODFmY2MzYmM3NTlkMWMwNWU2OTAzYmU1ZTRlZDgyMGMzNzVlZmE5YjE0YzBj
+    NmZjNjhlN2VlNTI0MjNiYzU5NDZhZDU3YWNmYWU1MDFlODBmMGQzMmE4MGQ0
+    ZWQxZjI0ZWQxNjkwNTJlOWUyMjEwZDg5MmQ2OTViYzJiNDEzODY=

data/README.md

@@ -70,6 +70,8 @@ ach.batches.first.entries.first.addenda.first.payment_data
 => "C05992222220280489      1211403932                                          1211"
 ```
 
+**Note:** When adding an amount to your ach file, it needs to be in cents. So you'll want to multiply any dollar amounts by 100
+
 ##Copyright
 
 Copyright (c) 2008-2009 Jared E Morgan, released under the MIT license

data/lib/ach/ach_file.rb

@@ -14,7 +14,11 @@ module ACH
       @control = Records::FileControl.new
 
       if data
-        parse(data)
+        if (data.encode(Encoding.find('ASCII'),ENCODING_OPTIONS) =~ /\n|\r\n/).nil?
+          parse_fixed(data)
+        else
+          parse(data)
+        end
       end
     end
 
@@ -37,13 +41,12 @@ module ACH
       @control.entry_hash = 0
 
       @batches.each do | batch |
-        @control.entry_count += batch.entries.length
+        @control.entry_count += batch.entries.inject(0) { |total, entry| total + entry.records_count }
         @control.debit_total += batch.control.debit_total
         @control.credit_total += batch.control.credit_total
         @control.entry_hash += batch.control.entry_hash
       end
 
-
       records.collect { |r| r.to_ach }.join("\r\n") + "\r\n"
     end
 
@@ -66,6 +69,12 @@ module ACH
       lines.join("\r\n")
     end
 
+    def parse_fixed data
+      # replace with a space to preserve the record-lengths
+      encoded_data = data.encode(Encoding.find('ASCII'),{:invalid => :replace, :undef => :replace, :replace => ' '})
+      parse encoded_data.scan(/.{94}/).join("\n")
+    end
+
     def parse data
       trace_number = 0
       fh =  self.header
@@ -89,7 +98,7 @@ module ACH
           batch = ACH::Batch.new
           bh = batch.header
           bh.company_name                   = line[4..19].strip
-          bh.company_identification         = line[40..49].strip.gsub(/\A1/, '')
+          bh.company_identification         = line[40..49].gsub(/\A1/, '')
           bh.standard_entry_class_code      = line[50..52].strip
           bh.company_entry_description      = line[53..62].strip
           bh.company_descriptive_date       = Date.parse(line[63..68]) rescue nil # this can be various formats

data/lib/ach/ach_file.rb.orig

@@ -0,0 +1,150 @@
+require 'date'
+
+module ACH
+  class ACHFile
+    include FieldIdentifiers
+
+    attr_reader :batches
+    attr_reader :header
+    attr_reader :control
+
+    def initialize data=nil
+      @batches = []
+      @header = Records::FileHeader.new
+      @control = Records::FileControl.new
+
+      if data
+        if (data =~ /\n|\r\n/).nil?
+          parse_fixed(data)
+        else
+          parse(data)
+        end
+      end
+    end
+
+    def to_s
+      records = []
+      records << @header
+      @batches.each { |b| records += b.to_ach }
+      records << @control
+
+      nines_needed = 10 - (records.length % 10)
+      nines_needed = nines_needed % 10
+      nines_needed.times { records << Records::Nines.new() }
+
+      @control.batch_count = @batches.length
+      @control.block_count = (records.length / 10).ceil
+
+      @control.entry_count = 0
+      @control.debit_total = 0
+      @control.credit_total = 0
+      @control.entry_hash = 0
+
+      @batches.each do | batch |
+        @control.entry_count += batch.entries.length
+        @control.debit_total += batch.control.debit_total
+        @control.credit_total += batch.control.credit_total
+        @control.entry_hash += batch.control.entry_hash
+      end
+
+
+      records.collect { |r| r.to_ach }.join("\r\n") + "\r\n"
+    end
+
+    def report
+      to_s # To ensure correct records
+      lines = []
+
+      @batches.each do | batch |
+        batch.entries.each do | entry |
+          lines << left_justify(entry.individual_name + ": ", 25) +
+              sprintf("% 7d.%02d", entry.amount / 100, entry.amount % 100)
+        end
+      end
+      lines << ""
+      lines << left_justify("Debit Total: ", 25) +
+          sprintf("% 7d.%02d", @control.debit_total / 100, @control.debit_total % 100)
+      lines << left_justify("Credit Total: ", 25) +
+          sprintf("% 7d.%02d", @control.credit_total / 100, @control.credit_total % 100)
+
+      lines.join("\r\n")
+    end
+
+    def parse_fixed data
+      parse data.scan(/.{94}/).join("\n")
+    end
+
+    def parse data
+      trace_number = 0
+      fh =  self.header
+      batch = nil
+      bh = nil
+      ed = nil
+
+      data.strip.split(/\n|\r\n/).each do |line|
+        type = line[0].chr
+        case type
+        when '1'
+          fh.immediate_destination          = line[03..12].strip
+          fh.immediate_origin               = line[13..22].strip
+          fh.transmission_datetime          = Time.utc('20'+line[23..24], line[25..26], line[27..28], line[29..30], line[31..32])
+          fh.file_id_modifier               = line[33..33]
+          fh.immediate_destination_name     = line[40..62].strip
+          fh.immediate_origin_name          = line[63..85].strip
+          fh.reference_code                 = line[86..93].strip
+        when '5'
+          self.batches << batch unless batch.nil?
+          batch = ACH::Batch.new
+          bh = batch.header
+          bh.company_name                   = line[4..19].strip
+<<<<<<< HEAD
+          bh.company_identification         = line[40..49].strip.gsub(/\A1/, '')
+=======
+          bh.company_identification         = line[41..49]# .strip - do not strip need to preserve trailing spaces
+>>>>>>> 2dd27ff1c45679b6544a088c4a21f2689123ddf8
+          bh.standard_entry_class_code      = line[50..52].strip
+          bh.company_entry_description      = line[53..62].strip
+          bh.company_descriptive_date       = Date.parse(line[63..68]) rescue nil # this can be various formats
+          bh.effective_entry_date           = Date.parse(line[69..74])
+          bh.originating_dfi_identification = line[79..86].strip
+        when '6'
+          ed = ACH::CtxEntryDetail.new
+          ed.transaction_code               = line[1..2]
+          ed.routing_number                 = line[3..11]
+          ed.account_number                 = line[12..28].strip
+          ed.amount                         = line[29..38].to_i # cents
+          ed.individual_id_number           = line[39..53].strip
+          ed.individual_name                = line[54..75].strip
+          ed.originating_dfi_identification = line[79..86]
+          ed.trace_number                   = line[87..93].to_i
+          batch.entries << ed
+        when '7'
+          type_code = line[1..2]
+          ad = case type_code
+          when '98'
+            ACH::Addendum::NotificationOfChange.new
+          when '99'
+            ACH::Addendum::Return.new
+          else
+            ACH::Addendum.new
+          end
+          ad.type_code                      = type_code
+          ad.payment_data                   = line[3..82].strip
+          ad.sequence_number                = line[83..86].strip.to_i
+          ad.entry_detail_sequence_number   = line[87..93].to_i
+          ed.addenda << ad
+        when '8'
+          # skip
+        when '9'
+          # skip
+        else
+          raise "Didn't recognize type code #{type} for this line:\n#{line}"
+        end
+      end
+
+      self.batches << batch unless batch.nil?
+      batch.entries.each{ |entry| entry.trace_number = (trace_number += 1) }
+      to_s
+    end
+  end
+end

data/lib/ach/batch.rb

@@ -13,7 +13,7 @@ module ACH
     end
 
     def to_ach
-      @control.entry_count = @entries.length
+      @control.entry_count = @entries.inject(0) { |total, entry| total + entry.records_count }
       @control.debit_total = 0
       @control.credit_total = 0
       @control.entry_hash = 0

data/lib/ach/records/batch_control.rb

@@ -14,8 +14,7 @@ module ACH::Records
     field :debit_total, Integer, lambda { |f| sprintf('%012d', f)}
     field :credit_total, Integer, lambda { |f| sprintf('%012d', f)}
     field :company_identification, String,
-        lambda { |f| f.length == 10 ? f : "1#{f}" }, nil, /\A\d{9,10}\z/
-
+        lambda { |f| f.length == 10 ? f : "1#{f}" }, nil, /\A.{9,10}\z/
     field :message_authentication_code, String,
         lambda { |f| left_justify(f, 19)}, ''
 

data/lib/ach/records/batch_header.rb

@@ -12,7 +12,7 @@ module ACH::Records
     field :company_discretionary_data, String,
         lambda { |f| left_justify(f, 20)}, ''
     field :company_identification, String,
-        lambda { |f| f.length == 10 ? f : "1#{f}" }, nil, /\A[a-zA-Z0-9 ]{9,10}\z/
+        lambda { |f| f.length == 10 ? f : "1#{f}" }, nil, /\A.{9,10}\z/
     # TODO This should be used to determine whether other records are valid for
     # this code. Should there be a Class for each code?
     # The default of PPD is purely for my benefit (Jared Morgan)

data/lib/ach/records/entry_detail.rb

@@ -23,6 +23,12 @@ module ACH::Records
     field :trace_number, Integer, lambda { |f| sprintf('%07d', f)}, nil,
         lambda { |n| n.to_s.length <= 7 }
 
+    attr_reader :addenda
+
+    def initialize
+      @addenda = []
+    end
+
     def credit?
       CREDIT_RECORD_TRANSACTION_CODE_ENDING_DIGITS.include?(@transaction_code[1..1])
     end
@@ -35,35 +41,13 @@ module ACH::Records
       return self.amount
     end
 
-  end
-
-  class CtxEntryDetail < EntryDetail
-
-    @fields = EntryDetail.fields.slice(0, 6)
-    field :number_of_addenda_records, Integer, lambda { |f| sprintf('%04d', f)}, 0
-    field :individual_name, String, lambda { |f| left_justify(f, 16)}
-    const_field :reserved, '  '
-    field :discretionary_data, String, lambda { |f| left_justify(f, 2)}, '  '
-    field :addenda_record_indicator, Integer,
-        lambda { |f| sprintf('%01d', f)}
-    field :originating_dfi_identification, String,
-        nil, nil, /\A\d{8}\z/
-    field :trace_number, Integer, lambda { |f| sprintf('%07d', f)}
-
-
-    attr_reader :addenda
-
-    def initialize
-      @addenda = []
-    end
-
     def addenda_records?
       return !self.addenda.empty?
     end
 
     def to_ach
-      self.addenda_record_indicator = (self.addenda.empty? ? 0 : 1)
-      self.number_of_addenda_records = self.addenda.length
+      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
 
@@ -74,5 +58,22 @@ module ACH::Records
       return ach_string
     end
 
+    # @return [Integer] Length of addenda plus 1, used by Batch#entry_count
+    def records_count
+      1 + self.addenda.length
+    end
+  end
+
+  class CtxEntryDetail < EntryDetail
+    @fields = EntryDetail.fields.slice(0, 6)
+    field :number_of_addenda_records, Integer, lambda { |f| sprintf('%04d', f)}, 0
+    field :individual_name, String, lambda { |f| left_justify(f, 16)}
+    const_field :reserved, '  '
+    field :discretionary_data, String, lambda { |f| left_justify(f, 2)}, '  '
+    field :addenda_record_indicator, Integer,
+        lambda { |f| sprintf('%01d', f)}
+    field :originating_dfi_identification, String,
+        nil, nil, /\A\d{8}\z/
+    field :trace_number, Integer, lambda { |f| sprintf('%07d', f)}
   end
 end

data/lib/ach/version.rb

@@ -1,3 +1,3 @@
 module ACH
-  VERSION = '0.4.7'.freeze
+  VERSION = '0.4.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ach
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Jared Morgan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,21 +47,22 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- MIT-LICENSE
+- README.md
 - lib/ach.rb
-- lib/ach/field_identifiers.rb
+- lib/ach/ach_file.rb
+- lib/ach/ach_file.rb.orig
 - lib/ach/batch.rb
-- lib/ach/version.rb
-- lib/ach/records/file_header.rb
-- lib/ach/records/file_control.rb
+- lib/ach/field_identifiers.rb
+- lib/ach/records/addendum.rb
 - lib/ach/records/batch_control.rb
+- lib/ach/records/batch_header.rb
 - lib/ach/records/entry_detail.rb
+- lib/ach/records/file_control.rb
+- lib/ach/records/file_header.rb
 - lib/ach/records/nines.rb
-- lib/ach/records/addendum.rb
 - lib/ach/records/record.rb
-- lib/ach/records/batch_header.rb
-- lib/ach/ach_file.rb
-- MIT-LICENSE
-- README.md
+- lib/ach/version.rb
 homepage: https://github.com/jm81/ach
 licenses: []
 metadata: {}
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Helper for building ACH files