bank_scrap 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce7f4d32e3f3900721ec3a2ab289f9cb15ce8968
-  data.tar.gz: 8ecc35df726bc45669b3fde9ebf9f023506e24e9
+  metadata.gz: 011bc3352dbc67fd3346b8214de8761910772cb7
+  data.tar.gz: 839d98e70e9755a1d8032e789f587655f7a52d55
 SHA512:
-  metadata.gz: 5ce34cc53d2c9f7274e66aac5bfe39d5cc672c87ce989967c2d08cf5158c51f77b485a1531fe5f30db200207336568986b025da6125143e17a2799676b1e593c
-  data.tar.gz: e577618b857f9211a8bd34ab8048324fb68cc4276a80e4f5ff92458262ccbe9ced2d99f68f85891f9720d0b0d235ed70e5a6ac637decb11c570b5e92abadcd2d
+  metadata.gz: 3ed3e531ad452268c55e95cfb3c8dd0eaa7bc4b9c46ad884f4f2a16a1e0bca5edeafb1d02337864dd85b2d240cfe893b9252f7bc0a92177b61eeedcb845a3dfe
+  data.tar.gz: 844bc92e681e981f6cede4963c1b64a0ffab36e3702fddf06fadd63c0c3e758fe61c85c4a671ee62afe4b140e1fdc756cebad0b1456820d057cc7ff6cb4e3973

data/README.md

@@ -10,8 +10,8 @@ Feel free to contribute and add your bank if it isn't supported.
 
 |                 |  BBVA  | ING Direct | Bankinter |
 |-----------------|:------:|:----------:|:---------:|
-| Account Balance |    ✓   |     ✓     |    WIP    |
-|  Transactions   |    ✓   |     ✓     |    WIP    |
+| Account Balance |    ✓   |      ✓     |     ✓     |
+|  Transactions   |    ✓   |      ✓     |     ✓     |
 
 Interested in any other bank? Open a new Issue and we'll try to help.
  
@@ -54,12 +54,12 @@ Or, if you're using Bundler, just add the following to your Gemfile:
 ### From terminal
 #### Bank account balance
 
-###### BBVA
+###### BBVA | Bankinter
 
-    $ bank_scrap balance bbva --user YOUR_BBVA_USER --password YOUR_BBVA_PASSWORD
+    $ bank_scrap balance your_bank --user YOUR_BANK_USER --password YOUR_BANK_PASSWORD
 
 ###### ING Direct
-ING needs one more argument: your bithday.
+ING needs one more argument: your birthday.
 
     $ bank_scrap balance ing --user YOUR_DNI --password YOUR_PASSWORD --extra=birthday:01/01/1980
 
@@ -96,6 +96,8 @@ require 'bank_scrap'
 bbva = BankScrap::Bbva.new(YOUR_BBVA_USER, YOUR_BBVA_PASSWORD)
 # ING
 ing = BankScrap::Ing.new(YOUR_DNI, YOUR_ING_PASSWORD, extra_args: {"birthday" => "dd/mm/yyyy"})
