chgk_rating 1.0.0 → 2.2.0

data/lib/chgk_rating.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'uri'
 require 'faraday'
@@ -21,21 +23,26 @@ require 'chgk_rating/concerns/searching'
 require 'chgk_rating/chgk_object'
 
 require 'chgk_rating/models/base'
-require 'chgk_rating/models/tournament_team_result'
-require 'chgk_rating/models/tournament_player'
-require 'chgk_rating/models/tournament_team'
-require 'chgk_rating/models/rating'
-require 'chgk_rating/models/tournament'
+require 'chgk_rating/models/tournament/tournament_team_result'
+require 'chgk_rating/models/tournament/tournament_team_player'
+require 'chgk_rating/models/tournament/tournament_team'
+require 'chgk_rating/models/tournament/player_tournament'
+require 'chgk_rating/models/tournament/tournament'
+require 'chgk_rating/models/rating/rating'
+require 'chgk_rating/models/rating/player_rating'
+require 'chgk_rating/models/rating/team_rating'
 require 'chgk_rating/models/player'
 require 'chgk_rating/models/team'
 require 'chgk_rating/models/recap'
 
 require 'chgk_rating/collections/base'
-require 'chgk_rating/collections/tournament_team_results'
-require 'chgk_rating/collections/tournament_players'
-require 'chgk_rating/collections/tournament_teams'
-require 'chgk_rating/collections/ratings'
-require 'chgk_rating/collections/tournaments'
+require 'chgk_rating/collections/tournaments/tournament_team_results'
+require 'chgk_rating/collections/tournaments/tournament_team_players'
+require 'chgk_rating/collections/tournaments/tournament_teams'
+require 'chgk_rating/collections/tournaments/player_tournaments'
+require 'chgk_rating/collections/tournaments/tournaments'
+require 'chgk_rating/collections/ratings/player_ratings'
+require 'chgk_rating/collections/ratings/team_ratings'
 require 'chgk_rating/collections/players'
 require 'chgk_rating/collections/teams'
 require 'chgk_rating/collections/recaps'
@@ -49,4 +56,4 @@ module ChgkRating
   def self.client
     @client ||= ChgkRating::Client.new
   end
-end
+end

data/lib/ext/date.rb

@@ -1,11 +1,9 @@
+# frozen_string_literal: true
+
 class Date
   def self.parse_safely(raw_date_time)
-    begin
-      self.parse raw_date_time
-    rescue ArgumentError
-      nil
-    rescue TypeError
-      nil
-    end
+    parse raw_date_time
+  rescue ArgumentError, TypeError
+    nil
   end
-end
+end

data/lib/ext/date_time.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class DateTime
   def to_s_chgk
-    self.strftime('%Y-%m-%d %H:%M:%S')
+    strftime('%Y-%m-%d %H:%M:%S')
   end
-end
+end

data/lib/ext/uri.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 module URI
   def self.parse_safely(raw_uri)
-    begin
-      URI.parse raw_uri
-    rescue URI::InvalidURIError
-      nil
-    end
+    URI.parse raw_uri
+  rescue URI::InvalidURIError
+    nil
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chgk_rating
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.2.0
 platform: ruby
 authors:
-- Ilya Bodrov
-autorequire: 
+- Ilya Krukowski
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,42 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +95,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.31'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6.0'
 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
 email:
@@ -119,25 +175,30 @@ files:
 - lib/chgk_rating/client.rb
 - lib/chgk_rating/collections/base.rb
 - lib/chgk_rating/collections/players.rb
-- lib/chgk_rating/collections/ratings.rb
+- lib/chgk_rating/collections/ratings/player_ratings.rb
+- lib/chgk_rating/collections/ratings/team_ratings.rb
 - lib/chgk_rating/collections/recaps.rb
 - lib/chgk_rating/collections/teams.rb
-- lib/chgk_rating/collections/tournament_players.rb
-- lib/chgk_rating/collections/tournament_team_results.rb
-- lib/chgk_rating/collections/tournament_teams.rb
-- lib/chgk_rating/collections/tournaments.rb
+- lib/chgk_rating/collections/tournaments/player_tournaments.rb
+- lib/chgk_rating/collections/tournaments/tournament_team_players.rb
+- lib/chgk_rating/collections/tournaments/tournament_team_results.rb
+- lib/chgk_rating/collections/tournaments/tournament_teams.rb
+- lib/chgk_rating/collections/tournaments/tournaments.rb
 - lib/chgk_rating/concerns/searching.rb
 - lib/chgk_rating/connection.rb
 - lib/chgk_rating/error.rb
 - lib/chgk_rating/models/base.rb
 - lib/chgk_rating/models/player.rb
-- lib/chgk_rating/models/rating.rb
+- lib/chgk_rating/models/rating/player_rating.rb
+- lib/chgk_rating/models/rating/rating.rb
+- lib/chgk_rating/models/rating/team_rating.rb
 - lib/chgk_rating/models/recap.rb
 - lib/chgk_rating/models/team.rb
-- lib/chgk_rating/models/tournament.rb
-- lib/chgk_rating/models/tournament_player.rb
-- lib/chgk_rating/models/tournament_team.rb
-- lib/chgk_rating/models/tournament_team_result.rb
+- lib/chgk_rating/models/tournament/player_tournament.rb
+- lib/chgk_rating/models/tournament/tournament.rb
+- lib/chgk_rating/models/tournament/tournament_team.rb
+- lib/chgk_rating/models/tournament/tournament_team_player.rb
+- lib/chgk_rating/models/tournament/tournament_team_result.rb
 - lib/chgk_rating/request.rb
 - lib/chgk_rating/utils/snakecase.rb
 - lib/chgk_rating/utils/transformations.rb
@@ -145,39 +206,12 @@ files:
 - lib/ext/date.rb
 - lib/ext/date_time.rb
 - lib/ext/uri.rb
-- spec/lib/chgk_rating/client_spec.rb
-- spec/lib/chgk_rating/collections/players_spec.rb
-- spec/lib/chgk_rating/collections/ratings_spec.rb
-- spec/lib/chgk_rating/collections/recaps_spec.rb
-- spec/lib/chgk_rating/collections/teams_spec.rb
-- spec/lib/chgk_rating/collections/tournament_players_spec.rb
-- spec/lib/chgk_rating/collections/tournament_team_results_spec.rb
-- spec/lib/chgk_rating/collections/tournament_teams_spec.rb
-- spec/lib/chgk_rating/collections/tournaments_spec.rb
-- spec/lib/chgk_rating/models/base_spec.rb
-- spec/lib/chgk_rating/models/player_spec.rb
-- spec/lib/chgk_rating/models/rating_spec.rb
-- spec/lib/chgk_rating/models/recap_spec.rb
-- spec/lib/chgk_rating/models/team_spec.rb
-- spec/lib/chgk_rating/models/tournament_player_spec.rb
-- spec/lib/chgk_rating/models/tournament_spec.rb
-- spec/lib/chgk_rating/models/tournament_team_result_spec.rb
-- spec/lib/chgk_rating/models/tournament_team_spec.rb
-- spec/lib/chgk_rating/utils/snakecase_spec.rb
-- spec/lib/chgk_rating/utils/transformations_spec.rb
-- spec/lib/chgk_rating_spec.rb
-- spec/lib/ext/date_spec.rb
-- spec/lib/ext/date_time_spec.rb
-- spec/lib/ext/uri_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples.rb
-- spec/support/test_client.rb
-- spec/support/vcr.rb
-homepage: https://github.com/bodrovis/ChgkRating
+homepage: http://chgk-rating.bodrovis.tech/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,44 +219,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.17
+signing_key:
 specification_version: 4
 summary: Ruby interface to the competitive What? Where? When? rating API
-test_files:
-- spec/lib/chgk_rating/client_spec.rb
-- spec/lib/chgk_rating/collections/players_spec.rb
-- spec/lib/chgk_rating/collections/ratings_spec.rb
-- spec/lib/chgk_rating/collections/recaps_spec.rb
-- spec/lib/chgk_rating/collections/teams_spec.rb
-- spec/lib/chgk_rating/collections/tournaments_spec.rb
-- spec/lib/chgk_rating/collections/tournament_players_spec.rb
-- spec/lib/chgk_rating/collections/tournament_teams_spec.rb
-- spec/lib/chgk_rating/collections/tournament_team_results_spec.rb
-- spec/lib/chgk_rating/models/base_spec.rb
-- spec/lib/chgk_rating/models/player_spec.rb
-- spec/lib/chgk_rating/models/rating_spec.rb
-- spec/lib/chgk_rating/models/recap_spec.rb
-- spec/lib/chgk_rating/models/team_spec.rb
-- spec/lib/chgk_rating/models/tournament_player_spec.rb
-- spec/lib/chgk_rating/models/tournament_spec.rb
-- spec/lib/chgk_rating/models/tournament_team_result_spec.rb
-- spec/lib/chgk_rating/models/tournament_team_spec.rb
-- spec/lib/chgk_rating/utils/snakecase_spec.rb
-- spec/lib/chgk_rating/utils/transformations_spec.rb
-- spec/lib/chgk_rating_spec.rb
-- spec/lib/ext/date_spec.rb
-- spec/lib/ext/date_time_spec.rb
-- spec/lib/ext/uri_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples.rb
-- spec/support/test_client.rb
-- spec/support/vcr.rb
+test_files: []

