taric 1.0.0.pre.beta.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44cd3b4600cd84b0ad5028a0efb5079f81b7d970
-  data.tar.gz: 1d69a03f5509088119d3aa362645c7ba4dff4c43
+  metadata.gz: e1f94f1069841bb455489c42bcca6d841e5ffc8f
+  data.tar.gz: cf3eaa6228e798e76e1ceb7bea026339161a2b19
 SHA512:
-  metadata.gz: 10c53039c913dbb5950ae1ad8fa9090f2e7e6d7a3e216ebdcfd53d704d858901c28e19cb244c98848f4399b8980f7645ce933fe5db0b46bbcabbe59d75e68eb3
-  data.tar.gz: 3f4d46480b99b87414d045541795ce4422164882df82d26cacdea7d1c8677eb8f7cefbebf7fc5c85b4d5e6d22af0f5dbbb1c4a548232c15c9475918e4b4b7807
+  metadata.gz: eafb2cdb0de729cd167c407829431106b5673ce2bf01658091d954c7d78ddcb6e1e41b3b8cad59e3bb92bb6e375003072dca6f6fd8959ac6baa5d3979c11f6ba
+  data.tar.gz: ddc554cf1f823a1e409529db2f54ad4d07b03c4ef908a4699caeb72768d231cedd9a203680d47310748be25d29aa30860262e31141a523e9d8b6d650e3c24553

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.5
-  - 2.2.1
-  - 2.3.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 after_success:
   - bundle exec codeclimate-test-reporter

data/README.md

@@ -40,7 +40,7 @@ Or install it yourself as:
 
 - [x] CHAMPION-V3
 - [x] CHAMPION-MASTERY-V3
-- [x] LEAGUE-V2.5
+- [x] LEAGUE-V3
 - [x] LOL-STATUS-V3
 - [x] MASTERIES-V3
 - [x] MATCH-V3
@@ -51,6 +51,7 @@ Or install it yourself as:
 - [x] ~~CURRENT-GAME-V1.0~~ replaced by SPECTATOR-V3
 - [x] ~~FEATURED-GAMES-V1.0~~ replaced by SPECTATOR-V3
 - [x] ~~GAME-V1.3~~ replaced by MATCH-V3
+- [x] ~~LEAGUE-V2.5~~ replaced by LEAGUE-V3
 - [x] ~~LOL-STATIC-DATA-V1.2~~ replaced by STATIC-DATA-V3
 - [x] ~~LOL-STATUS-V1.0~~ replaced by LOL-STATUS-V3
 - [x] ~~MATCH-V2.2~~ replaced by MATCH-V3
@@ -127,25 +128,23 @@ responses = parallel_client.execute!
 ### Champion
 
 ```ruby
-# https://developer.riotgames.com/api/methods#!/958/3289
 client.champion(id: )
+```
 
-# https://developer.riotgames.com/api/methods#!/958/3290
+```ruby
 client.champions
 ```
 
 ### Current Game
 
 ```ruby
-# https://developer.riotgames.com/api/methods#!/956/3287
-client.current_game(summoner_id: )
+response = client.current_game(summoner_id: 21066)
 ```
 
 ### Featured Games
 
 ```ruby
-# https://developer.riotgames.com/api/methods#!/957/3288
-client.featured_games
+response = client.featured_games
 ```
 
 TODO: finish writing this crap :p

data/lib/taric/client.rb

@@ -57,8 +57,8 @@ module Taric
       # @param api_key [String] rito api key
       # @param region [Symbol] key for region
       # @return [Hash] of api_key and region info
-      def operation_values(api_key:, region:)
-        {api_key: api_key}.merge!(REGION_ENDPOINT_INFO[region])
+      def operation_values(region:)
+        REGION_ENDPOINT_INFO[region]
       end
       memoize :operation_values
 
@@ -72,8 +72,8 @@ module Taric
       #
       # @example
       #   Taric::Client.expand_template(api_key: 'ritokey', region: :na, operation: Taric::Operation::Champion::CHAMPIONS)
-      def expand_template(api_key:, region:, operation:, options: {})
-        operation.expand(options.merge(operation_values(api_key: api_key, region: region)))
+      def expand_template(region:, operation:, options: {})
+        operation.expand(options.merge(operation_values(region: region)))
       end
     end
 