+# BANKINTER
+bankinter = BankScrap::Bankinter.new(YOUR_BANKINTER_USER, YOUR_BANKINTER_PASSWORD)
 ```
 
 

data/lib/bank_scrap/bank.rb

@@ -57,9 +57,6 @@ module BankScrap
 
 
     def initialize_cookie(url)
-      log 'Initialize cookie'
-
-      @http.url = url
       @http.get(url).body
     end
 

data/lib/bank_scrap/banks/bankinter.rb

@@ -3,9 +3,9 @@ require 'execjs'
 
 module BankScrap
   class Bankinter < Bank
-
-    BASE_ENDPOINT = "https://movil.bankinter.es"
-    LOGIN_ENDPOINT = "/mov/es-es/cgi/ebkmovil+md+login"
+    BASE_ENDPOINT = "https://www.bankinter.com"
+    LOGIN_ENDPOINT = "/www/es-es/cgi/ebk+login"
+    TRANSACTIONS_ENDPOINT = "/www/es-es/cgi/ebk+opr+buscadormov"
 
     def initialize(user, password, log: false, debug: false, extra_args: nil)
       @user = user
@@ -14,50 +14,90 @@ module BankScrap
       @debug = debug
 
       initialize_connection
-      parse_html(initialize_cookie(BASE_ENDPOINT + '/'))
+      initialize_cookie(BASE_ENDPOINT)
+      parse_html(get(BASE_ENDPOINT + '/www/es-es/cgi/ebk+gc+lgin'))
       login
+      super
     end
 
-    def get_balance
+    def fetch_accounts
+      log 'fetch_accounts'
+      accounts = []
       if @dashboard_doc
-        if links = @dashboard_doc.css('div.textoresaltado_md a')
-          links[0].text
+        if links = @dashboard_doc.css('div.caj_content_plegable.bk_ocultable_novisible div.tab_extracto_01')[0]
+          links.css('table tbody tr').each do |x|
+            name = x.css('td.enlace div form button').text.encode("UTF-8")
+            balance_currency = x.css('td.numero').text.scan(/[\d,\.]+|\D+/)
+            balance = balance_currency[0]
+            currency = balance_currency[1].gsub(/[[:space:]]/,"")
+            cc = x.css('td.enlace div form input')[0]['value']
+            data = {'id' => cc, 'description' => name, 'availableBalance' => balance, 'currency' => currency, 'iban' => cc}
+
+            accounts.push(build_account(data))
+          end
         end
       end
+
+      accounts
     end
 
-    def get_transactions
-      response = get(BASE_ENDPOINT + "/mov/es-es/cgi/" + @transactions_endpoint)
+    def fetch_transactions_for(account, start_date: Date.today - 1.month, end_date: Date.today)
+      transactions = []
+
+      fields = {
+        'ext-solapa' => 'operar',
+        'ext-subsolapa' => 'mis_cuentas',
+        'ordenDesc' => '',
+        'ordenFechaC' => 'A',
+        'ordenFechaV' => '',
+        'ordenGasto' => '',
+        'ordenIng' => '',
+        'buscador' => 'S',
+        'tipoConsulta' => 'N',
+        'seleccionado_tipo' => '',
+        'cuenta_seleccionada' => account.iban,
+        'tipoMov' => 'A',
+        'dia' => start_date.strftime("%d"),
+        'mes' => start_date.strftime("%m"),
+        'anio' => start_date.strftime("%Y"),
+        'diaH' => end_date.strftime("%d"),
+        'mesH' => end_date.strftime("%m"),
+        'anioH' => end_date.strftime("%Y"),
+      }
+
+      response = post(BASE_ENDPOINT + TRANSACTIONS_ENDPOINT, fields)
 
       html_doc = Nokogiri::HTML(response)
 
-      html_transactions = html_doc.css('ul#listamovimiento li')
+      html_transactions = html_doc.css('table#tablaDin_tabla tbody tr')
 
-      # puts html_transactions[0]
-      html_transactions.each do |x| 
-        puts x.css('div.fechaimagen span').text
-        puts x.css('div.altoMaximo').text
-        puts x.css('div.importesproductosflecha_md').text
+      html_transactions.each do |x|
+        date = x.css('td.fecha')[0].text
+        description = x.css('td')[2].text
+        amount = x.css('td.numero').text.gsub(/\s+|\.|,/, "")
+
+        data = {'description' => description, 'amount' => amount, 'operationDate' => date, 'currency' => account.currency}
+        transactions.push(build_transaction(data, account));
       end
 
+      transactions
     end
 
     private
 
     def login
-      fields = [
-          Curl::PostField.content('bkcache',''),
-          Curl::PostField.content('destino', ''),
-          Curl::PostField.content(@id_field, 'username,password,psi'),
-          Curl::PostField.content(@login_field,@login_param)
-      ]
+      fields = {
+        'bkcache' => '',
+        'destino' => 'ebk+opr+extractointegral',
+        @id_field => 'username,password,psi',
+        @login_field => @login_param
+      }
 
       response = post(BASE_ENDPOINT + LOGIN_ENDPOINT, fields)
 
-      @dashboard_doc = Nokogiri::HTML(response)
-
-      @transactions_endpoint = @dashboard_doc.xpath('//div[@class="floatIzquierdo_md"]/form/@action')[0];
+      response = get(BASE_ENDPOINT + '/www/es-es/cgi/ebk+opr+extractointegral')
 
+      @dashboard_doc = Nokogiri::HTML(response, nil, "ISO-8859-1")
     end
 
     def parse_html(html)
@@ -67,7 +107,6 @@ module BankScrap
 
       html_form = html_doc.css('form#fLogSecurity')
       #TODO: Check if form is present if not retry initialize cookie for 5 attemps
-
       @id_field = html_form.xpath('input[3]/@id')
 
       js_source = 'var document = {};' + html_form.text
@@ -83,5 +122,31 @@ module BankScrap
 
       @login_param = js_context.call(js_function, @user, @password, psi_actions)
     end
+
+    def build_account(data)
+      Account.new(
+        bank: self,
+        id: data['id'],
+        balance: data['availableBalance'],
+        currency: data['currency'],
+        description: data['description'],
+        iban: data['iban']
+      )  
+    end
+
+    def build_transaction(data, account)
+      amount = Money.new(data['amount'], data['currency'])
+      balance = data['accountBalanceAfterMovement'] ? Money.new(data['accountBalanceAfterMovement'] * 100, data['currency']) : nil
+
+      Transaction.new(
+        account: account,
+        id: data['id'],
+        amount: amount,
+        description: data['conceptDescription'] || data['description'],
+        effective_date: Date.strptime(data['operationDate'], "%d-%m-%Y"),
+        currency: data['currency'],
+        balance: balance
+      )
+    end 
   end
 end

data/lib/bank_scrap/version.rb

@@ -1,3 +1,3 @@
 module BankScrap
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bank_scrap
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ismael Sánchez
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler