bankserv 0.2.2 → 0.2.3

data/lib/bankserv/engine.rb

@@ -91,7 +91,7 @@ module Bankserv
         transmission = Absa::H2h::Transmission::Document.build([document.to_hash])
         file_name = generate_input_file_name
         File.open("#{Bankserv::Engine.input_directory}/#{file_name}", 'w') { |f|
-          f.puts transmission
+          f.write transmission
         }
         @logs[:input_files] << "Input Document File created. File name: #{file_name}"
       rescue Exception => e

data/lib/bankserv/transmission/set/eft.rb

@@ -139,27 +139,15 @@ module Bankserv
       end
       
       def first_action_date
-        fad = Date.today
-        transactions.map(&:data).each do |hash|
-          first = Date.strptime(hash[:action_date], "%y%m%d")
-          fad = first if first < fad
-        end
-        fad.strftime("%y%m%d")
+        transactions.min_by{|t| t.data[:action_date]}.data[:action_date]
       end
       
-      def last_action_date
-        lad = Date.today
-        transactions.map(&:data).each do |hash|
-          last = Date.strptime(hash[:action_date], "%y%m%d")
-          lad = last if last < lad
-        end
-        lad = lad + 3.days
-        lad.strftime("%y%m%d")
+      def last_action_date        
+        transactions.max_by{|t| t.data[:action_date]}.data[:action_date]
       end
       
       def purge_date
-        date = Date.strptime("#{self.last_action_date}", "%y%m%d") + 4.days
-        date.strftime("%y%m%d")
+        last_action_date
       end
       
       def hash_total_of_homing_account_numbers

data/lib/bankserv/version.rb

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

data/spec/examples/INPUT.120411110604.txt

@@ -0,0 +1,8 @@
+000L2012041012345TESTTEST                      000000100000                                                                                                                                           
+001L0499991204101204111204111204110000010001TWO DAY                                                                                                                                                   
+001L5025025504530495834999900000125065562097363670100000301400120411440   TESTTEST  544                 DOUGLAS ANDERSON              00000000000000000000                21                          
+001L5025025504530495834999900000263200509076546281200000315000120411440   TESTTEST  545                 JEFFREY VAN ASWEGEN           00000000000000000000                21                          
+001L5025025504530495834999900000302000900070440213100000279300120411440   TESTTEST  546                 PETER DE VILLIERS             00000000000000000000                21                          
+001L5225025504530495834999900000425025504530495834100000895700120411100000TESTTEST  CONTRA19                                                                                                          
+001L929999000001000004120411120411000003000001000001000000895700000000895700075774845998                                                                                                              
+999L000000008                                                                                                                                                                                         

data/spec/examples/credit_eft_input.txt

@@ -1,5 +1,5 @@
 000L2008080800986TESTTEST                      000084600000                                                                                                                                           
-020L0499990808080808150808080808110000780846BATCH     YY                                                                                                                                              
+020L0499990808080808080808080808080000780846BATCH     YY                                                                                                                                              
 020L1063200504068123456999900007805002100081136250100001500000080808880   TESTTEST  _2055185_PAY USER   DEWEY  ASSOCIATES             00000000000000000000                21                          
 020L1063200504068123456999900007963200504051717311100000542380080808880   TESTTEST  _2055184_PAY USER   SURE SLIM WELLNESS CLINIC SA  00000000000000000000                21                          
 020L1063200504068123456999900008063200509193079313100000224500080808880   TESTTEST  _2055183_PAY USER   RUGGA KIDS EAST RAND          00000000000000000000                21                          
@@ -162,5 +162,5 @@
 020L1063200504068123456999900023725204562032469836100000314250080808880   TESTTEST  _2055026_PAY USER   COMPACT ACCOUNTING            00000000000000000000                21                          
 020L1063200504068123456999900023816514501651343144100000086503080808880   TESTTEST  _2055025_PAY USER   BOSHOFF SMUTS ING             00000000000000000000                21                          
 020L1263200504068123456999900023963200504068123456100127221665080808100000TESTTEST  CONTRA_0000846_PMT                                                                                                
-020L929999000078000239080808080811000001000161000001000127221665000127221665028905810181                                                                                                              
+020L929999000078000239080808080808000001000161000001000127221665000127221665028905810181                                                                                                              
 999L000000166

data/spec/examples/debit_eft_input_file.txt

@@ -1,5 +1,5 @@
 000T2004052400010LDC USER 10 AFRICA (PTY)      000062100000                                                                                                                                           
