portal_scraper 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1645a898b4d02cea25387829c4aa64cbba4079548e4a3071c2dd36e38890e3a8
-  data.tar.gz: 8d5ef9cc5da93c985773a63de9fcfdf196909357bcd69db414ccec45daab864d
+  metadata.gz: d3fb1ca99f014e8e2b70a56e0a5e5d85946854c59362025407366eb3c2fcf2cf
+  data.tar.gz: 385ced44a825c3c23fe963a27d666685df4943a69c25dd92e7d99d8d4f50f297
 SHA512:
-  metadata.gz: bd9db17c4112d4247fe21cd37d71acde3da046ec54be8fd91d2977a14f55312ff1117b2f20c12eb20be5caa6dffc4c31f3e4d0ef2863bbc4e0336a2606700736
-  data.tar.gz: 276da5c4531e01f87149e8e703658a9a0140c2808ec4c27e112445dd91e0556a88f3250048499c73d37bc012bc2b00d0fc6709d0f8360cf08eaa708478c1e571
+  metadata.gz: ce42252c1c6fc81ae34df080a3859e30070a5ceb1afff3363149a501d41172bdcf570005e217218ca60675d32aae33c24aac23b53479e6be5c91bf691add02d2
+  data.tar.gz: b1aff4808f6fd405b5a9f1a5eff0571954d0c5462fbf183c399eb398bae9b2b2f7e974f80ba0da405044240c712ace23c6f890543869530f07046d0213dad334

data/lib/portal_scraper.rb

@@ -6,12 +6,11 @@ module PortalScraper
   Config = Struct.new(:root_url, :app_id, :secret, :login_url, :token_url)
 
   def self.configure
-    raise ArgumentError.new('No block given') unless block_given?
+    raise ArgumentError, 'No block given' unless block_given?
+
     yield config
   end
 
-  private
-
   def self.config
     @config ||= Config.new
   end

data/lib/portal_scraper/accounts/client.rb

@@ -1,13 +1,11 @@
 require 'mechanize'
 require 'active_support/all'
-require_relative '../city_names_helper'
-require_relative '../number_helper'
+require_relative '../parsing_helper'
 
 module PortalScraper
   module Accounts
     class Client
-      include CityNamesHelper
-      include NumberHelper
+      include ParsingHelper
       attr_accessor :app_id, :secret
 
       CODE_TO_COUNTRY_MAPPING = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'code_to_country.json')))
@@ -16,10 +14,10 @@ module PortalScraper
       def initialize(app_id = nil, secret = nil)
         @app_id = app_id || config.app_id
         @secret = secret || config.secret
-        raise BadRootUrl unless config.root_url =~ URI::regexp
+        raise BadRootUrl unless config.root_url =~ URI::DEFAULT_PARSER.make_regexp
       end
 
-      def get_accounts_balance
+      def scrap_accounts_balance
         login
         accounts_data = { accounts: [] }
 
@@ -32,19 +30,19 @@ module PortalScraper
               result = transfer.click
               result.search('table#operation tbody tr').each do |row|
                 transfers << {
-                    operation_date: row.search('td[1]').text.strip.match(/\d{2}\/\d{2}\/\d{4}/).to_s,
-                    nature:         row.search('td[2]').text.strip.gsub(/[\n,\t,'']/, ''),
-                    value_date:     row.search('td[3]').text.strip.match(/\d{2}\/\d{2}\/\d{4}/).to_s,
-                    debit:          format_number(row.search('td[4]')),
-                    credit:         format_number(row.search('td[5]')),
+                  operation_date: parse_date(row.search('td[1]')),
+                  nature:         row.search('td[2]').text.strip.gsub(/[\n,\t,'']/, ''),
+                  value_date:     parse_date(row.search('td[3]')),
+                  debit:          parse_number(row.search('td[4]')),
+                  credit:         parse_number(row.search('td[5]')),
                 }
               end
             end
             accounts_data[:accounts] << {
-                client_ref: find_table_value(account, 'Identifiant tiers'),
-                balance:    format_number(account.search('table#contrat th.n')),
-                opened_on:  account.search('table#contrat td').text.gsub(/\d{2}\/\d{2}\/\d{4}/)&.max,
-                transfers:  transfers
+              client_ref: find_table_value(account, 'Identifiant tiers'),
+              balance:    parse_number(account.search('table#contrat th.n')),
+              opened_on:  parse_dates(account.search('table#contrat td'))&.max,
+              transfers:  transfers,
             }
           end
 
@@ -65,7 +63,7 @@ module PortalScraper
               form['commune']    = user[:codeInsee]
               form['libCommune'] = user[:ville]
             else
-              fill_commune(app, form, user[:codePostal], format_city_name(user[:ville]), user[:pays] || user[:libNation])
+              fill_commune(app, form, user[:codePostal], parse_city_name(user[:ville]), user[:pays] || user[:libNation])
             end
             fill_address(form, user[:numeroVoie])
             fill_birth_place(form, user[:paysNaissance])

data/lib/portal_scraper/parsing_helper.rb

@@ -0,0 +1,19 @@
+module PortalScraper
+  module ParsingHelper
+    def parse_city_name(node)
+      I18n.transliterate(node.upcase).gsub(/[^A-Z]/, ' ').sub(/\bSAINT\b/, 'ST')
+    end
+
+    def parse_number(node)
+      node.text.strip.gsub(/[[:space:]]+/, '').tr(',', '.').to_d
+    end
+
+    def parse_date(node)
+      parse_dates(node).first
+    end
+
+    def parse_dates(node)
+      node.text.strip.gsub(%r(\d{2}/\d{2}/\d{4}))
+    end
+  end
+end

data/lib/portal_scraper/version.rb

@@ -2,7 +2,7 @@ module PortalScraper
   class Version
     MAJOR = 1
     MINOR = 9
-    PATCH = 0
+    PATCH = 1
 
     def self.to_s
       [MAJOR, MINOR, PATCH].compact.join('.')

data/portal-scraper.gemspec

@@ -30,4 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'rubocop', '~> 0.67.2'
+  spec.add_development_dependency 'rubocop-performance'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portal_scraper
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Armand Mégrot
@@ -109,6 +109,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.67.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.67.2
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: Scrapping client for extranet portals.
 email:
 - armand.megrot@gmail.com
@@ -122,8 +150,7 @@ files:
 - lib/portal_scraper/accounts/code_to_country.json
 - lib/portal_scraper/bad_login_url.rb
 - lib/portal_scraper/bad_root_url.rb
-- lib/portal_scraper/city_names_helper.rb
-- lib/portal_scraper/number_helper.rb
+- lib/portal_scraper/parsing_helper.rb
 - lib/portal_scraper/portal_scraper_error.rb
 - lib/portal_scraper/version.rb
 - portal-scraper.gemspec

data/lib/portal_scraper/city_names_helper.rb

@@ -1,8 +0,0 @@
-module PortalScraper
-  module CityNamesHelper
-
-    def format_city_name(name)
-      I18n.transliterate(name.upcase).gsub(/[^A-Z]/, ' ').sub(/\bSAINT\b/, 'ST')
-    end
-  end
-end

data/lib/portal_scraper/number_helper.rb

@@ -1,8 +0,0 @@
-module PortalScraper
-  module NumberHelper
-
-    def format_number(number)
-      number.text.strip.gsub(/[[:space:]]+/, '').tr(',', '.').to_d
-    end
-  end
-end