bank_api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658eeb4228e71f3270ec9fcb7f9455e2a8f703ba
-  data.tar.gz: dea5f4a5b8c30973b5f1bcae01829869938c9272
+  metadata.gz: abde8158cac67c0a38e773a4667767026e6146ae
+  data.tar.gz: aeb12e55f14718d2df458d28173f61c9f5d032f1
 SHA512:
-  metadata.gz: 69241713c94c45fae648a6d92aa5002d781121d743e3f9579d28c52f5f078d3b8967a51bbba8630bcd132d75027775e4ea82f54139ae46f26db15ccb65fc2974
-  data.tar.gz: 9ab588cfcd5e6db746f9365707da79a99f2728dacdec3018072f191e33a0155be4357482a0aab4adcb497f5f3b8ae31b14543c59a94fdb8b8b5e0ca2f5df2ec1
+  metadata.gz: b87b6c4371123c40cb0727a2c9a1335bf7f4c3e599e0cb74fe57c81a767df9b9e26c250e819e90e20c8f64a06645799f28bacbd920e19b816f2ec3043da82b3e
+  data.tar.gz: 25af2be30ba0ae54b42b45c59b98e7760ac14a7b1b1046306c9d7e39b7099c3e08a698e196583a6480cb39de197141cb0b9e7729bec9683de17efd869c02e39b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bank_api (0.3.1)
+    bank_api (0.3.2)
       pincers
       timezone (~> 1.0)
 

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

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'timezone'
 
 require 'bank_api/clients/base_client'
@@ -29,17 +30,13 @@ module BankApi::Clients::BancoSecurity
 
     def get_deposits
       login
-      deposits_first_try = get_deposits_try
-      deposits_second_try = get_deposits_try
-      browser.close
-      deposits_first_try == deposits_second_try ? deposits_first_try : []
-    end
-
-    def get_deposits_try
       goto_company_dashboard
       goto_deposits
       select_deposits_range
-      extract_deposits_from_html
+      deposits = deposits_from_txt
+      validate_deposits(deposits) unless deposits.empty?
+      browser.close
+      deposits
     end
 
     def execute_transfer(transfer_data)

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

@@ -6,16 +6,13 @@ module BankApi::Clients::BancoSecurity
     RUT_COLUMN = 2
     AMOUNT_COLUMN = 5
 
-    NUMBER_OF_COLUMNS = 7
-
     def select_deposits_range
       browser.search('.BusquedaPorDefectoRecibida a:contains("búsqueda avanzada")').click
       browser.search('#RadioEntreFechasRecibido').click
-      browser.search('#datePickerInicioRecibidas').set deposit_range[:start]
-      browser.search('#datePickerFinRecibido').set deposit_range[:end]
+      browser.search('#datePickerInicioRecibidas').set deposit_range[:start].strftime('%d/%m/%Y')
+      browser.search('#datePickerFinRecibido').set deposit_range[:end].strftime('%d/%m/%Y')
       wait('.ContenedorSubmitRecibidas .btn_buscar').click
       wait_for_deposits_fetch
-      set_page_size
     end
 
     def wait_for_deposits_fetch
@@ -25,62 +22,42 @@ module BankApi::Clients::BancoSecurity
       wait('.k-loading-image') { browser.search('.k-loading-image').none? }
     end
 
-    def wait_for_next_page(last_seen_deposit)
-      wait(".k-pager-info") { last_seen_deposit < last_deposit_in_current_page }
+    def deposits_from_txt
+      return [] unless any_deposits?
+      download = browser.download(deposits_txt_url)
+      transactions = download.content.split("\n").drop(1).map { |r| r.split("|") }
+      format_transactions(transactions)
     end
 
-    def extract_deposits_from_html
-      deposits = []
-
-      return deposits unless any_deposits?
-
-      deposits += deposits_from_page
-      last_seen_deposit = last_deposit_in_current_page
-      ((total_deposits - 1) / @page_size).times do
-        goto_next_page
-        wait_for_next_page(last_seen_deposit)
-        last_seen_deposit = last_deposit_in_current_page
-
-        deposits += deposits_from_page
+    def format_transactions(transactions)
+      transactions.map do |t|
+        {
+          rut: format_rut(t[RUT_COLUMN]),
+          date: Date.parse(t[DATE_COLUMN]),
+          amount: t[AMOUNT_COLUMN].to_i
+        }
       end
-
-      validate_deposits(deposits, last_seen_deposit)
-
-      deposits.sort_by { |d| d[:date] }
     end
 
-    def deposits_from_page
-      deposits = []
-      deposit = {}
-      browser.search('#gridPrincipalRecibidas tbody td').each_with_index do |div, index|
-        if (index % NUMBER_OF_COLUMNS) == RUT_COLUMN
-          deposit[:rut] = div.text
-        elsif (index % NUMBER_OF_COLUMNS) == DATE_COLUMN
-          deposit[:date] = Date.parse div.text
-        elsif (index % NUMBER_OF_COLUMNS) == AMOUNT_COLUMN
-          deposit[:amount] = div.text.gsub(/[\. $]/, '').to_i
-        elsif ((index + 1) % NUMBER_OF_COLUMNS).zero?
-          deposits << deposit
-          deposit = {}
-        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), end: today }
       end
-      deposits
     end
 
-    def set_page_size
-      browser.search('[aria-owns="pagerSettingRecibidas_listbox"]').click
-      sleep 0.1
-      browser.search('.k-animation-container.km-popup li').find do |li|
-        li.text == @page_size.to_s
-      end.click
-      wait('.k-loading-image') { browser.search('.k-loading-image').any? }
-      wait('.k-loading-image') { browser.search('.k-loading-image').none? }
+    def deposits_txt_url
+      account_number = CGI.escape(selenium_browser.execute_script('return nCuenta'))
+      start_ = CGI.escape("#{deposit_range[:start].strftime('%m/%d/%Y')} 00:00:00")
+      end_ = CGI.escape("#{deposit_range[:end].strftime('%m/%d/%Y')} 00:00:00")
+      "https://www.bancosecurity.cl/ConvivenciaEmpresas/CartolasTEF/Download/" +
+        "CrearTxTRecibidas?numeroCuenta=#{account_number}&monto=0&" +
+        "fechaInicio=#{start_}&fechaFin=#{end_}&estado=1"
     end
 
-    def last_deposit_in_current_page
-      pages_info = wait(".k-pager-info")
-      matches = pages_info.text.match(/(\d+)[a-z\s-]+(\d+)[a-z\s-]+(\d+)/)
-      matches[2].to_i
+    def format_rut(rut)
+      rut.insert(-2, '-')
     end
 
     def total_deposits
@@ -89,18 +66,6 @@ module BankApi::Clients::BancoSecurity
       matches[3].to_i
     end
 
-    def goto_next_page
-      browser.search('#gridPrincipalRecibidas a.k-link[title="Go to the next page"]').click
-    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
-
     def any_deposits?
       browser.search(
         "#gridPrincipalRecibidas " \
@@ -108,17 +73,12 @@ module BankApi::Clients::BancoSecurity
       ).none?
     end
 
-    def validate_deposits(deposits, last_seen_deposit)
+    def validate_deposits(deposits)
       total_deposits_ = total_deposits
       unless deposits.count == total_deposits_
         raise BankApi::Deposit::QuantityError, "Expected #{total_deposits_} deposits," +
           " got #{deposits.count}."
       end
-
-      unless last_seen_deposit == total_deposits_
-        raise BankApi::Deposit::PaginationError, "Expected to fetch #{total_deposits_} deposits," +
-          " the last seen deposit was nº #{last_seen_deposit}."
-      end
     end
   end
 end

data/lib/bank_api/version.rb

@@ -1,3 +1,3 @@
 module BankApi
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bank_api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - oaestay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pincers