-001T0495340405240405310405240405270000010037CORPSSV                                                                                                                                                   
+001T0495340405240405250405240405250000010037CORPSSV                                                                                                                                                   
 001T5063200504053538939953400000163200501019611899100000001000040524440000ALIMITTST SPP   1040524 01    HENNIE DU TOIT                00000000000000000000                21                          
 001T5063200504053538939953400000263200501019801892100000002000040524440000ALIMITTST SPP   1040524 02    TYRONE DREYDEN                00000000000000000000                21                          
 001T5063200504053538939953400000363200501021131896100000003000040524440000ALIMITTST SPP   1040524 03    KEITH MEIKLEJOHN              00000000000000000000                21                          
@@ -16,5 +16,5 @@
 001T5063200501004651894953400001463200501019591898100000060000040525440000ALIMITTST SPP   2040525 06    PETER HAUPT                   00000000000000000000                21                          
 001T5063200501004651894953400001563200501020861726100000070000040525440000ALIMITTST SPP   2040525 07    HADLEY RAW                    00000000000000000000                21                          
 001T5263200501004651894953400001663200501004651894100004280000040525100000ALIMITTST CONTRA2040525 08                                                                                                  
-001T929534000001000016040524040527000014000002000002000020308000000020308000036311034141                                                                                                              
+001T929534000001000016040524040525000014000002000002000020308000000020308000036311034141                                                                                                              
 999T000000020

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

@@ -17,6 +17,7 @@ describe Bankserv::Engine do
     
     FileUtils.rm_rf(Dir.pwd + "/spec/examples/host2host/archives", secure: true)
     File.delete(Dir.pwd + "/spec/tmp/harry.txt")
+    File.delete(Dir.pwd + "/spec/tmp/sally.txt")
   end
   
   context "Prepare engine" do
@@ -134,7 +135,7 @@ describe Bankserv::Engine do
     
   end
   
-  context "processing ahv requests" do
+  context "integration testing" do
     
     before(:each) do
       Timecop.travel(Time.local(2012, 4, 10, 10, 5, 0))
@@ -143,20 +144,38 @@ describe Bankserv::Engine do
       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
+  
+    it "should process ahv requests" 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
+  
+    it "should process debit requests" do
+      create_debit_requests_scenario
+      
+      e = Bankserv::Engine.new
+      e.should_receive(:generate_input_file_name).and_return("sally.txt")
+      e.process!
+      puts e.inspect
     
+      expected_string = File.open("./spec/examples/INPUT.120411110604.txt", "rb").read
+      got_string = File.open(@tmpdir + '/sally.txt', "rb").read
+    
+      got_string.should == expected_string
+    end
+  
+    it "should process credit requests" do
+      pending
+    end
+  
   end
   
 end

data/spec/lib/bankserv/transmission/set/credit_spec.rb

@@ -43,17 +43,15 @@ describe Bankserv::Transmission::UserSet::Credit do
     end 
     
     it "should create a batch with a header when the job begins" do
