portal_scraper 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f511d4ae5d6568df6bc6960907a0964ecfb6c8f0c8d5850b5ad757a0ed35039
-  data.tar.gz: 5edb4fdbd33676d7b03623a86815b0b865fd214d85e4cd6e34e7fe42fa67204b
+  metadata.gz: 4da909bd4c96e2f086b1c3d829c27a1ed6be1fc2dd2a071d1b0c95aaf062f60a
+  data.tar.gz: dd4c79ee59b02dc544b54507cb74a67203f17f661c39add242024a82c52dd837
 SHA512:
-  metadata.gz: 5df684726b58e1d8da72af7abd8b0395d36bc403f8d045ef0abbf628a8eee0aeebaa13f13ecbc9e80b9ff1dd088695eec92470dac707d5e5977dab1961196234
-  data.tar.gz: d93c42d08e8f39ddacf8828060e91324f0ad1b42f1f131b381d43ba693bbba8d05c3d82e1c669736fc153d087b9f648ba1af8fab7936be25c70ee10d811c2708
+  metadata.gz: ad8b34815e11e7eea8cfd7278b0fe5ad9342567855fdef8faba6a274ca0731f3976aed8804372889f742f6d8f10b72730e55f4e6ce3b18de4b24d8c6f48fa1c9
+  data.tar.gz: ca74f2b24e0acf074795028ed4b84a0190197743d3c30b96f6b8b13873f6cf0938b775f403c4fc878f99600cede3f39db0f3a288a9f08e5d7a473a0df6969d93

data/lib/portal_scraper/accounts/client.rb

@@ -25,23 +25,28 @@ module PortalScraper
         loop do
           user_page.links_with(href: /appTiersDetail.do/).each do |link|
             account = link.click
-            selected_row = nil
-            selected_row_date = nil
-
-            account.links_with(css: 'table#contrat td a').each do |row|
-              row_date = parse_date(row.node.ancestors('tr').at('td[2]'))&.to_date
-              if selected_row_date.nil? || selected_row_date < row_date
-                selected_row_date = row_date
-                selected_row = row
-              end
+            selected_link = nil
+            opened_on, balance = nil, 0.to_d
+
+            account.links_with(css: 'table#contrat td a').each do |account_link|
+              row = account_link.node.ancestors('tr')
+              next unless row.at('td[1]').text.strip == 'Compte épargne rémunéré'
+
+              row_date = parse_date(row.at('td[2]'))
+              next unless opened_on.nil? || opened_on < row_date
+
+              selected_link = account_link
+              opened_on = row_date
+              balance = parse_number(row.at('td[4]'))
             end
 
-            transfers = scrap_transfers(selected_row)
-            balance = selected_row&.node&.ancestors('tr')&.at('td[4]')
+            next unless selected_link
+
+            transfers = scrap_transfers(selected_link)
             accounts_data[:accounts] << {
               client_ref: find_table_value(account, 'Identifiant tiers'),
-              balance:    balance.nil? ? "0".to_d : parse_number(balance),
-              opened_on:  selected_row_date.nil? ? parse_dates(account.search('table#contrat td'))&.max : selected_row_date.to_s,
+              balance:    balance,
+              opened_on:  opened_on,
               transfers:  transfers,
             }
           end
@@ -175,21 +180,17 @@ module PortalScraper
         PortalScraper.config
       end
 
-      def scrap_transfers(selected_row)
-        transfers = []
-        transfers_page = selected_row&.click
-        if transfers_page
-          transfers_page.search('table#operation tbody tr').each do |row|
-            transfers << {
-                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
+      def scrap_transfers(account_link)
+        transfers_page = account_link.click
+        transfers_page.search('table#operation tbody tr').map do |transfer_row|
+          {
+              operation_date: parse_date(transfer_row.search('td[1]')),
+              nature:         transfer_row.search('td[2]').text.strip.gsub(/[\n,\t,'']/, ''),
+              value_date:     parse_date(transfer_row.search('td[3]')),
+              debit:          parse_number(transfer_row.search('td[4]')),
+              credit:         parse_number(transfer_row.search('td[5]')),
+          }
         end
-        transfers
       end
     end
   end

data/lib/portal_scraper/parsing_helper.rb

@@ -13,7 +13,7 @@ module PortalScraper
     end
 
     def parse_dates(node)
-      node.text.strip.gsub(%r(\d{2}/\d{2}/\d{4}))
+      node.text.strip.gsub(%r(\d{2}/\d{2}/\d{4})).map { |d| Date.strptime(d, '%d/%m/%Y') }
     end
   end
 end

data/lib/portal_scraper/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portal_scraper
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Armand Mégrot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize