ehbrs_ruby_utils 0.26.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01492301e8c9f767213720ca3b78b900225fdb359f6f140ca7b29598af9ce125'
-  data.tar.gz: e6ac5d5ee6b8f2d5e667df6a0eb196283d21be8da3e42636d80fbedfa1be5aec
+  metadata.gz: c871abaf7dc4060d3d4165e5e0ac29e083ff688c87972b008578ad7c6ee3b51c
+  data.tar.gz: 56a62fcdb9ac75d7e5fed15c145dd14b36b207628499108781337b870001147a
 SHA512:
-  metadata.gz: 3a47e3110e4640dc017c1265b9bfd0f36661fe3e38379cdcdca9fd7bee8cb40acc6cb1385501f7f57f44a71a7ac0831725c51d4a977b0b7e5c2547298a9e8aeb
-  data.tar.gz: 2354c44fe899307ffba53b2be8843cb542f2095a0dd03efccc566a01fdc0641a699a30d190556febe6e0a7177134c3e94323a2a6a7f90d1c2072e34a68c6f354
+  metadata.gz: 238cdc34f19c2b8c45ef4280ddac58f0f10ac6354df28c6d3fadf6d52999f4cfd7c4464c36e8b2c3353dcb11dae5bbb56f29d4fc9c110cea960d2d259952cc9c
+  data.tar.gz: 0d6a2de37a8b40a4005b6dd6cd9363f4a7f730bf4e474307e15939ce5d902ab7ccfe1bce6e7f4f04d9021f7201783e7d58ad10c51adc17a85c33b9aca282ddca

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

@@ -10,13 +10,6 @@ module EhbrsRubyUtils
         USERNAME_INPUT_ID = 'username_input'
         PASSWORD_INPUT_ID = 'password_input'
         SUBMIT_ID = 'login_button'
-        LOGGED_MESSAGE_PATTERNS = [
-          /Page not found/ # Page not found: join.js
-        ].freeze
-        UNLOGGED_MESSAGE_PATTERSN = [
-          /Recover my password/ # Oops, we don't recognize your username or password. Don't panic.
-          # (Recover my password)
-        ].freeze
 
         # @return [Boolean]
         def login
@@ -24,7 +17,7 @@ module EhbrsRubyUtils
           input_username
           input_password
           submit_login
-          logged_by_message?(waited_message_info)
+          logged?
         end
 
         def login_url
@@ -48,14 +41,6 @@ module EhbrsRubyUtils
         def submit_login
           wait_for_click(id: SUBMIT_ID)
         end
-
-        # @return [Boolean]
-        def logged_by_message?(message_info)
-          return true if LOGGED_MESSAGE_PATTERNS.any? { |p| p.match?(message_info) }
-          return false if UNLOGGED_MESSAGE_PATTERNS.any? { |p| p.match?(message_info) }
-
-          raise("Unmapped login message: \"#{message_info}\"")
-        end
       end
     end
   end

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

@@ -37,7 +37,7 @@ module EhbrsRubyUtils
 
         # @return [Boolean]
         def skip_trophy_overlay?
-          find_element(xpath: TROPHY_SKIP_BUTTON_XPATH).present?
+          find_or_not_element(xpath: TROPHY_SKIP_BUTTON_XPATH).present?
         end
       end
     end

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

@@ -14,6 +14,8 @@ module EhbrsRubyUtils
         enable_simple_cache
         common_constructor :session, :table_id
 
+        RESULTS_XPATH = '//*[@id = "game_result"]'
+
         def result
           ::EhbrsRubyUtils::Bga::Table.new(
             fetch_data
@@ -29,6 +31,7 @@ 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
           )

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Bga
+    class Session < ::SimpleDelegator
+      module User
+        # @return [Boolean]
+        def logged?
+          navigate.to(build_url('/player'))
+          logged_username == username
+        end
+
+        # @return [String]
+        def logged_username
+          find_or_not_element(xpath: '//*[@id = "connected_username"]').attribute('innerHTML').strip
+        end
+
+        def on_logged(&block)
+          unless logged?
+            raise "Login failed for BoardGameUser user \"#{username}\"" unless login
+          end
+
+          block.call
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/bga/session.rb

@@ -10,7 +10,8 @@ module EhbrsRubyUtils
       include ::EhbrsRubyUtils::Bga::Urls
       MESSAGE_ID = 'head_infomsg_1'
 
-      common_constructor :username, :password, super_args: -> { [::Aranha::Selenium::Session.new] }
+      common_constructor :username, :password,
+                         super_args: -> { [::Aranha::Selenium::Session.new(driver: :chrome)] }
 
       # @return [EhbrsRubyUtils::Bga::Session::Player]
       def player(id)
@@ -22,11 +23,6 @@ module EhbrsRubyUtils
         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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ehbrs_ruby_utils/bga/parsers/table'
 require 'ehbrs_ruby_utils/bga/parsers/table/options'
 require 'ehbrs_ruby_utils/bga/urls'
 require 'eac_ruby_utils/core_ext'

data/lib/ehbrs_ruby_utils/bga/table_whatsapp_formatter.rb

@@ -21,11 +21,6 @@ module EhbrsRubyUtils
       }.freeze
       SECTION_SEPARATOR = "\n\n"
 
-      def perform
-        infov 'Fetching table', table_id
-        infov 'Message', "<<<EOS\n#{to_message}\nEOS\n"
-      end
-
       def to_s
         [root_items_to_s, players_to_s, options_to_s].map(&:strip).join(SECTION_SEPARATOR)
       end

data/lib/ehbrs_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -50,34 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.78'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.78'
 - !ruby/object:Gem::Dependency
   name: dentaku
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +242,7 @@ files:
 - 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/session/user.rb
 - lib/ehbrs_ruby_utils/bga/table.rb
 - lib/ehbrs_ruby_utils/bga/table/option.rb
 - lib/ehbrs_ruby_utils/bga/table/player.rb