ehbrs_ruby_utils 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bf7c3e4429f41191524b18b9d208696ff51c8758af361ed718e3234ebcdc74a
-  data.tar.gz: 5f15d68339789d7a1d3a101763f3509d425e484b185b93aba23675962abcd99e
+  metadata.gz: '01492301e8c9f767213720ca3b78b900225fdb359f6f140ca7b29598af9ce125'
+  data.tar.gz: e6ac5d5ee6b8f2d5e667df6a0eb196283d21be8da3e42636d80fbedfa1be5aec
 SHA512:
-  metadata.gz: 43a6c2d7ef864aad1c3a0876e6a1d2a8ea7a710c33d93a424f10a3f995b2a470c10750bc553a954cb3fc2168e6aca08b41b9abd6497d07a33db97c99f95a0676
-  data.tar.gz: 6b0f6f13cdca5b13938068eb9d9c2d2def16e2e7f0f79c74eae5c6c9c5d8a827303258db7b2b1c183db1cdba0e947f25aaf9a8f2a705d3ab96ed70162e95b57a
+  metadata.gz: 3a47e3110e4640dc017c1265b9bfd0f36661fe3e38379cdcdca9fd7bee8cb40acc6cb1385501f7f57f44a71a7ac0831725c51d4a977b0b7e5c2547298a9e8aeb
+  data.tar.gz: 2354c44fe899307ffba53b2be8843cb542f2095a0dd03efccc566a01fdc0641a699a30d190556febe6e0a7177134c3e94323a2a6a7f90d1c2072e34a68c6f354

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

@@ -2,6 +2,7 @@
 
 require 'aranha/parsers/html/item'
 require 'aranha/parsers/html/item_list'
+require 'dentaku'
 require 'eac_ruby_utils/core_ext'
 
 module EhbrsRubyUtils
@@ -10,17 +11,41 @@ module EhbrsRubyUtils
       class Table < ::Aranha::Parsers::Html::Item
         class Players < ::Aranha::Parsers::Html::ItemList
           ITEMS_XPATH = '//div[starts-with(@id, "score_entry_")]'
+          RANK_VALUES = { vencedor: 1, perdedor: 2 }.freeze
 
-          field :table_rank, :integer, './div[@class = "rank"]'
+          field :rank, :string, './div[@class = "rank"]'
           field :id, :integer, './div[@class = "name"]/a/@href'
           field :name, :string, './div[@class = "name"]/a/text()'
           field :score, :integer_optional, './div[@class = "score"]'
-          field :win_points, :string, './/*[starts-with(@id, "winpoints_value_")]/text()'
-          field :game_rank, :integer, './/*[@class = "gamerank_value"]/text()'
+          field :elo_increment, :string, './/*[starts-with(@id, "winpoints_value_")]/text()'
+          field :elo_reached, :integer, './/*[@class = "gamerank_value"]/text()'
+          field :penalty_clock, :boolean,
+                './/*[@class = "clockpenalty" and @style = "display: inline;"]'
+          field :penalty_leave, :boolean,
+                './/*[@class = "leavepenalty" and @style = "display: inline;"]'
 
           def items_xpath
             ITEMS_XPATH
           end
+
+          def item_data(data)
+            %i[elo_increment rank].inject(data) do |a, e|
+              a.merge(e => send("process_#{e}", data.fetch(e)))
+            end
+          end
+
+          # @return [Integer, nil]
+          def process_elo_increment(expression)
+            return nil if expression.blank?
+
+            ::Dentaku::Calculator.new.evaluate(expression.gsub(/\A\+/, '')).to_i
+          end
+
+          # @param value [String]
+          # @return [Integer]
+          def process_rank(source)
+            RANK_VALUES[source.downcase.to_sym] || source.to_i
+          end
         end
       end
     end

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

@@ -16,7 +16,7 @@ module EhbrsRubyUtils
         end
 
         def table_rank
-          "*#{player.table_rank}º*"
+          "*#{player.rank}º*"
         end
 
         delegate :name, to: :player
@@ -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.26.0'
 end

data/spec/lib/ehbrs_ruby_utils/bga/parsers/table_spec_files/table_302873643.target.yaml

@@ -20,16 +20,20 @@
   :value: Desligado
   :description: ''
 :players:
-- :table_rank: 1
+- :rank: 1
   :id: 84920871
   :name: eduardobogoni
   :score: 53
-  :win_points: ''
-  :game_rank:
-- :table_rank: 2
+  :elo_increment:
+  :elo_reached:
+  :penalty_clock: false
+  :penalty_leave: false
+- :rank: 2
   :id: 93167144
   :name: iuriadmvr1
   :score: 43
-  :win_points: ''
-  :game_rank:
+  :elo_increment:
+  :elo_reached:
+  :penalty_clock: false
+  :penalty_leave: false
 :game_conceded: false