sorare-rewards 1.1.2 → 1.1.3.beta0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +26 -27
  3. data/lib/sorare/rewards/concerns/with_analytics.rb +57 -0
  4. data/lib/sorare/rewards/game_week.rb +6 -0
  5. data/lib/sorare/rewards/interactors/tiers/qualify_players.rb +3 -3
  6. data/lib/sorare/rewards/version.rb +1 -1
  7. data/sorare-rewards.gemspec +7 -7
  8. metadata +20 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: df838191acb56979062609ee4184646e5c45381610efe994cc3c7e84d397aac7
4
- data.tar.gz: 300f47f3db86b1ea465360f15c59fa926b78544b70bf3c3242972c28213a51f9
3
+ metadata.gz: bcb36662a381adcf213a5ab17ad97ae1d57f862f84e274679657a05d096476cb
4
+ data.tar.gz: 1d38e28d7fc1912cf14ae3dfa48546f1aa87b427e5025ac8e2896dd3dce6a117
5
5
  SHA512:
6
- metadata.gz: 29ee679bddd7d79e01c96b3a15331d8c5946ea3cde90650d7afbc68b66a699e21739774a942b1cd2c45c991ce53eb984914d30890c1dc2abcc00ba245ff03775
7
- data.tar.gz: 8375b5b15925506505a29fc39e41b7bf8a7dbdbe6f0895abb03d768fd69c99d515ce7aaacf6134d9a2f46b5a9686428d966c4d5f82e1ff0f2571d20ee456042d
6
+ metadata.gz: e66851acb6b951557c607e2ebf24552ea5b16d63d3faf260f344175bf674758dc5efe7549b96c6fa164f1bdfc263066234b0e09f79a66ccbbb1c5f7dc0df903e
7
+ data.tar.gz: 6a2a8979952b7446ac9470b360fae8e7c2d8c53dd4db4442da9e60472090c2bae881fcf625e9c5da5a19d8bcff9c0356f80c2acb3a1586b074bdeb87f2e0689c
data/Gemfile.lock CHANGED
@@ -1,30 +1,30 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- sorare-rewards (1.1.2)
5
- activesupport (~> 6.1)
6
- interactor (~> 3.0)
4
+ sorare-rewards (1.1.3.beta0)
5
+ activesupport (~> 6.1.4)
6
+ interactor (~> 3.1.2)
7
7
  json (~> 2)
8
8
  net-http (~> 0.1.1)
9
- yaml (~> 0.1.1)
9
+ yaml (~> 0.2.0)
10
10
 
11
11
  GEM
12
12
  remote: https://rubygems.org/
13
13
  specs:
14
- activesupport (6.1.3.2)
14
+ activesupport (6.1.4.1)
15
15
  concurrent-ruby (~> 1.0, >= 1.0.2)
16
16
  i18n (>= 1.6, < 2)
17
17
  minitest (>= 5.1)
18
18
  tzinfo (~> 2.0)
19
19
  zeitwerk (~> 2.3)
20
20
  ast (2.4.2)
21
- concurrent-ruby (1.1.8)
21
+ concurrent-ruby (1.1.9)
22
22
  diff-lcs (1.4.4)
23
23
  i18n (1.8.10)
24
24
  concurrent-ruby (~> 1.0)
25
25
  interactor (3.1.2)
26
26
  io-wait (0.1.0)
27
- json (2.5.1)
27
+ json (2.6.0)
28
28
  minitest (5.14.4)
29
29
  net-http (0.1.1)
30
30
  net-protocol
@@ -32,9 +32,9 @@ GEM
32
32
  net-protocol (0.1.1)
33
33
  io-wait
34
34
  timeout
35
- ostruct (0.2.0)
36
- parallel (1.20.1)
37
- parser (3.0.1.0)
35
+ ostruct (0.4.0)
36
+ parallel (1.21.0)
37
+ parser (3.0.2.0)
38
38
  ast (~> 2.4.1)
39
39
  rainbow (3.0.0)
40
40
  rake (12.3.3)
@@ -53,42 +53,41 @@ GEM
53
53
  diff-lcs (>= 1.2.0, < 2.0)
54
54
  rspec-support (~> 3.10.0)
55
55
  rspec-support (3.10.2)
56
- rubocop (1.12.1)
56
+ rubocop (1.22.1)
57
57
  parallel (~> 1.10)
58
58
  parser (>= 3.0.0.0)
59
59
  rainbow (>= 2.2.2, < 4.0)
60
60
  regexp_parser (>= 1.8, < 3.0)
61
61
  rexml
62
- rubocop-ast (>= 1.2.0, < 2.0)
62
+ rubocop-ast (>= 1.12.0, < 2.0)
63
63
  ruby-progressbar (~> 1.7)
64
64
  unicode-display_width (>= 1.4.0, < 3.0)
