ehbrs_ruby_utils 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bf7c3e4429f41191524b18b9d208696ff51c8758af361ed718e3234ebcdc74a
-  data.tar.gz: 5f15d68339789d7a1d3a101763f3509d425e484b185b93aba23675962abcd99e
+  metadata.gz: 3c7b8c03f444eeecd6bc0cf3294b7fdb87d853e794d882a33075fc144d6e0643
+  data.tar.gz: 6d9ea47d713deb5f42930df49bf59beaa5d7feeadcaf1f317c2f72265e5645ac
 SHA512:
-  metadata.gz: 43a6c2d7ef864aad1c3a0876e6a1d2a8ea7a710c33d93a424f10a3f995b2a470c10750bc553a954cb3fc2168e6aca08b41b9abd6497d07a33db97c99f95a0676
-  data.tar.gz: 6b0f6f13cdca5b13938068eb9d9c2d2def16e2e7f0f79c74eae5c6c9c5d8a827303258db7b2b1c183db1cdba0e947f25aaf9a8f2a705d3ab96ed70162e95b57a
+  metadata.gz: 337fc2b2871c7546da3c36e7362463541466f77f94a32ac7813c68692dce1c0e0883d6dd765bbc1b0226a502ed0a9049f6b49debbf920f68d370e2b478ead4b5
+  data.tar.gz: db9aefd67166403008410368a68b5bde75777b3d819b7e0c829fb0b83a687af08f7b3e320ce2d840a0cfd38abaca8fbdf036adc785c3de4fbe8ae9451e5a4241

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

@@ -1,26 +1,15 @@
 # frozen_string_literal: true
 
-require 'ehbrs_ruby_utils/bga/parsers/game_stats'
-require 'ehbrs_ruby_utils/bga/urls'
 require 'eac_ruby_utils/core_ext'
 
 module EhbrsRubyUtils
   module Bga
     class Session < ::SimpleDelegator
       class Player
-        include ::EhbrsRubyUtils::Bga::Urls
-        GAME_HISTORY_XPATH = '//h3[text() = "Games history"]'
         common_constructor :session, :player_id
 
         def tables
-          session.navigate.to game_stats_url
-          session.wait_for_element(xpath: GAME_HISTORY_XPATH)
-          ::EhbrsRubyUtils::Bga::Parsers::GameStats.from_content(session.current_source).data
-        end
-
-        # @return [Addressable::URI]
-        def game_stats_url
-          session.url("/gamestats?player=#{player_id}")
+          session.player_tables_on_game_stats(player_id)
         end
       end
     end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'ehbrs_ruby_utils/bga/parsers/table'
-require 'ehbrs_ruby_utils/bga/table'
+require 'ehbrs_ruby_utils/bga/parsers/game_stats'
 require 'ehbrs_ruby_utils/bga/urls'
 require 'eac_ruby_utils/core_ext'
 
@@ -56,7 +55,7 @@ module EhbrsRubyUtils
         def list_end_reached?
           previous_count = current_data.count
           result = nil
-          session.wait_for_click(id: SEE_MORE_BUTTON_ID)
+          session.on_skip_trophies { session.wait_for_click(id: SEE_MORE_BUTTON_ID) }
           session.wait.until do
             result = list_end_reached_non_waiting(previous_count)
             !result.nil?

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Bga
+    class Session < ::SimpleDelegator
+      module SkipTrophies
+        TROPHY_SKIP_BUTTON_XPATH = '//*[@id = "splashedNotifications_overlay"]' \
+          '//*[starts-with(@id, "continue_btn_")]'
+        TROPHY_SKIP_TIMEOUT = 5
+
+        # @param &block [Proc]
+        # @return [Selenium::WebDriver::Error::TimeoutError, nil]
+        def on_rescue_timeout(&block)
+          block.call
+          nil
+        rescue ::Selenium::WebDriver::Error::TimeoutError => e
+          e
+        end
+
+        def on_skip_trophies(&block)
+          error = on_rescue_timeout(&block)
+          return unless error
+          raise error unless skip_trophy_overlay?
+
+          skip_trophies
+        end
+
+        def skip_trophies
+          loop do
+            wait_for_click({ xpath: TROPHY_SKIP_BUTTON_XPATH }, TROPHY_SKIP_TIMEOUT)
+          rescue ::Selenium::WebDriver::Error::TimeoutError
+            break
+          end
+        end
+
+        # @return [Boolean]
+        def skip_trophy_overlay?
+          find_element(xpath: TROPHY_SKIP_BUTTON_XPATH).present?
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/bga/table_whatsapp_formatter/format_option.rb

@@ -13,6 +13,6 @@ module EhbrsRubyUtils
           "*#{option.label}:* #{option.value}"
         end
       end
-      end
+    end
   end
 end

data/lib/ehbrs_ruby_utils/bga/table_whatsapp_formatter/format_player.rb

@@ -25,6 +25,6 @@ module EhbrsRubyUtils
           "⭐ #{player.score}"
         end
       end
-      end
+    end
   end
 end

data/lib/ehbrs_ruby_utils/bga/table_whatsapp_formatter.rb

@@ -61,6 +61,6 @@ module EhbrsRubyUtils
       end
 
       require_sub __FILE__, require_mode: :kernel
-      end
+    end
   end
 end

data/lib/ehbrs_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -50,6 +50,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: aranha-selenium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +226,7 @@ files:
 - 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_stats.rb
+- lib/ehbrs_ruby_utils/bga/session/skip_trophies.rb
 - lib/ehbrs_ruby_utils/bga/session/table.rb
 - lib/ehbrs_ruby_utils/bga/table.rb
 - lib/ehbrs_ruby_utils/bga/table/option.rb