sorare-rewards 1.4.3 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8641fffa2c82df83b2e775393fbc68ae16d99857695061d1a8b8af33017c4971
-  data.tar.gz: dc828084b6b07733bb8725e3d62d302ab3601c260c5ed7fbaf81039167df4a07
+  metadata.gz: ae70a652e6cbbcea1dac9494772d3ab72ddf6bdc0a354ee6da775f5a532226d5
+  data.tar.gz: 71a370d2608c2b709ef67372d6def7e391520ece05ee96fcc4f043d26de74a63
 SHA512:
-  metadata.gz: ce2bd4d025e0d1efcf6bf8bbefa6e9ff992d751cedaed1a582e07ebe380a6eae2cc4148ebc49be595a5345e8bda235096e287f0cb549a5f9b01f237c86b3d496
-  data.tar.gz: 6a9d835f7cd4c8237676c5b47e7ee6e122162ae1606062a9521754cca70d392941ff0a94413ba69c8e5bbd5dff29fe703dcc009290c766a3422b757e2d81319f
+  metadata.gz: 2ac8909193f8ac893553263ef02a345aa672833b3abd5522c4e69be9fe8bb76d9aea1f7bcffbfbbbcf0fd7f35d597c0f2e2eff2006c33eae4f6aecb40854eee8
+  data.tar.gz: cff95ecc875be592e58d92fd26849889f499cfcaebedde6c07aee31425031a0cfb6655487f54a1c6fb228b724ec1b4d6a43764e29ff78cc25cfb5f23ff5e0ee5

data/.gitlab-ci.yml

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

data/.rubocop.yml

@@ -86,3 +86,6 @@ RSpec/StubbedMock:
 Style/ExpandPathArguments:
   Exclude:
     - "*.gemspec"
+
+Style/OpenStructUse:
+  Enabled: false

data/Gemfile.lock

@@ -1,21 +1,20 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.4.3)
-      activesupport (~> 6.1.4)
-      interactor (~> 3.1.2)
+    sorare-rewards (1.4.7)
+      activesupport (>= 6.1.4)
+      interactor_with_steroids (>= 1.0.0)
       json (~> 2)
       yaml (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.3)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
@@ -24,19 +23,20 @@ GEM
       rexml
     diff-lcs (1.4.4)
     hashdiff (1.0.1)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    interactor (3.1.2)
