ehbrs_ruby_utils 0.50.0 → 0.50.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0154fa6393d2e1f167cae506bdd5fbf7b5a107feb7f059625cb1929c44d3a4
-  data.tar.gz: a709b36805a65f3d2ecdd69dc1cf7c830536f8a7d1ab9dbd228995a918c19ad4
+  metadata.gz: e27fa8e7b9de67f4c480a9d60988c49fdcd84240e1932c41f73eb46802e974d4
+  data.tar.gz: cafca570ed8faae4d48ea9be69bced3aa0dadf987a6b0ee7d767b5c544133c4e
 SHA512:
-  metadata.gz: 213af97b1e0ef6399fa12ebb3adfe378a1f192bc63f55b40b00359cd26aba7e1f67921068ff3fab29f2ed039abf0cc24fd9fd0ed63128e8f292f5d678dfa9814
-  data.tar.gz: '08ff1d66a9ac6a2e09c83090e073295f81dbdfc30adb10d85860e184197b9249465e0bc86dec1e59354e4a0e9edcc65c9aa904509926c84db8b4ce32868ef338'
+  metadata.gz: 19b9c40f54a1f47eed3cdd57c6fced7378b3e67442e65d775a15b2c8ecd8c4460f8aace63bf5b470d243e245561a841a452b78f196638ed8ffab7d8b0a227ef2
+  data.tar.gz: edb00210dad61f083e695f1f0258b9f03a973e9d42b7b4a2239c58a290bb3e273e0bc11c8c9e5f9507b6817526e3aa8bcb44c14c7b13b544f23aab3a10ce593c

data/lib/ehbrs_ruby_utils/bga/parsers/game_in_progress.rb

@@ -7,6 +7,7 @@ module EhbrsRubyUtils
         DEFAULT_STATUS = 'asyncplay'
         ID_PARSER = /table=(\d+)/.to_parser { |m| m[1].to_i }
         ITEMS_XPATH = '//*[@id = "section-play"]//a[contains(@href, "table=")]'
+        NO_TABLES_XPATH = '//p[normalize-space(text()) = "Nenhum jogo em andamento"]'
         STATUS_CLASS_PATTERN = /\Agametable_status_(.+)\z/
         STATUS_CLASS_PARSER = STATUS_CLASS_PATTERN.to_parser { |m| m[1] }
         TABLE_COUNT_XPATH =
@@ -37,7 +38,17 @@ module EhbrsRubyUtils
 
         # @return [Integer]
         def table_count
-          nokogiri.at_xpath(TABLE_COUNT_XPATH).if_present(-1) { |v| v.text.to_i }
+          nokogiri.at_xpath(TABLE_COUNT_XPATH).if_present(no_tables_count) { |v| v.text.to_i }
+        end
+
+        # @return [Integer]
+        def no_tables_count
+          no_tables? ? 0 : -1
+        end
+
+        # @return [Boolean]
+        def no_tables?
+          nokogiri.at_xpath(NO_TABLES_XPATH).present?
         end
       end
     end

data/lib/ehbrs_ruby_utils/bga/session/cookies_consent.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EhbrsRubyUtils
+  module Bga
+    class Session < ::SimpleDelegator
+      module CookiesConsent
+        REJECT_ALL_BUTTON_SELECTOR = { id: 'didomi-notice-disagree-button' }.freeze
+        REJECT_ALL_BUTTON_TIMEOUT = 5
+
+        # @return [void]
+        def dismiss_cookies_banner
+          wait_for_click(REJECT_ALL_BUTTON_SELECTOR, REJECT_ALL_BUTTON_TIMEOUT)
+        rescue ::Selenium::WebDriver::Error::TimeoutError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/bga/session/login.rb

@@ -5,14 +5,21 @@ module EhbrsRubyUtils
     class Session < ::SimpleDelegator
       module Login
         LOGIN_PATH = 'account'
