Skip to content

Commit

Permalink
Merge 080c0b1 into fe3608c
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicola Racco committed Apr 25, 2014
2 parents fe3608c + 080c0b1 commit 6dae8dd
Show file tree
Hide file tree
Showing 25 changed files with 5,825 additions and 11,247 deletions.
2 changes: 1 addition & 1 deletion lib/lol/static_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class StaticRequest < Request
STANDARD_ENDPOINTS = %w(champion item mastery rune summoner_spell)

def self.api_version
"v1"
"v1.2"
end

# Returns a full url for an API call
Expand Down
2 changes: 1 addition & 1 deletion spec/api_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def check_api_version(klass, version)
check_api_version(StatsRequest, "v1.3")
check_api_version(SummonerRequest, "v1.4")
check_api_version(TeamRequest, "v2.2")
check_api_version(StaticRequest, "v1")
check_api_version(StaticRequest, "v1.2")
end
6 changes: 6 additions & 0 deletions spec/fixtures/v1.2/get-champion-by-id.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"id": 81,
"title": "the Prodigal Explorer",
"name": "Ezreal",
"key": "Ezreal"
}
6 changes: 6 additions & 0 deletions spec/fixtures/v1.2/get-item-by-id.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"id": 3065,
"plaintext": "Increases Health and healing effects",
"description": "<stats>+400 Health<br>+55 Magic Resist<br>+20 Health Regen per 5 seconds<br>+10% Cooldown Reduction<\/stats><br><br><unique>UNIQUE Passive:<\/unique> Increases self-healing, Health Regen, Lifesteal, and Spell Vamp effects by 20%.",
"name": "Spirit Visage"
}
1,563 changes: 1,563 additions & 0 deletions spec/fixtures/v1.2/get-item.json

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions spec/fixtures/v1.2/get-mastery-by-id.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"id": 4353,
"description": [
"+2% Cooldown Reduction and reduces the cooldown of Activated Items by 4%",
"+3.5% Cooldown Reduction and reduces the cooldown of Activated Items by 7%",
"+5% Cooldown Reduction and reduces the cooldown of Activated Items by 10%"
],
"name": "Intelligence"
}

0 comments on commit 6dae8dd

Please sign in to comment.