-      purge = (Date.today + 7.days).strftime("%y%m%d")
-      
       @batch.header.data.should == {
         rec_id: "020",
         rec_status: "T",
         bankserv_record_identifier: "04",
         bankserv_user_code: "9534",
         bankserv_creation_date: Time.now.strftime("%y%m%d"),
-        bankserv_purge_date: purge,
+        bankserv_purge_date: Time.now.strftime("%y%m%d"),
         first_action_date: Time.now.strftime("%y%m%d"),
-        last_action_date: (Date.today + 3.days).strftime("%y%m%d"),
+        last_action_date: Time.now.strftime("%y%m%d"),
         first_sequence_number: "1",
         user_generation_number: "37",
         type_of_service: "SAMEDAY",
@@ -75,7 +73,7 @@ describe Bankserv::Transmission::UserSet::Credit do
         first_sequence_number: "1",
         last_sequence_number: "8",
         first_action_date: Time.now.strftime("%y%m%d"),
-        last_action_date: (Date.today + 3.days).strftime("%y%m%d"),
+        last_action_date: Time.now.strftime("%y%m%d"),
         no_debit_records: "2",
         no_credit_records: "6",
         no_contra_records: "2",

data/spec/lib/bankserv/transmission/set/debit_spec.rb

@@ -44,17 +44,15 @@ describe Bankserv::Transmission::UserSet::Debit do
       batch = Bankserv::Transmission::UserSet::Debit.generate(rec_status: "T")
       batch.save
       
-      purge = (Date.today + 7.days).strftime("%y%m%d")
-      
       batch.header.data.should == {
         rec_id: "001",
         rec_status: "T",
         bankserv_record_identifier: "04",
         bankserv_user_code: "9534",
         bankserv_creation_date: Time.now.strftime("%y%m%d"),
-        bankserv_purge_date: purge,
+        bankserv_purge_date: Time.now.strftime("%y%m%d"),
         first_action_date: Time.now.strftime("%y%m%d"),
-        last_action_date: (Date.today + 3.days).strftime("%y%m%d"),
+        last_action_date: Time.now.strftime("%y%m%d"),
         first_sequence_number: "1",
         user_generation_number: "37",
         type_of_service: "SAMEDAY",
@@ -89,7 +87,7 @@ describe Bankserv::Transmission::UserSet::Debit do
         first_sequence_number: "1",
         last_sequence_number: "8",
         first_action_date: Time.now.strftime("%y%m%d"),
-        last_action_date: (Date.today + 3.days).strftime("%y%m%d"),
+        last_action_date: Time.now.strftime("%y%m%d"),
         no_debit_records: "6",
         no_credit_records: "2",
         no_contra_records: "2",

data/spec/support/helpers.rb

@@ -202,5 +202,24 @@ module Helpers
     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
+  
+  def create_debit_requests_scenario
+    info = {
+      :type=>"debit", 
+      :data=>{
+        :type_of_service=>"TWO DAY", 
+        :batches=>[{
+          :debit=>[
+            {:account_number=>"62097363670", :id_number=>"6967756569139", :initials=>"DA", :account_name=>"Douglas Anderson", :branch_code=>"250655", :account_type=>"current", :amount=>301400, :user_ref=>544, :action_date=>Date.parse('Wed, 11 Apr 2012')}, 
+            {:account_number=>"9076546281", :id_number=>"2711783115132", :initials=>"JvA", :account_name=>"Jeffrey van Aswegen", :branch_code=>"632005", :account_type=>"savings", :amount=>315000, :user_ref=>545, :action_date=>Date.parse('Wed, 11 Apr 2012')}, 
+            {:account_number=>"070440213", :id_number=>"6175553360681", :initials=>"PDV", :account_name=>"Peter De Villiers", :branch_code=>"20009", :account_type=>"current", :amount=>279300, :user_ref=>546, :action_date=>Date.parse('Wed, 11 Apr 2012')}
+          ], 
+          :credit=>{:account_number=>"4530495834", :id_number=>"8008456465340", :initials=>"RC", :account_name=>"RC Transactional", :branch_code=>"250255", :account_type=>"savings", :amount=>895700, :user_ref=>19, :action_date=>Date.parse('Wed, 11 Apr 2012')}
+        }]
+      }
+    }
+    
+    Bankserv::Debit.request(info)
+  end
 end                                                                                                                                   
                                                                                                                                                                                                                                                                         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70116524139980 !ruby/object:Gem::Requirement
+  requirement: &70140537134240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116524139980
+  version_requirements: *70140537134240
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70116524139400 !ruby/object:Gem::Requirement
+  requirement: &70140537133740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116524139400
+  version_requirements: *70140537133740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70116524138840 !ruby/object:Gem::Requirement
+  requirement: &70140537133320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116524138840
+  version_requirements: *70140537133320
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70116524138220 !ruby/object:Gem::Requirement
+  requirement: &70140537132780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70116524138220
+  version_requirements: *70140537132780
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70116524137520 !ruby/object:Gem::Requirement
+  requirement: &70140537132280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70116524137520
+  version_requirements: *70140537132280
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70116524136940 !ruby/object:Gem::Requirement
+  requirement: &70140537131820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70116524136940
+  version_requirements: *70140537131820
 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. "
@@ -129,6 +129,7 @@ files:
 - lib/generators/active_record/bankserv_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - spec/examples/INPUT.120410144410.txt
+- spec/examples/INPUT.120411110604.txt
 - spec/examples/ahv_input_file.txt
 - spec/examples/ahv_output_file.txt
 - spec/examples/credit_eft_input.txt
@@ -190,6 +191,7 @@ 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/INPUT.120411110604.txt
 - spec/examples/ahv_input_file.txt
 - spec/examples/ahv_output_file.txt
 - spec/examples/credit_eft_input.txt