ach 0.5.13 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf3b5fe44c3ac5771d54dfce2a7c77df94106be4
-  data.tar.gz: a0e34d9a38f43585eb7b606ab2f85db29780ed87
+SHA256:
+  metadata.gz: c8950b0833382bb80f3ebf7b9e0e2702aece4ee0de2f385c4c9e5dbd4a7d1157
+  data.tar.gz: ce02f3a9a926be32cc72f8a986c308e4ceee7ceb617c487bc915ca20d6efa901
 SHA512:
-  metadata.gz: 601060ec262bd2d580d4d32e9eadc721f4ceaa4e28cd261f6523b909fc4232ce1cb29b6c653e48bc9dbccc282cda68597ff1c93c40911648c4f9854d3a9135af
-  data.tar.gz: 672e3d742549d701c449ed88c475bbeaed08c105d67d9538c052d8d2a3156edbc7199367fa36682c39e51d8893e144bbf367fa0229b47f697632386e16e3cebc
+  metadata.gz: 84465c6a64caeead398a541d7110ee473ce1cdd11a1c200a3b9f975813a2898e7d904ceaebc68e7d16cc5c880d9b27d5497f7930d5a28e8b7563038a9a3e1ede
+  data.tar.gz: dfc53a158083ef3559583b1f2e613f8fdd0f76ea38434345773d95af8875bc0d195b9ec560e1202cfcc8eeb742e1a923458fa0d052612132bcc57ec881f63c5b

data/lib/ach/ach_file.rb

@@ -14,7 +14,7 @@ module ACH
       @control = Records::FileControl.new
 
       if data
-        if (data.encode(Encoding.find('ASCII'),ENCODING_OPTIONS) =~ /\n|\r\n/).nil?
+        if (data.encode(Encoding.find('ASCII'), **ENCODING_OPTIONS) =~ /\n|\r\n/).nil?
           parse_fixed(data)
         else
           parse(data)
@@ -22,8 +22,9 @@ module ACH
       end
     end
 
+
     # @param eol [String] Line ending, default to CRLF
-    def to_s eol = "\r\n"
+    def to_s eol = ACH.eol
       records = []
       records << @header
 
@@ -33,16 +34,14 @@ module ACH
       end
       records << @control
 
-      records_count = records.inject(0) do |sum, record|
-        sum + record.records_count
-      end
-
+      records_count = records.map(&:records_count).reduce(:+)
       nines_needed = (10 - records_count) % 10
       nines_needed = nines_needed % 10
       nines_needed.times { records << Records::Nines.new() }
 
+      records_count = records.map(&:records_count).reduce(:+)
       @control.batch_count = @batches.length
-      @control.block_count = (records.length / 10).ceil
+      @control.block_count = (records_count / 10).ceil
 
       @control.entry_count = 0
       @control.debit_total = 0
@@ -56,10 +55,10 @@ module ACH
         @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 = []
 
@@ -75,7 +74,7 @@ module ACH
       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
@@ -106,6 +105,7 @@ module ACH
           batch = ACH::Batch.new
           bh = batch.header
           bh.company_name                   = line[4..19].strip
+          bh.company_discretionary_data     = line[20..39].strip
           bh.company_identification         = line[40..49].gsub(/\A1/, '')
 
           # Does not try to guess if company identification is an EIN
@@ -146,7 +146,8 @@ module ACH
         when '8'
           # skip
         when '9'
-          # skip
+          @control = Records::FileControl.new
+          @control.filler = line[55..93]
         else
           raise UnrecognizedTypeCode, "Didn't recognize type code #{type} for this line:\n#{line}"
         end

data/lib/ach/batch.rb

@@ -14,7 +14,7 @@ module ACH
     end
 
     def to_ach
-      @control.entry_count = @entries.inject(0) { |total, entry| total + entry.records_count }
+      @control.entry_count = @entries.map(&:records_count).reduce(:+).to_i
       @control.debit_total = 0
       @control.credit_total = 0
       @control.entry_hash = 0
@@ -51,8 +51,18 @@ module ACH
       @control.company_identification = @header.company_identification
       @control.originating_dfi_identification = @header.originating_dfi_identification
       @control.batch_number = @header.batch_number
+      if last_entry.is_a? ACH::BalancingEntryDetail
+        @control.credit_total = last_entry.amount
+        @control.debit_total = last_entry.amount
+      end
 
       [@header] + @entries + @addendas + [@control]
     end
+
+    private
+
+    def last_entry
+      @last_entry ||= @entries.last
+    end
   end
 end

data/lib/ach/field_identifiers.rb

@@ -53,7 +53,7 @@ module ACH
           if RUBY_VERSION < '1.9'
             val = Iconv.conv('ASCII//IGNORE', 'UTF8', val)
           else
-            val = val.encode Encoding.find('ASCII'), ENCODING_OPTIONS
+            val = val.encode(Encoding.find('ASCII'), **ENCODING_OPTIONS)
           end
         end
 

data/lib/ach/records/entry_detail.rb

@@ -54,7 +54,7 @@ module ACH::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)
 
@@ -62,7 +62,7 @@ module ACH::Records
 
       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
@@ -85,4 +85,14 @@ module ACH::Records
         nil, nil, /\A\d{8}\z/
     field :trace_number, Integer, lambda { |f| sprintf('%07d', f)}
   end
+
+  class BalancingEntryDetail < EntryDetail
+    @fields = EntryDetail.fields.slice(0, 5)
+    const_field :individual_id_number, (' ' * 15)
+    field :account_description, String, lambda { |f| left_justify(f, 22)}
+    field :discretionary_data, String, lambda { |f| left_justify(f, 2)}, '  '
+    field :addenda_record_indicator, Integer, lambda { |f| sprintf('%01d', f)}, 0
+    field :origin_routing_number, String, lambda { |f| sprintf('%08d', f.to_i) }
+    field :trace_number, Integer, lambda { |f| sprintf('%07d', f)}
+  end 
 end

data/lib/ach/records/file_control.rb

@@ -1,17 +1,18 @@
 module ACH::Records
   class FileControl < Record
     @fields = []
-    
+
     const_field :record_type, '9'
     # Many of the fields are calculated in ACHFile.to_ach
     field :batch_count, Integer, lambda { |f| sprintf('%06d', f)}
     field :block_count, Integer, lambda { |f| sprintf('%06d', f)}
     field :entry_count, Integer, lambda { |f| sprintf('%08d', f)}
     field :entry_hash, Integer, lambda { |f| sprintf('%010d', f % (10 ** 10))}
-    
+
     field :debit_total, Integer, lambda { |f| sprintf('%012d', f)}
     field :credit_total, Integer, lambda { |f| sprintf('%012d', f)}
-    const_field :reserved, (' ' * 39)
+
+    field :filler, String, lambda { |f| left_justify(f, 39)}, ' '
   end
 end
 

data/lib/ach/records/record.rb

@@ -13,7 +13,7 @@ module ACH
 
       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

data/lib/ach/version.rb

@@ -1,3 +1,3 @@
 module ACH
-  VERSION = '0.5.13'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ach
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.6.0
 platform: ruby
 authors:
 - Jared Morgan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Helper for building ACH files