league_api 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca5e201863a57dbd47ef48358b34b0f8e28530e8
-  data.tar.gz: 8e5ac6adb17cfbaa50a43da4f022afd2af9caee7
+  metadata.gz: c22f9622cfa0c53e5705e0ac1ee7b184ace3c968
+  data.tar.gz: 331599f857237ff4d6e003bd133b38ca4aa1b320
 SHA512:
-  metadata.gz: 4329e8c95b6fe9e49b9282a2bca05f63054c5cfd3fa5f5a90056cbdeeb93cbc4cad140840af5eda4634c64b5cdb9454958fd54abe09cf76fa7505fe84509a77e
-  data.tar.gz: a6bf01700126f3234129d7575c322cfbd2adffc78d7e58dd6e1ba281a461a163811f9dc87eb51fcdb1728f1d200ba748e6b99610901ca1830532d52051f4f3b4
+  metadata.gz: 30e43b67308a8740264855904c982cde45f1b04e4d5442aae135e0bc956a869f8093a6f04ca31d6c905bc31945b3d402b9953db94a978c815f1685e4796a3d8d
+  data.tar.gz: 4714a78563d7b7a9a86227c5ed31ba9a3f96bfdb71473a43afba3db2997ad5fced3a0f677bdf8586a963ea82e383bf25beb36206e669d414376764df9176f8bf

data/lib/league_api/champion.rb

@@ -4,7 +4,7 @@ module LeagueApi
     @base_url = "https://na.api.pvp.net/api/lol/na/v1.2/"
 
     def self.make_request(str, params=nil, region=nil)
-      LeagueApi.make_request(@base_url, str,params, region)
+      LeagueApi.make_request(@base_url, str, params, region)
     end
 
     def self.get_free_champs(region=nil)

data/lib/league_api/current_game.rb

@@ -0,0 +1,18 @@
+module LeagueApi
+
+  class CurrentGame
+    @base_url = "https://na.api.pvp.net/observer-mode/rest/consumer/getSpectatorGameInfo/"
+
+    def self.make_request(str, params=nil, region=nil)
+      LeagueApi.make_request(@base_url, str, params, region)
+    end
+
+    def self.fetch(platformId, summonerId, region="na")
+      make_request("#{platformId}/#{summonerId}", nil, region)
+    end
+
+    def self.requests
+      %w( fetch(platformId,summonerId,region) )
+    end
+  end
+end

data/lib/league_api/featured_games.rb

@@ -0,0 +1,14 @@
+module LeagueApi
+
+  class FeaturedGames
+    @base_url = "https://na.api.pvp.net/observer-mode/rest/featured"
+
+    def self.fetch(region="na")
+      LeagueApi.make_request(@base_url, "", nil, region)
+    end
+
+    def self.requests
+      %w( fetch(region) )
+    end
+  end
+end

data/lib/league_api/static.rb

@@ -75,15 +75,15 @@ module LeagueApi
     #TODO: Implement http://ddragon.leagueoflegends.com/cdn/4.7.8/img/sprite/rune0.png
 
     def self.get_item_image(id)
-      "http://ddragon.leagueoflegends.com/cdn/"+$version+"/img/item/"+id.to_s+".png"
+      "http://ddragon.leagueoflegends.com/cdn/"+$DDRAGON_VERSION+"/img/item/"+id.to_s+".png"
     end
 
     def self.get_champion_image(str)
-      "http://ddragon.leagueoflegends.com/cdn/"+$version+"/img/champion/"+str+".png"
+      "http://ddragon.leagueoflegends.com/cdn/"+$DDRAGON_VERSION+"/img/champion/"+str+".png"
     end
 
     def self.get_summoner_image(id)
-      "http://ddragon.leagueoflegends.com/cdn/"+$version+"/img/sprite/spell"+id.to_s+".png"
+      "http://ddragon.leagueoflegends.com/cdn/"+$DDRAGON_VERSION+"/img/sprite/spell"+id.to_s+".png"
     end
 
     def self.requests

