bank_api 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 677d96ca2f7b34dd14005b9dd33285af376bd7dccb71d176e70262b81337047c
-  data.tar.gz: d415acb7886194cb84d3f4075db0e20c5ec2ffdeb2aca895ecfa5f87e45dacd3
+SHA1:
+  metadata.gz: 4546cdde255d5e40b6106c68d8a8dec2c4aad0ca
+  data.tar.gz: 9113856380204a99a5a75faf2101336ab1e6564c
 SHA512:
-  metadata.gz: ac8b2ed80cd4c0a2533f13c2c0859210f1ae82f6a02386156d4eafffc6d0b20fc533edef2961b748608dc8df3b4fdb80fb9df899766c16384133b5cdf8744210
-  data.tar.gz: fc2f0d5b104f85c89003666181578088e5fe639d61796906db10ca5d9da873bafb1f3b2b418268ebcd13fb65a61b5ac66dbceb17ad52822281dfff83bdbd6494
+  metadata.gz: 97ed3117c45055b44b0f3ab5e38279aaff618f9812ab3db72d3238b9edc0e4339da9e21b822b207ee705b9030cc4a84fdfa0dc668ef3a603d876e4804974bb93
+  data.tar.gz: e9e3772328998873e562a1ea96fbcbb0df15435c1033d2c130d767b6fbeb897449cbed47c48c88ab8250e54ef0c62a4ae5ad639f9718106d0ac54e791f355592

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    bank_api (0.2.5)
+    bank_api (0.2.6)
       pincers
       timezone (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    childprocess (0.9.0)
+    byebug (10.0.2)
+    childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     diff-lcs (1.3)
@@ -23,6 +24,9 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -52,6 +56,7 @@ DEPENDENCIES
   bank_api!
   bundler (~> 1.16)
   pry
+  pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/bank_api.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 end

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

@@ -19,6 +19,7 @@ module BankApi::Clients::BancoSecurity
       @password = config.banco_security.password
       @company_rut = config.banco_security.company_rut
       @dynamic_card = config.banco_security.dynamic_card
+      @page_size = config.banco_security.page_size
       super
     end
 

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

@@ -7,7 +7,6 @@ module BankApi::Clients::BancoSecurity
     AMOUNT_COLUMN = 5
 
     NUMBER_OF_COLUMNS = 7
-    DEFAULT_PAGINATION = 30
 
     def select_deposits_range
       browser.search('.BusquedaPorDefectoRecibida a:contains("búsqueda avanzada")').click
@@ -15,14 +14,19 @@ module BankApi::Clients::BancoSecurity
       browser.search('#datePickerInicioRecibidas').set deposit_range[:start]
       browser.search('#datePickerFinRecibido').set deposit_range[:end]
       browser.search('.ContenedorSubmitRecibidas .btn_buscar').click
+      set_page_size
       wait_for_deposits_fetch
     end
 
     def wait_for_deposits_fetch
       goto_frame query: '#mainFrame'
       goto_frame query: 'iframe[name="central"]', should_reset: false
-      sleep 0.5
-      wait('.k-loading-image') { browser.search('.k-loading-image').count.zero? }
+      wait('.k-loading-image') { browser.search('.k-loading-image').any? }
+      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 }
     end
 
     def extract_deposits_from_html
@@ -31,12 +35,17 @@ module BankApi::Clients::BancoSecurity
       return deposits unless any_deposits?
 
       deposits += deposits_from_page
-
-      ((total_results - 1) / DEFAULT_PAGINATION).times do
+      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
       end
 
+      validate_deposits(deposits, last_seen_deposit)
+
       deposits.sort_by { |d| d[:date] }
     end
 
@@ -58,6 +67,28 @@ module BankApi::Clients::BancoSecurity
       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? }
+    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
+    end
+
+    def total_deposits
+      pages_info = wait(".k-pager-info")
+      matches = pages_info.text.match(/(\d+)[a-z\s-]+(\d+)[a-z\s-]+(\d+)/)
+      matches[3].to_i
+    end
+
     def goto_next_page
       browser.search('#gridPrincipalRecibidas a.k-link[title="Go to the next page"]').click
     end
@@ -78,9 +109,17 @@ module BankApi::Clients::BancoSecurity
       ).none?
     end
 
-    def total_results
-      browser.search('#gridPrincipalRecibidas .k-pager-info')
-             .text.scan(/\d+/).last.to_i
+    def validate_deposits(deposits, last_seen_deposit)
+      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/configs/banco_security.rb

@@ -2,13 +2,14 @@ require 'bank_api/values/dynamic_card'
 
 module BankApi::Configs
   class BancoSecurity
-    attr_accessor :user_rut, :password, :company_rut, :dynamic_card_entries
+    attr_accessor :user_rut, :password, :company_rut, :page_size, :dynamic_card_entries
 
     def initialize
       @user_rut = nil
       @password = nil
       @company_rut = nil
       @dynamic_card_entries = nil
+      @page_size = 30
     end
 
     def dynamic_card

data/lib/bank_api/exceptions.rb

@@ -1,5 +1,9 @@
 module BankApi
   class MissingCredentialsError < StandardError; end
+  module Deposit
+    class QuantityError < StandardError; end
+    class PaginationError < StandardError; end
+  end
   module Transfer
     class InvalidBank < StandardError; end
     class InvalidAccountType < StandardError; end

data/lib/bank_api/version.rb

@@ -1,3 +1,3 @@
 module BankApi
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bank_api
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - oaestay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pincers
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wrapper for chilean banks
 email:
 - oaestay@uc.cl
@@ -150,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Wrapper for chilean banks