league_api 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a69c7741131ad749d1345d30734ce0439fd5f489
-  data.tar.gz: 5f286af17c68e5f6fb11f651e35ba0f9781c3c7d
+  metadata.gz: 7b7c85b99ad4b9cdd68321e0c71ac397884bd07b
+  data.tar.gz: 8c168145d750c6c6f5926b4150aaae91719ac790
 SHA512:
-  metadata.gz: 6224a5ca61019c119652d8be6142d3c4dd571ae5bd8fc469650a7c7e734139048164ada80d260fe7040fbe310d05b916eb053439534f95bdd09d3920631afdd2
-  data.tar.gz: 3d99e21be43d11fc987a0db573f7657b0ae703911689b0b32177910187b4c9210283bf11bd4b30e078abf7a9cec2e19871c6866b7ff37af04c612839dffefd22
+  metadata.gz: 7e4307b067ae8349dbf168dc2377f9292aea7dded8ec163ea5f8440a8290b57639ba875bed088030223e97865d158d52c0ce4d8bd72e0db274d8a3f8bf7bb249
+  data.tar.gz: ff660162ca605fae95818e6039b4749f4bec3d4f88df334d8c67bc7e5291b63452fc699709317922ad4650dd44980c9db77091a3647608d4fc246d05a99b1a4d

data/lib/league_api/champion.rb

@@ -1,27 +1,23 @@
 module LeagueApi
 
   class Champion
-    @base_url = "https://prod.api.pvp.net/api/lol/"
-    @post_url = "/v1.2/"
+    @base_url = "https://prod.api.pvp.net/api/lol/na/v1.2/"
 
     def self.make_request(str, params=nil, region=nil)
-      @region = LeagueApi.get_region region
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str,params)
+      LeagueApi.make_request(@base_url, str,params, region)
     end
 
-    def self.get_free_champs
+    def self.get_free_champs(region=nil)
       params = {"freeToPlay" => "true"}
-      make_request('champion', params)["champions"]
+      make_request('champion', params, region)["champions"]
     end
 
-    def self.get_list
-      make_request('champion')["champions"]
+    def self.get_list(region=nil)
+      make_request('champion', region)["champions"]
  	  end
 
-    def self.get_by_id(id)
-      make_request('champion/'+id.to_s)
+    def self.get_by_id(id, region=nil)
+      make_request('champion/'+id.to_s, region)
     end
 
     def self.requests

data/lib/league_api/game.rb

@@ -1,18 +1,14 @@
 module LeagueApi
 
 	class Game
-		@base_url = "https://prod.api.pvp.net/api/lol/"
-		@post_url = "/v1.3/game/by-summoner/"
+		@base_url = "https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/"
 
 		def self.make_request(str, region=nil)
-      @region = LeagueApi.get_region region
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str)
+      LeagueApi.make_request(@base_url, str, nil, region)
 		end
 
-		def self.recent_games(id)
-			make_request(id.to_s+'/recent')["games"]
+		def self.recent_games(id, region=nil)
+			make_request(id.to_s+'/recent', region)["games"]
 		end
 
 		def self.requests

data/lib/league_api/league.rb

@@ -2,33 +2,29 @@ module LeagueApi
 
   class League
 
-    @base_url = 'https://prod.api.pvp.net/api/lol/'
-    @post_url = '/v2.3/league/'
+    @base_url = 'https://prod.api.pvp.net/api/lol/na/v2.3/league/'
 
     def self.make_request(str, params=nil, region=nil)
-      @region = LeagueApi.get_region region
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str, params)
+      LeagueApi.make_request(@base_url, str, params, region)
     end
 
-    def self.by_summoner(id)
+    def self.by_summoner(id, region=nil)
       make_request('by-summoner/'+id.to_s)
     end
 
-    def self.entry_by_summoner(id)
+    def self.entry_by_summoner(id, region=nil)
       make_request('by-summoner/'+id.to_s+'/entry')
     end
 
-    def self.by_team(id)
+    def self.by_team(id, region=nil)
       make_request('by-team/'+id.to_s)
     end
 
-    def self.entry_by_team(id)
+    def self.entry_by_team(id, region=nil)
       make_request('by-team/'+id.to_s+'/entry')
     end
 
-    def self.get_challenger(queue="RANKED_SOLO_5x5")
+    def self.get_challenger(queue="RANKED_SOLO_5x5", region=nil)
       params = {"type" => queue}
       make_request('challenger', params)
     end

data/lib/league_api/static.rb

@@ -1,67 +1,63 @@
 module LeagueApi
 
   class Static
-    @base_url = "https://prod.api.pvp.net/api/lol/static-data/"
-    @post_url = "/v1.2/"
+    @base_url = "https://prod.api.pvp.net/api/lol/static-data/na/v1.2/"
 
     def self.make_request(str, region=nil)
-      @region = LeagueApi.get_region region
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str)
+      LeagueApi.make_request(@base_url, str, nil, region)
     end
 
     # Return a hash of all champions. [name, {data, ..}]
-    def self.get_champion_list
-      make_request('champion')["data"]
+    def self.get_champion_list(region=nil)
+      make_request('champion', region)["data"]
     end
 
-    def self.get_champion_by_name(name)
-      make_request('champion')["data"].fetch(name)
+    def self.get_champion_by_name(name, region=nil)
+      make_request('champion', region)["data"].fetch(name)
     end
 
-    def self.get_champion_by_id(id)
-      make_request('champion/'+id.to_s)
+    def self.get_champion_by_id(id, region=nil)
+      make_request('champion/'+id.to_s, region)
     end
 
-    def self.get_item_list
-      make_request('item')["data"]
+    def self.get_item_list(region=nil)
+      make_request('item', region)["data"]
     end
 
-    def self.get_item_by_id(id)
-      make_request('item/'+id.to_s)
+    def self.get_item_by_id(id, region=nil)
+      make_request('item/'+id.to_s, region)
     end
 
-    def self.get_mastery_list
-      make_request('mastery')["data"]
+    def self.get_mastery_list(region=nil)
+      make_request('mastery', region)["data"]
     end
 
-    def self.get_mastery_by_id(id)
-      make_request('mastery/'+id.to_s)
+    def self.get_mastery_by_id(id, region=nil)
+      make_request('mastery/'+id.to_s, region)
     end
 
-    def self.get_realm
-      make_request('realm')
+    def self.get_realm(region=nil)
+      make_request('realm', region)
     end
 
-    def self.get_rune_list
-      make_request('rune')["data"]
+    def self.get_rune_list(region=nil)
+      make_request('rune', region)["data"]
     end
 
-    def self.get_rune_by_id(id)
-      make_request('rune/'+id.to_s)
+    def self.get_rune_by_id(id, region=nil)
+      make_request('rune/'+id.to_s, region)
     end
 
-    def self.get_summoner_spells
-      make_request('summoner-spell')["data"]
+    def self.get_summoner_spells(region=nil)
+      make_request('summoner-spell', region)["data"]
     end
 
-    def self.get_summoner_by_id(id)
-      make_request('summoner-spell/'+id.to_s)
+    def self.get_summoner_by_id(id, region=nil)
+      make_request('summoner-spell/'+id.to_s, region)
     end
 
-    def self.get_versions
-      make_request('versions')
+    def self.get_versions(region=nil)
+      make_request('versions', region)
     end
 
     def self.get_inverted_champion_list

data/lib/league_api/stats.rb

@@ -2,24 +2,20 @@ module LeagueApi
 
   class Stats
 
-    @base_url = "https://prod.api.pvp.net/api/lol/"
-    @post_url = "/v1.3/stats/by-summoner/"
+    @base_url = "https://prod.api.pvp.net/api/lol/na/v1.3/stats/by-summoner/"
 
     def self.make_request(str, params=nil, region=nil)
-      @region = LeagueApi.get_region region
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str, params)
+      LeagueApi.make_request(@base_url, str, params, region)
     end
 
-    def self.ranked(id, season="SEASON4")
+    def self.ranked(id, season="SEASON4", region=nil)
       params = {"season" => season}
-      make_request(id.to_s+'/ranked', params)
+      make_request(id.to_s+'/ranked', params, region)
     end
 
-    def self.summary(id, season="SEASON4")
+    def self.summary(id, season="SEASON4", region=nil)
       params = {"season" => season}
-      make_request(id.to_s+'/summary', params)
+      make_request(id.to_s+'/summary', params, region)
     end
 
     def self.requests

data/lib/league_api/summoner.rb

@@ -2,36 +2,31 @@ module LeagueApi
 
   class Summoner
 
-    @base_url = 'https://na.api.pvp.net/api/lol/'
-    @post_url = '/v1.4/summoner/'
+    @base_url = 'https://na.api.pvp.net/api/lol/na/v1.4/summoner/'
 
     def self.make_request(str, region=nil)
-      @region = LeagueApi.get_region region
-
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str)
+      LeagueApi.make_request(@base_url, str, nil, region)
     end
 
