bankserv 0.3.0 → 0.3.1

data/lib/bankserv/account_holder_verification.rb

@@ -35,11 +35,12 @@ module Bankserv
     end
     
     def self.build!(options)
-      bank_account = BankAccount.new options[:bank_account].filter_attributes(BankAccount)
+      bank_account = BankAccount.new(options.delete(:bank_account))
       is_internal = bank_account.branch_code == self.service.config[:internal_branch_code]
-      options = options.filter_attributes(self).merge(bank_account: bank_account, internal: is_internal)
-      
-      create!(options)
+      ahv = new(options)
+      ahv.bank_account = bank_account
+      ahv.internal = is_internal
+      ahv.save!
     end
     
     def internal?

data/lib/bankserv/eft.rb

@@ -28,10 +28,19 @@ module Bankserv
     end
     
     def build_contra!(batch_id, options)
-      ba_options = options.filter_attributes(BankAccount)
-      options = options.filter_attributes(self).merge(bank_account: BankAccount.new(ba_options), record_type: "contra", batch_id: batch_id, bankserv_request_id: @request_id)
+      account_name = options.delete(:account_name)
+      account_type = options.delete(:account_type)
+      account_number = options.delete(:account_number)
+      branch_code = options.delete(:branch_code)
+      initials = options.delete(:initials)
+      id_number = options.delete(:id_number)
       
-      create!(options)
+      bank_account = BankAccount.create!(account_name: account_name, account_type: account_type, account_number: account_number, 
+                                     branch_code: branch_code, initials: initials)
+                                     
+      options = options.merge(record_type: "contra", batch_id: batch_id, bankserv_request_id: @request_id, bankserv_bank_account_id: bank_account.id)
+      contra = new(options)
+      contra.save!
     end
     
     def build_standard!(batch_id, options)
@@ -45,10 +54,19 @@ module Bankserv
     end
     
     def create_standard!(batch_id, options)
-      ba_options = options.filter_attributes(BankAccount)
-      options = options.filter_attributes(self).merge(bank_account: BankAccount.new(ba_options), record_type: "standard", batch_id: batch_id, bankserv_request_id: @request_id)
+      account_name = options.delete(:account_name)
+      account_type = options.delete(:account_type)
+      account_number = options.delete(:account_number)
+      branch_code = options.delete(:branch_code)
+      initials = options.delete(:initials)
+      id_number = options.delete(:id_number)
       
-      create!(options)
+      bank_account = BankAccount.create!(account_name: account_name, account_type: account_type, account_number: account_number, 
+                                     branch_code: branch_code, initials: initials)
+                                     
+      options = options.merge(record_type: "standard", batch_id: batch_id, bankserv_request_id: @request_id, bankserv_bank_account_id: bank_account.id)
+      standard = new(options)
+      standard.save!
     end
     
     def next_batch_id

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/lib/bankserv/account_holder_verification_spec.rb

@@ -21,6 +21,24 @@ describe Bankserv::AccountHolderVerification do
       request.type.should == "ahv"
       request.data.should == @hash[:data]
     end
+    
+    it "should work" do
+      b_a = {
+        :account_number=>"2938423984",
+        :id_number=>"0394543905",
+        :initials=>"P",
+        :account_name=>"Hendrik",
+        :branch_code=>"250255",
+        :account_type=>"savings"
+      }
+      
+      info = {data: {user_ref: 83745678, bank_account: b_a}}
+      Bankserv::AHVService.last.request(info)
+      
+      puts Bankserv::AccountHolderVerification.where(user_ref: 83745678).first.inspect
+      puts Bankserv::AccountHolderVerification.all.inspect
+      puts Bankserv::Request.last.inspect
+    end
           
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70180810308280 !ruby/object:Gem::Requirement
+  requirement: &70162632244500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180810308280
+  version_requirements: *70162632244500
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70180810307760 !ruby/object:Gem::Requirement
+  requirement: &70162632243920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180810307760
+  version_requirements: *70162632243920
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70180810307320 !ruby/object:Gem::Requirement
+  requirement: &70162632243460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180810307320
+  version_requirements: *70162632243460
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70180810306760 !ruby/object:Gem::Requirement
+  requirement: &70162632242820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70180810306760
+  version_requirements: *70162632242820
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70180810306260 !ruby/object:Gem::Requirement
+  requirement: &70162632242180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70180810306260
+  version_requirements: *70162632242180
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70180810305800 !ruby/object:Gem::Requirement
+  requirement: &70162632241600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70180810305800
+  version_requirements: *70162632241600
 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. "