@@ -81,7 +81,15 @@ module Taric
     def response_for(operation, options = {})
       -> (method, url, body, headers) {
         API_CALL.(method, url, body, headers, @config.requestor.(@conn), @config.response_handler)
-      }.(operation.method, self.class.expand_template(api_key: @api_key, region: @region, operation: operation.template_url, options: options), operation.body, operation.headers)
+      }.(
+          operation.method,
+          self.class.expand_template(
+              region: @region,
+              operation: operation.template_url,
+              options: options
+          ),
+          operation.body,
+          operation.headers.merge('X-Riot-Token' => @api_key))
     end
 
     class ParallelClient
@@ -108,7 +116,7 @@ module Taric
       private
 
       def response_for(operation, options = {})
-        @operations << {url: @parent.class.expand_template(api_key: @parent.api_key, region: @parent.region, operation: operation.template_url, options: options), method: operation.method, body: operation.body, headers: operation.headers}
+        @operations << {url: @parent.class.expand_template(region: @parent.region, operation: operation.template_url, options: options), method: operation.method, body: operation.body, headers: operation.headers}
         self
       end
 

data/lib/taric/operation/champion.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'base'
 require_relative 'endpoint_template'
 module Taric
@@ -5,10 +6,10 @@ module Taric
     module Champion
       include Taric::Operation::Base
 
-      CHAMPION_BASE_URL = "https://{host}/lol/platform/v3/champions"
+      CHAMPION_BASE_URL = 'https://{host}/lol/platform/v3/champions'
 
-      CHAMPIONS =  EndpointTemplate.new(template_url: "#{CHAMPION_BASE_URL}{?api_key,freeToPlay}")
-      CHAMPION_BY_ID = EndpointTemplate.new(template_url: "#{CHAMPION_BASE_URL}/{id}{?api_key}")
+      CHAMPIONS =  EndpointTemplate.new(template_url: "#{CHAMPION_BASE_URL}{?freeToPlay}")
+      CHAMPION_BY_ID = EndpointTemplate.new(template_url: "#{CHAMPION_BASE_URL}/{id}")
 
       # Returns champion data.
       #

data/lib/taric/operation/champion_mastery.rb

@@ -5,9 +5,9 @@ module Taric
       include Taric::Operation::Base
 
       BASE_MASTERY_URL = "https://{host}/lol/champion-mastery/v3"
-      MASTERY_ALL_CHAMPIONS = EndpointTemplate.new(template_url: "#{BASE_MASTERY_URL}/champion-masteries/by-summoner/{summonerId}{?api_key}")
-      MASTERY_BY_CHAMPION_ID = EndpointTemplate.new(template_url: "#{BASE_MASTERY_URL}/champion-masteries/by-summoner/{summonerId}/by-champion/{championId}{?api_key}")
-      MASTERY_SCORE = EndpointTemplate.new(template_url: "#{BASE_MASTERY_URL}/scores/by-summoner/{summonerId}{?api_key}")
+      MASTERY_ALL_CHAMPIONS = EndpointTemplate.new(template_url: "#{BASE_MASTERY_URL}/champion-masteries/by-summoner/{summonerId}")
+      MASTERY_BY_CHAMPION_ID = EndpointTemplate.new(template_url: "#{BASE_MASTERY_URL}/champion-masteries/by-summoner/{summonerId}/by-champion/{championId}")
+      MASTERY_SCORE = EndpointTemplate.new(template_url: "#{BASE_MASTERY_URL}/scores/by-summoner/{summonerId}")
 
       def champion_mastery(summoner_id: , champion_id:)
         response_for MASTERY_BY_CHAMPION_ID, {summonerId: summoner_id, championId: champion_id}

data/lib/taric/operation/league.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'base'
 require_relative 'endpoint_template'
 module Taric
@@ -5,69 +6,66 @@ module Taric
     module League
       include Taric::Operation::Base
 
-      LEAGUE_VERSION = 'v2.5'
-      BASE_LEAGUE_URL = "#{BASE_URL_FN.(LEAGUE_VERSION)}/league"
+      LEAGUES_BY_SUMMONER_ID = EndpointTemplate.new(template_url: 'https://{host}/lol/league/v3/leagues/by-summoner/{summonerId}')
+      POSITION_BY_SUMMONER_ID = EndpointTemplate.new(template_url: 'https://{host}/lol/league/v3/positions/by-summoner/{summonerId}')
+      CHALLENGER = EndpointTemplate.new(template_url: 'https://{host}/lol/league/v3/challengerleagues/by-queue/{queue}')
+      MASTER = EndpointTemplate.new(template_url: 'https://{host}/lol/league/v3/masterleagues/by-queue/{queue}')
 
-      LEAGUES_BY_SUMMONER_IDS = EndpointTemplate.new(template_url: "#{BASE_LEAGUE_URL}/by-summoner/{summonerIds}{?api_key}")
-      ENTRIES_BY_SUMMONER_IDS = EndpointTemplate.new(template_url: "#{BASE_LEAGUE_URL}/by-summoner/{summonerIds}/entry{?api_key}")
-      CHALLENGER = EndpointTemplate.new(template_url: "#{BASE_LEAGUE_URL}/challenger{?api_key,type}")
-      MASTER = EndpointTemplate.new(template_url: "#{BASE_LEAGUE_URL}/master{?api_key,type}")
-
-      CHALLENGER_QUEUE_TYPES = ['RANKED_FLEX_SR'.freeze, 'RANKED_FLEX_TT'.freeze, 'RANKED_SOLO_5x5'.freeze, 'RANKED_TEAM_3x3'.freeze, 'RANKED_TEAM_5x5'.freeze].freeze
+      CHALLENGER_QUEUE_TYPES = %w(RANKED_FLEX_SR, RANKED_FLEX_TT, RANKED_SOLO_5x5).freeze
       MASTER_QUEUE_TYPES = CHALLENGER_QUEUE_TYPES
 
-      # Leagues by summoner IDs.
+      # Leagues by summoner ID.
       #
-      # @see https://developer.riotgames.com/api/methods#!/985/3351
-      # @param summoner_ids summoner_ids [String] comma separated list of summoner ids
-      # @return [Hash] leagues keyed by summoner ids
+      # @see https://developer.riotgames.com/api-methods/#league-v3/GET_getAllLeaguesForSummoner
+      # @param summoner_id [String] player's summoner ID
+      # @return [Hash] leagues keyed by summoner ID
       #
       # @example
       #   result = client.leagues_by_summoner_ids(summoner_ids: '21066,38877656')
       #   leagues = result['21066']
       #   entries = first_summoner_leagues.first['entries']
-      def leagues_by_summoner_ids(summoner_ids:)
-        response_for LEAGUES_BY_SUMMONER_IDS, {summonerIds: summoner_ids}
+      def leagues(summoner_id:)
+        response_for LEAGUES_BY_SUMMONER_ID, {summonerId: summoner_id}
       end
 
       # League entries by summoner IDs.
       #
-      # @see https://developer.riotgames.com/api/methods#!/985/3351
+      # @see https://developer.riotgames.com/api-methods/#league-v3/GET_getAllLeaguePositionsForSummoner
       # @param summoner_ids summoner_ids [String] comma separated list of summoner ids
       # @return [Hash] league entries keyed by summoner_ids
       #
       # @example
-      #   result = client.league_entries_by_summoner_ids(summoner_ids: '21066,38877656')
-      #   entries = result['38877656']
-      #   entry = entries.first
-      #   entry_name = entry['name']
-      #   entry_tier = entry['tier']
-      def league_entries_by_summoner_ids(summoner_ids:)
-        response_for ENTRIES_BY_SUMMONER_IDS, {summonerIds: summoner_ids}
+      #   result = client.league_positions(summoner_id: '21066').body
+      #   mapped_by_queue = result.map{ |h| [h['queueType'], h] }.to_h # {'RANKED_SOLO_5x5' => {...}}
+      #   solo_queue = mapped_by_queue['RANKED_SOLO_5x5']
+      #   wins = solo_queue['wins']
+      #   losses = solo_queue['losses']
+      def league_positions(summoner_id:)
+        response_for POSITION_BY_SUMMONER_ID, {summonerId: summoner_id}
       end
 
       # Challenger league data for queue type.
       #
-      # @param type [String] required, must be RANKED_FLEX_SR, RANKED_FLEX_TT, RANKED_SOLO_5x5, RANKED_TEAM_3x3, or RANKED_TEAM_5x5
+      # @param type [String] required, must be RANKED_FLEX_SR, RANKED_FLEX_TT, or RANKED_SOLO_5x5
       # @return [Hash] challenger league data
-      # @see https://developer.riotgames.com/api/methods#!/985/3353
-      def challenger(type: )
+      # @see https://developer.riotgames.com/api-methods/#league-v3/GET_getChallengerLeague
+      def challenger_leagues(queue: )
         raise ArgumentError,
-              "Invalid argument: #{type}, arg must be in #{CHALLENGER_QUEUE_TYPES}" unless CHALLENGER_QUEUE_TYPES.include?(type)
+              "Invalid argument: #{queue}, arg must be in #{CHALLENGER_QUEUE_TYPES}" unless CHALLENGER_QUEUE_TYPES.include?(queue)
 
-        response_for CHALLENGER, {type: type}
+        response_for CHALLENGER, {queue: queue}
       end
 
       # Master league data for queue type.
       #
-      # @param type [String] required, must be RANKED_FLEX_SR, RANKED_FLEX_TT, RANKED_SOLO_5x5, RANKED_TEAM_3x3, or RANKED_TEAM_5x5
+      # @param type [String] required, must be RANKED_FLEX_SR, RANKED_FLEX_TT, or RANKED_SOLO_5x5
       # @return [Hash] master league data
-      # https://developer.riotgames.com/api/methods#!/985/3354
-      def master(type: )
+      # @see https://developer.riotgames.com/api-methods/#league-v3/GET_getMasterLeague
+      def master_leagues(queue: )
         raise ArgumentError,
-              "Invalid argument: #{type}, arg must be in #{MASTER_QUEUE_TYPES}" unless MASTER_QUEUE_TYPES.include?(type)
+              "Invalid argument: #{queue}, arg must be in #{MASTER_QUEUE_TYPES}" unless MASTER_QUEUE_TYPES.include?(queue)
 
-        response_for MASTER, {type: type}
+        response_for MASTER, {queue: queue}
       end
     end
   end

data/lib/taric/operation/lol_static_data.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'base'
 require_relative 'endpoint_template'
 module Taric
@@ -7,22 +8,22 @@ module Taric
 
       BASE_STATIC_URL = "https://{host}/lol/static-data/v3"
 
-      STATIC_CHAMPIONS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/champions{?api_key,dataById,champListData,locale,version}")
-      STATIC_CHAMPION =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/champions/{id}{?api_key,champData,locale,version}")
-      STATIC_ITEMS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/items{?api_key,itemListData,locale,version}")
-      STATIC_ITEM =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/items/{id}{?api_key,itemData,locale,version}")
-      STATIC_LANGUAGE_STRINGS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/language-strings{?api_key,locale,version}")
+      STATIC_CHAMPIONS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/champions{?dataById,champListData,locale,version}")
+      STATIC_CHAMPION =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/champions/{id}{?champData,locale,version}")
+      STATIC_ITEMS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/items{?itemListData,locale,version}")
+      STATIC_ITEM =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/items/{id}{?itemData,locale,version}")
+      STATIC_LANGUAGE_STRINGS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/language-strings{locale,version}")
       STATIC_LANGUAGES =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/languages{?api_key}")
-      STATIC_MAP =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/maps{?api_key,locale,version}")
-      STATIC_MASTERIES =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/masteries{?api_key,masteryListData,locale,version}")
-      STATIC_MASTERY =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/masteries/{id}{?api_key,masteryData,locale,version}")
-      STATIC_PROFILE_ICONS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/profile-icons{?api_key,locale,version}")
+      STATIC_MAP =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/maps{locale,version}")
+      STATIC_MASTERIES =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/masteries{masteryListData,locale,version}")
+      STATIC_MASTERY =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/masteries/{id}{masteryData,locale,version}")
+      STATIC_PROFILE_ICONS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/profile-icons{locale,version}")
       STATIC_REALM =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/realms{?api_key}")