data/lib/league_api.rb

@@ -8,95 +8,36 @@ require 'league_api/league'
 require 'league_api/team'
 require 'league_api/stats'
 require 'league_api/util'
+require 'league_api/featured_games'
+require 'league_api/current_game'
 
 module LeagueApi
-  extend self
-
   @api_key = ENV["LOL_KEY"]
-  #XXX: Would rather have this generated by Static.get_versions
-  $version = "5.5.3"
+  @default_region = "na"
+  # third party versioning for image cdn (static info)
+  $DDRAGON_VERSION = "5.6.2"
 
-  @@default_region = "na"
+  extend self
 
   def make_request(base, modifier=nil, params=nil, region=nil)
-    region = @@default_region if region.nil?
-    base = LeagueApi.change_base(base, region)
+    region = @default_region if region.nil?
+    base = change_base(base, region)
 
     url = base + modifier
-
-    if params
-
-      params.each do |p|
-        url << '?'+p[0]+'='+p[1]
-      end
-      url += '&api_key=' + @api_key
-
-    else
-
-      url += '?api_key=' + @api_key
-
-    end
+    url << add_query_string(params)
 
     uri = URI.parse(url)
     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
-
-  def get_region(region)
-    if region.nil?
-      $region
-    else
-      region
-    end
-  end
-
-  def change_base(url, region)
-    case region
-    when "euw"
-      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").gsub("na","br")
-    when "eune"
-      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").gsub("na","kr")
-    when "las"
-      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").gsub("na","lan")
-    when "oce"
-      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").gsub("na","tr")
-    when "ru"
-      url.gsub("na.api.pvp.net","ru.api.pvp.net").gsub("na","ru")
-    else
-      url #Cause USA #1
-    end
-  end
-
   #Display all available Requests for all API classes
   def available_requests
-    c = self.constants
     requests = {}
-
     requests[LeagueApi] = self.instance_methods.map &:to_s
 
-    c.each do |i|
+    self.constants.each do |i|
       requests[eval(i.to_s)] = eval(i.to_s).requests
     end
-
     requests
   end
 
@@ -135,4 +76,37 @@ module LeagueApi
     Time.at( Game.recent_games(id, region).first["createDate"] / 1000 )
   end
 
+  def before(*methods)
+    methods.each do |name|
+      m = instance_method(name)
+      define_method(name) do |*args, &block|
+        yield
+        m.bind(self).(*args, &block)
+      end
+    end
+  end
+
+
+  before(*instance_methods) { ENV["LOL_KEY"] or raise("Must provide an LOL KEY") }
+
+  private
+
+  def add_query_string(params)
+    query_string = ""
+    if params
+      params.each do |p|
+        query_string << "?"+p[0]+"="+p[1]
+      end
+      query_string << "&api_key=" + @api_key
+    else
+      query_string << "?api_key=" + @api_key
+    end
+  end
+
+  def change_base(url, region)
+    return url if region == "na"
+    return url.gsub("na.api.pvp.net", "#{region}.api.pvp.net").gsub("na", region)
+  end
+
+
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: league_api
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - DanBradbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Gem to access Riot Developer APIs.
@@ -61,13 +61,15 @@ extra_rdoc_files: []
 files:
 - lib/league_api.rb
 - lib/league_api/champion.rb
-- lib/league_api/game.rb
-- lib/league_api/league.rb
 - lib/league_api/static.rb
-- lib/league_api/stats.rb
+- lib/league_api/game.rb
 - lib/league_api/summoner.rb
+- lib/league_api/league.rb
 - lib/league_api/team.rb
+- lib/league_api/stats.rb
 - lib/league_api/util.rb
+- lib/league_api/current_game.rb
+- lib/league_api/featured_games.rb
 homepage: http://danbradbury.github.io/LeagueApi/
 licenses:
 - MIT
@@ -78,19 +80,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Mapping of Riot Developer API with  additional helper methods
 test_files: []
-has_rdoc: