headache 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1bedb69c5748306c258fa087ba1195015aaca6
-  data.tar.gz: 559aa917ee1ad1a409763f5d65c2455ad2e2d611
+  metadata.gz: 80f79889e015c7a29218886c2beebc3b2cb74402
+  data.tar.gz: 632e5c29ed41d97e1d01993e66ae7cdd76380a93
 SHA512:
-  metadata.gz: d9a5081de1beb93da9a5d2ce2e24a726b3491b96595dfcf88197598a4fd1d6bf72f2e20fad68360524fe1d0502d1e015429c4c1bab721efa33585f19e5ce116b
-  data.tar.gz: 78c8b7ae9aafb80c608b96b13168857ced74f7ebfd54ca634cd424bf1dd9da473024e32bf2ededdb0aecca45776c356d5b91b086b7fd4f3d78e805d2d1edd340
+  metadata.gz: 1d59922f2b2bd1ba75043ccc16d703af3da7961f0c6ccbb8077e1ca8a0284274eac95174bd19536d1beeea40ded6fb69abad283002bf984b6262167c57f4ff84
+  data.tar.gz: dc9e297eb06621ff5e39a339cc1620d153f415f0b813f7e3261d2d959712472818f51ac453f731c2a6481ab9fe91ac1837c2d3e502ac2d386cc5ade4f3e3e580

data/headache.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_girl', '~> 4.5'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry', '~> 0.10'
 end

data/lib/headache/batch.rb

@@ -8,25 +8,9 @@ module Headache
                   :entry_class_code, :entry_description, :descriptive_date,
                   :total_debit, :total_credit, :entry_hash
 
-    @@record_classes = { header: Record::BatchHeader,
-                         control: Record::BatchControl }
-
-    def self.header=(klass)
-      set_class :header, klass
-    end
-
-    def self.control=(klass)
-      set_class :control, klass
-    end
-
-    def self.set_class(type, klass)
-      fail "unknown record class: #{type}" unless @@record_classes[type].present?
-      @@record_classes[type] = klass
-    end
-
     def parse(records)
-      @header  = @@record_classes[:header].new(self, @document).parse(records.shift)
-      @control = @@record_classes[:control].new(self, @document).parse(records.pop)
+      @header  = Record::BatchHeader.new(self, @document).parse(records.shift)
+      @control = Record::BatchControl.new(self, @document).parse(records.pop)
       records.each { |r| @members << Headache::Record::Entry.new(self, @document).parse(r) }
       self
     end
@@ -47,21 +31,21 @@ module Headache
     def self.type_from_service_code(code)
       return :credit if code.to_s == '220'
       return :debit  if code.to_s == '225'
-      fail "unknown service code: #{code.inspect} (expecting 220 or 225)"
+      fail Headache::UnknownServiceCode, "unknown service code: #{code.inspect} (expecting 220 or 225)"
     end
 
     def service_code
       return '220' if type == :credit
       return '225' if type == :debit
-      fail "unknown batch type: #{type.inspect} (expecting :credit or :debit)"
+      fail Headache::UnknownBatchType, "unknown batch type: #{type.inspect} (expecting :credit or :debit)"
     end
 
     def header
-      @header ||= @@record_classes[:header].new self, @document
+      @header ||= Record::BatchHeader.new self, @document
     end
 
     def control
-      @control ||= @@record_classes[:control].new self, @document
+      @control ||= Record::BatchControl.new self, @documentec
     end
 
     def entries
@@ -73,8 +57,8 @@ module Headache
     end
 
     def to_h
