aba 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035b4d53937aa04c7e72ef453991925a744533eb
-  data.tar.gz: 3f80ba614237f025a5a269ae2f7485ad6805ac6c
+  metadata.gz: f11f3830479ca1fad3b854bb9459f99ce7dc8f5a
+  data.tar.gz: f793d6648ffc17e7589b2c5db57b26f548c5800e
 SHA512:
-  metadata.gz: db7069fdba989915c2abfe634991af7443d3f24cbdd1b95bd1f4001118e7f369b2f4cd0cdcf3ca8833f0801e42beeaf4cf639c18c0efc3ee47dc0010ce72de27
-  data.tar.gz: c9591d89dfe8f8c9177debc5791603f4ef923e2c48176887b98e4e040ed6d125ea294af654b367e61b03b487bed2d571e4118e8c4759c718f546bf6d33b5e767
+  metadata.gz: b350430aa9ee2c21cfa6d239c6871fcb3626f724dbd67d5cc5d58dac4d627c16b1e2873d1d4c4e9e80e0ca11acec6a5dfede5bae8b8184fcd8ab182ced99e7d9
+  data.tar.gz: 356d63f3de331b90a69fc8d586690eb793fa606c8544f4bfc481a8a055ee96811c98a76158617db3e773f13a126eab2a0b53f62d5ac0ddcf0985e1f09ce8bec3

data/.rspec

@@ -1 +1,3 @@
---color
+--color
+--require spec_helper
+--format d

data/.travis.yml

@@ -2,6 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.2.2
-script: bundle exec rspec spec
+  - 2.1.7
+  - 2.2.3
+script: bundle exec rspec spec

data/README.md

@@ -10,29 +10,29 @@ Generates ABA (Australian Banking Association) file format output
 require 'aba'
 
 # Initialise ABA
