portal_scraper 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe0c3b20498468f4f56baacec71d686cace1aae23ad6b1898f61da8e9d3ce9c
-  data.tar.gz: 7e0f1d3b2072b61a40c9520a0c69c45a520073342b76523599b4d2cae08f5522
+  metadata.gz: 8825ed756349c40d08302537a67c019f92eacdbb9765f9e29175839216cb7a60
+  data.tar.gz: 15a5c317d86916cdcf36d28db34060582f23ebbdbf79b36cbc82ebf02b24ac45
 SHA512:
-  metadata.gz: 419806c515b49957b154fd27a5a32efbb3e04ff5a66d0203950766d3a713e6e16246b2951507c2f293f2be9d839dbe7a02b1240fc33a49902f05561be7190976
-  data.tar.gz: 8f5220886703936463c30ce27b1fa5979fe79a76930ea67408a2c9dc890fef5a2f4f2e59aecaaecdbe80e0faaa839f3672b6133345c58801735e2da28d1dec8e
+  metadata.gz: df5de7debdf23d19ae2d502fdae82c76842dea86452b70202d177bac631799199cc3d7bbebf2287b7d66897ffeb80a935b6f7b2c72b70c2607e696cff8f83979
+  data.tar.gz: f9aeca9291c8a5c57b0cd56fc5a9879b11d18e4c2f889136711011a633f8863d9181292d6c0a3cec1e5d3495c0e1bd64bcd0d33ec1e7bde5ae0befbe43e3d355

data/lib/portal_scraper/accounts/client.rb

@@ -1,8 +1,11 @@
 require 'mechanize'
+require 'active_support/all'
+require_relative '../city_names_helper'
 
 module PortalScraper
   module Accounts
     class Client
+      include CityNamesHelper
       attr_accessor :app_id, :secret
 
       CODE_TO_COUNTRY_MAPPING = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'code_to_country.json')))
@@ -37,7 +40,7 @@ module PortalScraper
               form['commune']    = user[:codeInsee]
               form['libCommune'] = user[:ville]
             else
-              fill_commune(app, form, user[:codePostal], user[:ville].gsub('-', ' ').upcase.sub('SAINT', 'ST'))
+              fill_commune(app, form, user[:codePostal], format_city_name(user[:ville]))
             end
             fill_birth_place(form, user[:paysNaissance])
             form['modeContact'] = ''
@@ -118,10 +121,10 @@ module PortalScraper
 
       def fill_commune(app, form, postal_code, city)
         app.post(url_for('/tiersCommunes.do'), { codPos: postal_code }).tap do |mappings|
-          mapping            = mappings.search('td.t').find { |c| c.text.strip.include?(city) }
-          code               = mapping&.parent.search('a.PL_LST').text.strip
-          form['commune']    = code
-          form['libCommune'] = mapping&.text.strip
+          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) }
+          form['commune']    = matched_city[:code]
+          form['libCommune'] = matched_city[:name]
         end
       end
 

data/lib/portal_scraper/city_names_helper.rb

@@ -0,0 +1,8 @@
+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/version.rb

@@ -1,8 +1,8 @@
 module PortalScraper
   class Version
     MAJOR = 1
-    MINOR = 4
-    PATCH = 3
+    MINOR = 5
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].compact.join('.')

data/portal-scraper.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5.3'
 
   spec.add_dependency 'mechanize', '~> 2.7'
+  spec.add_dependency 'activesupport', '~> 5.2'
 
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'bundler', '~> 1.16'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portal_scraper
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Armand Mégrot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,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/portal_scraper_error.rb
 - lib/portal_scraper/version.rb
 - portal-scraper.gemspec