data/spec/lib/chgk_rating/client_spec.rb

@@ -1,208 +0,0 @@
-RSpec.shared_examples 'lazy loaded' do
-  it 'is lazy loaded' do
-    expect(object.lazy).to eq(true)
-  end
-end
-
-RSpec.describe ChgkRating::Client do
-  let(:team_1) { test_client.team(1, true) }
-  let(:team_52853) { test_client.team(52853, true) }
-  let(:tournament_3506) { test_client.tournament(3506, true) }
-
-  def with_erroneous_cassette
-    VCR.use_cassette('erroneous_request') { yield }
-  end
-
-  context 'errors' do
-    it 'should raise an error for an erroneous request' do
-      expect do
-        # That's a very strange bug that makes VCR raise UnhandledHTTPError
-        # so for now disable VCR for Ruby 2.5+
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-          test_client.tournament '/thats/an/error'
-        else
-          with_erroneous_cassette { test_client.tournament '/thats/an/error' }
-        end
-      end.to raise_error(ChgkRating::Error::NotFound)
-    end
-  end
-
-  describe '#team_at_tournament' do
-    subject { test_client.team_at_tournament tournament_3506, team_52853 }
-
-    it { is_expected.to be_an_instance_of ChgkRating::Models::TournamentTeam }
-
-    include_examples 'lazy loaded' do
-      let(:object) { subject }
-    end
-  end
-
-  describe '#tournament' do
-    subject { test_client.tournament 3506, true }
-
-    include_examples 'lazy loaded' do
-      let(:object) { subject }
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Models::Tournament }
-  end
-
-  describe '#rating' do
-    subject do
-      VCR.use_cassette('rating_release') { test_client.rating team_1, 24 }
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Models::Rating }
-  end
-
-  describe '#recap' do
-    subject do
-      VCR.use_cassette 'recap_last_season' do
-        test_client.recap test_client.team(7931, true), :last
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Models::Recap }
-  end
-
-  describe '#team' do
-    subject { test_client.team 1, true }
-
-    it { is_expected.to be_an_instance_of ChgkRating::Models::Team }
-
-    include_examples 'lazy loaded' do
-      let(:object) { subject }
-    end
-  end
-
-  describe '#player' do
-    subject { test_client.player 42511, true }
-
-    it { is_expected.to be_an_instance_of ChgkRating::Models::Player }
-
-    include_examples 'lazy loaded' do
-      let(:object) { subject }
-    end
-  end
-
-  describe '#ratings' do
-    subject do
-      VCR.use_cassette 'team_ratings' do
-        test_client.ratings team_1
-      end
-    end
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::Ratings }
-  end
-
-  describe '#team_players_at_tournament' do
-    subject do
-      VCR.use_cassette 'team_players_at_tournament' do
-        test_client.team_players_at_tournament tournament_3506, team_52853
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::TournamentPlayers }
-  end
-
-  describe '#team_results_at_tournament' do
-    subject do
-      VCR.use_cassette 'team_results_at_tournament' do
-        test_client.team_results_at_tournament tournament_3506, team_52853
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::TournamentTeamResults }
-  end
-
-  describe '#teams_at_tournament' do
-    subject do
-      VCR.use_cassette 'teams_at_tournament' do
-        test_client.teams_at_tournament tournament_3506
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::TournamentTeams }
-  end
-
-  describe '#tournaments' do
-    context 'all tournaments for a team by season' do
-      subject do
-        VCR.use_cassette 'team_tournaments_season' do
-          test_client.tournaments team_or_id: team_1, season_id: 4
-        end
-      end
-
-      it { is_expected.to be_an_instance_of ChgkRating::Collections::Tournaments }
-    end
-
-    context 'tournaments for a team' do
-      subject do
-        VCR.use_cassette 'team_tournaments' do
-          test_client.tournaments team_or_id: team_1
-        end
-      end
-
-      it { is_expected.to be_an_instance_of ChgkRating::Collections::Tournaments }
-    end
-
-    context 'all tournaments' do
-      subject do
-        VCR.use_cassette 'tournaments' do
-          test_client.tournaments
-        end
-      end
-
-      it { is_expected.to be_an_instance_of ChgkRating::Collections::Tournaments }
-    end
-  end
-
-  describe '#recaps' do
-    subject do
-      VCR.use_cassette 'recaps' do
-        test_client.recaps team_1
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::Recaps }
-  end
-
-  describe '#search_teams' do
-    subject do
-      VCR.use_cassette 'teams_searching' do
-        test_client.search_teams name: 'э', town: 'мин'
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::Teams::Search }
-  end
-
-  describe '#teams' do
-    subject do
-      VCR.use_cassette 'teams' do
-        test_client.teams
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::Teams }
-  end
-
-  describe '#search_players' do
-    subject do
-      VCR.use_cassette 'players_searching' do
-        test_client.search_players name: 'вас', surname: 'а'
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::Players::Search }
-  end
-
-  describe '#players' do
-    subject do
-      VCR.use_cassette 'players' do
-        test_client.players
-      end
-    end
-
-    it { is_expected.to be_an_instance_of ChgkRating::Collections::Players }
-  end
-end