-      {  batch_header: @header.to_h,
-              entries: @members.to_a.map(&:to_h),
+      { batch_header: @header.to_h,
+        entries: @members.to_a.map(&:to_h),
         batch_control: @control.to_h }
     end
 
@@ -103,6 +87,5 @@ module Headache
     def total_credit
       @total_credit || entries.map(&:amount).select { |amt| (amt || 0) > 0 }.sum
     end
-
   end
 end

data/lib/headache/document.rb

@@ -2,89 +2,28 @@ module Headache
   class Document < Fixy::Document
     attr_reader :batches
 
-    LINE_SEPARATOR = "\r\n"
-
     delegate :add_entry, :'<<', to: :first_batch
 
-    @@record_classes = { batch: Batch,
-                         header: Record::FileHeader,
-                         control: Record::FileControl }
-
-    def self.header_class
-      @@record_classes[:header]
-    end
-
-    def self.control_class
-      @@record_classes[:control]
-    end
-
-    def self.header=(klass)
-      set_class :header, klass
-    end
-
-    def self.control=(klass)
-      set_class :control, klass
-    end
-
-    def self.extract_lines(string_or_file)
-      string = string_or_file.respond_to?(:read) ? string_or_file.read : string_or_file
-      string.split(LINE_SEPARATOR).reject { |line| line == Headache::Record::Overflow.new.generate.strip }
-    end
-
-    def self.cleanse_records(records)
-      invalid_lines = records.reject { |line| Headache::Record::FileHeader.record_type_codes.values.include?(line.first.to_i) }
-      raise "uknown record type(s): #{invalid_lines.map(&:first).inspect}" if invalid_lines.any?
-      records
-    end
-
-    def self.parse(string_or_file)
-      records = cleanse_records(extract_lines string_or_file)
-      header  = header_class.new(nil).parse(records.shift)
-      control = control_class.new(nil).parse(records.pop)
-      batches = get_batches(records).map { |b| Headache::Batch.new(self).parse(b) }
-      new header, control, batches
-    end
-
-    def self.get_batches(records)
-      batches = []
-      batch   = []
-      records.each do |line|
-        if line.starts_with?(Headache::Record::BatchHeader.record_type_codes[:batch_header].to_s)
-          batches << batch unless batches.empty? && batch == []
-          batch = [line]
-        else
-          batch << line
-        end
-      end
-      batches << batch
-    end
-
-    def self.set_class(type, klass)
-      fail "unknown record class: #{type}" unless @@record_classes[type].present?
-      @@record_classes[type] = klass
-    end
-
     def initialize(header = nil, control = nil, batches = [])
       @header  = header
       @control = control
       @batches = batches
-      @header.document  = self unless @header.nil?
-      @control.document = self unless @control.nil?
+      [@header, @control].each { |r| r.try :document=, self }
     end
 
     def first_batch
-      add_batch @@record_classes[:batch].new(self) if @batches.empty?
+      add_batch Batch.new(self) if @batches.empty?
       @batches.first
     end
 
     def batch
-      fail 'multiple batches detected, be more explicit or use first_batch' if @batches.count > 1
+      fail Headache::AmbiguousBatch, 'multiple batches detected, be more explicit or use first_batch' if @batches.count > 1
       first_batch
     end
 
     def add_batch(batch)
       batch.document = self
-      @batches << batch # @@record_classes[:batch].new(self)
+      @batches << batch
     end
 
     def <<(batch)
@@ -97,17 +36,17 @@ module Headache
     end
 
     def header
-      @header ||= @@record_classes[:header].new self
+      @header ||= Record::FileHeader.new self
     end
 
     def control
-      @control ||= @@record_classes[:control].new self
+      @control ||= Record::FileControl.new self
     end
 
     def records
-      ([ header ] << batches.map do |batch|
-        [ batch.header, batch.entries, batch.control ]
-      end << control).flatten # .compact
+      ([header] << batches.map do |batch|
+        [batch.header, batch.entries, batch.control]
+      end << control).flatten
     end
 
     def lines
@@ -119,8 +58,8 @@ module Headache
     end
 
     def to_h
-      {  file_header: @header.to_h,
-             batches: @batches.map(&:to_h),
+      { file_header: @header.to_h,
+        batches: @batches.map(&:to_h),
         file_control: @control.to_h }
     end
 
@@ -134,6 +73,5 @@ module Headache
       append_record control
       overflow_lines_needed.times { append_record Record::Overflow.new }
     end
-
   end
 end

data/lib/headache/document_parser.rb

@@ -0,0 +1,51 @@
+module Headache
+  class DocumentParser
+    LINE_SEPARATOR = "\r\n".freeze
+
+    def initialize(string_or_file)
+      @ach_string = string_or_file.respond_to?(:read) ? string_or_file.read : string_or_file
+    end
+
+    def parse
+      fail Headache::InvalidRecordType, invalid_fail_message if invalid_ach?
+
+      Headache::Document.new(
+        Record::FileHeader.new(nil).parse(records.shift),
+        Record::FileControl.new(nil).parse(records.pop),
+        get_batches.map { |b| Headache::Batch.new(self).parse(b) }
+      )
+    end
+
+    protected
+
+    def records
+      @records ||= @ach_string.split(LINE_SEPARATOR).reject { |record| record == Headache::Record::Overflow.new.generate.strip }
+    end
+
+    def invalid_fail_message
+      "unknown record type(s): #{invalid_records.map(&:first).inspect}"
+    end
+
+    def invalid_ach?
+      invalid_records.any?
+    end
+
+    def invalid_records
+      @invalid_records ||= records.reject { |record| Headache::Record::FileHeader.record_type_codes.values.include?(record.first.to_i) }
+    end
+
+    def get_batches
+      batches = []
+      batch   = []
+      records.each do |record|
+        if record.starts_with?(Headache::Record::BatchHeader.record_type_codes[:batch_header].to_s)
+          batches << batch unless batches.empty? && batch == []
+          batch = [record]
+        else
+          batch << record
+        end
+      end
+      batches << batch
+    end
+  end
+end

data/lib/headache/exception.rb

@@ -0,0 +1,16 @@
+module Headache
+  class Exception < ::RuntimeError
+  end
+
+  class InvalidRecordType < Headache::Exception
+  end
+
+  class AmbiguousBatch < Headache::Exception
+  end
+
+  class UnknownServiceCode < Headache::Exception
+  end
+
+  class UnknownBatchType < Headache::Exception
+  end
+end

data/lib/headache/formatters.rb

@@ -36,7 +36,7 @@ module Headache
       if input.is_a?(String) || input.is_a?(Fixnum)
         chars   = input.to_s.chars
         minutes = chars.pop(2).join.to_i
-        hours   = chars.join.to_i
+        hours   = chars.first(2).join.to_i
         input   = Time.new 0, 1, 1, hours, minutes
       end
       fail "input #{input.inspect} does not respond to #strftime!" unless input.respond_to?(:strftime)

data/lib/headache/record/base.rb

@@ -36,7 +36,7 @@ module Headache
       end
 
       def to_h
-        str = self.generate.gsub Headache::Document::LINE_SEPARATOR, ''
+        str = self.generate.gsub Headache::DocumentParser::LINE_SEPARATOR, ''
         self.class.parse_fields(str)
       end
 

data/lib/headache/version.rb

@@ -1,3 +1,3 @@
 module Headache
-  VERSION = "0.1.4"
+  VERSION = "1.0.0"
 end

data/lib/headache.rb

@@ -4,9 +4,11 @@ require 'active_support/concern'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/enumerable'
 
+require 'headache/exception'
 require 'headache/formatters'
 require 'headache/definitions'
 require 'headache/record/base'
 require 'headache/records'
 require 'headache/batch'
 require 'headache/document'
+require 'headache/document_parser'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: headache
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Payoff, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fixy
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Take the pain out of building ACH files. Wraps the Fixy gem for building
   fixed-with ACH files as specified by NACHA.
 email:
@@ -136,6 +150,8 @@ files:
 - lib/headache/definition/file_header.rb
 - lib/headache/definitions.rb
 - lib/headache/document.rb
+- lib/headache/document_parser.rb
+- lib/headache/exception.rb
 - lib/headache/formatters.rb
 - lib/headache/record/base.rb
 - lib/headache/record/batch_control.rb
@@ -166,9 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Take the pain out of building ACH files.
 test_files: []
-has_rdoc: