afterbanks-api-ruby 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4fa27b556d79a7825b09d17c10a21f9c554d1b05
-  data.tar.gz: a32e2b93047687dc1f97fabb398ebff542863ba4
+SHA256:
+  metadata.gz: 7e8930f102e85517209fcce5b5b135df8a2c2ef8f006b34373d2f3f8fb506c6c
+  data.tar.gz: c0dc2f9f696a0c7deb911c8c97540c58c24ae279889fcbf1e817523c9d004379
 SHA512:
-  metadata.gz: 85b9193d0c31773f937f5915cd23a6a4a4979173a010f643e21e06664db4ea7b6d918ddf06aca5daa65908b5391e2d269830ed099865bb54efad2f7e195199d0
-  data.tar.gz: 8b7bbbf76fbbde4cab9439d4c7266a4d547cb9ab5b2094457549b9dc370a70c1568bb80551ce1996f00abaf953db41cd0e0cda955b5a062f3e400210b8bfc946
+  metadata.gz: '0399b89536f56a7a7a005b1de08a39467e904f334d93e71785417e7484dc52c33a5ddcbbe45c071ccb2f33b6d6b95277bf948db36b21f05f0f4d917c22c08985'
+  data.tar.gz: 8470ba253a635d0fe30f37ae3734ce9d71bef65d95065e0ec53c45a8f6792f9bad155ba69437e73e32d1e1beb5d9f60638510a54d896f89e6e2fc9d8681307cb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afterbanks-api-ruby (0.1.0)
+    afterbanks-api-ruby (0.3.0)
       rest-client (~> 2.0.2)
 
 GEM

data/README.md

@@ -4,11 +4,6 @@
 
 This is a Ruby client for the Afterbanks' API
 
-Changelog
----------
-
-* v.0.1.0 First vull version, including resource wrapping (for banks, accounts, transactions and the user) and separate exceptions for each different code.
-
 Installation
 ---------
 
@@ -35,6 +30,17 @@ end
 
 You can set a `logger` as well.
 
+Changelog
+---------
+
+* v.0.3.0 Set a higher timeout so it works properly with ING Direct
+* v.0.2.3 Better logging
+* v.0.2.2 Better naming (fix Caixa Guissona, Caixa Burriana and Banco Pichincha)
+* v.0.2.1 Better naming for banks (add Particulares for the proper ones, and use Caixa Enginyers)
+* v.0.2.0 Allow adding an (opt-in) random parameter to Afterbanks::Account.list to avoid caching
+* v.0.1.1 Fix rake security issue and remove specific Ruby version dependency.
+* v.0.1.0 First vull version, including resource wrapping (for banks, accounts, transactions and the user) and separate exceptions for each different code.
+
 TODO
 ----
 

data/lib/afterbanks/base.rb

@@ -16,7 +16,8 @@ module Afterbanks
     def api_call(method:, path:, params: {})
       url = 'https://api.afterbanks.com' + path
 
-      request_params = { method: method, url: url }
+      # Timeout is set to 5min: some banks take a lot to respond (e.g. ING Direct)
+      request_params = { method: method, url: url, timeout: 60*5 }
 
       if method == :post
         request_params.merge!(payload: params)
@@ -50,38 +51,33 @@ module Afterbanks
     end
 
     def log_request(method:, url:, params: {}, debug_id: nil)
-      now = Time.now
+      logger = Afterbanks.configuration.logger
+      return if logger.nil?
 
-      log_message(message: "")
-      log_message(message: "=> #{method.upcase} #{url}")
+      now = Time.now
 
-      log_message(message: "* Time: #{now}")
-      log_message(message: "* Timestamp: #{now.to_i}")
-      log_message(message: "* Debug ID: #{debug_id || 'none'}")
+      safe_params = {}
+      params.each do |key, value|
+        safe_value = if %w{servicekey user pass pass2}.include?(key.to_s)
+                       "<masked>"
+                     else
+                       value
+                     end
 
-      if params.any?
-        log_message(message: "* Params")
-        params.each do |key, value|
-          safe_value = if %w{servicekey user pass pass2}.include?(key.to_s)
-                         "<masked>"
-                       else
-                         value
-                       end
+        safe_value = safe_value.to_s if safe_value.is_a?(Symbol)
 
-          log_message(message: "#{key}: #{safe_value}")
-        end
-      else
-        log_message(message: "* No params")
+        safe_params[key] = safe_value
       end
-    end
 
