sorare-rewards 1.1.3.beta0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb36662a381adcf213a5ab17ad97ae1d57f862f84e274679657a05d096476cb
-  data.tar.gz: 1d38e28d7fc1912cf14ae3dfa48546f1aa87b427e5025ac8e2896dd3dce6a117
+  metadata.gz: 4f64ea163ad5ed02120737f8a540b3c1a86cbfc4e2d472ff4906cf2ca836f060
+  data.tar.gz: d9021d4ce7717b197408ee1e9e1da025e3af46f4f744862c987ea58654e9f191
 SHA512:
-  metadata.gz: e66851acb6b951557c607e2ebf24552ea5b16d63d3faf260f344175bf674758dc5efe7549b96c6fa164f1bdfc263066234b0e09f79a66ccbbb1c5f7dc0df903e
-  data.tar.gz: 6a2a8979952b7446ac9470b360fae8e7c2d8c53dd4db4442da9e60472090c2bae881fcf625e9c5da5a19d8bcff9c0356f80c2acb3a1586b074bdeb87f2e0689c
+  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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.1.3.beta0)
+    sorare-rewards (1.2.0)
       activesupport (~> 6.1.4)
       interactor (~> 3.1.2)
       json (~> 2)

data/lib/sorare/rewards/game_week.rb

@@ -8,8 +8,6 @@ module Sorare
   module Rewards
     # GameWeek stores the reward data of a game week
     class GameWeek
-      include WithAnalytics
-
       attr_reader :salt
 
       delegate :card_allocations, :prize_pools, to: :reward_allocations
@@ -71,10 +69,6 @@ module Sorare
       def player(slug)
         Player.new(slug, self)
       end
-
-      def inspect
-        super.splice(:version)
-      end
     end
   end
 end

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/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.3.beta0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.1.3.beta0
+  version: 1.2.0
 platform: ruby
 authors:
 - pierre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,6 +161,7 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -171,7 +172,6 @@ files:
 - data.patch
 - lib/sorare/rewards.rb
 - lib/sorare/rewards/allocation_configuration.yml
-- lib/sorare/rewards/concerns/with_analytics.rb
 - lib/sorare/rewards/configuration.rb
 - lib/sorare/rewards/game_week.rb
 - lib/sorare/rewards/game_week_allocations.rb
@@ -221,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.22
 signing_key: 

data/lib/sorare/rewards/concerns/with_analytics.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/concern'
-
-module Sorare
-  module Rewards
-    # WithAnalytics defines analytics methods
-    module WithAnalytics
-      extend ActiveSupport::Concern
-
-      def analytics
-        @analytics ||= each_league.each_with_object({}) do |league, stats|
-          stats[league.name] = league_analytics(league)
-        end
-      end
-
-      private
-
-      def reward_distributed
-        @reward_distributed ||= reward_allocations.card_allocations.transform_values do |league|
-          league.transform_values do |rarity|
-            rarity.sum { |_, divisions| divisions.values.sum }
-          end
-        end
-      end
-
-      def league_analytics(league)
-        {
-          playing_players_with_supply: nb_of_playing_players(league),
-          available_cards: nb_of_available_cards(league),
-          cooldown_players: nb_of_fully_cooldown_players(league),
-          rewarded: reward_distributed[league.name]
-        }
-      end
-
-      def nb_of_playing_players(league)
-        supply_for(league.name).keys.index_with do |rarity|
-          (supply_for(league.name, rarity: rarity).keys & playing_players.keys).count
-        end
-      end
-
-      def nb_of_available_cards(league)
-        supply_for(league.name).keys.index_with do |rarity|
-          supply_for(league.name, rarity: rarity).sum { |_, data| data['supply'] }
-        end
-      end
-
-      def nb_of_fully_cooldown_players(league)
-        supply_for(league.name).keys.index_with do |rarity|
-          supply_for(league.name, rarity: rarity).filter do |player_slug|
-            player(player_slug).available_during_cooldown(league, rarity).zero?
-          end.count
-        end
-      end
-    end
-  end
-end