-    json (2.6.0)
+    interactor_with_steroids (1.1.2)
+      activesupport
+    json (2.6.1)
     minitest (5.15.0)
     ostruct (0.4.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (12.3.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -51,16 +51,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.22.1)
+    rubocop (1.24.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.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
@@ -75,7 +75,6 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yaml (0.2.0)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -84,7 +83,7 @@ DEPENDENCIES
   ostruct (~> 0.4.0)
   rake (~> 12.0)
   rspec (~> 3.10)
-  rubocop (~> 1.22.1)
+  rubocop (~> 1.24.1)
   rubocop-rake (~> 0.6.0)
   rubocop-rspec (~> 2.5.0)
   sorare-rewards!

data/lib/sorare/rewards/configuration.rb

@@ -19,7 +19,7 @@ module Sorare
       end
 
       def load_yaml_configuration_file(filename)
-        YAML.safe_load(File.read("#{File.dirname(__FILE__)}/#{filename}"), [], [], true)
+        YAML.safe_load(File.read("#{File.dirname(__FILE__)}/#{filename}"), aliases: true)
             .with_indifferent_access
       end
     end

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

@@ -10,7 +10,8 @@ module Sorare
       class ComputeForGameWeek
         include Interactor
 
-        delegate :supply, :randomizer, :public_seed, :salt, to: :context
+        receive :supply, :public_seed, :salt
+        hold :randomizer, :game_week_allocations
 
         def call
           context.randomizer = Sorare::Rewards::Random.new(public_seed, salt)

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

@@ -10,7 +10,8 @@ module Sorare
       class ComputeForLeague
         include Interactor
 
-        delegate :supply, :config, to: :context
+        receive :supply, :config, :randomizer
+        hold :league_allocations
 
         def call
           context.league_allocations = allocate_and_format!
@@ -19,9 +20,9 @@ module Sorare
         def allocate_and_format!
           each_rarity_allocation do |rarity|
             (allocations[rarity].first || {}).keys.index_with do |division|
-              allocations[rarity].each_with_index.map do |qualified_allocations, tier|
+              allocations[rarity].each_with_index.to_h do |qualified_allocations, tier|
                 [Sorare::Rewards.configuration.transform_tier.call(tier), qualified_allocations[division]]
-              end.to_h
+              end
             end
           end
         end

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

@@ -9,7 +9,8 @@ module Sorare
       class ComputeForQuality
         include Interactor
 
-        delegate :supply, :config, :randomizer, :allocated, to: :context
+        receive :supply, :config, :randomizer
+        hold :allocated, :quality_allocations
 
         def call
           check_config!
@@ -20,9 +21,9 @@ module Sorare
         end
 
         def allocations
-          config.length.times.map do |division|
+          config.length.times.to_h do |division|
             [Sorare::Rewards.configuration.transform_division.call(division + 1), allocated[division]]
-          end.to_h
+          end
         end
 
         def allocate!

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

@@ -10,7 +10,8 @@ module Sorare
       class ComputeForRarity
         include Interactor
 
-        delegate :supply, :config, to: :context
+        receive :supply, :config, :randomizer
+        hold :rarity_allocations
 
         def call
           context.fail!(error: 'Invalid config') unless config

data/lib/sorare/rewards/interactors/build.rb

@@ -8,7 +8,8 @@ module Sorare
     class Build
       include Interactor
 
-      delegate :game_week, to: :context
+      receive :game_week
+      hold :card_allocations, :prize_pools
 
       def call
         context.card_allocations = allocate!

data/lib/sorare/rewards/interactors/cards/pick_for_division.rb

@@ -22,7 +22,8 @@ module Sorare
       class PickForDivision
         include Interactor
 
-        delegate :league, :allocations, :pickers, :qualified_players, to: :context
+        receive :league, :allocations, :pickers
+        hold :cards_picked
 
         def call
           context.cards_picked = allocations.keys.index_with do |rarity|

data/lib/sorare/rewards/interactors/cards/pick_for_division_and_rarity.rb

@@ -17,7 +17,8 @@ module Sorare
       class PickForDivisionAndRarity
         include Interactor
 
-        delegate :league, :rarity, :allocations, :pickers, to: :context
+        receive :league, :rarity, :allocations, :pickers
+        hold :cards_picked
 
         def call
           context.cards_picked = supply!

data/lib/sorare/rewards/interactors/cards/pick_for_division_rarity_and_quality.rb

@@ -15,7 +15,9 @@ module Sorare
 
         MISSING_CARDS = 'There are not enough cards to fulfill the requirements'
 
-        delegate :picker, :allocations, :league, :rarity, :force, :cards_picked, to: :context
+        receive :picker, :allocations, :league, :rarity, force: false
+        hold :cards_picked
+
         delegate :game_week, to: :league
 
         def call

data/lib/sorare/rewards/interactors/cards/pick_for_game_week.rb

@@ -19,7 +19,8 @@ module Sorare
       class PickForGameWeek
         include Interactor
 
-        delegate :game_week, :allocations, :picks, to: :context
+        receive :game_week, :allocations
+        hold :cards_picked
 
         def call
           context.cards_picked = pick!

data/lib/sorare/rewards/interactors/cards/pick_for_league.rb

@@ -17,7 +17,9 @@ module Sorare
       class PickForLeague
         include Interactor
 
-        delegate :league, :allocations, :pickers, to: :context
+        receive :league, :allocations
+        hold :pickers, :cards_picked
+
         delegate :game_week, to: :league
         delegate :public_seed, :salt, to: :game_week
 

data/lib/sorare/rewards/interactors/pick.rb

@@ -19,7 +19,8 @@ module Sorare
     class Pick
       include Interactor
 
-      delegate :card_allocations, :game_week, :salt, to: :context
+      receive :card_allocations, :game_week, :salt
+      hold :cards_picked
 
       # Depending on the way the allocations interpreter is implemented it could be done by him or we
       # update the allocations process to match the structure

data/lib/sorare/rewards/interactors/prize_pools/compute_for_division.rb

@@ -9,7 +9,8 @@ module Sorare
       class ComputeForDivision
         include Interactor
 
-        delegate :playing_rate, :available_prize_pools, to: :context
+        receive :playing_rate, :available_prize_pools
+        hold :division_prize_pools
 
         def call
           context.division_prize_pools = available_prize_pools.map do |available_prize_pool|

data/lib/sorare/rewards/interactors/prize_pools/compute_for_game_week.rb

@@ -10,7 +10,8 @@ module Sorare
       class ComputeForGameWeek
         include Interactor
 
-        delegate :game_week, to: :context
+        receive :game_week
+        hold :prize_pools
 
         def call
           context.prize_pools = prize_pools!

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

@@ -9,20 +9,21 @@ module Sorare
       class ComputeForLeague
         include Interactor
 
-        delegate :league, to: :context
+        receive :league
+        hold :league_prize_pools
 
         def call
           context.league_prize_pools = prize_pools!
         end
 
         def prize_pools!
-          league.each_division_prize_pools.map do |division, prize_pools|
+          league.each_division_prize_pools.to_h do |division, prize_pools|
             [
               Sorare::Rewards.configuration.transform_division.call(division),
               ComputeForDivision.call!(playing_rate: league.playing_rate, available_prize_pools: prize_pools)
                                 .division_prize_pools
             ]
-          end.to_h
+          end
         end
       end
     end

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

@@ -10,7 +10,8 @@ module Sorare
       class ComputeForGameWeek
         include Interactor
 
-        delegate :game_week, :game_week_supply, to: :context
+        receive :game_week
+        hold :game_week_supply
 
         def call
           context.game_week_supply = game_week_supply!

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

@@ -9,7 +9,8 @@ module Sorare
       class ComputeForQuality
         include Interactor
 
-        delegate :randomizer, :total_supply, :tier_supply, :rewarded, :rewardable, to: :context
+        receive :randomizer, :total_supply, :tier_supply, :rewarded, :rewardable
+        hold :quality_supply
 
         def call
           context.quality_supply = total_supply.zero? ? 0 : quality_supply

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

@@ -9,8 +9,9 @@ module Sorare
       class ComputeForRarity
         include Interactor
 
-        delegate :randomizer, :league, :rarity, :supply, :rewardable, :rarity_supply,
-                 :minimum_remaining_games, to: :context
+        receive :randomizer, :league, :rarity, :supply
+        hold :rarity_supply, :rewardable
+
         delegate :game_week, to: :league
 
         def call

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

@@ -10,7 +10,8 @@ module Sorare
       class QualifyPlayers
         include Interactor
 
-        delegate :sorted_supply, to: :context
+        receive :sorted_supply
+        hold :players
 
         def call
           context.players = by_rank ? qualified_players_by_rank : qualified_players_by_tier

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

@@ -10,7 +10,8 @@ module Sorare
       class QualifySupply
         include Interactor
 
-        delegate :sorted_supply, to: :context
+        receive :sorted_supply
+        hold :count, :supply
 
         def call
           context.count = sorted_supply.values.sum { |p| p['supply'] }

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.4.3'
+    VERSION = '1.4.7'
   end
 end

data/sorare-rewards.gemspec

@@ -29,14 +29,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.4'
-  spec.add_dependency 'interactor', '~> 3.1.2'
+  spec.add_dependency 'activesupport', '>= 6.1.4'
+  spec.add_dependency 'interactor_with_steroids', '>= 1.0.0'
   spec.add_dependency 'json', '~> 2'
   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.22.1'
+  spec.add_development_dependency 'rubocop', '~> 1.24.1'
   spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.5.0'
   spec.add_development_dependency 'webmock', '~> 3.14.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.7
 platform: ruby
 authors:
 - Sorare team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.4
 - !ruby/object:Gem::Dependency
-  name: interactor
+  name: interactor_with_steroids
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: 1.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: 1.24.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ licenses:
 metadata:
   homepage_uri: https://gitlab.com/sorare/sorare-rewards
   source_code_uri: https://gitlab.com/sorare/sorare-rewards
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: '["Sorare", "reward", "allocation", "algorithm"]'