summoner 1.3 and call for multiple summoners
This commit is contained in:
@@ -19,15 +19,15 @@ class SummonerModule < SightstoneBaseModule
|
|||||||
def summoner(name_or_id, optional={})
|
def summoner(name_or_id, optional={})
|
||||||
region = optional[:region] || @sightstone.region
|
region = optional[:region] || @sightstone.region
|
||||||
uri = if name_or_id.is_a? Integer
|
uri = if name_or_id.is_a? Integer
|
||||||
"https://prod.api.pvp.net/api/lol/#{region}/v1.2/summoner/#{name_or_id}"
|
"https://prod.api.pvp.net/api/lol/#{region}/v1.3/summoner/#{name_or_id}"
|
||||||
else
|
else
|
||||||
"https://prod.api.pvp.net/api/lol/#{region}/v1.2/summoner/by-name/#{URI::encode(name_or_id)}"
|
"https://prod.api.pvp.net/api/lol/#{region}/v1.3/summoner/by-name/#{URI::encode(name_or_id)}"
|
||||||
end
|
end
|
||||||
|
|
||||||
response = _get_api_response(uri)
|
response = _get_api_response(uri)
|
||||||
_parse_response(response) { |resp|
|
_parse_response(response) { |resp|
|
||||||
data = JSON.parse(resp)
|
data = JSON.parse(resp)
|
||||||
s = Summoner.new(data)
|
s = Summoner.new(data.values[0])
|
||||||
if block_given?
|
if block_given?
|
||||||
yield s
|
yield s
|
||||||
else
|
else
|
||||||
@@ -36,6 +36,38 @@ class SummonerModule < SightstoneBaseModule
|
|||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# returns an array of summoner objects
|
||||||
|
# @param names_or_ids [Array<Integer, String>] names or ids of summoners
|
||||||
|
# @param optional [Hash] optional arguments: :region => replaces default region
|
||||||
|
# @return [Hash<(String or Integer), Summoner>] A Hash mapping summoner ids or names to summoner objects
|
||||||
|
def summoners(names_or_ids, optional={})
|
||||||
|
return {} if names_or_ids.empty?
|
||||||
|
|
||||||
|
region = optional[:region] || @sightstone.region
|
||||||
|
|
||||||
|
uri = if !names_or_ids[0].is_a? String
|
||||||
|
"https://prod.api.pvp.net/api/lol/#{region}/v1.3/summoner/#{names_or_ids.join(',')}"
|
||||||
|
else
|
||||||
|
"https://prod.api.pvp.net/api/lol/#{region}/v1.3/summoner/by-name/#{URI::encode(names_or_ids.join(','))}"
|
||||||
|
end
|
||||||
|
|
||||||
|
response = _get_api_response(uri)
|
||||||
|
_parse_response(response) { |resp|
|
||||||
|
data = JSON.parse(resp)
|
||||||
|
summoners = {}
|
||||||
|
data.each do |id_or_name, raw_summoner|
|
||||||
|
summoners[id_or_name] = Summoner.new(raw_summoner)
|
||||||
|
end
|
||||||
|
|
||||||
|
if block_given?
|
||||||
|
yield summoners
|
||||||
|
else
|
||||||
|
return summoners
|
||||||
|
end
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
# returns the names for the ids
|
# returns the names for the ids
|
||||||
# @param ids [Array<Numeric>] ids
|
# @param ids [Array<Numeric>] ids
|
||||||
# @param optional [Hash<Symbol, String>] optional arguments: :region => replaces default region
|
# @param optional [Hash<Symbol, String>] optional arguments: :region => replaces default region
|
||||||
|
|||||||
@@ -13,6 +13,18 @@ class SummonerModuleTest < BaseTest
|
|||||||
assert_instance_of(Fixnum, s.level)
|
assert_instance_of(Fixnum, s.level)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_summoners_by_names
|
||||||
|
begin
|
||||||
|
s = @@sightstone.summoner.summoners([@@test_name, @@test_name2])
|
||||||
|
s.each { |name, summoner| _check_summoner_validity(summoner) }
|
||||||
|
rescue Sightstone::RateLimitExceededException
|
||||||
|
puts "Rate limit exeeded, waiting 1 sec"
|
||||||
|
sleep 1
|
||||||
|
retry
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
def test_summoner_by_name
|
def test_summoner_by_name
|
||||||
begin
|
begin
|
||||||
s = @@sightstone.summoner.summoner(@@test_name)
|
s = @@sightstone.summoner.summoner(@@test_name)
|
||||||
@@ -22,6 +34,7 @@ class SummonerModuleTest < BaseTest
|
|||||||
retry
|
retry
|
||||||
end
|
end
|
||||||
_check_summoner_validity(s)
|
_check_summoner_validity(s)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_summoner_by_id
|
def test_summoner_by_id
|
||||||
|
|||||||
Reference in New Issue
Block a user