ach 0.5.11 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9e7ca9ea4816c360f88497c889f35c4edc6157cb
-  data.tar.gz: 1a7c8e819411bf1d75e8e2ea0c596de88d9c8741
+SHA256:
+  metadata.gz: a6f2cdcb923998c4fc08e11bd9efeb320e349187e657ab7b29ff79c325447510
+  data.tar.gz: 951a8528fb40feebb2ed689649b86cce1b25623a51fab780c0c6f994bfa8ffee
 SHA512:
-  metadata.gz: 8c4c4d8eb7597ef6a4b54400f3aeb73c4301484ce9f0ed30e6e46adb822b69363bc7b7e59e12d2854b14d8fc30b3b3c911191a28cae389880d423ebbd5049fd4
-  data.tar.gz: 1b274bf95a738e664f38c78b893d948e8eed798a314202df0a319cbc799f41643f0ceb1b03d139acbf91984ba4d03390c0885b06bd8f1bc126c52adec39096d7
+  metadata.gz: 1bbc5ff04f7a5ee0196495e00c8a31077dc0a2ad1439953ff6c5c7971d2bb256ad03321261c187a8364c96ddfe6db0983104b07f10266ada86ad24699c09dab2
+  data.tar.gz: 6d8158a6e81466d7d6017e4d017a948a898dfed6ed96880ff5b6be19cc4496890bd585da757d800dd921287e4334889d942d67390f7d020ebbefda9e2c69cbc8

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,6 +22,7 @@ module ACH
       end
     end
 
+
     # @param eol [String] Line ending, default to CRLF
     def to_s eol = "\r\n"
       records = []
@@ -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

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/next_federal_reserve_effective_date.rb

@@ -2,6 +2,12 @@ require 'holidays'
 
 module ACH
   class NextFederalReserveEffectiveDate
+    FEDERAL_RESERVE_SYMBOL =
+      if Gem.loaded_specs['holidays'].version < Gem::Version.new('7.0.0')
+        :federal_reserve
+      else
+        :federalreserve
+      end
     def initialize(submission_date)
       @submission_date = submission_date
     end
@@ -30,7 +36,7 @@ module ACH
     end
 
     def holiday?(date)
-      Holidays.on(date, :federal_reserve, :observed).any?
+      Holidays.on(date, FEDERAL_RESERVE_SYMBOL, :observed).any?
     end
 
     def holiday_or_weekend?(date)

data/lib/ach/records/entry_detail.rb

@@ -16,7 +16,7 @@ module ACH::Records
     field :account_number, String, lambda { |f| left_justify(f, 17)}
     field :amount, Integer, lambda { |f| sprintf('%010d', f)}
     field :individual_id_number, String, lambda { |f| left_justify(f, 15)}
-    field :individual_name, String, lambda { |f| left_justify(f, 22)}
+    field :individual_name, String, lambda { |f| left_justify(f.gsub(/[\n\r]/, ''), 22)}
     field :discretionary_data, String, lambda { |f| left_justify(f, 2)}, '  '
     field :addenda_record_indicator, Integer,
         lambda { |f| sprintf('%01d', f)}, 0
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module ACH
-  VERSION = '0.5.11'.freeze
+  VERSION = '0.5.16'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ach
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.16
 platform: ruby
 authors:
 - Jared Morgan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2020-11-10 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
@@ -73,20 +73,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: '3.1'
 description: ach is a Ruby helper for building and parsing ACH files. In particular,
   it helps with field order and alignment, and adds padding lines to end of file.
 email: jmorgan@morgancreative.net
@@ -131,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