65
- rubocop-ast (1.4.1)
66
- parser (>= 2.7.1.5)
67
- rubocop-rake (0.5.1)
68
- rubocop
69
- rubocop-rspec (2.2.0)
65
+ rubocop-ast (1.12.0)
66
+ parser (>= 3.0.1.1)
67
+ rubocop-rake (0.6.0)
70
68
  rubocop (~> 1.0)
71
- rubocop-ast (>= 1.1.0)
69
+ rubocop-rspec (2.5.0)
70
+ rubocop (~> 1.19)
72
71
  ruby-progressbar (1.11.0)
73
- timeout (0.1.1)
72
+ timeout (0.2.0)
74
73
  tzinfo (2.0.4)
75
74
  concurrent-ruby (~> 1.0)
76
- unicode-display_width (2.0.0)
75
+ unicode-display_width (2.1.0)
77
76
  uri (0.10.1)
78
- yaml (0.1.1)
79
- zeitwerk (2.4.2)
77
+ yaml (0.2.0)
78
+ zeitwerk (2.5.0)
80
79
 
81
80
  PLATFORMS
82
81
  ruby
83
82
 
84
83
  DEPENDENCIES
85
- ostruct (~> 0.2.0)
84
+ ostruct (~> 0.4.0)
86
85
  rake (~> 12.0)
87
86
  rspec (~> 3.10)
88
- rubocop (~> 1.12.1)
89
- rubocop-rake (~> 0.5.1)
90
- rubocop-rspec (~> 2.2.0)
87
+ rubocop (~> 1.22.1)
88
+ rubocop-rake (~> 0.6.0)
89
+ rubocop-rspec (~> 2.5.0)
91
90
  sorare-rewards!
92
91
 
93
92
  BUNDLED WITH
94
- 2.1.4
93
+ 2.2.22
data/lib/sorare/rewards/concerns/with_analytics.rb ADDED
@@ -0,0 +1,57 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'active_support/concern'
4
+
5
+ module Sorare
6
+ module Rewards
7
+ # WithAnalytics defines analytics methods
8
+ module WithAnalytics
9
+ extend ActiveSupport::Concern
10
+
11
+ def analytics
12
+ @analytics ||= each_league.each_with_object({}) do |league, stats|
13
+ stats[league.name] = league_analytics(league)
14
+ end
15
+ end
16
+
17
+ private
18
+
19
+ def reward_distributed
20
+ @reward_distributed ||= reward_allocations.card_allocations.transform_values do |league|
21
+ league.transform_values do |rarity|
22
+ rarity.sum { |_, divisions| divisions.values.sum }
23
+ end
24
+ end
25
+ end
26
+
27
+ def league_analytics(league)
28
+ {
29
+ playing_players_with_supply: nb_of_playing_players(league),
30
+ available_cards: nb_of_available_cards(league),
31
+ cooldown_players: nb_of_fully_cooldown_players(league),
32
+ rewarded: reward_distributed[league.name]
33
+ }
34
+ end
35
+
36
+ def nb_of_playing_players(league)
37
+ supply_for(league.name).keys.index_with do |rarity|
38
+ (supply_for(league.name, rarity: rarity).keys & playing_players.keys).count
39
+ end
40
+ end
41
+
42
+ def nb_of_available_cards(league)
43
+ supply_for(league.name).keys.index_with do |rarity|
44
+ supply_for(league.name, rarity: rarity).sum { |_, data| data['supply'] }
45
+ end
46
+ end
47
+
48
+ def nb_of_fully_cooldown_players(league)
49
+ supply_for(league.name).keys.index_with do |rarity|
50
+ supply_for(league.name, rarity: rarity).filter do |player_slug|
51
+ player(player_slug).available_during_cooldown(league, rarity).zero?
52
+ end.count
53
+ end
54
+ end
55
+ end
56
+ end
57
+ end
data/lib/sorare/rewards/game_week.rb CHANGED
@@ -8,6 +8,8 @@ module Sorare
8
8
  module Rewards
9
9
  # GameWeek stores the reward data of a game week
10
10
  class GameWeek
11
+ include WithAnalytics
12
+
11
13
  attr_reader :salt
12
14
 
13
15
  delegate :card_allocations, :prize_pools, to: :reward_allocations
@@ -69,6 +71,10 @@ module Sorare
69
71
  def player(slug)
70
72
  Player.new(slug, self)
71
73
  end
74
+
75
+ def inspect
76
+ super.splice(:version)
77
+ end
72
78
  end
73
79
  end
74
80
  end
data/lib/sorare/rewards/interactors/tiers/qualify_players.rb CHANGED
@@ -33,13 +33,13 @@ module Sorare
33
33
  end
34
34
 
35
35
  def tier_depth
