chgk_rating 1.0.0 → 2.2.0

data/lib/chgk_rating/attribute_mappings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module AttributeMappings
     extend ChgkRating::Utils::Transformations
@@ -5,6 +7,8 @@ module ChgkRating
     class << self
       def find(name)
         const_get name.snakecase_upcase
+      rescue NameError
+        {}
       end
 
       def generate_mappings_for(data)
@@ -16,21 +20,20 @@ module ChgkRating
       private
 
       def name_from(raw_name)
-        { raw_name: raw_name.to_s }
+        {raw_name: raw_name.to_s}
       end
 
       def parse_raw_scheme(raw_scheme)
         if raw_scheme.respond_to? :inject
           scheme_from raw_scheme
         else
-          { raw_scheme => name_from(raw_scheme) }
+          {raw_scheme => name_from(raw_scheme)}
         end
       end
 
       def scheme_from(raw_scheme)
-        raw_scheme.inject({}) do |memo, (key, value)|
+        raw_scheme.each_with_object({}) do |(key, value), memo|
           memo[key] = scheme_value_from key, value
-          memo
         end
       end
 
@@ -47,7 +50,7 @@ module ChgkRating
         return unless raw_schemes&.any?
 
         if raw_schemes.is_a? Array
-          raw_schemes.inject({}) do |memo, raw_scheme|
+          raw_schemes.reduce({}) do |memo, raw_scheme|
             memo.merge parse_raw_scheme(raw_scheme)
           end
         else