-      STATIC_RUNES =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/runes{?api_key,runeListData,locale,version}")
-      STATIC_RUNE =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/runes/{id}{?api_key,runeData,locale,version}")
-      STATIC_SUMMONER_SPELLS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/summoner-spells{?api_key,spellData,locale,version}")
-      STATIC_SUMMONER_SPELL =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/summoner-spells/{id}{?api_key,spellData,locale,version}")
-      STATIC_VERSIONS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/versions{?api_key}")
+      STATIC_RUNES =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/runes{runeListData,locale,version}")
+      STATIC_RUNE =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/runes/{id}{runeData,locale,version}")
+      STATIC_SUMMONER_SPELLS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/summoner-spells{spellData,locale,version}")
+      STATIC_SUMMONER_SPELL =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/summoner-spells/{id}{spellData,locale,version}")
+      STATIC_VERSIONS =  EndpointTemplate.new(template_url: "#{BASE_STATIC_URL}/versions")
 
       CHAMP_DATA_OPTIONS = [
           'all'.freeze,

data/lib/taric/operation/lol_status.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require_relative 'endpoint_template'
 module Taric
   module Operation
     module LolStatus
-      SHARD =  EndpointTemplate.new(template_url: 'https://{host}/lol/status/v3/shard-data{?api_key}')
+      SHARD =  EndpointTemplate.new(template_url: 'https://{host}/lol/status/v3/shard-data')
 
       # Region metadata, implicitly uses endpoint host to determine which region.
       #

data/lib/taric/operation/masteries.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require_relative 'endpoint_template'
 module Taric
   module Operation
     module Masteries
 
-      MASTERIES = EndpointTemplate.new(template_url: "https://{host}/lol/platform/v3/masteries/by-summoner/{summonerId}{?api_key}")
+      MASTERIES = EndpointTemplate.new(template_url: 'https://{host}/lol/platform/v3/masteries/by-summoner/{summonerId}')
 
       # Masteries by summoner ID.
       #

data/lib/taric/operation/match.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'base'
 require_relative 'endpoint_template'
 module Taric

data/lib/taric/operation/runes.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require_relative 'endpoint_template'
 module Taric
   module Operation
     module Runes
 
-      RUNES_V3 = EndpointTemplate.new(template_url: "https://{host}/lol/platform/v3/runes/by-summoner/{summonerId}{?api_key}")
+      RUNES_V3 = EndpointTemplate.new(template_url: 'https://{host}/lol/platform/v3/runes/by-summoner/{summonerId}')
 
       # Runes by summoner ID.
       #

data/lib/taric/operation/spectator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'endpoint_template'
 module Taric
   module Operation

data/lib/taric/operation/summoner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'base'
 require_relative 'endpoint_template'
 module Taric
@@ -5,10 +6,10 @@ module Taric
     module Summoner
       include Taric::Operation::Base
 
-      BASE_SUMMONER_URL = "https://{host}/lol/summoner/v3/summoners"
-      SUMMONER_BY_ID = EndpointTemplate.new(template_url: "#{BASE_SUMMONER_URL}/{summonerId}{?api_key}")
-      SUMMONER_BY_NAME = EndpointTemplate.new(template_url: "#{BASE_SUMMONER_URL}/by-name/{summonerName}{?api_key}")
-      SUMMONER_BY_ACCOUNT_ID = EndpointTemplate.new(template_url: "#{BASE_SUMMONER_URL}/by-account/{accountId}{?api_key}")
+      BASE_SUMMONER_URL = 'https://{host}/lol/summoner/v3/summoners'
+      SUMMONER_BY_ID = EndpointTemplate.new(template_url: "#{BASE_SUMMONER_URL}/{summonerId}")
+      SUMMONER_BY_NAME = EndpointTemplate.new(template_url: "#{BASE_SUMMONER_URL}/by-name/{summonerName}")
+      SUMMONER_BY_ACCOUNT_ID = EndpointTemplate.new(template_url: "#{BASE_SUMMONER_URL}/by-account/{accountId}")
 
       def summoner_by_id(summoner_id:)
         response_for SUMMONER_BY_ID, {summonerId: summoner_id}

data/lib/taric/version.rb

@@ -1,3 +1,3 @@
 module Taric
-  VERSION = '1.0.0-beta.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taric
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Joseph Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -253,9 +253,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1