bank_api 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63748c7e32a8c3a3485046be38b918a427f4d6a8833ad1ea7d6845c3bbf310b2
-  data.tar.gz: 62d60679b1a457f6f96a57a4f9144a4e66b4704ba361eaca69eb0d3253a99820
+  metadata.gz: cd569e27d05057177eb55bd22f5ea7e715e1320543d49343a684cd12a3ed53b5
+  data.tar.gz: 1421ca3ecfa79b5c441849470666099ee5b0e2429550e186a5ff3273d0a9707a
 SHA512:
-  metadata.gz: 39605cd234af305e2033c6c720203807a1fff43e3a462ae4d16e32cdba2a7c769c0bea4263225f428522493a85285fa6631f0417fdd98de15bf484702b96f8f9
-  data.tar.gz: 0231306ca60a4b307b14a9cc70ef0b515c4e920848d7be5bebc4d33e22f7ae1b8ff9df0fa108eb31b710efb2a40af4179a669870fd09f823cd8d3a171f453aea
+  metadata.gz: fd21fb3ebd6cac2413c52c04066012cd5893eaee3ddbe898d91a1164037590f345c7a9746bb6c9fa2cc22b1b639fe4adddf3a45b4d6c9da684e66ef39a92015e
+  data.tar.gz: 4e90b787dc4120d7735a28058d9d973544abc6661bd12393a40361c07c9882b8b61821811f7d351431b57c54168199607b3d48e82249518fc8a9a4174df2011f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bank_api (0.4.4)
+    bank_api (0.5.0)
       pincers
       rest-client
       timezone (~> 1.0)
@@ -60,7 +60,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)

data/lib/bank_api.rb

@@ -27,20 +27,23 @@ module BankApi
 
   module BancoSecurity
     def self.get_account_balance(account_number)
-      Clients::BancoSecurity::CompanyClient.new(BankApi.configuration).get_balance(account_number)
+      company_instance.get_balance(account_number)
     end
 
-    def self.get_recent_company_deposits
-      Clients::BancoSecurity::CompanyClient.new(BankApi.configuration).get_recent_deposits
+    def self.get_recent_company_deposits(options = {})
+      company_instance.get_recent_deposits(options)
     end
 
     def self.company_transfer(transfer_data)
-      Clients::BancoSecurity::CompanyClient.new(BankApi.configuration).transfer(transfer_data)
+      company_instance.transfer(transfer_data)
     end
 
     def self.company_batch_transfers(transfers_data)
+      company_instance.batch_transfers(transfers_data)
+    end
+
+    def self.company_instance
       Clients::BancoSecurity::CompanyClient.new(BankApi.configuration)
-                                           .batch_transfers(transfers_data)
     end
   end
 end

data/lib/bank_api/clients/banco_de_chile_company_client.rb

@@ -38,7 +38,7 @@ module BankApi::Clients
       ].any?(&:nil?)
     end
 
-    def get_deposits
+    def get_deposits(_options = {})
       login
       goto_deposits
       select_deposits_range

data/lib/bank_api/clients/banco_security/company_client.rb

@@ -37,14 +37,15 @@ module BankApi::Clients::BancoSecurity
       find_account_balance(account_number)
     end
 
-    def get_deposits
+    def get_deposits(options = {})
       login
       goto_company_dashboard
-      goto_deposits
-      select_deposits_range
-      deposits = deposits_from_txt
-      validate_deposits(deposits) unless deposits.empty?
-      deposits
+
+      if options[:source] == :account_details
+        return get_deposits_from_balance_section(options[:account_number])
+      end
+
+      get_deposits_from_transfers_section
     ensure
       browser.close
     end
@@ -71,6 +72,21 @@ module BankApi::Clients::BancoSecurity
       browser.close
     end
 
+    def get_deposits_from_transfers_section
+      goto_deposits
+      select_deposits_range
+      deposits = deposits_from_txt
+      validate_deposits(deposits) unless deposits.empty?
+      deposits
+    end
+
+    def get_deposits_from_balance_section(account_number)
+      fail "missing :account_number option" unless account_number
+      goto_balance
+      goto_account_details(account_number.to_s)
+      deposits_from_account_details
+    end
+
     def goto_frame(query: nil, should_reset: true)
       sleep 1
       super

data/lib/bank_api/clients/banco_security/concerns/deposits.rb

@@ -2,10 +2,6 @@
 
 module BankApi::Clients::BancoSecurity
   module Deposits
-    DATE_COLUMN = 0
-    RUT_COLUMN = 2
-    AMOUNT_COLUMN = 5
-
     def select_deposits_range
       browser.search('.BusquedaPorDefectoRecibida a:contains("búsqueda avanzada")').click
       browser.search('#RadioEntreFechasRecibido').click
@@ -29,16 +25,54 @@ module BankApi::Clients::BancoSecurity
       format_transactions(transactions)
     end
 
+    def deposits_from_account_details
+      data = browser.download(
+        deposits_account_details_url
+      ).content.encode("UTF-8", "iso-8859-3").split("\r\n")
+      transactions = data[3, data.count - 11].reverse
+      format_account_transactions(transactions)
+    end
+
     def format_transactions(transactions)
       transactions.map do |t|
+        datetime = DateTime.parse(t[0])
         {
-          rut: format_rut(t[RUT_COLUMN]),
-          date: timezone.local_to_utc(DateTime.parse(t[DATE_COLUMN])).to_date,
-          amount: t[AMOUNT_COLUMN].to_i
+          client: t[1],
+          rut: format_rut(t[2]),
+          date: timezone.local_to_utc(datetime).to_date,
+          time: datetime,
+          amount: t[5].to_i
         }
       end
     end
 
+    def format_account_transactions(transactions)
+      transactions.inject([]) do |memo, t|
+        parts = t.split(";")
+        amount = parts[4].delete(",").to_i
+        next memo if amount.zero?
+        client = extract_client_name(parts[1])
+        next memo unless client
+
+        memo << {
+          client: client,
+          rut: nil,
+          date: Date.strptime(parts[0], "%d/%m"),
+          time: nil,
+          amount: amount
+        }
+
+        memo
+      end
+    end
+
+    def extract_client_name(text)
+      parts = text.to_s.split(" De ")
+      parts = text.to_s.split(" DE ") if parts.count == 1
+      return text if parts.count > 2
+      parts.last.to_s.strip
+    end
+
     def deposit_range
       @deposit_range ||= begin
         today = timezone.utc_to_local(Time.now).to_date
@@ -55,6 +89,10 @@ module BankApi::Clients::BancoSecurity
         "fechaInicio=#{start_}&fechaFin=#{end_}&estado=1"
     end
 
+    def deposits_account_details_url
+      browser.search("a:contains('Descargar TXT')").first.attribute("href")
+    end
+
     def format_rut(rut)
       verification_digit = rut[-1]
       without_verification_digit = rut[0..-2].reverse.scan(/.{1,3}/).join(".").reverse

data/lib/bank_api/clients/base_client.rb

@@ -11,9 +11,9 @@ module BankApi::Clients
       @days_to_check = config.days_to_check
     end
 
-    def get_recent_deposits
+    def get_recent_deposits(options = {})
       validate_credentials
-      parse_entries(get_deposits)
+      parse_entries(get_deposits(options))
     end
 
     def transfer(transfer_data)
@@ -42,7 +42,7 @@ module BankApi::Clients
       raise NotImplementedError
     end
 
-    def get_deposits
+    def get_deposits(_options = {})
       raise NotImplementedError
     end
 
@@ -122,8 +122,10 @@ module BankApi::Clients
         BankApi::Values::DepositEntry.new(
           entry[:amount],
           entry[:date],
+          entry[:time],
           entry[:rut],
-          bank_name
+          bank_name,
+          entry[:client]
         )
       end
       BankApi::SignDeposits.sign(deposit_entries)

data/lib/bank_api/clients/navigation/banco_security/company_navigation.rb

@@ -67,6 +67,10 @@ module BankApi::Clients::Navigation
         goto_frame query: 'iframe[name="central"]', should_reset: false
       end
 
+      def goto_account_details(account_number)
+        wait("a.clickable:contains(\"#{account_number}\")").click
+      end
+
       def goto_transfer_form
         goto_frame query: '#topFrame'
         selenium_browser.execute_script(

data/lib/bank_api/sign_deposits.rb

@@ -37,6 +37,7 @@ module BankApi::SignDeposits
   end
 
   def entry_key(entry)
-    "#{entry.amount}|#{entry.date}|#{entry.rut}|#{entry.bank}"
+    rut_or_client = entry.rut || entry.client.to_s.downcase.delete(' ')
+    "#{entry.amount}|#{entry.date}|#{rut_or_client}|#{entry.bank}"
   end
 end

data/lib/bank_api/values/deposit_entry.rb

@@ -1,12 +1,14 @@
 module BankApi::Values
   class DepositEntry
-    attr_accessor :amount, :date, :rut, :signature, :bank
+    attr_accessor :client, :amount, :date, :time, :rut, :signature, :bank
 
-    def initialize(amount, date, rut, bank)
+    def initialize(amount, date, time, rut, bank, client)
       @amount = amount
       @date = date
+      @time = time
       @rut = rut
       @bank = bank
+      @client = client
     end
   end
 end

data/lib/bank_api/version.rb

@@ -1,3 +1,3 @@
 module BankApi
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bank_api
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - oaestay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pincers