-aba = Aba.new(
+aba = Aba.batch(
   bsb: "123-345", # Optional (Not required by NAB)
-  financial_institution: "WPC", 
+  financial_institution: "WPC",
   user_name: "John Doe",
-  user_id: "466364", 
-  description: "Payroll", 
+  user_id: "466364",
+  description: "Payroll",
   process_at: Time.now.strftime("%d%m%y")
 )
 
 # Add transactions
 10.times do
   aba.add_transaction(
-    Aba::Transaction.new(
-      bsb: "342-342", 
-      account_number: "3244654", 
+    {
+      bsb: "342-342",
+      account_number: "3244654",
       amount: 10000, # Amount in cents
-      account_name: "John Doe", 
+      account_name: "John Doe",
       transaction_code: 53,
-      lodgement_reference: "R435564", 
-      trace_bsb: "453-543", 
-      trace_account_number: "45656733", 
+      lodgement_reference: "R435564",
+      trace_bsb: "453-543",
+      trace_account_number: "45656733",
       name_of_remitter: "Remitter"
-    )
+    }
   )
 end
 
@@ -40,6 +40,66 @@ puts aba.to_s # View output
 File.write("/Users/me/dd_#{Time.now.to_i}.aba", aba.to_s) # or write output to file
 ```
 
+There are a few ways to create a complete set of ABA data:
+
+```ruby
+# Transactions added to the defined ABA object variable
+aba = Aba.batch financial_institution: 'ANZ', user_name: 'Joe Blow', user_id: 123456, process_at: 200615
+aba.add_transaction bsb: '123-456', account_number: '000-123-456', amount: 50000
+aba.add_transaction bsb: '456-789', account_number: '123-456-789', amount: '-10000', transaction_code: 13
+
+# Transactions passed individually inside a block
+aba = Aba.batch financial_institution: 'ANZ', user_name: 'Joe Blow', user_id: 123456, process_at: 200615 do |a|
+  a.add_transaction bsb: '123-456', account_number: '000-123-456', amount: 50000
+  a.add_transaction bsb: '456-789', account_number: '123-456-789', amount: '-10000', transaction_code: 13
+end
+
+# Transactions as an array passed to the second param of Aba.batch
+aba = Aba.batch(
+  { financial_institution: 'ANZ', user_name: 'Joe Blow', user_id: 123456, process_at: 200615 },
+  [
+    { bsb: '123-456', account_number: '000-123-456', amount: 50000 },
+    { bsb: '456-789', account_number: '123-456-789', amount: '-10000', transaction_code: 13 }
+  ]
+)
+
+# NOTE: Be careful with negative transaction amounts! transaction_code will not
+#       be set to debit automatically!
+```
+
+Validation errors can be caught in several ways:
+
+```ruby
+# Create an ABA object with invalid character in the user_name
+aba = Aba.batch(
+  financial_institution: "ANZ",
+  user_name: "Jøhn Doe",
+  user_id: "123456",
+  process_at: Time.now.strftime("%d%m%y")
+)
+
+# Add a transaction with a bad BSB
+aba.add_transaction(
+  bsb: "abc-123",
+  account_number: "000123456"
+)
+
+# Is the data valid?
+aba.valid?
+# Returns: false
+
+# Return a structured array of errors
+puts aba.errors
+# Returns:
+# {:aba => ["user_name must not contain invalid characters"],
+#  :transactions =>
+#   {0 => ["bsb format is incorrect", "trace_bsb format is incorrect"]}}
+```
+
+Validation errors will stop parsing of the data to an ABA formatted string using
+`to_s`. `aba.to_s` will raise a `RuntimeError` instead of returning output.
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/aba.rb

@@ -1,159 +1,10 @@
 require "aba/version"
 require "aba/validations"
+require "aba/batch"
 require "aba/transaction"
 
 class Aba
-  include Aba::Validations
-
-  attr_accessor :bsb, :financial_institution, :user_name, :user_id, :description, :process_at
-
-  validates_bsb :bsb, allow_blank: true
-
-  validates_max_length :user_name,              26
-  validates_max_length :user_id,                6
-  validates_max_length :description,            12
-
-  validates_length     :financial_institution,  3
-  validates_length     :process_at,             6
-
-  def initialize(attrs = {})
-    attrs.each do |key, value|
-      send("#{key}=", value)
-    end
-
-    @transactions = []
-
-    yield self if block_given?
-  end
-
-  def to_s
-    # Descriptive record
-    output = "#{descriptive_record}\r\n"
-    
-    # Transactions records
-    output += @transactions.map{ |t| t.to_s }.join("\r\n")
-
-    # Batch control record
-    output += "\r\n#{batch_control_record}"
-  end
-
-  def add_transaction(transaction)
-    @transactions << transaction
-  end
-
-  private
-
-  def descriptive_record
-    # Record type
-    # Max: 1
-    # Char position: 1
-    output = "0"
-
-    # Optional branch number of the funds account with a hyphen in the 4th character position
-    # Char position: 2-18
-    # Max: 17
-    # Blank filled
-    output += self.bsb.nil? ? " " * 17 : self.bsb.to_s.ljust(17)
-
-    # Sequence number 
-    # Char position: 19-20
-    # Max: 2
-    # Zero padded
-    output += "01"
-
-    # Name of user financial instituion
-    # Max: 3
-    # Char position: 21-23
-    output += self.financial_institution.to_s
-
-    # Reserved 
-    # Max: 7
-    # Char position: 24-30
-    output += " " * 7
-
-    # Name of User supplying File
-    # Char position: 31-56
-    # Max: 26
-    # Blank filled
-    output += self.user_name.to_s.ljust(26)
-
-    # Direct Entry User ID
-    # Char position: 57-62
-    # Max: 6
-    # Zero padded
-    output += self.user_id.to_s.rjust(6, "0")
-
-    # Description of payments in the file (e.g. Payroll, Creditors etc.)
-    # Char position: 63-74
-    # Max: 12
-    # Blank filled
-    output += self.description.to_s.ljust(12)
-
-    # Date on which the payment is to be processed
-    # Char position: 75-80
-    # Max: 6
-    output += self.process_at.rjust(6, "0")
-
-    # Reserved
-    # Max: 40
-    # Char position: 81-120
-    output += " " * 40
-  end
-
-  def batch_control_record
-    net_total_amount    = 0
-    credit_total_amount = 0
-    debit_total_amount  = 0
-
-    @transactions.each do |t|
-      net_total_amount += t.amount
-      credit_total_amount += t.amount if t.amount > 0
-      debit_total_amount += t.amount if t.amount < 0
-    end
-
-    # Record type
-    # Max: 1
-    # Char position: 1
-    output = "7"
-
-    # BSB Format Filler
-    # Max: 7
-    # Char position: 2-8
-    output += "999-999"
-
-    # Reserved
-    # Max: 12
-    # Char position: 9-20
-    output += " " * 12
-
-    # Net total
-    # Max: 10
-    # Char position: 21-30
-    output += net_total_amount.abs.to_s.rjust(10, "0")
-
-    # Credit Total Amount 
-    # Max: 10
-    # Char position: 31-40
-    output += credit_total_amount.abs.to_s.rjust(10, "0")
-
-    # Debit Total Amount 
-    # Max: 10
-    # Char position: 41-50
-    output += debit_total_amount.abs.to_s.rjust(10, "0")
-
-    # Reserved
-    # Max: 24
-    # Char position: 51-74
-    output += " " * 24
-
-    # Total Item Count 
-    # Max: 6
-    # Char position: 75-80
-    output += @transactions.size.to_s.rjust(6, "0")
-
-    # Reserved
-    # Max: 40
-    # Char position: 81-120
-    output += " " * 40
+  def self.batch(attrs = {}, transactions = [])
+    Aba::Batch.new(attrs, transactions)
   end
 end

data/lib/aba/batch.rb

@@ -0,0 +1,218 @@
+class Aba
+  class Batch
+    include Aba::Validations
+
+    attr_accessor :bsb, :financial_institution, :user_name, :user_id, :description, :process_at, :transactions
+
+    # BSB
+    validates_bsb         :bsb, allow_blank: true
+
+    # Financial Institution
+    validates_length      :financial_institution, 3
+
+    # User Name
+    validates_presence_of :user_name
+    validates_max_length  :user_name, 26
+    validates_becs        :user_name
+
+    # User ID
+    validates_presence_of :user_id
+    validates_max_length  :user_id, 6
+    validates_integer     :user_id, false
+
+    # Description
+    validates_max_length  :description, 12
+    validates_becs        :description
+
+    # Process at Date
+    validates_length      :process_at, 6
+    validates_integer     :process_at, false
+
+
+    def initialize(attrs = {}, transactions = [])
+      attrs.each do |key, value|
+        send("#{key}=", value)
+      end
+
+      @transaction_index = 0
+      @transactions = {}
+
+      unless transactions.nil? || transactions.empty?
+        transactions.to_a.each do |t|
+          self.add_transaction(t) unless t.nil? || t.empty?
+        end
+      end
+
+      yield self if block_given?
+    end
+
+    def to_s
+      raise RuntimeError, 'No transactions present - add one using `add_transaction`' if @transactions.empty?
+      raise RuntimeError, 'ABA data is invalid - check the contents of `errors`' unless valid?
+
+      # Descriptive record
+      output = "#{descriptive_record}\r\n"
+
+      # Transactions records
+      output += @transactions.map{ |t| t[1].to_s }.join("\r\n")
+
+      # Batch control record
+      output += "\r\n#{batch_control_record}"
+    end
+
+    def add_transaction(attrs = {})
+      if attrs.instance_of?(Aba::Transaction)
+        transaction = attrs
+      else
+        transaction = Aba::Transaction.new(attrs)
+      end
+      @transactions[@transaction_index] = transaction
+      @transaction_index += 1
+      transaction
+    end
+
+    def transactions_valid?
+      !has_transaction_errors?
+    end
+
+    def valid?
+      !has_errors? && transactions_valid?
+    end
+
+    def errors
+      # Run validations
+      has_errors?
+      has_transaction_errors?
+
+      # Build errors
+      all_errors = {}
+      all_errors[:aba] = self.error_collection unless self.error_collection.empty?
+      transaction_error_collection = @transactions.each_with_index.map{ |(k, t), i| [k, t.error_collection] }.reject{ |e| e[1].nil? || e[1].empty? }.to_h
+      all_errors[:transactions] = transaction_error_collection unless transaction_error_collection.empty?
+
+      all_errors unless all_errors.empty?
+    end
+
+    private
+
+    def has_transaction_errors?
+      @transactions.map{ |t| t[1].valid? }.include?(false)
+    end
+
+    def descriptive_record
+      # Record type
+      # Max: 1
+      # Char position: 1
+      output = "0"
+
+      # Optional branch number of the funds account with a hyphen in the 4th character position
+      # Char position: 2-18
+      # Max: 17
+      # Blank filled
+      output += self.bsb.nil? ? " " * 17 : self.bsb.to_s.ljust(17)
+
+      # Sequence number
+      # Char position: 19-20
+      # Max: 2
+      # Zero padded
+      output += "01"
+
+      # Name of user financial instituion
+      # Max: 3
+      # Char position: 21-23
+      output += self.financial_institution.to_s
+
+      # Reserved
+      # Max: 7
+      # Char position: 24-30
+      output += " " * 7
+
+      # Name of User supplying File
+      # Char position: 31-56
+      # Max: 26
+      # Full BECS character set valid
+      # Blank filled
+      output += self.user_name.to_s.ljust(26)
+
+      # Direct Entry User ID
+      # Char position: 57-62
+      # Max: 6
+      # Zero padded
+      output += self.user_id.to_s.rjust(6, "0")
+
+      # Description of payments in the file (e.g. Payroll, Creditors etc.)
+      # Char position: 63-74
+      # Max: 12
+      # Full BECS character set valid
+      # Blank filled
+      output += self.description.to_s.ljust(12)
+
+      # Date on which the payment is to be processed
+      # Char position: 75-80
+      # Max: 6
+      output += self.process_at.to_s.rjust(6, "0")
+
+      # Reserved
+      # Max: 40
+      # Char position: 81-120
+      output += " " * 40
+    end
+
+    def batch_control_record
+      net_total_amount    = 0
+      credit_total_amount = 0
+      debit_total_amount  = 0
+
+      @transactions.each do |t|
+        net_total_amount += t[1].amount.to_i
+        credit_total_amount += t[1].amount.to_i if t[1].amount.to_i > 0
+        debit_total_amount += t[1].amount.to_i if t[1].amount.to_i < 0
+      end
+
+      # Record type
+      # Max: 1
+      # Char position: 1
+      output = "7"
+
+      # BSB Format Filler
+      # Max: 7
+      # Char position: 2-8
+      output += "999-999"
+
+      # Reserved
+      # Max: 12
+      # Char position: 9-20
+      output += " " * 12
+
+      # Net total
+      # Max: 10
+      # Char position: 21-30
+      output += net_total_amount.abs.to_s.rjust(10, "0")
+
+      # Credit Total Amount
+      # Max: 10
+      # Char position: 31-40
+      output += credit_total_amount.abs.to_s.rjust(10, "0")
+
+      # Debit Total Amount
+      # Max: 10
+      # Char position: 41-50
+      output += debit_total_amount.abs.to_s.rjust(10, "0")
+
+      # Reserved
+      # Max: 24
+      # Char position: 51-74
+      output += " " * 24
+
+      # Total Item Count
+      # Max: 6
+      # Char position: 75-80
+      output += @transactions.size.to_s.rjust(6, "0")
+
+      # Reserved
+      # Max: 40
+      # Char position: 81-120
+      output += " " * 40
+    end
+  end
+end

data/lib/aba/transaction.rb

@@ -2,30 +2,95 @@ class Aba
   class Transaction
     include Aba::Validations
 
-    attr_accessor :account_number, :transaction_code, :amount, :account_name, 
+    attr_accessor :account_number, :transaction_code, :amount, :account_name,
                   :bsb, :trace_bsb, :trace_account_number, :name_of_remitter,
                   :witholding_amount, :indicator, :lodgement_reference
 
-    validates_bsb :bsb
-    validates_bsb :trace_bsb
-    
-    validates_integer :amount
+    # BSB
+    validates_bsb               :bsb
+
+    # Account Number
+    validates_account_number    :account_number
+
+    # Indicator
+    validates_indicator         :indicator
+
+    # Transaction Code
+    validates_transaction_code  :transaction_code
+
+    # Amount
+    validates_integer           :amount
+
+    # Account Name
+    validates_max_length        :account_name, 32
+    validates_becs              :account_name
+
+    # Lodgement Reference
+    validates_max_length        :lodgement_reference, 18
+    validates_becs              :lodgement_reference
+
+    # Trace Record
+    validates_bsb               :trace_bsb
+    validates_account_number    :trace_account_number
+
+    # Name of Remitter
+    validates_max_length        :name_of_remitter, 16
+    validates_becs              :name_of_remitter
 
-    validates_max_length :account_number,         9
-    validates_max_length :indicator,              1
-    validates_max_length :transaction_code,       2
-    validates_max_length :account_name,           32
-    validates_max_length :lodgement_reference,    18
-    validates_max_length :trace_account_number,   9
-    validates_max_length :name_of_remitter,       16
 
     def initialize(attrs = {})
       attrs.each do |key, value|
         send("#{key}=", value)
       end
     end
-    
+
+    # Allow dashes to be input, but remove them from output
+    def account_number
+      @account_number ? @account_number.to_s.gsub('-', '') : nil
+    end
+
+    # Fall back to blank string
+    def indicator
+      @indicator || Aba::Validations::INDICATORS.first
+    end
+
+    # Fall back to 50
+    def transaction_code
+      @transaction_code || 50
+    end
+
+    # Fall back to 0
+    def amount
+      @amount || 0
+    end
+
+    # Fall back to empty string
+    def account_name
+      @account_name || ''
+    end
+
+    # Fall back to empty string
+    def lodgement_reference
+      @lodgement_reference || ''
+    end
+
+    # Fall back to BSB
+    def trace_bsb
+      @trace_bsb || bsb
+    end
+
+    # Fall back to Account Number
+    def trace_account_number
+      @trace_account_number ? @trace_account_number.to_s.gsub('-', '') : account_number
+    end
+
+    def name_of_remitter
+      @name_of_remitter || ''
+    end
+
     def to_s
+      raise RuntimeError, 'Transaction data is invalid - check the contents of `errors`' unless valid?
+
       # Record type
       output = "1"
 
@@ -33,41 +98,46 @@ class Aba
       output += bsb
 
       # Account number
+      #raise RuntimeError, 'Transaction is missing account_number' unless account_number
       output += account_number.to_s.rjust(9, " ")
 
       # Withholding Tax Indicator
       # "N" – for new or varied Bank/State/Branch number or name details, otherwise blank filled.
+      # "T" - for a drawing under a Transaction Negotiation Authority.
       # "W" – dividend paid to a resident of a country where a double tax agreement is in force.
       # "X" – dividend paid to a resident of any other country.
       # "Y" – interest paid to all non-residents.
       output += indicator.to_s.ljust(1, " ")
 
       # Transaction Code
-      # 50 General Credit. 
-      # 53 Payroll. 
-      # 54 Pension. 
-      # 56 Dividend. 
-      # 57 Debenture Interest. 
+      # 50 General Credit.
+      # 53 Payroll.
+      # 54 Pension.
+      # 56 Dividend.
+      # 57 Debenture Interest.
       # 13 General Debit.
       output += transaction_code.to_s
 
       # Amount to be credited or debited
-      output += amount.abs.to_s.rjust(10, "0")
+      output += amount.to_i.abs.to_s.rjust(10, "0")
 
       # Title of Account
-      output += account_name.ljust(32, " ")
+      # Full BECS character set valid
+      output += account_name.to_s.ljust(32, " ")
 
-      # Lodgement Reference Produced on the recipient’s Account Statement. 
-      output += lodgement_reference.ljust(18, " ")     
+      # Lodgement Reference Produced on the recipient’s Account Statement.
+      # Full BECS character set valid
+      output += lodgement_reference.to_s.ljust(18, " ")
 
       # Trace BSB Number
       output += trace_bsb
 
-      # Trace Account Number 
+      # Trace Account Number
       output += trace_account_number.to_s.rjust(9, " ")
 
       # Name of Remitter Produced on the recipient’s Account Statement
-      output += name_of_remitter.ljust(16, " ")
+      # Full BECS character set valid
+      output += name_of_remitter.to_s.ljust(16, " ")
 
       # Withholding amount in cents
       output += (witholding_amount || 0).abs.to_s.rjust(8, "0")

data/lib/aba/validations.rb

@@ -1,6 +1,9 @@
 class Aba
   module Validations
-    attr_accessor :errors
+    attr_accessor :error_collection
+
+    BECS_PATTERN = /\A[\w\+\-\@\ \$\!\%\&\(\)\*\.\/\#\=\:\;\?\,\'\[\]\_\^]*\Z/
+    INDICATORS = [' ', 'N', 'T', 'W', 'X', 'Y']
 
     def self.included(base)
       base.instance_eval do
@@ -10,9 +13,17 @@ class Aba
       base.send :extend, ClassMethods
     end
 
-    # Run all validations
     def valid?
-      self.errors = []
+      !has_errors?
+    end
+
+    alias_method 'errors', 'error_collection'
+
+    private
+
+    # Run all validations
+    def has_errors?
+      self.error_collection = []
 
       self.class.instance_variable_get(:@_validations).each do |attribute, validations|
         value = send(attribute)
@@ -20,27 +31,42 @@ class Aba
         validations.each do |type, param|
           case type
           when :presence
-            self.errors << "#{attribute} is empty" if value.nil? || value.to_s.empty?
+            self.error_collection << "#{attribute} is empty" if value.nil? || value.to_s.empty?
           when :bsb
             unless((param && value.nil?) || value =~ /^\d{3}-\d{3}$/)
-              self.errors << "#{attribute} format is incorrect"
+              self.error_collection << "#{attribute} format is incorrect"
             end
           when :max_length
-            self.errors << "#{attribute} length must not exceed #{param} characters" if value.to_s.length > param
+            self.error_collection << "#{attribute} length must not exceed #{param} characters" if value.to_s.length > param
           when :length
-            self.errors << "#{attribute} length must be exactly #{param} characters" if value.to_s.length != param
+            self.error_collection << "#{attribute} length must be exactly #{param} characters" if value.to_s.length != param
           when :integer
-            self.errors << "#{attribute} must be an integer" unless value.to_s =~ /\A[+-]?\d+\Z/
+            if param
+              self.error_collection << "#{attribute} must be a number" unless value.to_s =~ /\A[+-]?\d+\Z/
+            else
+              self.error_collection << "#{attribute} must be an unsigned number" unless value.to_s =~ /\A\d+\Z/
+            end
+          when :account_number
+            if value.to_s =~ /\A[0\ ]+\Z/ || value.to_s !~ /\A[a-z\d\ ]{1,9}\Z/
+              self.error_collection << "#{attribute} must be a valid account number"
+            end
+          when :becs
+            self.error_collection << "#{attribute} must not contain invalid characters" unless value.to_s =~ BECS_PATTERN
+          when :indicator
+            list = INDICATORS.join('\', \'')
+            self.error_collection << "#{attribute} must be a one of '#{list}'" unless INDICATORS.include?(value.to_s)
+          when :transaction_code
+            self.error_collection << "#{attribute} must be a 2 digit number" unless value.to_s =~ /\A\d{2,2}\Z/
           end
         end
       end
 
-      self.errors.empty?
+      !self.error_collection.empty?
     end
-   
+
     module ClassMethods
       def validates_presence_of(*attributes)
-        attributes.each do |a| 
+        attributes.each do |a|
           add_validation_attribute(a, :presence)
         end
       end
@@ -58,8 +84,24 @@ class Aba
         add_validation_attribute(attribute, :length, length)
       end
 
-      def validates_integer(attribute)
-        add_validation_attribute(attribute, :integer)
+      def validates_integer(attribute, signed = true)
+        add_validation_attribute(attribute, :integer, signed)
+      end
+
+      def validates_account_number(attribute)
+        add_validation_attribute(attribute, :account_number)
+      end
+
+      def validates_becs(attribute)
+        add_validation_attribute(attribute, :becs)
+      end
+
+      def validates_indicator(attribute)
+        add_validation_attribute(attribute, :indicator)
+      end
+
+      def validates_transaction_code(attribute)
+        add_validation_attribute(attribute, :transaction_code)
       end
 
       private

data/lib/aba/version.rb

@@ -1,3 +1,3 @@
 class Aba
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/{aba_spec.rb → lib/aba/batch_spec.rb}

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 require "spec_helper"
 
-describe Aba do
-  let(:aba) { Aba.new(financial_institution: "WPC", user_name: "John Doe", 
+describe Aba::Batch do
+  let(:aba) { Aba::Batch.new(financial_institution: "WPC", user_name: "John Doe",
                       user_id: "466364", description: "Payroll", process_at: "190615") }
   let(:transaction_values) { [30, -20] }
   let(:transactions) do

data/spec/{transaction_spec.rb → lib/aba/transaction_spec.rb}

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "spec_helper"
 
 describe Aba::Transaction do
@@ -10,8 +12,8 @@ describe Aba::Transaction do
     :witholding_amount => 87,
     :indicator => "W",
     :lodgement_reference => "R45343",
-    :trace_bsb => "123-234", 
-    :trace_account_number => "4647642", 
+    :trace_bsb => "123-234",
+    :trace_account_number => "4647642",
     :name_of_remitter => "Remitter"
   } }
   subject(:transaction) { Aba::Transaction.new(transaction_params) }

data/spec/lib/aba/validations_spec.rb

@@ -0,0 +1,215 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Aba::Validations do
+  let(:clean_room) do
+    Class.new(Object) do
+      include Aba::Validations
+    end
+  end
+
+  subject(:test_instance) { clean_room.new }
+
+  describe "#valid?" do
+    it "should validate presence of attrs" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_presence_of :attr1
+      end
+
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 is empty"]
+
+      subject.attr1 = "hello!"
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate bsb format" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_bsb :attr1
+      end
+
+      subject.attr1 = "234456"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 format is incorrect"]
+
+      subject.attr1 = "234-456"
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate max length" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_max_length :attr1, 5
+      end
+
+      subject.attr1 = "234456642"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 length must not exceed 5 characters"]
+
+      subject.attr1 = "23445"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "2344"
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate length" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_length :attr1, 5
+      end
+
+      subject.attr1 = "234456642"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 length must be exactly 5 characters"]
+
+      subject.attr1 = "23445"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "2344"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 length must be exactly 5 characters"]
+    end
+
+    it "should validate signed integer" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_integer :attr1
+      end
+
+      subject.attr1 = "+1234A"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a number"]
+
+      subject.attr1 = "+1234"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "-1234"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "1234"
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate unsigned integer" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_integer :attr1, false
+      end
+
+      subject.attr1 = "1234A"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be an unsigned number"]
+
+      subject.attr1 = "+1234"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be an unsigned number"]
+
+      subject.attr1 = "-1234"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be an unsigned number"]
+
+      subject.attr1 = "1234"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = 1234
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate account number" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_account_number :attr1
+      end
+
+      subject.attr1 = "      "
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a valid account number"]
+
+      subject.attr1 = "000000"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a valid account number"]
+
+      subject.attr1 = "00 0 0"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a valid account number"]
+
+      subject.attr1 = "00 0A0"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a valid account number"]
+
+      subject.attr1 = "00 111"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "0a 111"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "aaaaaa"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = "aa aaa"
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate becs" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_becs :attr1
+      end
+
+      subject.attr1 = "abc123 é"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must not contain invalid characters"]
+
+      subject.attr1 = "abc123 ~"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must not contain invalid characters"]
+
+      subject.attr1 = "abc123"
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate indicator" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_indicator :attr1
+      end
+
+      subject.attr1 = "$"
+      expect(subject.valid?).to eq false
+      list = Aba::Validations::INDICATORS.join('\', \'')
+      expect(subject.errors).to eq ["attr1 must be a one of '#{list}'"]
+
+      subject.attr1 = Aba::Validations::INDICATORS.sample
+      expect(subject.valid?).to eq true
+    end
+
+    it "should validate transaction code" do
+      clean_room.instance_eval do
+        attr_accessor :attr1
+        validates_transaction_code :attr1
+      end
+
+      subject.attr1 = "AA"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a 2 digit number"]
+
+      subject.attr1 = "123"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a 2 digit number"]
+
+      subject.attr1 = "1"
+      expect(subject.valid?).to eq false
+      expect(subject.errors).to eq ["attr1 must be a 2 digit number"]
+
+      subject.attr1 = "15"
+      expect(subject.valid?).to eq true
+
+      subject.attr1 = 15
+      expect(subject.valid?).to eq true
+    end
+  end
+end

data/spec/lib/aba_spec.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Aba do
+  describe ".batch" do
+    it "initialize instance of Aba::Batch with passed arguments" do
+      attributes = double.as_null_object
+      transactions = double.as_null_object
+
+      expect(Aba::Batch).to receive(:new).with(attributes, transactions)
+      described_class.batch(attributes, transactions)
+    end
+
+    it "returns instance of Aba::Batch" do
+      obj = described_class.batch(double.as_null_object, double.as_null_object)
+
+      expect(obj).to be_a(Aba::Batch)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,4 +5,6 @@ require "aba"
 
 RSpec.configure do |config|
   config.order = :random
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aba
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrey Bazhutkin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,13 +84,15 @@ files:
 - Rakefile
 - aba.gemspec
 - lib/aba.rb
+- lib/aba/batch.rb
 - lib/aba/transaction.rb
 - lib/aba/validations.rb
 - lib/aba/version.rb
-- spec/aba_spec.rb
+- spec/lib/aba/batch_spec.rb
+- spec/lib/aba/transaction_spec.rb
+- spec/lib/aba/validations_spec.rb
+- spec/lib/aba_spec.rb
 - spec/spec_helper.rb
-- spec/transaction_spec.rb
-- spec/validations_spec.rb
 homepage: https://github.com/andrba/aba
 licenses:
 - MIT
@@ -116,7 +118,8 @@ signing_key:
 specification_version: 4
 summary: ABA File Generator
 test_files:
-- spec/aba_spec.rb
+- spec/lib/aba/batch_spec.rb
+- spec/lib/aba/transaction_spec.rb
+- spec/lib/aba/validations_spec.rb
+- spec/lib/aba_spec.rb
 - spec/spec_helper.rb
-- spec/transaction_spec.rb
-- spec/validations_spec.rb

data/spec/validations_spec.rb

@@ -1,47 +0,0 @@
-require "spec_helper"
-
-describe Aba::Validations do
-  let(:clean_room) do 
-    Class.new(Object) do
-      include Aba::Validations
-    end
-  end
-
-  subject(:test_instance) { clean_room.new }
-
-  describe "#valid?" do
-    it "should validate presence of attrs" do
-      clean_room.instance_eval do
-        attr_accessor :attr1
-        validates_presence_of :attr1
-      end
-
-      expect(subject.valid?).to eq false
-      expect(subject.errors).to eq ["attr1 is empty"]
-    end
-
-    it "should validate bsb format" do
-      clean_room.instance_eval do
-        attr_accessor :attr1
-        validates_bsb :attr1
-      end
-
-      subject.attr1 = "234456"
-
-      expect(subject.valid?).to eq false
-      expect(subject.errors).to eq ["attr1 format is incorrect"]
-    end
-
-    it "should validate length" do
-      clean_room.instance_eval do
-        attr_accessor :attr1
-        validates_max_length :attr1, 5
-      end
-
-      subject.attr1 = "234456642"
-
-      expect(subject.valid?).to eq false
-      expect(subject.errors).to eq ["attr1 length must not exceed 5 characters"]
-    end
-  end
-end