bank_api 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc730d3ccd3df5e99abf8d49ef0df61a100ec2bf5d2abe349c15a2eb85251f23
-  data.tar.gz: 5b51badad99fe9db5f0c72809d022aeabf8fec712522ba453f2c124a4d6a6f3d
+  metadata.gz: 165cb735e2871a94d6767c41ba7fe0ad18e5dfe81dab404fb997f2881eefc279
+  data.tar.gz: 49431a70b4e18686ac0c2a600233493266f7d7cd2e41531424bedacf29a65e4b
 SHA512:
-  metadata.gz: 27bed8041370135108fa1892796b2eaccc7682a7acf5f97c7cc6dd69b069e7cad4592d98b44aadf0efc3fb34a1310e37e7b070160d69cfc21581c983d4be4434
-  data.tar.gz: 416495f81f5c24ab408e11c1ed06694ea14474582b99706a17ba9d46edb05a216657254bda14ccba2f218dfe4e3a92ed40ac3c375c399883befa7765c0db1073
+  metadata.gz: b6098dd8ae93f1bf1c90494550ae8261d9cbe317d03201c740abca1984f52041bffa5a4e311bc84fb9be985647163caf6ad8e875d23585bb81aa03bb6823f354
+  data.tar.gz: d9b825d50ed7ad44fe5c95ee8913138c77f1a10546388aa766221a847662aed4c2b393cb2426d1306d697cbc904fc533269d7b4630c7e735d976a588e7c7aa76

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    bank_api (0.3.4)
+    bank_api (0.4.0)
       pincers
+      rest-client
       timezone (~> 1.0)
 
 GEM
@@ -13,10 +14,18 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     diff-lcs (1.3)
-    ffi (1.9.23)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.25)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.2)
+    netrc (0.11.0)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     pincers (0.7.12)
       nokogiri (~> 1.6)
@@ -28,6 +37,10 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     rake (10.5.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -46,8 +59,11 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    timezone (1.2.11)
-    websocket (1.2.5)
+    timezone (1.2.12)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    websocket (1.2.8)
 
 PLATFORMS
   ruby

data/bank_api.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'pincers'
+  spec.add_dependency 'rest-client'
   spec.add_dependency 'timezone', '~> 1.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/bank_api.rb

@@ -26,6 +26,10 @@ module BankApi
   end
 
   module BancoSecurity
+    def self.get_account_balance(account_number)
+      Clients::BancoSecurity::CompanyClient.new(BankApi.configuration).get_balance(account_number)
+    end
+
     def self.get_recent_company_deposits
       Clients::BancoSecurity::CompanyClient.new(BankApi.configuration).get_recent_deposits
     end

data/lib/bank_api/clients/banco_de_chile_company_client.rb

@@ -1,3 +1,4 @@
+require 'rest-client'
 require 'timezone'
 
 require 'bank_api/clients/base_client'
@@ -6,8 +7,7 @@ module BankApi::Clients
   class BancoDeChileCompanyClient < BaseClient
     COMPANY_LOGIN_URL = 'https://www.empresas.bancochile.cl/cgi-bin/navega?pagina=enlinea/login_fus'
     COMPANY_DEPOSITS_URL = 'https://www.empresas.bancochile.cl/GlosaInternetEmpresaRecibida/ConsultaRecibidaAction.do'
-
-    TABLE_OFFSET = 1
+    COMPANY_DEPOSITS_TXT_URL = 'https://www.empresas.bancochile.cl/GlosaInternetEmpresaRecibida/RespuestaConsultaRecibidaAction.do'
 
     DATE_COLUMN = 0
     RUT_COLUMN = 4
@@ -39,18 +39,11 @@ module BankApi::Clients
 
     def get_deposits
       login
-      deposits_first_try = get_deposits_try
-      deposits_second_try = get_deposits_try
-      deposits_first_try == deposits_second_try ? deposits_first_try : []
-    ensure
-      browser.close
-    end
-
-    def get_deposits_try
       goto_deposits
       select_deposits_range
-      submit_deposits_form
-      extract_deposits_from_html
+      deposits = deposits_from_txt
+      browser.close
+      deposits
     end
 
     def login
@@ -80,14 +73,7 @@ module BankApi::Clients
     end
 
     def select_deposits_range
-      timezone = Timezone['America/Santiago']
-      range_start = (
-        timezone.utc_to_local(Time.now).to_date - @days_to_check
-      ).strftime("%d/%m/%Y")
-      browser.search('input[name=initDate]').set(range_start)
-    end
-
-    def submit_deposits_form
+      browser.search('input[name=initDate]').set(deposit_range[:start])
       browser.search('#consultar').click
     end
 
@@ -95,46 +81,69 @@ module BankApi::Clients
       browser.search('table#sin_datos').count.zero?
     end
 
-    def extract_deposits_from_html
-      deposits = []
-
-      return deposits unless any_deposits?
+    def total_results
+      browser.search("#pager .encabezadotabla:contains(\"Operaciones encontradas\")")
+             .text[/\d+/].to_i
+    end
 
-      deposits += deposits_from_page
+    def deposits_from_txt
+      return [] unless any_deposits?
+      response = RestClient.post(
+        COMPANY_DEPOSITS_TXT_URL,
+        deposits_params(deposit_range[:start], deposit_range[:end]),
+        session_headers
+      )
+      transactions = split_transactions(response.body)
+      format_transactions(transactions)
+    end
 
-      ((total_results - 1) / 10).times do
-        goto_next_page
-        deposits += deposits_from_page
+    def split_transactions(transactions_str)
+      transactions_str.delete("\r").split("\n").drop(1).map { |r| r.split(";") }.select do |t|
+        t[STATE_COLUMN] == "Aprobada"
       end
+    end
 
-      deposits.sort_by { |d| d[:date] }
-    end
-
-    def deposits_from_page
-      deposits = []
-      deposit = {}
-      browser.search('.linea1tabla').each_with_index do |div, index|
-        if ((index - TABLE_OFFSET) % NUMBER_OF_COLUMNS) == RUT_COLUMN
-          deposit[:rut] = div.text
-        elsif ((index - TABLE_OFFSET) % NUMBER_OF_COLUMNS) == DATE_COLUMN
-          deposit[:date] = Date.parse div.text
-        elsif ((index - TABLE_OFFSET) % NUMBER_OF_COLUMNS) == AMOUNT_COLUMN
-          deposit[:amount] = div.text.delete(',')
-        elsif ((index - TABLE_OFFSET) % NUMBER_OF_COLUMNS) == STATE_COLUMN
-          deposits << deposit if div.text == 'Aprobada'
-          deposit = {}
-        end
+    def format_transactions(transactions)
+      transactions.map do |t|
+        {
+          rut: t[RUT_COLUMN],
+          date: Date.parse(t[DATE_COLUMN]),
+          amount: t[AMOUNT_COLUMN].to_i
+        }
       end
-      deposits
     end
 
-    def goto_next_page
-      browser.search("#pager .next").click
+    def deposits_params(from_date, to_date)
+      {
+        'accion' => 'exportarTxtOperaciones',
+        'initDate' => from_date,
+        'endDate' => to_date,
+        'ctaCorriente' => 'TODAS',
+        'nada' => 'nada'
+      }
     end
 
-    def total_results
-      browser.search("#pager .encabezadotabla:contains(\"Operaciones encontradas\")")
-             .text[/\d+/].to_i
+    def session_headers
+      {
+        "Cookie" => "JSESSIONID=#{cookie('JSESSIONID')}; token=#{cookie('token')}",
+        "Content-Type" => "application/x-www-form-urlencoded",
+        "Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/" +
+          "apng,*/*;q=0.8",
+        "Referer" => "https://www.empresas.bancochile.cl/GlosaInternetEmpresaRecibida/" +
+          "RespuestaConsultaRecibidaAction.do"
+      }
+    end
+
+    def cookie(name)
+      selenium_browser.manage.cookie_named(name)[:value]
+    end
+
+    def deposit_range
+      @deposit_range ||= begin
+        timezone = Timezone['America/Santiago']
+        today = timezone.utc_to_local(Time.now).to_date
+        { start: (today - @days_to_check).strftime("%d/%m/%Y"), end: today.strftime("%d/%m/%Y") }
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@ require 'cgi'
 require 'timezone'
 
 require 'bank_api/clients/base_client'
+require 'bank_api/clients/banco_security/concerns/balance'
 require 'bank_api/clients/banco_security/concerns/deposits'
 require 'bank_api/clients/banco_security/concerns/login'
 require 'bank_api/clients/banco_security/concerns/transfers'
@@ -11,6 +12,7 @@ require 'bank_api/utils/banco_security'
 module BankApi::Clients::BancoSecurity
   class CompanyClient < BankApi::Clients::BaseClient
     include BankApi::Clients::Navigation::BancoSecurity::CompanyNavigation
+    include BankApi::Clients::BancoSecurity::Balance
     include BankApi::Clients::BancoSecurity::Deposits
     include BankApi::Clients::BancoSecurity::Transfers
     include BankApi::Clients::BancoSecurity::Login
@@ -28,6 +30,13 @@ module BankApi::Clients::BancoSecurity
       :security
     end
 
+    def get_balance(account_number)
+      login
+      goto_company_dashboard
+      goto_balance
+      find_account_balance(account_number)
+    end
+
     def get_deposits
       login
       goto_company_dashboard

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

@@ -0,0 +1,35 @@
+# coding: utf-8
+
+module BankApi::Clients::BancoSecurity
+  module Balance
+    ACCOUNT_NUMBER_COLUMN = 0
+    AVAILABLE_BALANCE_COLUMN = 1
+    COUNTABLE_BALANCE_COLUMN = 2
+
+    def find_account_balance(account_number)
+      balance = browser.search(".cuentas-corrientes").search("tbody tr").map do |row|
+        cells = row.search("td")
+        {
+          account_number: cells[ACCOUNT_NUMBER_COLUMN].text,
+          available_balance: money_to_i(cells[AVAILABLE_BALANCE_COLUMN].text),
+          countable_balance: money_to_i(cells[COUNTABLE_BALANCE_COLUMN].text)
+        }
+      end.find do |row|
+        row[:account_number] == account_number
+      end
+      validate_balance(balance, account_number)
+      balance
+    end
+
+    def money_to_i(text)
+      text.delete(".").delete("$").delete(" ").to_i
+    end
+
+    def validate_balance(balance, account_number)
+      if balance.nil?
+        raise BankApi::Balance::InvalidAccountNumber, "Couldn't find balance of account " +
+          account_number.to_s
+      end
+    end
+  end
+end

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

@@ -50,6 +50,23 @@ module BankApi::Clients::Navigation
         wait('a.k-link:contains("Recibidas")').click
       end
 
+      def goto_balance
+        goto_frame query: '#topFrame'
+        selenium_browser.execute_script(
+          "MM_goToURL('parent.frames[\\'topFrame\\']','../menu/MenuTopInicio.asp'," +
+          "'parent.frames[\\'leftFrame\\']','../menu/MenuInicio.asp'," +
+          "'parent.frames[\\'mainFrame\\']','../../../noticias/arriba_noticias.asp');" +
+          "return document.MM_returnValue;"
+        )
+        selenium_browser.execute_script(
+          "MM_goToURL('parent.frames[\\'mainFrame\\']'," +
+          "'/empresas/RedirectConvivencia.asp?urlRedirect" +
+          "=Cartola/Home/CartolaOrSaldoCuentaCorriente')"
+        )
+        goto_frame query: '#mainFrame'
+        goto_frame query: 'iframe[name="central"]', should_reset: false
+      end
+
       def goto_transfer_form
         goto_frame query: '#topFrame'
         selenium_browser.execute_script(

data/lib/bank_api/exceptions.rb

@@ -1,5 +1,8 @@
 module BankApi
   class MissingCredentialsError < StandardError; end
+  module Balance
+    class InvalidAccountNumber < StandardError; end
+  end
   module Deposit
     class QuantityError < StandardError; end
     class PaginationError < StandardError; end

data/lib/bank_api/version.rb

@@ -1,3 +1,3 @@
 module BankApi
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bank_api
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - oaestay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pincers
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timezone
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ files:
 - lib/bank_api.rb
 - lib/bank_api/clients/banco_de_chile_company_client.rb
 - lib/bank_api/clients/banco_security/company_client.rb
+- lib/bank_api/clients/banco_security/concerns/balance.rb
 - lib/bank_api/clients/banco_security/concerns/deposits.rb
 - lib/bank_api/clients/banco_security/concerns/login.rb
 - lib/bank_api/clients/banco_security/concerns/transfers.rb