-    def self.find_by_name(name,region=nil)
+    def self.find_by_name(name, region=nil)
       @name = URI.escape(name, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       make_request('by-name/'+@name,region)[name.gsub(" ", "").downcase]
     end
 
     # Get Summoner Objects mapped by summoner ID for a given a comma seperated list of summoner IDs
-    def self.find_summoners(str)
+    def self.find_summoners(str, region=nil)
       make_request(str.gsub(" ", ""))
     end
 
-    def self.get_masteries(summoners)
+    def self.get_masteries(summoners, region=nil)
       make_request(summoners.gsub(" ", "")+'/masteries')
     end
 
-    def self.get_names(summoners)
+    def self.get_names(summoners, region=nil)
       make_request(summoners.gsub(" ", "")+'/name')
     end
 
-    def self.get_runes(summoners)
+    def self.get_runes(summoners, region=nil)
       make_request(summoners.gsub(" ", "")+'/runes')
     end
 

data/lib/league_api/team.rb

@@ -2,21 +2,17 @@ module LeagueApi
 
   class Team
 
-    @base_url = 'https://prod.api.pvp.net/api/lol/'
-    @post_url = '/v2.2/team/'
+    @base_url = 'https://prod.api.pvp.net/api/lol/na/v2.2/team/'
 
     def self.make_request(str, region=nil)
-      @region = LeagueApi.get_region region
-      base = LeagueApi.change_base(@base_url, @region)
-
-      LeagueApi.make_request(base+@region+@post_url, str)
+      LeagueApi.make_request(@base_url, str, nil, region)
     end
 
-    def self.by_summoner(id)
+    def self.by_summoner(id, region=nil)
       make_request('by-summoner/'+id.to_s)
     end
 
-    def self.find_teams(str)
+    def self.find_teams(str, region=nil)
       make_request(str.gsub(" ",""))
     end
 

data/lib/league_api.rb

@@ -13,12 +13,15 @@ module LeagueApi
   extend self
 
   @api_key = ENV["LOL_KEY"]
-  @region = "na"
   #XXX: Would rather have this generated by Static.get_versions
   $version = "4.9.1"
-  $region = "na"
+  
+  @@default_region = "na"
+
+  def make_request(base, modifier=nil, params=nil, region=nil)
+    region = @@default_region if region.nil?
+    base = LeagueApi.change_base(base, region)
 
-  def make_request(base, modifier=nil, params=nil)
     url = base + modifier
 
     if params
@@ -38,6 +41,14 @@ module LeagueApi
     JSON.parse(uri.read)
   end
 
+  def default_region
+    @@default_region
+  end
+
+  def change_region(region)
+    @@default_region = region
+  end
+
   def set_region(name)
     $region = name
   end
@@ -53,23 +64,23 @@ module LeagueApi
   def change_base(url, region)
     case region
     when "euw"
-      url.gsub("na.api.pvp.net","euw.api.pvp.net")
+      url.gsub("na.api.pvp.net","euw.api.pvp.net").gsub("na","euw")
     when "br"
-      url.gsub("na.api.pvp.net","br.api.pvp.net")
+      url.gsub("na.api.pvp.net","br.api.pvp.net").gsub("na","br")
     when "eune"
-      url.gsub("na.api.pvp.net","eune.api.pvp.net")
+      url.gsub("na.api.pvp.net","eune.api.pvp.net").gsub("na","eune")
     when "kr"
-      url.gsub("na.api.pvp.net","kr.api.pvp.net")
+      url.gsub("na.api.pvp.net","kr.api.pvp.net").gsub("na","kr")
     when "las"
-      url.gsub("na.api.pvp.net","las.api.pvp.net")
+      url.gsub("na.api.pvp.net","las.api.pvp.net").gsub("na","las")
     when "lan"
-      url.gsub("na.api.pvp.net","lan.api.pvp.net")
+      url.gsub("na.api.pvp.net","lan.api.pvp.net").gsub("na","lan")
     when "oce"
-      url.gsub("na.api.pvp.net","oce.api.pvp.net")
+      url.gsub("na.api.pvp.net","oce.api.pvp.net").gsub("na","oce")
     when "tr"
-      url.gsub("na.api.pvp.net","tr.api.pvp.net")
+      url.gsub("na.api.pvp.net","tr.api.pvp.net").gsub("na","tr")
     when "ru"
-      url.gsub("na.api.pvp.net","ru.api.pvp.net")
+      url.gsub("na.api.pvp.net","ru.api.pvp.net").gsub("na","ru")
     else
       url #Cause USA #1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: league_api
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - DanBradbury