36
- @tier_depth ||= sorted_supply.keys.length / (nb_of_tiers**2 - 1)
36
+ @tier_depth ||= sorted_supply.keys.length / ((nb_of_tiers**2) - 1)
37
37
  end
38
38
 
39
39
  def nb_of_tiers
40
40
  @nb_of_tiers ||= begin
41
41
  default = Sorare::Rewards.configuration.tiers
42
- default -= 1 while (default**2 - 1) > sorted_supply.keys.length
42
+ default -= 1 while ((default**2) - 1) > sorted_supply.keys.length
43
43
 
44
44
  default
45
45
  end
@@ -49,7 +49,7 @@ module Sorare
49
49
  return 0 unless tier.positive?
50
50
  return sorted_supply.keys.length if tier == nb_of_tiers
51
51
 
52
- tier_index(tier - 1) + tier_depth * tier_size(tier - 1)
52
+ tier_index(tier - 1) + (tier_depth * tier_size(tier - 1))
53
53
  end
54
54
 
55
55
  def tier_size(tier)
data/lib/sorare/rewards/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Sorare
4
4
  module Rewards
5
- VERSION = '1.1.2'
5
+ VERSION = '1.1.3.beta0'
6
6
  end
7
7
  end
data/sorare-rewards.gemspec CHANGED
@@ -30,15 +30,15 @@ Gem::Specification.new do |spec|
30
30
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
31
31
  spec.require_paths = ['lib']
32
32
 
33
- spec.add_dependency 'activesupport', '~> 6.1'
34
- spec.add_dependency 'interactor', '~> 3.0'
33
+ spec.add_dependency 'activesupport', '~> 6.1.4'
34
+ spec.add_dependency 'interactor', '~> 3.1.2'
35
35
  spec.add_dependency 'json', '~> 2'
36
36
  spec.add_dependency 'net-http', '~> 0.1.1'
37
- spec.add_dependency 'yaml', '~> 0.1.1'
38
- spec.add_development_dependency 'ostruct', '~> 0.2.0'
37
+ spec.add_dependency 'yaml', '~> 0.2.0'
38
+ spec.add_development_dependency 'ostruct', '~> 0.4.0'
39
39
  spec.add_development_dependency 'rspec', '~> 3.10'
40
- spec.add_development_dependency 'rubocop', '~> 1.12.1'
41
- spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
42
- spec.add_development_dependency 'rubocop-rspec', '~> 2.2.0'
40
+ spec.add_development_dependency 'rubocop', '~> 1.22.1'
41
+ spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
42
+ spec.add_development_dependency 'rubocop-rspec', '~> 2.5.0'
43
43
  end
44
44
  # rubocop:enable Metrics/BlockLength
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sorare-rewards
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3.beta0
5
5
  platform: ruby
6
6
  authors:
7
7
  - pierre
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-08-20 00:00:00.000000000 Z
11
+ date: 2021-10-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '6.1'
19
+ version: 6.1.4
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '6.1'
26
+ version: 6.1.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: interactor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '3.0'
33
+ version: 3.1.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '3.0'
40
+ version: 3.1.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: json
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.1.1
75
+ version: 0.2.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.1.1
82
+ version: 0.2.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: ostruct
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 0.2.0
89
+ version: 0.4.0
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 0.2.0
96
+ version: 0.4.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -114,42 +114,42 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.12.1
117
+ version: 1.22.1
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.12.1
124
+ version: 1.22.1
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rubocop-rake
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 0.5.1
131
+ version: 0.6.0
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 0.5.1
138
+ version: 0.6.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rubocop-rspec
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 2.2.0
145
+ version: 2.5.0
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 2.2.0
152
+ version: 2.5.0
153
153
  description:
154
154
  email:
155
155
  - pierre@sorare.com
@@ -171,6 +171,7 @@ files:
171
171
  - data.patch
172
172
  - lib/sorare/rewards.rb
173
173
  - lib/sorare/rewards/allocation_configuration.yml
174
+ - lib/sorare/rewards/concerns/with_analytics.rb
174
175
  - lib/sorare/rewards/configuration.rb
175
176
  - lib/sorare/rewards/game_week.rb
176
177
  - lib/sorare/rewards/game_week_allocations.rb
@@ -220,11 +221,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
220
221
  version: 2.7.1
221
222
  required_rubygems_version: !ruby/object:Gem::Requirement
222
223
  requirements:
223
- - - ">="
224
+ - - ">"
224
225
  - !ruby/object:Gem::Version
225
- version: '0'
226
+ version: 1.3.1
226
227
  requirements: []
227
- rubygems_version: 3.1.6
228
+ rubygems_version: 3.2.22
228
229
  signing_key:
229
230
  specification_version: 4
230
231
  summary: '["Sorare", "reward", "allocation", "algorithm"]'