ehbrs_ruby_utils 0.41.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44e90ef4da84b99b3b0f0ec915528e06feef36f88ac6e1a89d7b6cd2dfa4a85
-  data.tar.gz: 236d80b4491da318c1f5bc6ff6336ca9db5ddbb47b36e0222f817f906796e518
+  metadata.gz: 586c5869279d721b48b5cf6d6ce585edc26601a00aff87f412fa0cad3142206e
+  data.tar.gz: bf287e776722f8b92f3f7fe7832fdc574251c4ebee744c1f3018ef2957e278d7
 SHA512:
-  metadata.gz: 3d2ef32002c18d1a907989c1cd11f423bd010e4f03af74a857a4ee9c046bbd9ca5f22015f82f1711191918da22da320ace42e70f49de6f14b36cd1d624cb9d48
-  data.tar.gz: 6f9eef1ee52d3f97517448a03a346d6b392fecd4e26d064b7afa2b1eeddb0e530afffa6d3f25118752004c48d1be1ee382c11426156ae39ffec507ada037cb6d
+  metadata.gz: ba4bc8bce782d16640c2e984ffd02f1a4a8dd390921f136321697efc1d3dd03339baeac2722ff5f1d9f858e44f3d616b3bb1b83dca6358d5993f621c3fd6593a
+  data.tar.gz: f9711900cb11defad1165a869e77bdc5ff160b7a070f79870bd927c624871271476505900b1d45dd88bf7598191809879b84fc9c3f40d5f6a37d5302caf47c83

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

@@ -7,30 +7,40 @@ module EhbrsRubyUtils
   module Bga
     module Parsers
       class GameInProgress < ::Aranha::Parsers::Html::ItemList
-        ITEMS_XPATH = '//*[@id = "gametables_inprogress_all"]' \
-                      '//*[starts-with(@id, "gametableblock_")]'
+        DEFAULT_STATUS = 'asyncplay'
+        ID_PARSER = /table=(\d+)/.to_parser { |m| m[1].to_i }
+        ITEMS_XPATH = '//*[@id = "section-play"]//a[contains(@href, "table=")]'
         STATUS_CLASS_PATTERN = /\Agametable_status_(.+)\z/.freeze
         STATUS_CLASS_PARSER = STATUS_CLASS_PATTERN.to_parser { |m| m[1] }
+        TABLE_COUNT_XPATH =
+          '//*[@id = "section-play"]/h1/span[contains(@class, "font-normal")]/span/text()'
 
-        field :id, :integer, './@id'
-        field :status, :string, './@class'
+        field :href, :string, './@href'
+
+        def data
+          {
+            table_count: table_count,
+            tables: items_data
+          }
+        end
 
         def item_data(idd)
-          %i[status].each do |key|
-            idd[key] = send("process_#{key}", idd.fetch(key))
-          end
-          idd
+          { id: parse_id(idd.fetch(:href)), status: 'asyncplay' }
         end
 
         def items_xpath
           ITEMS_XPATH
         end
 
-        private
+        # @param href [String]
+        # @return [Integer]
+        def parse_id(href)
+          ID_PARSER.parse!(href)
+        end
 
-        def process_status(status)
-          status.split.lazy.map { |s| STATUS_CLASS_PARSER.parse(s.strip) }.find(&:present?) ||
-            raise("No status class found in \"#{status}\"")
+        # @return [Integer]
+        def table_count
+          nokogiri.at_xpath(TABLE_COUNT_XPATH).if_present(-1) { |v| v.text.to_i }
         end
       end
     end

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

@@ -13,6 +13,8 @@ module EhbrsRubyUtils
         enable_simple_cache
         common_constructor :session, :player_id
 
+        WAIT_FOR_RESULT_SECONDS = 60
+
         def result
           navigate_to_page
           result_data
@@ -25,14 +27,28 @@ module EhbrsRubyUtils
 
         private
 
+        def current_data
+          ::EhbrsRubyUtils::Bga::Parsers::GameInProgress.from_content(session.current_source).data
+        end
+
         # @return [Array<Hash>]
         def result_data
-          ::EhbrsRubyUtils::Bga::Parsers::GameInProgress.from_content(session.current_source).data
+          cr = nil
+          session.wait(WAIT_FOR_RESULT_SECONDS).until do
+            scroll_down
+            cr = current_data
+            cr.fetch(:tables).count == cr.fetch(:table_count)
+          end
+          cr.fetch(:tables)
         end
 
         def navigate_to_page
           session.navigate.to url
         end
+
+        def scroll_down
+          session.execute_script('window.scrollBy(0, 90)')
+        end
       end
     end
   end

data/lib/ehbrs_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.41.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.120'
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.120'
+        version: '0.121'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,6 +157,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement