ehbrs_ruby_utils 0.50.0 → 0.50.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0154fa6393d2e1f167cae506bdd5fbf7b5a107feb7f059625cb1929c44d3a4
-  data.tar.gz: a709b36805a65f3d2ecdd69dc1cf7c830536f8a7d1ab9dbd228995a918c19ad4
+  metadata.gz: 313577609ee6eb941fe4555a69dd45857adabbe01969cabf59c3fae4021aa07c
+  data.tar.gz: d23750e408c10e7724fb7292504a601ff6d8118823f881ff6f41f9febaca4fee
 SHA512:
-  metadata.gz: 213af97b1e0ef6399fa12ebb3adfe378a1f192bc63f55b40b00359cd26aba7e1f67921068ff3fab29f2ed039abf0cc24fd9fd0ed63128e8f292f5d678dfa9814
-  data.tar.gz: '08ff1d66a9ac6a2e09c83090e073295f81dbdfc30adb10d85860e184197b9249465e0bc86dec1e59354e4a0e9edcc65c9aa904509926c84db8b4ce32868ef338'
+  metadata.gz: 11dadee80b32212622c880e31c379cae640df69cb101b77d51fe5de0e89753ce879705615f2bc1c4e0eda9a4c7e0b3bd9e6ef68482817642d41a77c6bad06256
+  data.tar.gz: 7e1628e39e81cfc507bf1151cd7ae89e9c5a28ecf4a7187971cc1a7f00eed40cc153ce22abb5dc25153d52ecb07eda21eef1150b5c72cd73de528efec48c5ca5

data/lib/ehbrs_ruby_utils/airbnb/parsers/page.rb

@@ -69,7 +69,7 @@ module EhbrsRubyUtils
         # @param prices [Enumerable<Float, nil>]
         # @return [Float]
         def build_price(*prices)
-          prices.reject(&:blank?).min
+          prices.reject(&:blank?).min # rubocop:disable Rails/CompactBlank
         end
 
         # @param text [String]

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/parsers/table/ended_players.rb

@@ -15,7 +15,8 @@ module EhbrsRubyUtils
           field :name, :string, './div[@class = "name"]/a/text()'
           field :score, :integer_optional, './div[@class = "score"]'
           field :elo_increment, :string, './/*[starts-with(@id, "winpoints_value_")]/text()'
-          field :elo_reached, :integer_optional, './/*[@class = "gamerank_value"]/text()'
+          field :elo_reached, :integer_optional,
+                './/*[normalize-space(@class) = "gamerank_value"]/text()'
           field :penalty_clock, :boolean,
                 './/*[@class = "clockpenalty" and @style = "display: inline;"]'
           field :penalty_leave, :boolean,

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

@@ -4,7 +4,7 @@ module EhbrsRubyUtils
   module Bga
     module Parsers
       class Table < ::Aranha::Parsers::Html::Item
-        GAME_IMAGE_URL_PARSER = %r{/gamemedia/([^/]+)/box/}.to_parser { |m| m[1] }
+        GAME_IMAGE_URL_PARSER = %r{/gamemedia/([^/]+)/}.to_parser { |m| m[1] }
         ITEM_XPATH = '/'
         PLAYERS_IDS = {
           'game_result' => ::EhbrsRubyUtils::Bga::Parsers::Table::EndedPlayers,

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/bga/table.rb

@@ -8,7 +8,7 @@ module EhbrsRubyUtils
       enable_simple_cache
       common_constructor :data
 
-      GAME_MODE_KEY = 'Modo de Jogo'
+      GAME_MODE_KEYS = ['Modo do jogo', 'Modo de Jogo'].freeze
       GAME_MODE_FRIENDLY_VALUE = 'Modo Amigável'
       GAME_MODE_NORMAL_VALUE = 'Modo Normal'
       SET_ITEMS = %i[options players].freeze
@@ -22,11 +22,11 @@ module EhbrsRubyUtils
 
       # @return [Boolean]
       def friendly?
-        value = option_value(GAME_MODE_KEY)
+        value = game_mode_value
         return true if value == GAME_MODE_FRIENDLY_VALUE
         return false if value == GAME_MODE_NORMAL_VALUE
 
-        raise "Unknown \"#{GAME_MODE_KEY}\" value: \"#{value}\""
+        raise "Unknown value for game mode: \"#{value}\" (Options: #{options_to_s})"
       end
 
       # @return [Boolean]
@@ -34,6 +34,18 @@ module EhbrsRubyUtils
         game_conceded
       end
 
+      # @return [String]
+      def game_mode_value
+        GAME_MODE_KEYS.lazy.map { |k| option_value(k) }.find(&:present?) ||
+          raise("No option found with one of the labels #{GAME_MODE_KEYS} " \
+                "(Options: #{options_to_s})")
+      end
+
+      # @return [String]
+      def options_to_s
+        options.map { |o| "#{o.label}=\"#{o.value}\"" }.join(', ')
+      end
+
       # @param key [String]
       # @return [String, nil]
       def option_value(label)

data/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.50.0'
+  VERSION = '0.50.2'
 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.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
@@ -49,20 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +286,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