chgk_rating 2.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f4ca06ab6d5493cf307d4d0c69a9286d6306e821ee186a1efa5f59ee90e6ac
-  data.tar.gz: fe44eff613828362a3bd6e1347d1bffcb3eddaf9ec6b2ab74974271526e3c29e
+  metadata.gz: c29ae6874afaf3aecceeb48bf0565c39f3b6e9477539dc55b27f8af30dcb04d8
+  data.tar.gz: c9534ce8ed794db2899ce9f56078c453c4f1ec2bd70152ed20cf7fb438f890b5
 SHA512:
-  metadata.gz: bf3d999776bcf5f32a2f2f763c7d04b47a4ee32738b526da7de9b54c0d8a79ddddc7d499dc0d251c3d7d02be9ce2e87b08afcef61c9e94788f25ac3d498d7012
-  data.tar.gz: fef80b06f8457b2ce82a58a5fb8b183d5bab8c88c53e0c6de80462bba6822157ec53b19283f27c8d67f2e2fbabec8f6fcb47567c9e59e375861cdefccdaadaca
+  metadata.gz: 76b4ce04cae4ba912d425f6f2aad741c6e638fe72cc90f469add0bbf5edde63ede65858a5c0da1e1f509f360e2210aafdaad95250296a18eee56f0c38dc76a7b
+  data.tar.gz: 97e23393e3bb53579b6f433cc4f8d1fe6c4e70d7a39a9b7cca34dcfe7f524e58969bfe8c8ba8497ba7c013f5a58413c9d816701507151b1d8e03258dedee09dc

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v2.2.1 (2022-08-05)
+
+* Fixed conversion to boolean (thanks, @L-Eugene)
+
+## v2.2.0 (2022-07-07)
+
+* **Drop support for Ruby 2.4 and 2.5 (EOL)**
+* Switched to Faraday v2 (thanks, @L-Eugene)
+* Fixed various minor issues
+* Switched to GH Actions
+* Use Rubocop
+* Update test matrix
+
+## v2.1.0 (2021-12-29)
+
+* Updated API mappings (thanks, @L-Eugene)
+
 ## v2.0.0 (2021-12-28)
 
 Breaking changes:

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
-gemspec
+gemspec

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Ilya Bodrov
+Copyright (c) 2022 Ilya Krukowski
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,10 +1,10 @@
 # ChgkRating
 
 [![Gem Version](https://badge.fury.io/rb/chgk_rating.svg)](https://badge.fury.io/rb/chgk_rating)
-[![Build Status](https://travis-ci.org/bodrovis/ChgkRating.svg?branch=master)](https://travis-ci.org/bodrovis/ChgkRating)
-[![Code Climate](https://codeclimate.com/github/bodrovis/ChgkRating/badges/gpa.svg)](https://codeclimate.com/github/bodrovis/ChgkRating)
+![CI](https://github.com/bodrovis/ChgkRating/actions/workflows/ci.yml/badge.svg)
+[![Test Coverage](https://codecov.io/gh/bodrovis/ChgkRating/graph/badge.svg)](https://codecov.io/gh/bodrovis/ChgkRating)
 
-**This gem is in passive maintenance mode. I won't release any new features or introduce any complex enhancements as ChgkRating v1 is deprecated.**
+**This gem is in passive maintenance mode. I won't release any new features or introduce any complex enhancements as ChgkRating v1 is deprecated. Please use [rating-chgk-v2 gem](https://github.com/bodrovis/rating-chgk-v2) which works with the new version of the API.**
 
 Ruby interface for the [rating.chgk.info](http://rating.chgk.info/index.php/api) WebAPI. This is not just a wrapper, but rather a quite complex opinionated client that allows to easily work with various API resources.
 
@@ -64,4 +64,4 @@ Tests run against mock responses so you don't need to perform any special setup.
 
 This plugin is licensed under the [MIT License](https://github.com/bodrovis/ChgkRating/blob/master/LICENSE).
 
-Copyright (c) [Ilya Bodrov](http://bodrovis.tech)
+Copyright (c) [Ilya Krukowski](http://bodrovis.tech)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 begin
@@ -7,7 +9,7 @@ rescue LoadError
   puts 'although not required, bundler is recommened for running the tests'
 end
 
-task :default => :spec
+task default: :spec
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)

data/chgk_rating.gemspec

@@ -1,30 +1,37 @@
-require File.expand_path('../lib/chgk_rating/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/chgk_rating/version', __dir__)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'chgk_rating'
   spec.version               = ChgkRating::VERSION
-  spec.authors               = ['Ilya Bodrov']
+  spec.authors               = ['Ilya Krukowski']
   spec.email                 = ['golosizpru@gmail.com']
   spec.summary               = 'Ruby interface to the competitive What? Where? When? rating API'
-  spec.description           = 'Opinionated Ruby client for the competitive What? Where? When? rating WebAPI (rating.chgk.info) that allows to work with data as with Ruby objects'
+  spec.description           = 'Opinionated Ruby client for the competitive What? Where? When? ' \
+                               'rating WebAPI (rating.chgk.info) that ' \
+                               'allows to work with data as with Ruby objects'
   spec.homepage              = 'http://chgk-rating.bodrovis.tech/'
   spec.license               = 'MIT'
   spec.platform              = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.files            =  Dir["README.md", "LICENSE", "CONTRIBUTING.md",
-                               "CHANGELOG.md", "lib/**/*.rb", "chgk_rating.gemspec", ".github/*.md",
-                               "Gemfile", "Rakefile"]
-  spec.test_files       = Dir["spec/**/*.rb"]
+  spec.files = Dir['README.md', 'LICENSE', 'CONTRIBUTING.md',
+                   'CHANGELOG.md', 'lib/**/*.rb', 'chgk_rating.gemspec', '.github/*.md',
+                   'Gemfile', 'Rakefile']
   spec.extra_rdoc_files = ['README.md']
   spec.require_paths    = ['lib']
 
-  spec.add_dependency 'faraday',                       '~> 1.8'
-  spec.add_dependency 'faraday_middleware',            '~> 1.2'
+  spec.add_dependency 'faraday',                       '~> 2.0'
+  spec.add_dependency 'faraday-follow_redirects',      '~> 0.3'
   spec.add_dependency 'multi_json',                    '~> 1.15'
 
+  spec.add_development_dependency 'codecov', '~> 0.1'
   spec.add_development_dependency 'rake',                      '~> 13.0'
   spec.add_development_dependency 'rspec',                     '~> 3.6'
-  spec.add_development_dependency 'vcr',                       '~> 6.0'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
+  spec.add_development_dependency 'rubocop', '~> 1.31'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rspec',       '~> 2.11'
+  spec.add_development_dependency 'vcr', '~> 6.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/chgk_rating/attribute_mappings.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module AttributeMappings
     extend ChgkRating::Utils::Transformations
 
     class << self
       def find(name)
-        begin
-          const_get name.snakecase_upcase
-        rescue NameError
-          {}
-        end
+        const_get name.snakecase_upcase
+      rescue NameError
+        {}
       end
 
       def generate_mappings_for(data)
@@ -20,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
 
@@ -51,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
@@ -61,95 +60,107 @@ module ChgkRating
     end
 
     generate_mappings_for({
-                              PLAYER: [
-                                  { id: 'idplayer' },
-                                  :name,
-                                  :surname,
-                                  :patronymic,
-                                  :comment,
-                                  :db_chgk_info_tag
-                              ],
-                              RATING: {
-                                  release_id: 'idrelease',
-                                  rating: [],
-                                  rating_position: [],
-                                  date: ['date', :date]
-                              },
-                              PLAYER_RATING: {
-                                  player: ['idplayer', :player_id],
-                                  tournaments_in_year: [],
-                                  tournament_count_total: []
-                              },
-                              TEAM_RATING: {
-                                  team: ['idteam', :team_id],
-                                  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]
                               },
-                              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],
-                                      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_TEAM_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,14 +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
@@ -138,7 +140,7 @@ module ChgkRating
     # @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
+        team: team_or_id, season_id: season_id
       )
     end
 
@@ -201,4 +203,4 @@ module ChgkRating
       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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class TeamRatings < Base
@@ -19,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class PlayerTournaments < Base
@@ -12,12 +14,12 @@ module ChgkRating
 
       def revert_to_hash(key, values)
         [
-            key,
-            {
-                'idplayer' => @player.id.to_s,
-                'idseason' => key,
-                'tournaments' => values.map(&:to_h)
-            }
+          key,
+          {
+            'idplayer' => @player.id.to_s,
+            'idseason' => key,
+            'tournaments' => values.map(&:to_h)
+          }
         ]
       end
 
@@ -33,12 +35,14 @@ module ChgkRating
         end
       end
 
-      # @return [String] Either `tournaments`, `teams/ID/tournaments`, `players/ID/tournaments`, `teams/ID/tournaments/SEASON_ID`, `players/ID/tournaments/SEASON_ID`
+      # @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
+end

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

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

data/lib/chgk_rating/collections/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