ehbrs_ruby_utils 0.23.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c029952b15c0fa9fd3034c5766583e9f8679c8efd16a005304ede77774b1ee
-  data.tar.gz: 8862eaf9b276fd42e92856ea98fa42e38d991c5e3c825ec1e1474ebaaaddefc6
+  metadata.gz: ef922dc8e609ca372c63e29cbfda768e95abc03b24c0fd5b9a5c6d46bf707445
+  data.tar.gz: ad3022d2b588614b4471798f751a8edca0800e301ab0f7bd689a22fc684fd59f
 SHA512:
-  metadata.gz: fbc869e81f0a95f04cf9a393eb4f6f9b1d79e3d77ac3ff9f720b3115722adf41fbe6478e9c7d9878b297c8c46342686ce79a11fceb2f8b5d52c197044724372b
-  data.tar.gz: aab5320864d3863cc32878679ae7ee7cfa84610ed24bd0ade989c60a20a3285fb0a348efeb2aafc7eed71bf824c1ff6ee7dcc2c12467ab5efbd89722f058474f
+  metadata.gz: f2e2052b2490544bcb9edd3234d082f46489aa76d277889d33cc75ad75e31e9181c1c38deb00b4741723ba396be7c0f2ebbe71931845fd7db4145cfffe60dd00
+  data.tar.gz: 4b27d92bade1d8a85151dbd2ce9c101286b75c433327a849fbab1bb275ce47e4c6b06c850616b320480b18ea294b59c76b55199023e80bcb38c7da465d4c54c1

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

@@ -10,10 +10,10 @@ module EhbrsRubyUtils
         class Players < ::Aranha::Parsers::Html::ItemList
           ITEMS_XPATH = '//div[@class = "simple-score-entry"]'
 
-          field :rank, :integer, './div[@class = "rank"]'
+          field :rank, :integer_optional, './div[@class = "rank"]'
           field :id, :integer, './div[@class = "name"]/a/@href'
           field :name, :string, './div[@class = "name"]/a/text()'
-          field :score, :integer, './div[@class = "score"]'
+          field :score, :integer_optional, './div[@class = "score"]'
 
           def items_xpath
             ITEMS_XPATH

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

@@ -23,7 +23,7 @@ module EhbrsRubyUtils
 
         def item_data(item)
           r = super
-          r[:table_id] = table_name_to_id(r.delete(:table_name))
+          r[:id] = table_name_to_id(r.delete(:table_name))
           r[:players] = players_data(r.delete(:players))
           r
         end
@@ -36,8 +36,10 @@ module EhbrsRubyUtils
           ).data
         end
 
+        # @param name [String]
+        # @return [Integer]
         def table_name_to_id(name)
