sorare-rewards 1.3.0.beta0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21a3d6ed4a19177ff92d64b89a4f605f76de64f3f7d1cc077d9d59a5f241c7c
-  data.tar.gz: cdfc9b29382f52800871f27533b1d5dcfa7795bc35c7f223d9a19f02287d245b
+  metadata.gz: f6d8d21c6c8da818dfecacdb8ff179dfa81e39d01f8470f1009b36afe45a06c2
+  data.tar.gz: 0303c1e4e365b4879712cab90da1553e60cc07b78d0810b2790720e31365be2a
 SHA512:
-  metadata.gz: 3d4d20f37c3072805b4d6927936f959b7639ae0904fbd327e9aa709fd33d8c1360aa0d45d949402c250f57878bd06b19b8d1406d9a11999b62322c3d05276b8e
-  data.tar.gz: 6deb5eb9c375f07b3f6c20107155019782dc3fab546de56bf7979fc131a927077575822b5111235cd16bcc842b851f74524848bf12c4436c2f3514e738f6ae8b
+  metadata.gz: 5facf11a38d2ec192177f46f4b13b2a3f4d63379b8d586266255f5dae906b7a0ed660d0cf3166b68399c1269dd271e0f63711569744587839ce63b52934416ee
+  data.tar.gz: de7c3eed4459e498e528c419ade463e1972082d251559ce75908152ca6869e9535f2334e86604fa51a79c1dbc2de09efebbe0e2eee4450b213e37a8c8da3df54

data/CHANGELOG.md

@@ -1,11 +1,29 @@
+## [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
+
+- Added support for rarity based `rewards_ratio_per_cards_in_circulation`
+
 ## [1.3.0] - 2021-11-02
+
 ### Breaking
+
 - Removed rewards method from `GameWeek` (`card_rewards`, `cards_picked`, `reward_allocations`, `prize_pools`, `card_allocations`)
 - `Picker` has been renamed to `CardPicker`
+
 ### Added
+
 - Added a `GameWeekRewards` class that provides all rewards related methods
 - Added a way to pick cards with a custom `card_allocations`
 
 ## [1.2.0] - 2021-11-02
+
 ### Added
+
 - Enable cross leagues cooldown using `per_league` configuration flag

data/Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.3.0.beta0)
+    sorare-rewards (1.4.2)
       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.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -20,18 +19,11 @@ GEM
     ast (2.4.2)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    i18n (1.8.10)
+    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
+    minitest (5.15.0)
     ostruct (0.4.0)
     parallel (1.21.0)
     parser (3.0.2.0)
@@ -69,13 +61,11 @@ GEM
     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)
     yaml (0.2.0)
-    zeitwerk (2.5.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -90,4 +80,4 @@ DEPENDENCIES
   sorare-rewards!
 
 BUNDLED WITH
-   2.2.22
+   2.2.30

data/README.md

@@ -10,15 +10,14 @@ gem 'sorare-rewards'
 
 And then execute:
 
-  $ bundle install
+$ bundle install
 
 Or install it yourself as:
 
-  $ gem install sorare-rewards
+$ gem install sorare-rewards
 
 ## Usage
 
-
 First you need to load a game week
 
 ```ruby
@@ -27,7 +26,6 @@ game_week = Sorare::Rewards::GameWeek.new(hash: 'QmbwCo1fuhRN1T2DyEQtETefsBH6yCj
 
 Game Week's `hash` and `salt` can be retrieved using the GQL API, the salt is made public after the rewards have been distributed.
 
-
 To compute rewards for a game week :
 
 ```ruby
@@ -67,7 +65,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/sorare/rewards/game_week.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'net/http'
 require 'active_support/core_ext/module/delegation'
 
 module Sorare
@@ -11,7 +10,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 +22,11 @@ module Sorare
       end
 
       def data
-        @data ||= JSON.parse(::Net::HTTP.get(@uri))
+        @data ||= JSON.parse(@uri.open)
       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/cards/pick_for_league.rb

@@ -19,6 +19,7 @@ module Sorare
 
         delegate :league, :allocations, :pickers, to: :context
         delegate :game_week, to: :league
+        delegate :public_seed, :salt, to: :game_week
 
         def call
           context.pickers = {}
@@ -48,7 +49,7 @@ module Sorare
         end
 
         def initialize_tier_picker(players, rarity, tier)
-          pickers[rarity][tier] = CardPicker.new(game_week.public_seed, game_week.salt)
+          pickers[rarity][tier] = CardPicker.new(public_seed, salt)
 
           players.each do |slug, _|
             pickers[rarity][tier].add_player(slug, player_supply(rarity, slug))

data/lib/sorare/rewards/league.rb

@@ -24,9 +24,17 @@ module Sorare
       end
 
       def cards_in_circulation_limit(rarity)
-        return unless cards_in_circulation&.dig(rarity) && game_week.config.rewards_ratio_per_cards_in_circulation
+        return unless cards_in_circulation&.dig(rarity) && rewards_ratio_per_cards_in_circulation_for_rarity(rarity)
 
-        (cards_in_circulation[rarity] * game_week.config.rewards_ratio_per_cards_in_circulation).floor
+        (cards_in_circulation[rarity] * rewards_ratio_per_cards_in_circulation_for_rarity(rarity)).floor
+      end
+
+      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[rarity]
+        end
+
+        game_week.config.rewards_ratio_per_cards_in_circulation
       end
 
       def each_division_prize_pools

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.3.0.beta0'
+    VERSION = '1.4.2'
   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,7 +2,6 @@
 
 require_relative 'lib/sorare/rewards/version'
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'sorare-rewards'
   spec.version       = Sorare::Rewards::VERSION
@@ -33,7 +32,6 @@ 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'
@@ -41,4 +39,3 @@ Gem::Specification.new do |spec|
   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.3.0.beta0
+  version: 1.4.2
 platform: ruby
 authors:
 - pierre
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-12-30 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
@@ -150,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
-description: 
+description:
 email:
 - pierre@sorare.com
 executables: []
@@ -211,7 +197,7 @@ licenses:
 metadata:
   homepage_uri: https://gitlab.com/sorare/sorare-rewards
   source_code_uri: https://gitlab.com/sorare/sorare-rewards
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,12 +208,12 @@ 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: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: '["Sorare", "reward", "allocation", "algorithm"]'
 test_files: []