sorare-rewards 1.4.1 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8b73fbf4bff9af80575de83f2d3d726fa91a4d587892fb9d06eb88bf28e006f
-  data.tar.gz: e8d9949c62b554da58ba80ba1cb7c849bc5ba8cc6e5a565fac89fa316f961c48
+  metadata.gz: a96e240df1e7ffc11d06b265919c29f86d1f74d07ec4878443276412bf1f9e95
+  data.tar.gz: f9e83487cad5213f909663cc0d903a6a7f9f92f09c48ea5cbdd8481f17b10a09
 SHA512:
-  metadata.gz: ce1fc376f8102f8df7ded7337f235f64393ed954e122b978051a9efbf6b9d70f2548f5ada427af8a070152495ba4206277f680c3a2cbcf6097a3cba2db4af48f
-  data.tar.gz: a338114ad5c95083d4e674880fae0a5b9285ccae2ae73d3358c908fb5a4551271590976a92fdbe79dc58b830b88e164eca3bc7384673dbde51a4db537add85e0
+  metadata.gz: 82a5ec0fc133697cb3e111a424a023c997eea978a0b04739b8dbc381849f6f3dd09d39d18a01c56876b4eab439bbe289043d36c9f5f82a1cf607402031303375
+  data.tar.gz: 6d73ca65887ad1a5c7aaf73b091f0b724db86cee40e702e017326b6650275305f69e41a087c42c06d6e1d11969d7b99127c66f53945f7b00076b5c4e446d8d93

data/.gitlab-ci.yml

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

data/.rubocop.yml

@@ -14,6 +14,7 @@ Metrics/BlockLength:
     - "Rakefile"
     - "**/*.rake"
     - "spec/**/*.rb"
+    - "sorare-rewards.gemspec"
 
 Metrics/ClassLength:
   Max: 120
@@ -85,3 +86,6 @@ RSpec/StubbedMock:
 Style/ExpandPathArguments:
   Exclude:
     - "*.gemspec"
+
+Style/OpenStructUse:
+  Enabled: false

data/Gemfile.lock

@@ -1,44 +1,43 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.4.1)
+    sorare-rewards (1.4.5)
       activesupport (~> 6.1.4)
-      interactor (~> 3.1.2)
+      interactor_with_steroids (~> 1.0.0)
       json (~> 2)
-      net-http (~> 0.1.1)
       yaml (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       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)
     concurrent-ruby (1.1.9)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
+    hashdiff (1.0.1)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    interactor (3.1.2)
-    io-wait (0.1.0)
-    json (2.6.0)
-    minitest (5.14.4)
-    net-http (0.1.1)
-      net-protocol
-      uri
-    net-protocol (0.1.2)
-      io-wait
-      timeout
+    interactor_with_steroids (1.0.0)
+      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)
@@ -53,29 +52,31 @@ 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)
     rubocop-rspec (2.5.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    timeout (0.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    uri (0.11.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     yaml (0.2.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
@@ -84,10 +85,11 @@ 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!
+  webmock (~> 3.14.0)
 
 BUNDLED WITH
    2.2.30

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/game_week.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'net/http'
 require 'active_support/core_ext/module/delegation'
+require 'open-uri'
 
 module Sorare
   module Rewards
@@ -11,7 +11,7 @@ module Sorare
       attr_reader :salt
 
       def initialize(data: nil, hash: nil, salt: nil)
-        @uri = URI("#{Sorare::Rewards.configuration.gateway}#{hash}")
+        @uri = URI.parse("#{Sorare::Rewards.configuration.gateway}#{hash}")
         @data = data
         @salt = salt
       end
@@ -23,7 +23,7 @@ module Sorare
       end
 
       def data
-        @data ||= JSON.parse(::Net::HTTP.get(@uri))
+        @data ||= JSON.parse(@uri.open.read)
       end
 
       def config

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.1'
+    VERSION = '1.4.5'
   end
 end

data/lib/sorare/rewards.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'net/http'
 require 'digest'
 
 Dir["#{File.dirname(__FILE__)}/rewards/**/*.rb"].sort.each do |file|

data/sorare-rewards.gemspec

@@ -2,12 +2,11 @@
 
 require_relative 'lib/sorare/rewards/version'
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'sorare-rewards'
   spec.version       = Sorare::Rewards::VERSION
-  spec.authors       = ['pierre']
-  spec.email         = ['pierre@sorare.com']
+  spec.authors       = ['Sorare team']
+  spec.email         = ['hello@sorare.com']
 
   spec.summary       = %w[Sorare reward allocation algorithm]
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
@@ -31,14 +30,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport', '~> 6.1.4'
-  spec.add_dependency 'interactor', '~> 3.1.2'
+  spec.add_dependency 'interactor_with_steroids', '~> 1.0.0'
   spec.add_dependency 'json', '~> 2'
-  spec.add_dependency 'net-http', '~> 0.1.1'
   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
-# rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.5
 platform: ruby
 authors:
-- pierre
+- Sorare team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,19 +25,19 @@ dependencies:
       - !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
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: net-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: yaml
   requirement: !ruby/object:Gem::Requirement
@@ -114,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
@@ -150,9 +136,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.14.0
 description:
 email:
-- pierre@sorare.com
+- hello@sorare.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: '["Sorare", "reward", "allocation", "algorithm"]'