-          name.gsub(/\A\#/, '')
+          name.gsub(/\A\#/, '').to_i
         end
 
         require_sub __FILE__

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

@@ -14,7 +14,7 @@ module EhbrsRubyUtils
           field :table_rank, :integer, './div[@class = "rank"]'
           field :id, :integer, './div[@class = "name"]/a/@href'
           field :name, :string, './div[@class = "name"]/a/text()'
-          field :score, :integer, './div[@class = "score"]'
+          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()'
 

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

@@ -14,6 +14,7 @@ module EhbrsRubyUtils
         field :estimated_duration, :string, './/*[@id = "estimated_duration"]/text()'
         field :options, :node, './/*[@id = "gameoptions"]'
         field :players, :node, './/*[@id = "game_result"]'
+        field :game_conceded, :node, './/*[@id = "game_conceded" and @style="display: block;"]'
 
         def item_xpath
           ITEM_XPATH
@@ -25,6 +26,7 @@ module EhbrsRubyUtils
             r[key] = self.class.const_get(key.to_s.camelize).from_node(r.fetch(key)).data
           end
           r[:creation_time] = process_creation_time(r[:creation_time])
+          r[:game_conceded] = process_game_conceded(r[:game_conceded])
           r
         end
 
@@ -34,6 +36,12 @@ module EhbrsRubyUtils
           creation_time.gsub('Criado:', '').strip
         end
 
+        # @param node [Nokogiri::XML::Element]
+        # @return [Boolean]
+        def process_game_conceded(node)
+          node.present?
+        end
+
         require_sub __FILE__
       end
     end

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

@@ -24,7 +24,7 @@ module EhbrsRubyUtils
           input_username
           input_password
           submit_login
-          logged_by_message?(message_info)
+          logged_by_message?(waited_message_info)
         end
 
         def login_url

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

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/bga/parsers/table'
+require 'ehbrs_ruby_utils/bga/table'
+require 'ehbrs_ruby_utils/bga/urls'
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Bga
+    class Session < ::SimpleDelegator
+      class PlayerTablesOnGameStats
+        include ::EhbrsRubyUtils::Bga::Urls
+        enable_method_class
+        enable_simple_cache
+        common_constructor :session, :player_id, :until_table_id, default: [nil] do
+          self.until_table_id = until_table_id.if_present(&:to_i)
+        end
+
+        SEE_MORE_BUTTON_ID = 'see_more_tables'
+
+        def result
+          navigate_to_page
+          loop do
+            return result_data unless more?
+          end
+        end
+
+        # @return [Addressable::URI]
+        def url
+          player_game_stats_url(player_id)
+        end
+
+        private
+
+        # @return [Array<Hash>]
+        def current_data_uncached
+          ::EhbrsRubyUtils::Bga::Parsers::GameStats.from_content(session.current_source).data
+        end
+
+        # @return [Array<Hash>]
+        def new_current_data
+          reset_cache(:current_data)
+          current_data
+        end
+
+        def navigate_to_page
+          session.navigate.to url
+        end
+
+        # @return [Boolean]
+        def more?
+          !(table_id_found? || list_end_reached?)
+        end
+
+        # @return [Boolean]
+        def list_end_reached?
+          previous_count = current_data.count
+          result = nil
+          session.wait_for_click(id: SEE_MORE_BUTTON_ID)
+          session.wait.until do
+            result = list_end_reached_non_waiting(previous_count)
+            !result.nil?
+          end
+          result
+        end
+
+        # @param previous_count [Integer]
+        # @return [Boolean, nil]
+        def list_end_reached_non_waiting(previous_count)
+          if session.message_info.present?
+            true
+          elsif new_current_data.count != previous_count
+            false
+          end
+        end
+
+        # @return [Array<Hash>]
+        def result_data
+          until_table_id.if_present(current_data) do |v|
+            r = []
+            current_data.each do |d|
+              break if d.fetch(:id) == v
+
+              r << d
+            end
+            r
+          end
+        end
+
+        # @return [Boolean]
+        def table_id_found?
+          until_table_id.if_present(false) do |v|
+            current_data.any? { |d| d.fetch(:id) == v }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/bga/session.rb

@@ -12,16 +12,21 @@ module EhbrsRubyUtils
 
       common_constructor :username, :password, super_args: -> { [::Aranha::Selenium::Session.new] }
 
-      # @return [String]
-      def message_info
-        wait_for_click(id: MESSAGE_ID).text
-      end
-
       # @return [EhbrsRubyUtils::Bga::Session::Player]
       def player(id)
         ::EhbrsRubyUtils::Bga::Session::Player.new(self, id)
       end
 
+      # @return [String, nil]
+      def message_info
+        find_or_not_element(id: MESSAGE_ID).if_present { |v| v.text.strip }
+      end
+
+      # @return [String]
+      def waited_message_info
+        wait_for_click(id: MESSAGE_ID).text
+      end
+
       require_sub __FILE__, include_modules: true, require_mode: :kernel
     end
   end

data/lib/ehbrs_ruby_utils/bga/table.rb

@@ -20,6 +20,11 @@ module EhbrsRubyUtils
         end
       end
 
+      # @return [Boolean]
+      def game_conceded?
+        game_conceded
+      end
+
       # @return [Addressable::URI]
       def url
         table_url(id)

data/lib/ehbrs_ruby_utils/bga/urls.rb

@@ -9,7 +9,7 @@ module EhbrsRubyUtils
       common_concern
 
       module InstanceMethods
-        ROOT_URL = 'https://en.boardgamearena.com'
+        ROOT_URL = 'https://boardgamearena.com'
 
         # @param suffix [String]
         # @return [Addressable::URI]
@@ -17,6 +17,12 @@ module EhbrsRubyUtils
           root_url + suffix
         end
 
+        # @para player_id [Integer]
+        # @return [Addressable::URI]
+        def player_game_stats_url(player_id)
+          build_url("/gamestats?player=#{player_id}")
+        end
+
         # @return [Addressable::URI]
         def root_url
           ROOT_URL.to_uri

data/lib/ehbrs_ruby_utils/version.rb

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

data/spec/lib/ehbrs_ruby_utils/bga/parsers/game_stats_spec_files/1.target.yaml

@@ -4,7 +4,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 254
-  :table_id: '374270557'
+  :id: 374270557
   :players:
   - :rank: 1
     :id: 92442373
@@ -19,7 +19,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 122
-  :table_id: '375280703'
+  :id: 375280703
   :players:
   - :rank: 1
     :id: 84920871
@@ -34,7 +34,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 106
-  :table_id: '373870907'
+  :id: 373870907
   :players:
   - :rank: 1
     :id: 84920871
@@ -49,7 +49,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 105
-  :table_id: '373602409'
+  :id: 373602409
   :players:
   - :rank: 1
     :id: 84920871
@@ -64,7 +64,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 83
-  :table_id: '372806271'
+  :id: 372806271
   :players:
   - :rank: 1
     :id: 84920871
@@ -79,7 +79,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 1
-  :table_id: '373870075'
+  :id: 373870075
   :players:
   - :rank: 1
     :id: 90379834
@@ -94,7 +94,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 268
-  :table_id: '370752197'
+  :id: 370752197
   :players:
   - :rank: 1
     :id: 84920871
@@ -109,7 +109,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 262
-  :table_id: '372466754'
+  :id: 372466754
   :players:
   - :rank: 1
     :id: 84920871
@@ -124,7 +124,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 100
-  :table_id: '373747455'
+  :id: 373747455
   :players:
   - :rank: 1
     :id: 84559362
@@ -139,7 +139,7 @@
   :leave_penalty:
   :rank_increment:
   :rank_after: 256
-  :table_id: '373436042'
+  :id: 373436042
   :players:
   - :rank: 1
     :id: 84920871