sorare-rewards 1.4.0 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385b50a4b23229464d9807665633f7bc5475f2572a1981fb2be18dd5501f3620
-  data.tar.gz: 01f7f7d0bed52e96f3caec5743004bb10b16f4a223ce83f804ec4e94d96b4bd3
+  metadata.gz: 64ce3ebddf119cf93cc3cb87a87576be330a1cea5673a91c4403c0be574ce484
+  data.tar.gz: 3d5aedfa9b6b3a5bfef3793d62900c17a4ede3bb86eeed164a305173d43146b6
 SHA512:
-  metadata.gz: 188333489495c2a7ab8e4da7a1f0cd7874131cdb01acde247997f925edf473639db04ee8a7ddb02c8458c77f89888c0bb6a6eaccd724523d86c305cd50c86835
-  data.tar.gz: 00c0276d280c1c3b0e5980837709d69d24dbd5263975f33546099589ddca46aeebb8cad4bee0572561bd85febfdea98e986f5cb622ab92bd0bca9d1357500ee0
+  metadata.gz: 9255987966f248d9c46040efd606c2ed718953cd089d96692c982f6294fb16803b6d687c1e047f45c5142b50cf0a86cb51ca6d3dae1f4a6c072f8423bc22eb45
+  data.tar.gz: 9ba2bb81da433811b482e721994035b03d96534d299ee513f96d7768cd3649a5604428a2625480a795049d84027635edce480f5deb36e21e1e646be9dcc2cd98

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/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.4.1] - 2021-12-14
+
+### Fixes
+
+- Fix an issue where the `config` was null when accessed on a `GameWeek` with no loaded data
+
 ## [1.4.0] - 2021-12-14
 
 ### Added

data/Gemfile.lock

@@ -1,44 +1,42 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.4.0)
+    sorare-rewards (1.4.4)
       activesupport (~> 6.1.4)
       interactor (~> 3.1.2)
       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)
-    i18n (1.8.10)
+    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
+    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 +51,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.0)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
@@ -84,10 +84,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,11 +23,11 @@ module Sorare
       end
 
       def data
-        @data ||= JSON.parse(::Net::HTTP.get(@uri))
+        @data ||= JSON.parse(@uri.open.read)
       end
 
       def config
-        @config ||= GameWeekConfig.new(@data['config'])
+        @config ||= GameWeekConfig.new(data['config'])
       end
 
       def supply_for(league, rarity: nil, player: nil)

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

@@ -19,9 +19,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

@@ -20,9 +20,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/prize_pools/compute_for_league.rb

@@ -16,13 +16,13 @@ module Sorare
         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/league.rb

@@ -31,7 +31,7 @@ module Sorare
 
       def rewards_ratio_per_cards_in_circulation_for_rarity(rarity)
         if game_week.config.rewards_ratio_per_cards_in_circulation.is_a?(Hash)
-          return game_week.config.rewards_ratio_per_cards_in_circulation&.dig(rarity)
+          return game_week.config.rewards_ratio_per_cards_in_circulation[rarity]
         end
 
         game_week.config.rewards_ratio_per_cards_in_circulation

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.4.0'
+    VERSION = '1.4.4'
   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.}
@@ -33,12 +32,12 @@ Gem::Specification.new do |spec|
   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.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.0
+  version: 1.4.4
 platform: ruby
 authors:
-- pierre
+- Sorare team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: '["Sorare", "reward", "allocation", "algorithm"]'