bankserv 0.2.1 → 0.2.2

data/lib/bankserv/account_holder_verification.rb

@@ -15,8 +15,12 @@ module Bankserv
     after_create :generate_internal_user_ref
     
     def generate_internal_user_ref
-      self.internal_user_ref = "AHV#{id}"
-      save!  
+      self.internal_user_ref = Bankserv::AccountHolderVerification.generate_reference_number(self)
+      save!
+    end
+    
+    def self.generate_reference_number(ahv)
+      "AHV#{ahv.id}"
     end
   
     def self.request(options = {})

data/lib/bankserv/engine.rb

@@ -89,7 +89,7 @@ module Bankserv
     def write_file!(document)
       begin
         transmission = Absa::H2h::Transmission::Document.build([document.to_hash])
-        file_name = "INPUT.#{Time.now.strftime('%y%m%d%H%M%S')}.txt"
+        file_name = generate_input_file_name
         File.open("#{Bankserv::Engine.input_directory}/#{file_name}", 'w') { |f|
           f.puts transmission
         }
@@ -102,6 +102,10 @@ module Bankserv
       true
     end
     
+    def generate_input_file_name
+      "INPUT.#{Time.now.strftime('%y%m%d%H%M%S')}.txt"
+    end
+    
     def archive_file!(file)
       year, month = Date.today.year, Date.today.month
       

data/lib/bankserv/transmission/document.rb

@@ -4,6 +4,7 @@ module Bankserv
     self.inheritance_column = :_type_disabled
     
     belongs_to :set
+    has_many :sets
     serialize :error
         
     def mark_processed!

data/lib/bankserv/transmission/set.rb

@@ -2,9 +2,9 @@ module Bankserv
   
   class Set < ActiveRecord::Base
     belongs_to :set
+    belongs_to :document
     has_many :sets
     
-    has_one :document
     has_many :records
     
     def build_header(options = {})
@@ -43,7 +43,7 @@ module Bankserv
       records.each do |record|
         defaults = klass.record_type(record.record_type).template_options
         record.data = defaults.merge(record.data)
-        record.data[:rec_status] = rec_status unless record.data[:rec_status]
+        record.data[:rec_status] ||= rec_status
       end
       
       self.records.each{|rec| rec.save!} # TODO: does this cause records to save before set?

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/generators/active_record/templates/migration.rb

@@ -104,6 +104,7 @@ class CreateBankservTables < ActiveRecord::Migration
     end
     
     create_table :bankserv_sets do |t|
+      t.references :document
       t.references :set
       t.string :type
       t.string :generation_number

data/spec/examples/INPUT.120410144410.txt

@@ -0,0 +1,14 @@
+000L2012041012345TESTTEST                      000000100000                                                                                                                                           
+030L0000001506                                                                                                                                                                                        
+031L00000010000000090765462816570367799950JVAJEFFREY VAN ASWEGEN                                         00000000AHV70                                                                                
+031L00000020000000090765462814956965800383JVAJEFFREY VAN ASWEGEN                                         00000000AHV73                                                                                
+039L0000002000000018153092562                                                                                                                                                                         
+030L0000002506                                                                                                                                                                                        
+031L00000010000000045304958348008456465340RC RC TRANSACTIONAL                                            00000000AHV67                         250255000060LD00000000000000000                        
+031L00000020000000039243424238008456465340RC RC DEPOSIT                                                  00000000AHV68                         250255000060LD00000000000000000                        
+031L00000030000000620973636704662871445971DA DOUGLAS ANDERSON                                            00000000AHV69                         250655000060LD00000000000000000                        
+031L00000040000000000704402131345940529631PDVPETER DE VILLIERS                                           00000000AHV71                         020009000060LD00000000000000000                        
+031L00000050000000620973636704285493033498DA DOUGLAS ANDERSON                                            00000000AHV72                         250655000060LD00000000000000000                        
+031L00000060000000000704402131116501771108PDVPETER DE VILLIERS                                           00000000AHV74                         020009000060LD00000000000000000                        
+039L0000006000000132790446023                                                                                                                                                                         
+999L000000014                                                                                                                                                                                         

data/spec/internal/db/schema.rb

@@ -103,6 +103,7 @@ ActiveRecord::Schema.define do
   end
   
   create_table :bankserv_sets, :force => true do |t|
+    t.references :document
     t.references :set
     t.string :type
     t.string :generation_number

data/spec/lib/bankserv/engine/engine_spec.rb

@@ -16,7 +16,7 @@ describe Bankserv::Engine do
     end
     
     FileUtils.rm_rf(Dir.pwd + "/spec/examples/host2host/archives", secure: true)
-    
+    File.delete(Dir.pwd + "/spec/tmp/harry.txt")
   end
   
   context "Prepare engine" do
@@ -134,4 +134,29 @@ describe Bankserv::Engine do
     
   end
   
