sightstone 1.4.3 → 1.4.4

data/lib/sightstone/modules/champion_module.rb

@@ -1,34 +1,34 @@
-require 'sightstone/champion'
-require 'sightstone/modules/sightstone_base_module'
-module Sightstone
-# Module to provide calls to the summoner api
-class ChampionModule < SightstoneBaseModule
-
-  def initialize(sightstone)
-    @sightstone = sightstone
-  end
-
-  # call to get champions
-  # @param optional [Hash] optional arguments: :region => replaces default region, :free_to_play => boolean (only free to play champs if true)
-  # @return [Array<Champion>] array of champs
-  def champions(optional={})
-    region = optional[:region] || @sightstone.region
-    free_to_play = optional[:free_to_play]
-    uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.1/champion"
-    response = _get_api_response(uri, {'freeToPlay' => free_to_play})
-
-    _parse_response(response) { |resp|
-      data = JSON.parse(resp)
-      champions = []
-      data['champions'].each do |champ|
-        champions << Champion.new(champ)
-      end
-      if block_given?
-        yield champions
-      else
-        return champions
-      end
-    }
-  end
-end
+require 'sightstone/champion'
+require 'sightstone/modules/sightstone_base_module'
+module Sightstone
+# Module to provide calls to the summoner api
+class ChampionModule < SightstoneBaseModule
+
+  def initialize(sightstone)
+    @sightstone = sightstone
+  end
+
+  # call to get champions
+  # @param optional [Hash] optional arguments: :region => replaces default region, :free_to_play => boolean (only free to play champs if true)
+  # @return [Array<Champion>] array of champs
+  def champions(optional={})
+    region = optional[:region] || @sightstone.region
+    free_to_play = optional[:free_to_play]
+    uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.1/champion"
+    response = _get_api_response(uri, {'freeToPlay' => free_to_play})
+
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      champions = []
+      data['champions'].each do |champ|
+        champions << Champion.new(champ)
+      end
+      if block_given?
+        yield champions
+      else
+        return champions
+      end
+    }
+  end
+end
 end

data/lib/sightstone/modules/datadragon_module.rb

@@ -1,26 +1,26 @@
-require 'sightstone/modules/sightstone_base_module'
-module Sightstone
-class DatadragonModule < SightstoneBaseModule
-
-  def initialize(sightstone)
-    @sightstone = sightstone
-  end
-
-  def version(optional={})
-    region = optional[:region] || @sightstone.region
-    uri = "https://ddragon.leagueoflegends.com/realms/#{region}.json"
-   
-    response = _get_api_response(uri)
-    _parse_response(response) { |resp|
-      data = JSON.parse(resp)
-      if block_given?
-        yield data['v']
-      else
-        return data['v']
-      end
-    }
-  end
-  
-  
-end
+require 'sightstone/modules/sightstone_base_module'
+module Sightstone
+class DatadragonModule < SightstoneBaseModule
+
+  def initialize(sightstone)
+    @sightstone = sightstone
+  end
+
+  def version(optional={})
+    region = optional[:region] || @sightstone.region
+    uri = "https://ddragon.leagueoflegends.com/realms/#{region}.json"
+   
+    response = _get_api_response(uri)
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      if block_given?
+        yield data['v']
+      else
+        return data['v']
+      end
+    }
+  end
+  
+  
+end
 end

data/lib/sightstone/modules/game_module.rb

@@ -1,39 +1,39 @@
-require 'sightstone/modules/sightstone_base_module'
-require 'sightstone/summoner'
-require 'sightstone/match_history'
-module Sightstone
-# module to access the game api
-class GameModule < SightstoneBaseModule
-  
-  def initialize(sightstone)
-    @sightstone = sightstone
-  end
-  
-  # returns the match history of a summoner
-  # @param [Summoner, Fixnum] summoner summoner object or id of a summoner
-  # @param optional [Hash] optional arguments: :region => replaces default region
-  # @return [MatchHistory] match history of the summoner
-  def recent(summoner, optional={})
-    region = optional[:region] || @sightstone.region
-   id = if summoner.is_a? Summoner
-     summoner.id
-   else
-     summoner
-   end
-   uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.3/game/by-summoner/#{id}/recent"
-   
-    response = _get_api_response(uri)
-    _parse_response(response) { |resp|
-      data = JSON.parse(resp)
-      history =  MatchHistory.new(data)
-      if block_given?
-        yield history
-      else
-        return history
-      end
-    }
-  end
-  
-  
-end
+require 'sightstone/modules/sightstone_base_module'
+require 'sightstone/summoner'
+require 'sightstone/match_history'
+module Sightstone
+# module to access the game api
+class GameModule < SightstoneBaseModule
+  
+  def initialize(sightstone)
+    @sightstone = sightstone
+  end
+  
+  # returns the match history of a summoner
+  # @param [Summoner, Fixnum] summoner summoner object or id of a summoner
+  # @param optional [Hash] optional arguments: :region => replaces default region
+  # @return [MatchHistory] match history of the summoner
+  def recent(summoner, optional={})
+    region = optional[:region] || @sightstone.region
+   id = if summoner.is_a? Summoner
+     summoner.id
+   else
+     summoner
+   end
+   uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.3/game/by-summoner/#{id}/recent"
+   
+    response = _get_api_response(uri)
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      history =  MatchHistory.new(data)
+      if block_given?
+        yield history
+      else
+        return history
+      end
+    }
+  end
+  
+  
+end
 end

data/lib/sightstone/modules/league_module.rb

@@ -1,41 +1,69 @@
-require 'sightstone/modules/sightstone_base_module'
-require 'sightstone/summoner'
-require 'sightstone/league'
-
-module Sightstone
-# module to provide calls to the league api
-class LeagueModule < SightstoneBaseModule
-  def initialize(sightstone)
-    @sightstone = sightstone
-  end
-  
-  # Provides league information of a summoner
-  # @param [Summoner, Integer] summoner
-  # @param optional [Hash] optional arguments: :region => replaces default region
-  # @return [Array<League>] an array of all leagues the summoner and his teams are in
-  def leagues(summoner, optional={})
-    region = optional[:region] || @sightstone.region
-    id = if summoner.is_a? Summoner
-      summoner.id
-    else
-      summoner
-    end
-    
-    uri = "https://prod.api.pvp.net/api/lol/#{region}/v2.3/league/by-summoner/#{id}"
-    response = _get_api_response(uri)
-    _parse_response(response) { |resp|
-      data = JSON.parse(resp)
-      leagues = []
-      data.each do |league|
-        leagues << League.new(league)
-      end
-      if block_given?
-        yield leagues
-      else
-        return leagues
-      end
-    }
-  end
-  
-end
+require 'sightstone/modules/sightstone_base_module'
+require 'sightstone/summoner'
+require 'sightstone/league'
+
+module Sightstone
+# module to provide calls to the league api
+class LeagueModule < SightstoneBaseModule
+  def initialize(sightstone)
+    @sightstone = sightstone
+  end
+  
+  # Provides league information of a summoner
+  # @param [Summoner, Integer] summoner
+  # @param optional [Hash] optional arguments: :region => replaces default region
+  # @return [Array<League>] an array of all leagues the summoner and his teams are in
+  def leagues(summoner, optional={})
+    region = optional[:region] || @sightstone.region
+    id = if summoner.is_a? Summoner
+      summoner.id
+    else
+      summoner
+    end
+    
+    uri = "https://prod.api.pvp.net/api/lol/#{region}/v2.3/league/by-summoner/#{id}"
+    response = _get_api_response(uri)
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      leagues = []
+      data.each do |league|
+        leagues << League.new(league)
+      end
+      if block_given?
+        yield leagues
+      else
+        return leagues
+      end
+    }
+  end
+
+  # Get all entries for the given summoner
+  # @param [Summoner, Integer] summoner or summoner id
+  # @param optional [Hash] optional arguments: :region => replaces default region
+  # @return [Array<LeagueItem>] an array of all entries for that given summoner
+  def league_entries(summoner, optional={})
+    region = optional[:region] || @sightstone.region
+    id = if summoner.is_a? Summoner
+      summoner.id
+    else
+      summoner
+    end
+    
+    uri = "https://prod.api.pvp.net/api/lol/#{region}/v2.3/league/by-summoner/#{id}/entry"
+    response = _get_api_response(uri)
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      entries = []
+      data.each do |entry|
+        entries << LeagueItem.new(entry)
+      end
+      if block_given?
+        yield entries
+      else
+        return entries
+      end
+    }
+  end
+  
+end
 end

data/lib/sightstone/modules/sightstone_base_module.rb

@@ -1,40 +1,40 @@
-require 'open-uri'
-module Sightstone
-# Base class of the api modules
-# @abstract
-class SightstoneBaseModule
-  
-  protected
-  def _get_api_response(uri, header={})
-    params = {'api_key' => @sightstone.api_key}.merge header
-    RestClient.get(uri, headers={:params => params}) {|response, request, result| response }
-  rescue SocketError => e
-    nil
-
-    end
-
-  def _parse_response(response, &block)
-    response_code = if response.nil?
-    500
-    else
-    response.code
-    end
-
-    if response_code == 200
-    block.call(response.body)
-    elsif response_code == 404
-      raise SummonerNotFoundException
-    elsif response_code == 500
-      raise SightstoneConnectionException
-    elsif response_code == 429
-      raise RateLimitExceededException
-    elsif response_code == 401
-	    raise InvalidApiKeyException
-    else
-      raise SightstoneApiException
-    end
-  end
-  
-end
-
+require 'open-uri'
+module Sightstone
+# Base class of the api modules
+# @abstract
+class SightstoneBaseModule
+  
+  protected
+  def _get_api_response(uri, header={})
+    params = {'api_key' => @sightstone.api_key}.merge header
+    RestClient.get(uri, headers={:params => params}) {|response, request, result| response }
+  rescue SocketError => e
+    nil
+
+    end
+
+  def _parse_response(response, &block)
+    response_code = if response.nil?
+    500
+    else
+    response.code
+    end
+
+    if response_code == 200
+    block.call(response.body)
+    elsif response_code == 404
+      raise SummonerNotFoundException
+    elsif response_code == 500
+      raise SightstoneConnectionException
+    elsif response_code == 429
+      raise RateLimitExceededException
+    elsif response_code == 401
+	    raise InvalidApiKeyException
+    else
+      raise SightstoneApiException
+    end
+  end
+  
+end
+
 end

data/lib/sightstone/modules/stats_module.rb

@@ -1,76 +1,76 @@
-
-require 'sightstone/modules/sightstone_base_module'
-require 'sightstone/summoner'
-require 'sightstone/player_stats_summary'
-require 'sightstone/ranked_stats'
-module Sightstone
-# Module to receive stats
-class StatsModule < SightstoneBaseModule
-  def initialize(sightstone)
-    @sightstone = sightstone
-  end
-
-  # get a summary of stats for a summoner
-  # @param [Summoner, Fixnum] summoner summoner object of name
-  # @param optional [Hash] optional arguments: :region => replaces default region
-  # @ return [PlayerStatsSummaryList] of the summoner
-  def summary(summoner, optional={})
-    region = optional[:region] || @sightstone.region
-    season = optional[:season]
-    
-    id = if summoner.is_a? Summoner
-    summoner.id
-    else
-    summoner
-    end
-    uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.2/stats/by-summoner/#{id}/summary"
-    response = if season.nil?
-      _get_api_response(uri)
-    else
-       _get_api_response(uri, {'season' => season})
-    end
-
-    _parse_response(response) { |resp|
-      data = JSON.parse(resp)
-      statList =  PlayerStatsSummaryList.new(data)
-      if block_given?
-        yield statList
-      else
-        return statList
-      end
-    }
-
-  end
-  
-  # get a summary of stats for a summoner
-  # @param [Summoner, Fixnum] summoner summoner object of name
-  # @param optional [Hash] optional arguments: :region => replaces default region
-  # @ return [RankedStats] of the summoner
-  def ranked(summoner, optional={})
-    region = optional[:region] || @sightstone.region
-    season = optional[:season]
-    id = if summoner.is_a? Summoner
-    summoner.id
-    else
-    summoner
-    end
-    uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.2/stats/by-summoner/#{id}/ranked"
-    response = if season.nil?
-      _get_api_response(uri)
-    else
-       _get_api_response(uri, {'season' => season})
-    end
-
-    _parse_response(response) { |resp|
-      data = JSON.parse(resp)
-      stats =  RankedStats.new(data)
-      if block_given?
-        yield stats
-      else
-        return stats
-      end
-    }
-
-  end
-end
+
+require 'sightstone/modules/sightstone_base_module'
+require 'sightstone/summoner'
+require 'sightstone/player_stats_summary'
+require 'sightstone/ranked_stats'
+module Sightstone
+# Module to receive stats
+class StatsModule < SightstoneBaseModule
+  def initialize(sightstone)
+    @sightstone = sightstone
+  end
+
+  # get a summary of stats for a summoner
+  # @param [Summoner, Fixnum] summoner summoner object of name
+  # @param optional [Hash] optional arguments: :region => replaces default region
+  # @ return [PlayerStatsSummaryList] of the summoner
+  def summary(summoner, optional={})
+    region = optional[:region] || @sightstone.region
+    season = optional[:season]
+    
+    id = if summoner.is_a? Summoner
+    summoner.id
+    else
+    summoner
+    end
+    uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.2/stats/by-summoner/#{id}/summary"
+    response = if season.nil?
+      _get_api_response(uri)
+    else
+       _get_api_response(uri, {'season' => season})
+    end
+
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      statList =  PlayerStatsSummaryList.new(data)
+      if block_given?
+        yield statList
+      else
+        return statList
+      end
+    }
+
+  end
+  
+  # get a summary of stats for a summoner
+  # @param [Summoner, Fixnum] summoner summoner object of name
+  # @param optional [Hash] optional arguments: :region => replaces default region
+  # @ return [RankedStats] of the summoner
+  def ranked(summoner, optional={})
+    region = optional[:region] || @sightstone.region
+    season = optional[:season]
+    id = if summoner.is_a? Summoner
+    summoner.id
+    else
+    summoner
+    end
+    uri = "https://prod.api.pvp.net/api/lol/#{region}/v1.2/stats/by-summoner/#{id}/ranked"
+    response = if season.nil?
+      _get_api_response(uri)
+    else
+       _get_api_response(uri, {'season' => season})
+    end
+
+    _parse_response(response) { |resp|
+      data = JSON.parse(resp)
+      stats =  RankedStats.new(data)
+      if block_given?
+        yield stats
+      else
+        return stats
+      end
+    }
+
+  end
+end
 end