@@ -57,83 +60,107 @@ module ChgkRating
     end
 
     generate_mappings_for({
-                              PLAYER: [
-                                  { id: 'idplayer' },
-                                  :name,
-                                  :surname,
-                                  :patronymic,
-                                  :comment,
-                                  :db_chgk_info_tag
-                              ],
-                              RATING: {
-                                  team: ['idteam', :team_id],
-                                  release_id: 'idrelease',
-                                  rating: [],
-                                  rating_position: [],
-                                  date: ['date', :date],
-                                  formula: ['formula', :sym]
+                            PLAYER: [
+                              {id: 'idplayer'},
+                              :name,
+                              :surname,
+                              :patronymic,
+                              :comment,
+                              :db_chgk_info_tag
+                            ],
+                            RATING: {
+                              release_id: 'idrelease',
+                              rating: [],
+                              rating_position: [],
+                              tech_rating: [],
+                              date: ['date', :date]
+                            },
+                            PLAYER_RATING: {
+                              player: ['idplayer', :player_id],
+                              tournaments_in_year: [],
+                              tournament_count_total: []
+                            },
+                            TEAM_RATING: {
+                              team: ['idteam', :team_id],
+                              formula: ['formula', :sym]
+                            },
+                            RECAP: {
+                              season_id: 'idseason',
+                              team: ['idteam', :team_id],
+                              captain: ['captain', :player_id],
+                              players: ['players', :players_ids]
+                            },
+                            PLAYER_TOURNAMENT: [
+                              tournament: ['idtournament', :tournament_id],
+                              team: ['idteam', :team_id],
+                              in_base_team: ['in_base_team', :boolean_binboolean]
+                            ],
+                            TOURNAMENT: [
+                              {
+                                id: 'idtournament',
+                                date_start: ['date_start', :datetime],
+                                date_end: ['date_end', :datetime],
+                                tour_count: [],
+                                tour_questions: [],
+                                tour_ques_per_tour: [],
+                                questions_total: [],
+                                main_payment_value: ['main_payment_value', :float],
+                                discounted_payment_value: ['discounted_payment_value', :float],
+                                tournament_in_rating: ['tournament_in_rating', :boolean_binboolean],
+                                date_requests_allowed_to: ['date_requests_allowed_to', :datetime],
+                                site_url: ['site_url', :uri],
+                                date_archived_at: ['date_archived_at', :datetime]
                               },
-                              RECAP: {
-                                  season_id: 'idseason',
-                                  team: ['idteam', :team_id],
-                                  captain: ['captain', :player_id],
-                                  players: ['players', :players_ids]
+                              :name,
+                              :town,
+                              :long_name,
+                              :type_name,
+                              :main_payment_currency,
+                              :discounted_payment_currency,
+                              :discounted_payment_reason,
+                              :archive,
+                              :comment
+                            ],
+                            TOURNAMENT_TEAM_PLAYER: {
+                              id: 'idplayer',
+                              is_captain: ['is_captain', :boolean_binboolean],
+                              is_base: ['is_base', :boolean_binboolean],
+                              is_foreign: ['is_foreign', :boolean_binboolean]
+                            },
+                            TOURNAMENT_TEAM: [
+                              {
+                                id: 'idteam',
+                                position: ['position', :float],
+                                questions_total: [],
+                                result: ['mask', :splitboolean_arraystrboolean],
+                                bonus_b: [],
+                                tech_rating_rt: [],
+                                tech_rating_rg: [],
+                                tech_rating_rb: [],
+                                rating_r: [],
+                                predicted_position: [],
+                                diff_bonus: [],
+                                included_in_rating: ['included_in_rating', :boolean_binboolean]
                               },
-                              TOURNAMENT: [
-                                  {
-                                      id: 'idtournament',
-                                      date_start: ['date_start', :datetime],
-                                      date_end: ['date_end', :datetime],
-                                      tour_count: [],
-                                      tour_questions: [],
-                                      tour_ques_per_tour: [],
-                                      questions_total: [],
-                                      main_payment_value: ['main_payment_value', :float],
-                                      discounted_payment_value: ['discounted_payment_value', :float],
-                                      date_requests_allowed_to: ['date_requests_allowed_to', :datetime],
-                                      site_url: ['site_url', :uri]
-                                  },
-                                  :name,
-                                  :town,
-                                  :long_name,
-                                  :type_name,
-                                  :discounted_payment_reason,
-                                  :comment
-                              ],
-                              TOURNAMENT_PLAYER: {
-                                  id: 'idplayer',
-                                  is_captain: ['is_captain', :boolean_binboolean],
-                                  is_base: ['is_base', :boolean_binboolean],
-                                  is_foreign: ['is_foreign', :boolean_binboolean]
+                              :current_name,
+                              :base_name
+                            ],
+                            TEAM: [
+                              {
+                                id: 'idteam',
+                                tournaments_this_season: [],
+                                tournaments_total: []
                               },
-                              TOURNAMENT_TEAM: [
-                                  {
-                                      id: 'idteam',
-                                      position: ['position', :float],
-                                      questions_total: [],
-                                      result: ['mask', :splitboolean_arraystrboolean],
-                                      bonus_a: [],
-                                      bonus_b: [],
-                                      tech_rating: [],
-                                      predicted_position: [],
-                                      d_bonus_a: [],
-                                      d_bonus_b: [],
-                                      d_diff_bonus: [],
-                                      included_in_rating: ['included_in_rating', :boolean_binboolean]
-                                  },
-                                  :current_name,
-                                  :base_name
-                              ],
-                              TEAM: [
-                                  { id: 'idteam' },
-                                  :name,
-                                  :town,
-                                  :comment
-                              ],
-                              TOURNAMENT_TEAM_RESULT: {
-                                  tour: [],
-                                  result: ['mask', :arrayboolean_arraystrboolean]
-                              }
+                              :name,
+                              :town,
+                              :region_name,
+                              :country_name,
+                              :comment
+                            ],
+                            TOURNAMENT_TEAM_RESULT: {
+                              tour: [],
+                              result: ['mask', :arrayboolean_arraystrboolean]
+                            }
                           })
   end
-end
+end

data/lib/chgk_rating/chgk_object.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
+
 module ChgkRating
   class ChgkObject
     def build_model(object, klass = ChgkRating::Models::Team, params = {lazy: true})
       return unless object
+
       object.instance_of?(klass) ? object : klass.new(object, params)
     end
 
     def extract_id_from(obj, klass = ChgkRating::Models::Team)
+      return unless obj
       return obj unless obj.is_a? klass
+
       obj&.id
     end
   end
-end
+end

data/lib/chgk_rating/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   class Client
     # Returns a single Team
@@ -47,19 +49,29 @@ module ChgkRating
     # @param tournament_or_id [String, Integer or Tournament] Tournament to load team for.
     # @param team_or_id [String, Integer or Team] Team to search for.
     def team_at_tournament(tournament_or_id, team_or_id)
-      tournament(tournament_or_id, true).team(team_or_id)
+      tournament(tournament_or_id, true).team_by(team_or_id)
     end
 
-    # Returns Rating for a given Team in a given release
+    # Returns rating for a given Team in a given release
     #
     # @raise [ChgkRating::Error::NotFound] Error raised when the requested release or Team cannot be found.
-    # @return [ChgkRating::Models::Rating] The requested Rating.
+    # @return [ChgkRating::Models::TeamRating] The requested rating.
     # @param team_or_id [String, Integer or ChgkRating::Models::Team] Team to load rating for.
     # @param release_id [String or Integer] Release to load rating for.
-    def rating(team_or_id, release_id)
+    def team_rating(team_or_id, release_id)
       team(team_or_id, true).rating(release_id)
     end
 
+    # Returns rating for a given Player in a given release
+    #
+    # @raise [ChgkRating::Error::NotFound] Error raised when the requested release or Player cannot be found.
+    # @return [ChgkRating::Models::PlayerRating] The requested rating.
+    # @param player_or_id [String, Integer or ChgkRating::Models::Team] Player to load rating for.
+    # @param release_id [String or Integer] Release to load rating for.
+    def player_rating(player_or_id, release_id)
+      player(player_or_id, true).rating(release_id)
+    end
+
     # Search
 
     # Returns a Players collection based on the search criteria.
@@ -127,18 +139,39 @@ module ChgkRating
     # @param season_id [String or Integer] Season to load tournaments for
     # @option params [String or Integer] :page The requested page. Default is 1
     def tournaments(team_or_id: nil, season_id: nil, params: {})
-      ChgkRating::Collections::Tournaments.new params.merge(team: team_or_id, season_id: season_id)
+      ChgkRating::Collections::Tournaments.new params.merge(
+        team: team_or_id, season_id: season_id
+      )
     end
 
-    # Returns an array-like Ratings collection for a given team.
+    # Returns a collection of Tournaments that the Player has participated in
+    #
+    # @return [ChgkRating::Collection::PlayerTournaments] The collection of tournaments.
+    # @param player_or_id [String, Integer or ChgkRating::Models::Player] Player to load tournaments for.
+    # @param season_id [String or Integer] Season to load tournaments for
+    def player_tournaments(player_or_id, season_id = nil)
+      ChgkRating::Collections::PlayerTournaments.new player: player_or_id,
+                                                     season_id: season_id
+    end
+
+    # Returns an array-like Ratings collection for a given Team.
     #
     # @raise [ChgkRating::Error::NotFound] Error raised when the requested Team cannot be found.
     # @return [ChgkRating::Collection::Ratings] The collection of ratings.
     # @param team_or_id [String, Integer or ChgkRating::Models::Team] Team to load ratings for.
-    def ratings(team_or_id)
+    def team_ratings(team_or_id)
       team(team_or_id, true).ratings
     end
 
+    # Returns an array-like Ratings collection for a given Player.
+    #
+    # @raise [ChgkRating::Error::NotFound] Error raised when the requested Player cannot be found.
+    # @return [ChgkRating::Collection::Ratings] The collection of ratings.
+    # @param player_or_id [String, Integer or ChgkRating::Models::Team] Player to load ratings for.
+    def player_ratings(player_or_id)
+      player(player_or_id, true).ratings
+    end
+
     # Returns an array-like TournamentTeams collection specifying which teams participated in a given tournament
     #
     # @raise [ChgkRating::Error::NotFound] Error raised when the requested Tournament cannot be found.
@@ -159,15 +192,15 @@ module ChgkRating
       team_at_tournament(tournament_or_id, team_or_id).results
     end
 
-    # Returns an array-like TournamentPlayers collection containing roster for a
+    # Returns an array-like TournamentTeamPlayers collection containing roster for a
     # given team at a given tournament.
     #
     # @raise [ChgkRating::Error::NotFound] Error raised when the requested Tournament or Team cannot be found.
-    # @return [ChgkRating::Collection::TournamentPlayers] The collection of results.
+    # @return [ChgkRating::Collection::TournamentTeamPlayers] The collection of results.
     # @param tournament_or_id [String, Integer or ChgkRating::Models::Tournament] Tournament to load players for.
     # @param team_or_id [String, Integer or ChgkRating::Models::Team] Team to load players for.
     def team_players_at_tournament(tournament_or_id, team_or_id)
       team_at_tournament(tournament_or_id, team_or_id).players
     end
   end
-end
+end

data/lib/chgk_rating/collections/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class Base < ChgkObject
@@ -8,7 +10,7 @@ module ChgkRating
 
       def initialize(params = {})
         results = params[:collection] ||
-            prepare(get(api_path, build_request_params_from(params)))
+                  prepare(get(api_path, build_request_params_from(params)))
 
         @items = process results, params
       end
@@ -22,27 +24,30 @@ module ChgkRating
       end
 
       def to_a
-        raise ChgkRating::Error::NotArrayType unless self.respond_to?(:to_a)
-        self.items.to_a.map &:to_h
+        raise ChgkRating::Error::NotArrayType unless respond_to?(:to_a)
+
+        items.to_a.map(&:to_h)
       end
 
       def to_h
-        raise ChgkRating::Error::NotHashType unless self.respond_to?(:to_h)
-        self.items.map { |k,v| revert_to_hash(k, v) }.to_h
+        raise ChgkRating::Error::NotHashType unless respond_to?(:to_h)
+
+        items.to_h { |k, v| revert_to_hash(k, v) }
       end
 
       def respond_to?(method, include_all = false)
         method = method.to_sym
-        if %i( to_a to_h ).include?(method.to_sym)
-          self.convertable? method
+        if %i[to_a to_h].include?(method.to_sym)
+          convertable? method
         else
           super
         end
       end
 
       def convertable?(method)
-        return true if (method == :to_a && self.items.is_a?(Array)) ||
-            (method == :to_h && self.items.is_a?(Hash))
+        return true if (method == :to_a && items.is_a?(Array)) ||
+                       (method == :to_h && items.is_a?(Hash))
+
         false
       end
 
@@ -54,26 +59,26 @@ module ChgkRating
 
       def build_request_params_from(params)
         request_params = params[:request].to_h
-        request_params[:page] = params.delete(:page).to_i if params.has_key?(:page)
+        request_params[:page] = params.delete(:page).to_i if params.key?(:page)
         request_params
       end
 
       def prepare(raw_results)
         if raw_results.respond_to?(:has_key?)
-          return raw_results['tournaments'] if raw_results.has_key?('tournaments')
-          return raw_results['items'] if raw_results.has_key?('items')
+          return raw_results['tournaments'] if raw_results.key?('tournaments')
+          return raw_results['items'] if raw_results.key?('items')
         end
 
         raw_results
       end
 
-      def process(results, *_args)
+      def process(results, *_args, &block)
         if results.is_a? Hash
           results.each { |season, result| results[season] = yield result }
         else
-          results.map { |result| yield result }
+          results.map(&block)
         end
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/players.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class Players < Base
@@ -14,4 +16,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/ratings/player_ratings.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ChgkRating
+  module Collections
+    class PlayerRatings < Base
+      attr_reader :player
+
+      def initialize(params = {})
+        @player = build_model params[:player], ChgkRating::Models::Player
+        super
+      end
+
+      private
+
+      def process(*_args)
+        super { |result| ChgkRating::Models::PlayerRating.new result }
+      end
+
+      def api_path
+        "players/#{@player.id}/rating"
+      end
+    end
+  end
+end

data/lib/chgk_rating/collections/{ratings.rb → ratings/team_ratings.rb}

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
-    class Ratings < Base
+    class TeamRatings < Base
       attr_reader :team
 
       def initialize(params = {})
         @team = build_model params[:team]
-
         super
       end
 
       private
 
       def process(*_args)
-        super { |result| ChgkRating::Models::Rating.new result }
+        super { |result| ChgkRating::Models::TeamRating.new result }
       end
 
       def api_path
@@ -20,4 +21,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/recaps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class Recaps < Base
@@ -12,7 +14,7 @@ module ChgkRating
       private
 
       def process(results, _params)
-        results.each do |season,value|
+        results.each do |season, value|
           results[season] = ChgkRating::Models::Recap.new value, team: @team
         end
       end
@@ -22,4 +24,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/teams.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class Teams < Base
@@ -14,4 +16,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/tournaments/player_tournaments.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module ChgkRating
+  module Collections
+    class PlayerTournaments < Base
+      attr_reader :season_id, :player
+
+      def initialize(params = {})
+        @player = build_model params[:player], ChgkRating::Models::Player
+
+        @season_id = params[:season_id]
+        super
+      end
+
+      def revert_to_hash(key, values)
+        [
+          key,
+          {
+            'idplayer' => @player.id.to_s,
+            'idseason' => key,
+            'tournaments' => values.map(&:to_h)
+          }
+        ]
+      end
+
+      private
+
+      def process(_results, params = {})
+        super do |result|
+          if @player && @season_id.nil?
+            ChgkRating::Collections::PlayerTournaments.new(collection: result['tournaments']).items
+          else
+            ChgkRating::Models::PlayerTournament.new result
+          end
+        end
+      end
+
+      # @return [String] Either `tournaments`, `teams/ID/tournaments`, `players/ID/tournaments`,
+      # `teams/ID/tournaments/SEASON_ID`, `players/ID/tournaments/SEASON_ID`
+      def api_path
+        path = "players/#{@player.id}/tournaments"
+        return path unless @season_id
+
+        path + "/#{@season_id}"
+      end
+    end
+  end
+end

data/lib/chgk_rating/collections/{tournament_players.rb → tournaments/tournament_team_players.rb}

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
-    class TournamentPlayers < Base
+    class TournamentTeamPlayers < Base
       attr_reader :team, :tournament
 
       def initialize(params = {})
@@ -13,7 +15,7 @@ module ChgkRating
       private
 
       def process(*_args)
-        super { |result| ChgkRating::Models::TournamentPlayer.new result }
+        super { |result| ChgkRating::Models::TournamentTeamPlayer.new result }
       end
 
       def api_path
@@ -21,4 +23,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/{tournament_team_results.rb → tournaments/tournament_team_results.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class TournamentTeamResults < Base
@@ -21,4 +23,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/{tournament_teams.rb → tournaments/tournament_teams.rb}

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class TournamentTeams < Base
       attr_reader :tournament
+
       def initialize(params = {})
         @tournament = build_model params[:tournament], ChgkRating::Models::Tournament
 
@@ -19,4 +22,4 @@ module ChgkRating
       end
     end
   end
-end
+end