portal_scraper 2.0.3 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56fa7cb02271ba8d4399e8e9dc1e8bc966b8740e88657f604367a33ab0ff42df
-  data.tar.gz: '0582f340a21e6ed99268c8e6a06dcc344ea711dd7260f4d467b35ddfd4bb62e4'
+  metadata.gz: '009002ad1b898fbfd1b7aa934da6e15acf6c74b0a065d9c7c95060433ff3eff8'
+  data.tar.gz: 7775cc6cb2ed570c50b25783e399a0008be103196f7b70f749b4affb35773012
 SHA512:
-  metadata.gz: 209a4b05439f3c5d804f2bb3f742a0f0ec1e6f30735d29a60444f2901bdd29c79e42c64ac62f5081d2478326d7bde7537ea2b8edd292ea6772d07b44e5cd8ed1
-  data.tar.gz: e31eaa22c79c62f3f8e39342771a8251bb3d5594cccf5b413f08e3f23533c70bf50983434d691a21ff877698c33ae188e543f172b40fed10dd8853e078caf595
+  metadata.gz: 1040fc3657d32bb490a38b7896016b009c53c69da99988568adf9aafb01fcc82b8c406cd18d4ac5dab6d3904ebffd08792cf82bf50b19b5a810e254517e3e3c6
+  data.tar.gz: 62fe9b8a3110ea2944849dfa58927556e43511b81d2ed1529fa93235cd95ef636cfb86848d6c813567a60ab8266bd53a73fd6051e91b11c67958022b78d9c808

data/lib/portal_scraper/accounts/client.rb

@@ -9,6 +9,7 @@ module PortalScraper
       attr_accessor :app_id, :secret
 
       CODE_TO_COUNTRY_MAPPING = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'code_to_country.json')))
+      IS_POSTAL_CODE_DOM      = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'is_postal_code_dom.json')))
       MINIMUM_AMOUNT          = 10
 
       def initialize(app_id = nil, secret = nil)
@@ -24,8 +25,8 @@ module PortalScraper
         user_page = app.post(url_for('/appRecherche.do'), { nom: '', prenom: '', chercher: 'Chercher' })
         loop do
           user_page.links_with(href: /appTiersDetail.do/).each do |link|
-            account = link.click
-            selected_link = nil
+            account            = link.click
+            selected_link      = nil
             opened_on, balance = nil, 0.to_d
 
             account.links_with(css: 'table#contrat td a').each do |account_link|
@@ -36,8 +37,8 @@ module PortalScraper
               next unless opened_on.nil? || opened_on < row_date
 
               selected_link = account_link
-              opened_on = row_date
-              balance = parse_number(row.at('td[5]'))
+              opened_on     = row_date
+              balance       = parse_number(row.at('td[5]'))
             end
 
             next unless selected_link
@@ -68,7 +69,7 @@ module PortalScraper
               form['commune']    = user[:codeInsee]
               form['libCommune'] = user[:ville]
             else
-              fill_commune(app, form, user[:codePostal], parse_city_name(user[:ville]), user[:pays] || user[:libNation])
+              fill_commune(app, form, user[:codePostal], parse_city_name(user[:ville]))
             end
             fill_address(form, user[:numeroVoie])
             fill_birth_place(form, user[:paysNaissance])
@@ -85,6 +86,8 @@ module PortalScraper
           end
         end
         nil
+      rescue => e
+        { error: e.message }
       end
 
       def create_proposition(client_ref)
@@ -148,14 +151,15 @@ module PortalScraper
         end
       end
 
-      def fill_commune(app, form, postal_code, city, country_code)
+      def fill_commune(app, form, postal_code, city)
         app.post(url_for('/tiersCommunes.do'), { codPos: postal_code }).tap do |mappings|
-          cities             = mappings.search('td.t').map { |c| { code: c.parent.search('a.PL_LST').text.strip, name: c.text.strip } }
-          matched_city       = cities.find(-> { cities.first }) { |c| c[:name].include?(city) }
+          cities       = mappings.search('td.t').map { |c| { code: c.parent.search('a.PL_LST').text.strip, name: c.text.strip } }
+          matched_city = cities.find(-> { cities.first }) { |c| c[:name].include?(city) }
+          raise "City '#{city}' and postcode '#{postal_code}' not found" unless matched_city
           form['commune']    = matched_city[:code]
           form['libCommune'] = matched_city[:name]
         end
-        form['territoireRes'] = CODE_TO_COUNTRY_MAPPING.dig(country_code, 'category')
+        form['territoireRes'] = IS_POSTAL_CODE_DOM.dig(postal_code[0..2], 'category') || 0
       end
 
       def fill_address(form, address)

data/lib/portal_scraper/accounts/is_postal_code_dom.json

@@ -0,0 +1 @@
+{"971":{"name":"GUADELOUPE","category":1},"972":{"name":"MARTINIQUE","category":1},"973":{"name":"GUYANE FRANCAISE","category":1},"974":{"name":"REUNION","category":1}}

data/lib/portal_scraper/version.rb

@@ -1,7 +1,7 @@
 module PortalScraper
   class Version
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     PATCH = 3
 
     def self.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portal_scraper
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.3
 platform: ruby
 authors:
 - Armand Mégrot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -148,6 +148,7 @@ files:
 - lib/portal_scraper.rb
 - lib/portal_scraper/accounts/client.rb
 - lib/portal_scraper/accounts/code_to_country.json
+- lib/portal_scraper/accounts/is_postal_code_dom.json
 - lib/portal_scraper/bad_login_url.rb
 - lib/portal_scraper/bad_root_url.rb
 - lib/portal_scraper/parsing_helper.rb