-    def log_message(message: nil)
-      return if message.nil?
-
-      logger = Afterbanks.configuration.logger
-      return if logger.nil?
-
-      logger.info(message)
+      logger.info(
+        message: 'Afterbanks request',
+        method: method.upcase.to_s,
+        url: url,
+        time: now.to_s,
+        timestamp: now.to_i,
+        debug_id: debug_id || 'none',
+        params: safe_params
+      )
     end
 
     private

data/lib/afterbanks/resources/account.rb

@@ -11,7 +11,8 @@ module Afterbanks
                holders: :hash
 
     def self.list(service:, username:, password:, password2: nil,
-                  document_type: nil, session_id: nil, otp: nil, counter_id: nil)
+                  document_type: nil, session_id: nil, otp: nil, counter_id: nil,
+                  avoid_caching: false)
 
       params = {
         servicekey: Afterbanks.configuration.servicekey,
@@ -27,6 +28,8 @@ module Afterbanks
       params.merge!(OTP: otp) unless otp.nil?
       params.merge!(counterId: counter_id) unless counter_id.nil?
 
+      params.merge!(randomizer: Time.now.to_i) if avoid_caching
+
       response, debug_id = Afterbanks.api_call(
         method: :post,
         path: '/V3/',

data/lib/afterbanks/resources/bank.rb

@@ -24,16 +24,11 @@ module Afterbanks
         path: '/forms/'
       )
 
-      if ordered
-        response.sort! do |bank1, bank2|
-          bank1['fullname'].downcase <=> bank2['fullname'].downcase
-        end
-      end
-
       Response.new(
         result: Collection.new(
           banks_information_for(
-            response: response
+            response: response,
+            ordered: ordered
           ),
           self
         ),
@@ -43,18 +38,74 @@ module Afterbanks
 
     private
 
-    def self.banks_information_for(response:)
+    def self.banks_information_for(response:, ordered:)
       banks_information = []
 
+      services_number_by_bank_id = {}
+      response.each { |bank_information|
+        bank_id = bank_id_for(bank_information: bank_information)
+        services_number_by_bank_id[bank_id] ||= 0
+        services_number_by_bank_id[bank_id] += 1
+      }
+
       response.each do |bank_information|
-        if bank_information['business'] == "1"
-          bank_information['fullname'] += " Empresas"
-        end
+        bank_information['fullname'] = bank_name_for(
+          bank_information: bank_information,
+          services_number_by_bank_id: services_number_by_bank_id
+        )
 
         banks_information << bank_information
       end
 
+      if ordered
+        banks_information.sort! do |bank_information1, bank_information2|
+          bank_information1['fullname'].downcase <=> bank_information2['fullname'].downcase
+        end
+      end
+
       banks_information
     end
+
+    def self.bank_name_for(bank_information:, services_number_by_bank_id:)
+      # Name changes:
+      # 1. Add Particulares if there are different personal/company endpoints
+      # 2. Add Empresas following the same reason
+      # 3. Rename Caja Ingenieros into Caixa d'Enginyers (most known name)
+      # 4. Rename Caixa Guisona into Caixa Guissona (fix typo)
+      # 5. Rename Caixa burriana into Caixa Burriana (fix typo)
+      # 6. Rename Bancho Pichincha into Banco Pichincha (fix typo)
+
+      if bank_information['service'] == 'cajaingenieros'
+        return "Caixa d'Enginyers"
+      end
+
+      if bank_information['service'] == 'caixaguissona'
+        return "Caixa Guissona"
+      end
+
+      if bank_information['service'] == 'caixaruralburriana'
+        return "Caixa Burriana"
+      end
+
+      if bank_information['service'] == 'pichincha'
+        return "Banco Pichincha"
+      end
+
+      fullname = bank_information['fullname']
+      if bank_information['business'] == "1"
+        return "#{fullname} Empresas"
+      end
+
+      bank_id = bank_id_for(bank_information: bank_information)
+      if services_number_by_bank_id[bank_id] > 1
+        return "#{fullname} Particulares"
+      end
+
+      fullname
+    end
+
+    def self.bank_id_for(bank_information:)
+      bank_information['service'].split("_").first
+    end
   end
 end

data/lib/afterbanks/version.rb

@@ -1,3 +1,3 @@
 module Afterbanks
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterbanks-api-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Albert Bellonch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -104,7 +104,6 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -141,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Afterbanks' API

data/.ruby-version

@@ -1 +0,0 @@
-2.4.1