sorare-rewards 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd12e11f5b4eb146655a6944d6ffd4b541a3cfe926e38b5bb77e7235d4cc92fd
-  data.tar.gz: 12acbcb47c3d6f366855278b96d75ab787414f802cbbfe9c597f98a96867c8ae
+  metadata.gz: 4f64ea163ad5ed02120737f8a540b3c1a86cbfc4e2d472ff4906cf2ca836f060
+  data.tar.gz: d9021d4ce7717b197408ee1e9e1da025e3af46f4f744862c987ea58654e9f191
 SHA512:
-  metadata.gz: 858689cacfc5e20404a485c5500266c613c47ec4838fbf909b7975594a6e1eb59cc96d0e3fa14cdc3cfdf4cea2b0f1ad9cd01adc215d02c0369d3ef02a3a7351
-  data.tar.gz: ba9f2aa66b4332ba1611f38a9b7fad80582bc1d03f67530bb356d203d4a71f9405ac353461ea4f6383775a03145adb923ade0762b9f1d89041299f7aa2b27e74
+  metadata.gz: eafcc27cb84b5974e901b8246fd49a9f351b7e88b784274eb2a3dc0b1086f6b11a6d96611b20790b42c92e83ac97e4abb6dadfa3b2f928f2c66db161451c86c4
+  data.tar.gz: db9da4a9da91484dd38a71afa544cc324d7c1e724a85cebe154453fa381c376c8c028ad3f4494e533cd6480657c6d6b9a6a2c2b6cef6e1be6f96fa2f57516222

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.7.1
+image: ruby:3.0
 
 workflow:
   rules:

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## [1.2.0] - 2021-11-02
+### Added
+- Enable cross leagues cooldown using `per_league` configuration flag

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.1.0)
-      activesupport (~> 6.1)
-      interactor (~> 3.0)
+    sorare-rewards (1.2.0)
+      activesupport (~> 6.1.4)
+      interactor (~> 3.1.2)
       json (~> 2)
       net-http (~> 0.1.1)
-      yaml (~> 0.1.1)
+      yaml (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     interactor (3.1.2)
     io-wait (0.1.0)
-    json (2.5.1)
+    json (2.6.0)
     minitest (5.14.4)
     net-http (0.1.1)
       net-protocol
@@ -32,9 +32,9 @@ GEM
     net-protocol (0.1.1)
       io-wait
       timeout
-    ostruct (0.2.0)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    ostruct (0.4.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (12.3.3)
@@ -53,42 +53,41 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.12.1)
+    rubocop (1.22.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    timeout (0.1.1)
+    timeout (0.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     uri (0.10.1)
-    yaml (0.1.1)
-    zeitwerk (2.4.2)
+    yaml (0.2.0)
+    zeitwerk (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ostruct (~> 0.2.0)
+  ostruct (~> 0.4.0)
   rake (~> 12.0)
   rspec (~> 3.10)
-  rubocop (~> 1.12.1)
-  rubocop-rake (~> 0.5.1)
-  rubocop-rspec (~> 2.2.0)
+  rubocop (~> 1.22.1)
+  rubocop-rake (~> 0.6.0)
+  rubocop-rspec (~> 2.5.0)
   sorare-rewards!
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/sorare/rewards/game_week_config.rb

@@ -30,6 +30,12 @@ module Sorare
         cooldown.dig(rarity, 'quantity')
       end
 
+      def cooldown_per_league?(rarity)
+        per_league = cooldown.dig(rarity, 'per_league')
+
+        per_league.nil? ? true : per_league
+      end
+
       def cooldown_since(rarity)
         cooldown.dig(rarity, 'since')
       end

data/lib/sorare/rewards/interactors/allocations/compute_for_league.rb

@@ -17,10 +17,8 @@ module Sorare
         end
 
         def allocate_and_format!
-          allocations = allocate!
-
-          allocations.keys.index_with do |rarity|
-            allocations[rarity].first.keys.index_with do |division|
+          each_rarity_allocation do |rarity|
+            (allocations[rarity].first || {}).keys.index_with do |division|
               allocations[rarity].each_with_index.map do |qualified_allocations, tier|
                 [Sorare::Rewards.configuration.transform_tier.call(tier), qualified_allocations[division]]
               end.to_h
@@ -28,8 +26,12 @@ module Sorare
           end
         end
 
-        def allocate!
-          (config || {}).keys.index_with do |rarity|
+        def each_rarity_allocation(&block)
+          allocations.keys.index_with(&block)
+        end
+
+        def allocations
+          @allocations ||= (config || {}).keys.index_with do |rarity|
             ComputeForRarity.call!(**context.to_h, supply: supply[rarity], config: config[rarity]).rarity_allocations
           end
         end

data/lib/sorare/rewards/interactors/allocations/compute_for_rarity.rb

@@ -15,7 +15,13 @@ module Sorare
         def call
           context.fail!(error: 'Invalid config') unless config
 
-          context.rarity_allocations = supply.each_with_index.map do |tier_supply, tier|
+          context.rarity_allocations = allocations
+        end
+
+        def allocations
+          return [] unless supply
+
+          supply.each_with_index.map do |tier_supply, tier|
             ComputeForQuality.call!(
               **context.to_h,
               supply: tier_supply,

data/lib/sorare/rewards/interactors/supply/compute_for_rarity.rb

@@ -21,37 +21,46 @@ module Sorare
         end
 
         def rewardable_supply
-          total_float_supply = supply.keys.sum { |player| player_supply(player) }
+          total_float_supply = supply.keys.sum { |player| player_contribution(player) }
 
-          round_and_cap_supply(total_float_supply)
+          round_and_cap_league_supply(total_float_supply)
         end
 
         def distribute_in_tiers!
           ctx = Tiers::QualifySupply.call!(sorted_supply: supply)
-          ctx.supply.each do |tier_supply|
+          qualified_players = Tiers::QualifyPlayers.call!(sorted_supply: supply).players
+          ctx.supply.each_with_index do |tier_supply, index|
             rarity_supply.push(
-              ComputeForQuality.call!(
-                randomizer: randomizer,
-                total_supply: ctx.count,
-                tier_supply: tier_supply,
-                rewardable: rewardable,
-                rewarded: rarity_supply
-              ).quality_supply
+              capped_tier_supply(ctx.count, tier_supply, rewardable, qualified_players[index])
             )
           end
         end
 
-        def round_and_cap_supply(float_supply)
+        # Cap with the actual pickable supply for the tier
+        def capped_tier_supply(total_supply, tier_supply, rewardable, tier_players)
+          target = ComputeForQuality.call!(
+            randomizer: randomizer, total_supply: total_supply,
+            tier_supply: tier_supply, rewardable: rewardable, rewarded: rarity_supply
+          ).quality_supply
+
+          [target, tier_players.sum { |player| player_pickable_supply(player) }].min
+        end
+
+        def round_and_cap_league_supply(float_supply)
           [
             float_supply.floor + remaining_supply(float_supply.modulo(1)), # Supply limit
             league.cards_in_circulation_limit(rarity) # Circulation limit
           ].compact.min
         end
 
-        def player_supply(slug)
+        def player_contribution(slug)
           game_week.player(slug).reward_pool_supply_contribution(league, rarity)
         end
 
+        def player_pickable_supply(slug)
+          game_week.player(slug).pickable_supply(league, rarity)
+        end
+
         def remaining_supply(reward_probability)
           probability = randomizer.rand
           return 0 unless probability < reward_probability

data/lib/sorare/rewards/interactors/tiers/qualify_players.rb

@@ -33,13 +33,13 @@ module Sorare
         end
 
         def tier_depth
-          @tier_depth ||= sorted_supply.keys.length / (nb_of_tiers**2 - 1)
+          @tier_depth ||= sorted_supply.keys.length / ((nb_of_tiers**2) - 1)
         end
 
         def nb_of_tiers
           @nb_of_tiers ||= begin
             default = Sorare::Rewards.configuration.tiers
-            default -= 1 while (default**2 - 1) > sorted_supply.keys.length
+            default -= 1 while ((default**2) - 1) > sorted_supply.keys.length
 
             default
           end
@@ -49,7 +49,7 @@ module Sorare
           return 0 unless tier.positive?
           return sorted_supply.keys.length if tier == nb_of_tiers
 
-          tier_index(tier - 1) + tier_depth * tier_size(tier - 1)
+          tier_index(tier - 1) + (tier_depth * tier_size(tier - 1))
         end
 
         def tier_size(tier)

data/lib/sorare/rewards/player.rb

@@ -55,16 +55,22 @@ module Sorare
       end
 
       def available_during_cooldown(league, rarity)
-        [@config.cooldown_limit(rarity) - rewarded_during_cooldown(league, rarity), 0].max
+        [@config.cooldown_limit(rarity) - rewarded_under_cooldown(league, rarity), 0].max
       end
 
-      def rewarded_during_cooldown(league, rarity)
-        (@game_data&.dig(league.name, rarity) || []).count do |at|
+      def rewarded_under_cooldown(league, rarity)
+        rewarded(league, rarity).count do |at|
           (Time.parse(at) + @config.cooldown_since(rarity)) > Time.now
         end
       end
 
-      %w[remaining_games_for_supply remaining_games].each do |key|
+      def rewarded(league, rarity)
+        return (@game_data&.dig(league.name, rarity) || []) if @config.cooldown_per_league?(rarity)
+
+        latest_rewarded&.dig(rarity) || []
+      end
+
+      %w[remaining_games_for_supply remaining_games latest_rewarded].each do |key|
         define_method(key) do
           @game_data&.dig(key)
         end

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/sorare-rewards.gemspec

@@ -30,15 +30,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 6.1'
-  spec.add_dependency 'interactor', '~> 3.0'
+  spec.add_dependency 'activesupport', '~> 6.1.4'
+  spec.add_dependency 'interactor', '~> 3.1.2'
   spec.add_dependency 'json', '~> 2'
   spec.add_dependency 'net-http', '~> 0.1.1'
-  spec.add_dependency 'yaml', '~> 0.1.1'
-  spec.add_development_dependency 'ostruct', '~> 0.2.0'
+  spec.add_dependency 'yaml', '~> 0.2.0'
+  spec.add_development_dependency 'ostruct', '~> 0.4.0'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.12.1'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.2.0'
+  spec.add_development_dependency 'rubocop', '~> 1.22.1'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.5.0'
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - pierre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: interactor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,42 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.22.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.22.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.5.0
 description: 
 email:
 - pierre@sorare.com
@@ -161,6 +161,7 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: '["Sorare", "reward", "allocation", "algorithm"]'