-        USERNAME_INPUT_ID = 'username_input'
-        PASSWORD_INPUT_ID = 'password_input'
-        SUBMIT_ID = 'login_button'
+        STEP1_SELECTOR = { css: '.bga-account-manager-form__step1' }.freeze
+        STEP2_SELECTOR = { css: '.bga-account-manager-form__step2' }.freeze
+        EMAIL_INPUT_SELECTOR = { css: "#{STEP1_SELECTOR[:css]} input[name=\"email\"]" }.freeze
+        NEXT_BUTTON_SELECTOR = { css: "#{STEP1_SELECTOR[:css]} a.bga-button--blue" }.freeze
+        PASSWORD_INPUT_SELECTOR = {
+          css: "#{STEP2_SELECTOR[:css]} input[type=\"password\"]"
+        }.freeze
+        LOGIN_BUTTON_SELECTOR = { css: "#{STEP2_SELECTOR[:css]} a.bga-button--blue" }.freeze
+        URL_LOGIN_PAGE_COMPONENT = 'page=login'
 
         # @return [Boolean]
         def login # rubocop:disable Naming/PredicateMethod
           navigate_to_login_page
           input_username
+          submit_username
           input_password
           submit_login
           logged?
@@ -26,18 +33,29 @@ module EhbrsRubyUtils
 
         def navigate_to_login_page
           navigate.to(login_url)
+          dismiss_cookies_banner
         end
 
         def input_username
-          wait_for_element(id: USERNAME_INPUT_ID).send_keys(username)
+          wait_for_element(EMAIL_INPUT_SELECTOR).send_keys(username)
+        end
+
+        def submit_username
+          wait_for_click(NEXT_BUTTON_SELECTOR)
         end
 
         def input_password
-          wait_for_element(id: PASSWORD_INPUT_ID).send_keys(password)
+          wait_for_element(PASSWORD_INPUT_SELECTOR).send_keys(password)
         end
 
+        # @return [void]
         def submit_login
-          wait_for_click(id: SUBMIT_ID)
+          wait_for_click(LOGIN_BUTTON_SELECTOR)
+          begin
+            wait.until { current_url.exclude?(URL_LOGIN_PAGE_COMPONENT) }
+          rescue ::Selenium::WebDriver::Error::TimeoutError
+            nil
+          end
         end
       end
     end

data/lib/ehbrs_ruby_utils/bga/session/skip_trophies.rb

@@ -17,12 +17,13 @@ module EhbrsRubyUtils
           e
         end
 
-        def on_skip_trophies(...)
-          error = on_rescue_timeout(...)
+        def on_skip_trophies(&block)
+          error = on_rescue_timeout(&block)
           return unless error
           raise error unless skip_trophy_overlay?
 
           skip_trophies
+          block.call
         end
 
         def skip_trophies

data/lib/ehbrs_ruby_utils/bga/session/user.rb

@@ -10,9 +10,9 @@ module EhbrsRubyUtils
           logged_username == username
         end
 
-        # @return [String]
+        # @return [String, nil]
         def logged_username
-          find_or_not_element(xpath: '//*[@id = "connected_username"]').attribute('innerHTML').strip
+          find_or_not_element(xpath: '//*[@id = "real_player_name"]')&.attribute('innerHTML')&.strip
         end
 
         def on_logged(&block)

data/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.50.0'
+  VERSION = '0.50.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.50.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
@@ -292,6 +292,7 @@ files:
 - lib/ehbrs_ruby_utils/bga/parsers/table/options.rb
 - lib/ehbrs_ruby_utils/bga/player.rb
 - lib/ehbrs_ruby_utils/bga/session.rb
+- lib/ehbrs_ruby_utils/bga/session/cookies_consent.rb
 - lib/ehbrs_ruby_utils/bga/session/login.rb
 - lib/ehbrs_ruby_utils/bga/session/player.rb
 - lib/ehbrs_ruby_utils/bga/session/player_tables_on_game_in_progress.rb