ehbrs_ruby_utils 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3d030552c8f65af3c5c12d12466e7c0b79b17aaa1d15e2b6b34401178a4db6
-  data.tar.gz: '05393346d1434c2ddfe1fbfdd0287cdbc324fbded63eaf69db3f910d27ae6397'
+  metadata.gz: 3802f6228037cca931f88ce749cf512aa19c4c2e62a6ce91f35e81a8ea3e5928
+  data.tar.gz: 433ae6d2b1dc7133920a5a6c10dddf6ae2170aff8a1f5d5e03dd88dd978de1fd
 SHA512:
-  metadata.gz: 71849968b06015398fddacfa93e9751c2088426c1a09cb9f83ec67e49e657b11488e3d9b776e8326547ff19f5b18285070ad63817fe2ea382016b2c5ad75bba0
-  data.tar.gz: e70b99ec32cffb0ab62f43fe7695bb8dc58795bcdaa385a66494025f5dcdf4445a8f86808fa43e9677526fd30d24291a90acdde806898563e55240c5403e69af
+  metadata.gz: 6c084798e36730906270e5ce96e9086527a75be3e5474af382ae03a67d2784aca2eb8ef110048f02fc5501f9113474eacbe3fd19f49491fbaf44f90393361fea
+  data.tar.gz: 6fc1efe60241280dfe67da246075424285262d9ad1c24b3c467ac50aafd7b448388c5687e28b344e5061085ab55e0255ea885810bbfc0af4a7ca2d1aefc15abc

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/html/item_list'
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Bga
+    module Parsers
+      class GameInProgress < ::Aranha::Parsers::Html::ItemList
+        ITEMS_XPATH = '//*[@id = "gametables_inprogress_all"]' \
+          '//*[starts-with(@id, "gametableblock_")]'
+
+        field :id, :integer, './@id'
+
+        def items_xpath
+          ITEMS_XPATH
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/html/item'
+require 'aranha/parsers/html/item_list'
+require 'dentaku'
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Bga
+    module Parsers
+      class Table < ::Aranha::Parsers::Html::Item
+        class ActivePlayers < ::Aranha::Parsers::Html::ItemList
+          ITEMS_XPATH = '//div[starts-with(@id, "active_player_")]'
+
+          field :id, :integer, './@id'
+          field :name, :string, './/*[contains(@class, "active_player_fullname")]'
+
+          def items_xpath
+            ITEMS_XPATH
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/bga/parsers/table/{players.rb → ended_players.rb}

@@ -9,7 +9,7 @@ module EhbrsRubyUtils
   module Bga
     module Parsers
       class Table < ::Aranha::Parsers::Html::Item
-        class Players < ::Aranha::Parsers::Html::ItemList
+        class EndedPlayers < ::Aranha::Parsers::Html::ItemList
           ITEMS_XPATH = '//div[starts-with(@id, "score_entry_")]'
           RANK_VALUES = { vencedor: 1, perdedor: 2 }.freeze
 

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

@@ -7,15 +7,23 @@ module EhbrsRubyUtils
   module Bga
     module Parsers
       class Table < ::Aranha::Parsers::Html::Item
+        require_sub __FILE__
+
         GAME_IMAGE_URL_PARSER = %r{/gamemedia/([^/]+)/box/}.to_parser { |m| m[1] }
         ITEM_XPATH = '/'
+        PLAYERS_IDS = {
+          'game_result' => ::EhbrsRubyUtils::Bga::Parsers::Table::EndedPlayers,
+          'players_at_table' => ::EhbrsRubyUtils::Bga::Parsers::Table::ActivePlayers
+        }.freeze
+        PLAYERS_IDS_XPATH = PLAYERS_IDS.keys.map { |id| "@id = \"#{id}\"" }.join(' or ')
+        PLAYERS_XPATH = ".//*[(#{PLAYERS_IDS_XPATH}) and count(./*) > 0]"
 
         field :game_code, :string, '//meta[@property="og:image"]/@content'
         field :game_name, :string, './/*[@id = "table_name"]/text()'
         field :creation_time, :string, './/*[@id = "creationtime"]/text()'
         field :estimated_duration, :string, './/*[@id = "estimated_duration"]/text()'
         field :options, :node, './/*[@id = "gameoptions"]'
-        field :players, :node, './/*[@id = "game_result"]'
+        field :players, :node, PLAYERS_XPATH
         field :game_conceded, :node, './/*[@id = "game_conceded" and @style="display: block;"]'
 
         def item_xpath
@@ -24,10 +32,7 @@ module EhbrsRubyUtils
 
         def data
           r = super
-          %i[options players].each do |key|
-            r[key] = self.class.const_get(key.to_s.camelize).from_node(r.fetch(key)).data
-          end
-          %i[creation_time game_code game_conceded].each do |key|
+          %i[creation_time game_code game_conceded options players].each do |key|
             r[key] = send("process_#{key}", r.fetch(key))
           end
           r
@@ -51,7 +56,23 @@ module EhbrsRubyUtils
           node.present?
         end
 
-        require_sub __FILE__
+        # @param node [Nokogiri::XML::Element]
+        # @return [Hash]
+        def process_options(node)
+          ::EhbrsRubyUtils::Bga::Parsers::Table::Options.from_node(node).data
+        end
+
+        # @param node [Nokogiri::XML::Element]
+        # @return [Hash]
+        def process_players(node)
+          process_players_parser(node).from_node(node).data
+        end
+
+        # @param node [Nokogiri::XML::Element]
+        # @return [Class]
+        def process_players_parser(node)
+          PLAYERS_IDS.fetch(node.attribute('id').value)
+        end
       end
     end
   end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/bga/parsers/game_in_progress'
+require 'ehbrs_ruby_utils/bga/urls'
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Bga
+    class Session < ::SimpleDelegator
+      class PlayerTablesOnGameInProgress
+        include ::EhbrsRubyUtils::Bga::Urls
+        enable_method_class
+        enable_simple_cache
+        common_constructor :session, :player_id
+
+        def result
+          navigate_to_page
+          result_data
+        end
+
+        # @return [Addressable::URI]
+        def url
+          player_game_in_progress_url(player_id)
+        end
+
+        private
+
+        # @return [Array<Hash>]
+        def result_data
+          ::EhbrsRubyUtils::Bga::Parsers::GameInProgress.from_content(session.current_source).data
+        end
+
+        def navigate_to_page
+          session.navigate.to url
+        end
+      end
+    end
+  end
+end

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

@@ -14,8 +14,6 @@ module EhbrsRubyUtils
         enable_simple_cache
         common_constructor :session, :table_id
 
-        RESULTS_XPATH = '//*[@id = "game_result"]'
-
         def result
           ::EhbrsRubyUtils::Bga::Table.new(
             fetch_data
@@ -31,10 +29,13 @@ module EhbrsRubyUtils
 
         def fetch_data
           session.navigate.to url
-          session.wait_for_element(xpath: RESULTS_XPATH)
-          { id: table_id }.merge(
-            ::EhbrsRubyUtils::Bga::Parsers::Table.from_content(session.current_source).data
-          )
+          session.wait_for_element(xpath: parser_class.const_get('PLAYERS_XPATH'))
+          { id: table_id }.merge(parser_class.from_content(session.current_source).data)
+        end
+
+        # @return [Class]
+        def parser_class
+          ::EhbrsRubyUtils::Bga::Parsers::Table
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ehbrs_ruby_utils/bga/parsers/table/players'
+require 'ehbrs_ruby_utils/bga/parsers/table/ended_players'
 require 'eac_ruby_utils/core_ext'
 
 module EhbrsRubyUtils
@@ -9,7 +9,7 @@ module EhbrsRubyUtils
       class Player
         common_constructor :table, :data
 
-        ::EhbrsRubyUtils::Bga::Parsers::Table::Players.fields.each do |field|
+        ::EhbrsRubyUtils::Bga::Parsers::Table::EndedPlayers.fields.each do |field|
           define_method field.name do
             data.fetch(field.name)
           end

data/lib/ehbrs_ruby_utils/bga/urls.rb

@@ -17,6 +17,12 @@ module EhbrsRubyUtils
           root_url + suffix
         end
 
+        # @para player_id [Integer]
+        # @return [Addressable::URI]
+        def player_game_in_progress_url(player_id)
+          build_url("/gameinprogress?player=#{player_id}&all")
+        end
+
         # @para player_id [Integer]
         # @return [Addressable::URI]
         def player_game_stats_url(player_id)

data/lib/ehbrs_ruby_utils/version.rb

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

data/spec/lib/ehbrs_ruby_utils/bga/parsers/game_in_progress_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/bga/parsers/game_in_progress'
+
+::RSpec.describe ::EhbrsRubyUtils::Bga::Parsers::GameInProgress do
+  include_examples 'source_target_fixtures', __FILE__
+end