data/spec/lib/chgk_rating/collections/players_spec.rb

@@ -1,45 +0,0 @@
-RSpec.describe ChgkRating::Collections::Players do
-  let(:player) { subject[1] }
-  subject do
-    VCR.use_cassette 'players' do
-      described_class.new
-    end
-  end
-
-  it_behaves_like 'not a hash'
-  it_behaves_like 'an array'
-
-  specify '#to_a' do
-    players_arr = subject.to_a
-    expect(players_arr.count).to eq 1000
-    expect(players_arr[10]['surname']).to eq 'Абарников'
-  end
-  specify('#id') { expect(player.id).to eq '6' }
-  specify('#surname') { expect(player.surname).to eq 'Абаков' }
-  specify('#name') { expect(player.name).to eq 'Карен' }
-  it 'respond_to should still work properly' do
-    expect(subject.respond_to?(:count)).to eq true
-  end
-
-  context 'searching' do
-    subject do
-      VCR.use_cassette 'players_searching' do
-        test_client.search_players(name: 'вас', surname: 'а')[28]
-      end
-    end
-
-    specify('#id') { expect(subject.id).to eq '148380' }
-    specify('#surname') { expect(subject.surname).to eq 'Абросимов' }
-  end
-
-  context 'pagination' do
-    subject do
-      VCR.use_cassette 'players_page3' do
-        described_class.new(page: 3)[1]
-      end
-    end
-
-    specify('#id') { expect(subject.id).to eq '2101' }
-    specify('#surname') { expect(subject.surname).to eq 'Бажов' }
-  end
-end

data/spec/lib/chgk_rating/collections/ratings_spec.rb

@@ -1,25 +0,0 @@
-RSpec.describe ChgkRating::Collections::Ratings do
-  subject do
-    VCR.use_cassette 'team_ratings' do
-      described_class.new(team: 1)
-    end
-  end
-  let(:ratings) do
-    subject[0]
-  end
-
-  it_behaves_like 'not a hash'
-  it_behaves_like 'an array'
-
-  specify '#to_a' do
-    ratings_arr = subject.to_a
-    expect(ratings_arr.count).to eq 572
-    expect(ratings_arr[500]['date']).to eq '2006-08-17'
-  end
-  specify('#date') { expect(ratings.date.to_s).to eq '2003-07-01' }
-  specify('#formula') { expect(ratings.formula).to eq :a }
-  specify('#rating_position') { expect(ratings.rating_position).to eq 8 }
-  specify('#release_id') { expect(ratings.release_id).to eq '1' }
-  specify('#team') { expect(ratings.team.id).to eq '1' }
-  specify('#rating') { expect(ratings.rating).to eq 6093 }
-end