+  context "processing ahv requests" do
+    
+    before(:each) do
+      Timecop.travel(Time.local(2012, 4, 10, 10, 5, 0))
+      @tmpdir = Dir.pwd + "/spec/tmp"
+      tear_it_down
+      create(:configuration, client_code: "12345", client_name: "TESTTEST", user_code: "9999", user_generation_number: 1, client_abbreviated_name: "TESTTEST", department_code: "506")
+      Bankserv::EngineConfiguration.create!(interval_in_minutes: 15, input_directory: @tmpdir, output_directory: @tmpdir, archive_directory: @tmpdir)
+    end
+    
+    it "should create a valid input document" do
+      Bankserv::AccountHolderVerification.should_receive(:generate_reference_number).exactly(8).times.and_return("AHV67","AHV68","AHV69","AHV70","AHV71","AHV72","AHV73","AHV74")
+      create_ahv_requests_scenario
+      e = Bankserv::Engine.new
+      e.should_receive(:generate_input_file_name).and_return("harry.txt")
+      e.process!
+      
+      expected_string = File.open("./spec/examples/INPUT.120410144410.txt", "rb").read
+      got_string = File.open(@tmpdir + '/harry.txt', "rb").read
+      
+      got_string.should == expected_string
+    end
+    
+  end
+  
 end

data/spec/support/helpers.rb

@@ -182,6 +182,25 @@ module Helpers
         }]
       }
     })                                                                                                                                
-  end                                                                                                                                 
+  end
+  
+  def create_ahv_requests_scenario
+    info = {:data=>{:user_ref=>618, :bank_account=>{:account_number=>"4530495834", :id_number=>"8008456465340", :initials=>"RC", :account_name=>"RC Transactional", :branch_code=>"250255", :account_type=>"savings"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>619, :bank_account=>{:account_number=>"3924342423", :id_number=>"8008456465340", :initials=>"RC", :account_name=>"RC Deposit", :branch_code=>"250255", :account_type=>"savings"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>620, :bank_account=>{:account_number=>"62097363670", :id_number=>"4662871445971", :initials=>"DA", :account_name=>"Douglas Anderson", :branch_code=>"250655", :account_type=>"current"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>621, :bank_account=>{:account_number=>"9076546281", :id_number=>"6570367799950", :initials=>"JvA", :account_name=>"Jeffrey van Aswegen", :branch_code=>"632005", :account_type=>"savings"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>622, :bank_account=>{:account_number=>"070440213", :id_number=>"1345940529631", :initials=>"PDV", :account_name=>"Peter De Villiers", :branch_code=>"20009", :account_type=>"current"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>623, :bank_account=>{:account_number=>"62097363670", :id_number=>"4285493033498", :initials=>"DA", :account_name=>"Douglas Anderson", :branch_code=>"250655", :account_type=>"current"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>624, :bank_account=>{:account_number=>"9076546281", :id_number=>"4956965800383", :initials=>"JvA", :account_name=>"Jeffrey van Aswegen", :branch_code=>"632005", :account_type=>"savings"}}}
+    Bankserv::AccountHolderVerification.request(info)
+    info = {:data=>{:user_ref=>625, :bank_account=>{:account_number=>"070440213", :id_number=>"1116501771108", :initials=>"PDV", :account_name=>"Peter De Villiers", :branch_code=>"20009", :account_type=>"current"}}}
+    Bankserv::AccountHolderVerification.request(info)
+  end
 end                                                                                                                                   
                                                                                                                                                                                                                                                                         

data/spec/tmp/readme

@@ -0,0 +1 @@
+For git.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70246841198760 !ruby/object:Gem::Requirement
+  requirement: &70116524139980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246841198760
+  version_requirements: *70116524139980
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70246841198220 !ruby/object:Gem::Requirement
+  requirement: &70116524139400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246841198220
+  version_requirements: *70116524139400
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70246841197600 !ruby/object:Gem::Requirement
+  requirement: &70116524138840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246841197600
+  version_requirements: *70116524138840
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70246841197020 !ruby/object:Gem::Requirement
+  requirement: &70116524138220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70246841197020
+  version_requirements: *70116524138220
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70246841196320 !ruby/object:Gem::Requirement
+  requirement: &70116524137520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70246841196320
+  version_requirements: *70116524137520
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70246841195780 !ruby/object:Gem::Requirement
+  requirement: &70116524136940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70246841195780
+  version_requirements: *70116524136940
 description: ! "This engine allows users to inject requests into a queue to be processed.
   \n    \n                    The queue handles bank account validations, credit payments,
   debit orders\n                    and collecting bank statements. "
@@ -128,6 +128,7 @@ files:
 - lib/core_extensions.rb
 - lib/generators/active_record/bankserv_generator.rb
 - lib/generators/active_record/templates/migration.rb
+- spec/examples/INPUT.120410144410.txt
 - spec/examples/ahv_input_file.txt
 - spec/examples/ahv_output_file.txt
 - spec/examples/credit_eft_input.txt
@@ -162,6 +163,7 @@ files:
 - spec/lib/bankserv/transmission/statement_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
+- spec/tmp/readme
 homepage: ''
 licenses: []
 post_install_message: 
@@ -187,6 +189,7 @@ signing_key:
 specification_version: 3
 summary: A rails 3 engine wrapped around the Absa Host 2 Host gem.
 test_files:
+- spec/examples/INPUT.120410144410.txt
 - spec/examples/ahv_input_file.txt
 - spec/examples/ahv_output_file.txt
 - spec/examples/credit_eft_input.txt
@@ -221,3 +224,4 @@ test_files:
 - spec/lib/bankserv/transmission/statement_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
+- spec/tmp/readme