chgk_rating 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f4ca06ab6d5493cf307d4d0c69a9286d6306e821ee186a1efa5f59ee90e6ac
-  data.tar.gz: fe44eff613828362a3bd6e1347d1bffcb3eddaf9ec6b2ab74974271526e3c29e
+  metadata.gz: 2beed511c09dac149040e3ef7aa8b77b6544812b36b51edac684e59d31b3d13a
+  data.tar.gz: 9095b4e10577fcce79635959cf5c59e6735991a542529d9297055f7d16f31619
 SHA512:
-  metadata.gz: bf3d999776bcf5f32a2f2f763c7d04b47a4ee32738b526da7de9b54c0d8a79ddddc7d499dc0d251c3d7d02be9ce2e87b08afcef61c9e94788f25ac3d498d7012
-  data.tar.gz: fef80b06f8457b2ce82a58a5fb8b183d5bab8c88c53e0c6de80462bba6822157ec53b19283f27c8d67f2e2fbabec8f6fcb47567c9e59e375861cdefccdaadaca
+  metadata.gz: 3b46e4c6bc5bee3671c6a7eea8f01acc9de7eaba69d507e1c2c4dab48c03f8ec207f581e9c72adcb492146d036fb9357527e392604406a90e48e0327095f546a
+  data.tar.gz: 959bf5cdc7e97d4448afdd7798fff377ce6101d546d33bf28df0b4944a24bdddf9cd08b9041a81d337e25d0321aa808411b84ca6b81997642b2535a9ac0357d1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.1.0 (2021-12-29)
+
+* Updated API mappings (thanks, @L-Eugene)
+
 ## v2.0.0 (2021-12-28)
 
 Breaking changes:

data/lib/chgk_rating/attribute_mappings.rb

@@ -73,6 +73,7 @@ module ChgkRating
                                   release_id: 'idrelease',
                                   rating: [],
                                   rating_position: [],
+                                  tech_rating: [],
                                   date: ['date', :date]
                               },
                               PLAYER_RATING: {
@@ -106,14 +107,19 @@ module ChgkRating
                                       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]
+                                      site_url: ['site_url', :uri],
+                                      date_archived_at: ['date_archived_at', :datetime]
                                   },
                                   :name,
                                   :town,
                                   :long_name,
                                   :type_name,
+                                  :main_payment_currency,
+                                  :discounted_payment_currency,
                                   :discounted_payment_reason,
+                                  :archive,
                                   :comment
                               ],
                               TOURNAMENT_TEAM_PLAYER: {
@@ -128,22 +134,28 @@ module ChgkRating
                                       position: ['position', :float],
                                       questions_total: [],
                                       result: ['mask', :splitboolean_arraystrboolean],
-                                      bonus_a: [],
                                       bonus_b: [],
-                                      tech_rating: [],
+                                      tech_rating_rt: [],
+                                      tech_rating_rg: [],
+                                      tech_rating_rb: [],
+                                      rating_r: [],
                                       predicted_position: [],
-                                      d_bonus_a: [],
-                                      d_bonus_b: [],
-                                      d_diff_bonus: [],
+                                      diff_bonus: [],
                                       included_in_rating: ['included_in_rating', :boolean_binboolean]
                                   },
                                   :current_name,
                                   :base_name
                               ],
                               TEAM: [
-                                  { id: 'idteam' },
+                                  {
+                                    id: 'idteam',
+                                    tournaments_this_season: [],
+                                    tournaments_total: []
+                                  },
                                   :name,
                                   :town,
+                                  :region_name,
+                                  :country_name,
                                   :comment
                               ],
                               TOURNAMENT_TEAM_RESULT: {
@@ -152,4 +164,4 @@ module ChgkRating
                               }
                           })
   end
-end
+end

data/lib/chgk_rating/version.rb

@@ -1,3 +1,3 @@
 module ChgkRating
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/spec/lib/chgk_rating/collections/tournaments/tournament_teams_spec.rb

@@ -15,13 +15,12 @@ RSpec.describe ChgkRating::Collections::TournamentTeams do
   specify('#base_name') { expect(team.base_name).to eq 'Полосатый мамонт' }
   specify('#position') { expect(team.position).to eq 3 }
   specify('#questions_total') { expect(team.questions_total).to eq 34 }
-  specify('#bonus_a') { expect(team.bonus_a).to eq 1575 }
-  specify('#bonus_b') { expect(team.bonus_b).to eq -47 }
-  specify('#tech_rating') { expect(team.tech_rating).to eq 2549 }
+  specify('#bonus_b') { expect(team.bonus_b).to eq 421 }
+  specify('#tech_rating_rt') { expect(team.tech_rating_rt).to eq 2583 }
+  specify('#tech_rating_rg') { expect(team.tech_rating_rg).to eq 2583 }
+  specify('#tech_rating_rb') { expect(team.tech_rating_rb).to eq 2525 }
   specify('#predicted_position') { expect(team.predicted_position).to eq 2 }
-  specify('#d_bonus_a') { expect(team.d_bonus_a).to eq 1575 }
-  specify('#d_bonus_b') { expect(team.d_bonus_b).to eq 420 }
-  specify('#d_diff_bonus') { expect(team.d_diff_bonus).to eq -47 }
+  specify('#diff_bonus') { expect(team.diff_bonus).to eq -48 }
   specify('#included_in_rating') { expect(team.included_in_rating).to eq true }
   specify('#result') { expect(team.result).to eq [true, true, true, false, true, true,
                                                      true, true, true, true, true,
@@ -46,15 +45,14 @@ RSpec.describe ChgkRating::Collections::TournamentTeams do
                                              "0", "1", "1", "1", "0", "0", "1", "0", "1", "1", "0",
                                              "1", "1", "0", "1", "0", "1", "0", "1", "1", "1", "0",
                                              "1", "1", "1", "1"]
-    expect(tournament_team_h['bonus_a']).to eq '1575'
-    expect(tournament_team_h['bonus_b']).to eq '-47'
-    expect(tournament_team_h['tech_rating']).to eq '2549'
-    expect(tournament_team_h['d_bonus_a']).to eq '1575'
-    expect(tournament_team_h['d_bonus_b']).to eq '420'
-    expect(tournament_team_h['d_diff_bonus']).to eq '-47'
+    expect(tournament_team_h['bonus_b']).to eq '421'
+    expect(tournament_team_h['tech_rating_rt']).to eq '2583'
+    expect(tournament_team_h['tech_rating_rg']).to eq '2583'
+    expect(tournament_team_h['tech_rating_rb']).to eq '2525'
+    expect(tournament_team_h['diff_bonus']).to eq '-48'
     expect(tournament_team_h['predicted_position']).to eq '2'
     expect(tournament_team_h['included_in_rating']).to eq '1'
     expect(tournament_team_h['current_name']).to eq 'Полосатый мамонт'
     expect(tournament_team_h['base_name']).to eq 'Полосатый мамонт'
   end
-end
+end

data/spec/lib/chgk_rating/models/team_spec.rb

@@ -12,6 +12,10 @@ RSpec.describe ChgkRating::Models::Team do
 
   specify('#id') { expect(subject.id).to eq '1' }
   specify('#town') { expect(subject.town).to eq 'Москва' }
+  specify('#region_name') { expect(subject.region_name).to eq 'Москва' }
+  specify('#country_name') { expect(subject.country_name).to eq 'Россия' }
+  specify('#tournaments_total') { expect(subject.tournaments_total).to eq 101 }
+  specify('#tournaments_this_season') { expect(subject.tournaments_this_season).to eq 0 }
   specify('#name') { expect(subject.name).to eq 'Неспроста' }
   specify('#comment') { expect(subject.comment).to eq '' }
 
@@ -28,6 +32,10 @@ RSpec.describe ChgkRating::Models::Team do
     expect(team_h['idteam']).to eq '1'
     expect(team_h['name']).to eq 'Неспроста'
     expect(team_h['town']).to eq 'Москва'
+    expect(team_h['region_name']).to eq 'Москва'
+    expect(team_h['country_name']).to eq 'Россия'
+    expect(team_h['tournaments_total']).to eq '101'
+    expect(team_h['tournaments_this_season']).to eq '0'
     expect(team_h['comment']).to eq ''
   end
 
@@ -86,4 +94,4 @@ RSpec.describe ChgkRating::Models::Team do
     end
     it { expect(team_ratings).to be_an_instance_of ChgkRating::Collections::TeamRatings }
   end
-end
+end

data/spec/lib/chgk_rating/models/tournament/tournament_spec.rb

@@ -17,14 +17,17 @@ RSpec.describe ChgkRating::Models::Tournament do
   specify('#date_end') { expect(subject.date_end).to eq DateTime.parse('2015-11-08 18:00:00') }
   specify('#tour_count') { expect(subject.tour_count).to eq 4 }
   specify('#tour_questions') { expect(subject.tour_questions).to eq 12 }
-  specify('#tour_ques_per_tour') { expect(subject.tour_ques_per_tour).to eq 0 }
+  specify('#tour_ques_per_tour') { expect(subject.tour_ques_per_tour).to be_nil }
   specify('#questions_total') { expect(subject.questions_total).to eq 48 }
   specify('#type_name') { expect(subject.type_name).to eq 'Обычный' }
   specify('#main_payment_value') { expect(subject.main_payment_value).to eq 660 }
+  specify('#main_payment_currency') { expect(subject.main_payment_currency).to eq 'руб' }
   specify('#discounted_payment_value') { expect(subject.discounted_payment_value).to eq 360 }
+  specify('#discounted_payment_currency') { expect(subject.discounted_payment_currency).to eq 'руб' }
   specify('#discounted_payment_reason') { expect(subject.discounted_payment_reason).to eq 'для детских команд; 480 - для студенческих' }
+  specify('#tournament_in_rating') { expect(subject.tournament_in_rating).to eq true }
   specify('#date_requests_allowed_to') { expect(subject.date_requests_allowed_to).to be_nil }
-  specify('#comment') { expect(subject.comment).to eq '' }
+  specify('#comment') { expect(subject.comment).to be_nil }
   specify('#town') { expect(subject.town).to eq 'Пермь' }
   specify('#site_url') { expect(subject.site_url).to eq URI.parse('https://vk.com/chgk.perm.championship') }
   specify '#to_h' do
@@ -33,7 +36,7 @@ RSpec.describe ChgkRating::Models::Tournament do
     expect(tournament_h['date_end']).to eq '2015-11-08T18:00:00+00:00'
     expect(tournament_h['tour_count']).to eq '4'
     expect(tournament_h['tour_questions']).to eq '12'
-    expect(tournament_h['tour_ques_per_tour']).to eq '0'
+    expect(tournament_h['tour_ques_per_tour']).to eq ''
     expect(tournament_h['questions_total']).to eq '48'
     expect(tournament_h['main_payment_value']).to eq '660.0'
     expect(tournament_h['discounted_payment_value']).to eq '360.0'
@@ -44,7 +47,7 @@ RSpec.describe ChgkRating::Models::Tournament do
     expect(tournament_h['long_name']).to eq 'XV Чемпионат Перми и Пермского края по игре "Что? Где? Когда?"'
     expect(tournament_h['type_name']).to eq 'Обычный'
     expect(tournament_h['discounted_payment_reason']).to eq 'для детских команд; 480 - для студенческих'
-    expect(tournament_h['comment']).to eq ''
+    expect(tournament_h['comment']).to be_nil
   end
 
   specify '#eager_load!' do
@@ -89,4 +92,4 @@ RSpec.describe ChgkRating::Models::Tournament do
 
     it { expect(team_list).to be_an_instance_of ChgkRating::Collections::TournamentTeams }
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chgk_rating
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ilya Bodrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday