riot_api 0.0.4 → 0.1.0

data/lib/riot_api/model/team_stat_summary.rb

@@ -0,0 +1,11 @@
+require 'riot_api/model/team_id'
+require 'riot_api/model/team_stat_detail'
+
+module RiotApi
+  module Model
+    class TeamStatSummary < Base
+      attribute :team_id, RiotApi::Model::TeamId
+      attribute :team_stat_details, Array[RiotApi::Model::TeamStatDetail]
+    end
+  end
+end

data/lib/riot_api/resource/base.rb

@@ -6,6 +6,16 @@ module RiotApi
         @region = region
       end
 
+      def get(path, options={})
+        @connection.get(full_path(path), options).body
+      end
+
+      private
+
+      def full_path(path)
+        "#{endpoint_precursor}/#{path}"
+      end
+
       def endpoint_precursor
         "lol/#{@region}/v1.1"
       end

data/lib/riot_api/resource/champions.rb

@@ -3,7 +3,9 @@ module RiotApi
     class Champions < Base
 
       def list(free=false)
-        @connection.get(base_path, { :freeToPlay => free }).body.champions
+        get(base_path, { :freeToPlay => free }).champions.map do |champion|
+          RiotApi::Model::Champion.new(champion)
+        end
       end
 
       def free
@@ -13,7 +15,7 @@ module RiotApi
       private
 
       def base_path
-        "#{endpoint_precursor}/champion"
+        "champion"
       end
     end
   end

data/lib/riot_api/resource/game.rb

@@ -3,17 +3,23 @@ module RiotApi
     class Game < Base
 
       def recent(summoner_id)
-        @connection.get(recent_path(summoner_id)).body.games
+        get(recent_path(summoner_id)).games.map do |game|
+          build_game game
+        end
       end
 
       private
 
+      def build_game(data)
+        RiotApi::Model::Game.new data
+      end
+
       def recent_path(summoner_id)
         "#{base_path(summoner_id)}/recent"
       end
 
       def base_path(summoner_id)
-        "#{endpoint_precursor}/game/by-summoner/#{summoner_id}"
+        "game/by-summoner/#{summoner_id}"
       end
 
     end

data/lib/riot_api/resource/league.rb

@@ -3,17 +3,21 @@ module RiotApi
     class League < BaseV21
 
       def by_summoner(summoner_id)
-        @connection.get(by_summoner_path(summoner_id)).body[summoner_id.to_s]
+        build_league get(by_summoner_path(summoner_id))[summoner_id.to_s]
       end
 
       private
 
+      def build_league(data)
+        RiotApi::Model::League.new data
+      end
+
       def by_summoner_path(summoner_id)
         "#{base_path}/by-summoner/#{summoner_id}"
       end
 
       def base_path
-        "#{endpoint_precursor}/league"
+        "league"
       end
 
     end

data/lib/riot_api/resource/stats.rb

@@ -3,17 +3,29 @@ module RiotApi
     class Stats < Base
 
       def ranked(id, opts = {})
-        @connection.get("#{base_path(id)}/ranked", opts).body
+        get("#{base_path(id)}/ranked", opts).champions.map do |champion|
+          build_champion_stat(champion)
+        end
       end
 
       def summary(id, opts = {})
-        @connection.get("#{base_path(id)}/summary", opts).body
+        get("#{base_path(id)}/summary", opts).player_stat_summaries.map do |summaries|
+          build_player_stat_summary(summaries)
+        end
       end
 
       private
 
+      def build_champion_stat(data)
+        RiotApi::Model::ChampionStat.new data
+      end
+
+      def build_player_stat_summary(data)
+        RiotApi::Model::PlayerStatSummary.new data
+      end
+
       def base_path(id)
-        "#{endpoint_precursor}/stats/by-summoner/#{id}"
+        "stats/by-summoner/#{id}"
       end
     end
   end

data/lib/riot_api/resource/summoner.rb

@@ -3,32 +3,48 @@ module RiotApi
     class Summoner < Base
 
       def name(name, opts = {})
-        RiotApi::Model::Summoner.new @connection.get("#{base_path}/by-name/#{name}/").body
+        build_summoner get("#{base_path}/by-name/#{name}")
       end
 
       def id(id, opts = {})
-        RiotApi::Model::Summoner.new @connection.get("#{base_path}/#{id}/").body
+        build_summoner get("#{base_path}/#{id}")
       end
 
       def masteries(id)
-        @connection.get("#{base_path}/#{id}/masteries").body
+        get("#{base_path}/#{id}/masteries").pages.map do |page|
+          build_mastery_page page
+        end
       end
 
       def names(*ids)
         ids = ids.compact.join(',')
-        @connection.get("#{base_path}/#{ids}/name").body.summoners.map do |summoner|
-          RiotApi::Model::Summoner.new summoner
+        get("#{base_path}/#{ids}/name").summoners.map do |summoner|
+          build_summoner summoner
         end
       end
 
       def runes(id)
-        @connection.get("#{base_path}/#{id}/runes").body
+        get("#{base_path}/#{id}/runes").pages.map do |page|
+          build_rune_page page
+        end
       end
 
       private
 
+      def build_mastery_page(data)
+        RiotApi::Model::MasteryPage.new data
+      end
+
+      def build_rune_page(data)
+        RiotApi::Model::RunePage.new data
+      end
+
+      def build_summoner(data)
+        RiotApi::Model::Summoner.new data
+      end
+
       def base_path
-        "#{endpoint_precursor}/summoner/"
+        "summoner"
       end
 
     end

data/lib/riot_api/resource/team.rb

@@ -3,17 +3,23 @@ module RiotApi
     class Team < BaseV21
 
       def by_summoner(summoner_id)
-        @connection.get(by_summoner_path(summoner_id)).body
+        get(by_summoner_path(summoner_id)).map do |team|
+          build_team(team)
+        end
       end
 
       private
 
+      def build_team(data)
+        RiotApi::Model::Team.new data
+      end
+
       def by_summoner_path(summoner_id)
         "#{base_path}/by-summoner/#{summoner_id}"
       end
 
       def base_path
-        "#{endpoint_precursor}/team"
+        "team"
       end
 
     end

data/lib/riot_api/version.rb

@@ -1,3 +1,3 @@
 module RiotApi
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/spec/api_spec.rb

@@ -17,6 +17,20 @@ describe RiotApi::API, :vcr do
     it 'should raise an error when given an invalid region' do
       expect{ client = RiotApi::API.new :api_key => api_key, :region => 'YYZ'}.to raise_error(ArgumentError, "Invalid Region (Valid regions: 'eune','br','tr','na','euw')")
     end
+
+    it 'should output to stdout with debug parameter' do
+      client = RiotApi::API.new :api_key => api_key, :region => 'euw', :debug => true
+
+      printed = capture_stdout do
+        client.summoner.name 'BestLuxEUW'
+      end
+      expect(printed).to include 'Started GET request to: http://prod.api.pvp.net/api/lol/euw/v1.1/summoner/by-name/BestLuxEUW?api_key=[API-KEY]'
+    end
+
+    it 'should raise an error if the raise error status flag is enabled' do
+      client = RiotApi::API.new :api_key => api_key, :region => 'euw', :raise_status_errors => true
+      expect{ client.summoner.name 'fakemcfakename' }.to raise_error(Faraday::Error::ResourceNotFound, "the server responded with status 404")
+    end
   end
 
   describe 'ssl settings' do
@@ -62,13 +76,15 @@ describe RiotApi::API, :vcr do
     describe '#masteries' do
       let(:summoner_id) { '19531813' }
 
-      let(:response) {
-        subject.summoner.masteries summoner_id
-      }
+      let(:pages) { subject.summoner.masteries summoner_id }
+      let(:page)  { pages.first }
+      let(:talents) { page.talents }
+      let(:talent)  { talents.first }
 
       it 'should return a list of mastery pages containing lists of talents' do
-        response.pages.count.should be > 0
-        response.pages.first.talents.count.should be > 0
+        page.class.should == RiotApi::Model::MasteryPage
+        talent.class.should == RiotApi::Model::Talent
+        talent.name.should_not be_nil
       end
     end
 
@@ -89,13 +105,16 @@ describe RiotApi::API, :vcr do
     describe '#runes' do
       let(:summoner_id) { '19531813' }
 
-      let(:response) {
-        subject.summoner.runes summoner_id
-      }
+      let(:pages) { subject.summoner.runes summoner_id }
+      let(:page)  { pages.first }
+      let(:slot)  { page.slots.first }
+      let(:rune)  { slot.rune }
 
       it 'should return a list of rune pages containing lists of talents' do
-        response.pages.count.should be > 0
-        response.pages.first.slots.count.should be > 0
+        page.class.should == RiotApi::Model::RunePage
+        slot.class.should == RiotApi::Model::RuneSlot
+        rune.class.should == RiotApi::Model::Rune
+        rune.id.should_not be_nil
       end
     end
 
@@ -108,24 +127,32 @@ describe RiotApi::API, :vcr do
     describe '#ranked' do
 
       describe 'omitting season' do
-        let(:response) {
-          subject.stats.ranked summoner_id
-        }
+        let(:champion_stats) { subject.stats.ranked summoner_id }
+        let(:champion_stat)  { champion_stats.first }
+        let(:stats) { champion_stat.stats }
+        let(:stat)  { stats.first }
 
         it 'should return ranked information from the summoner id' do
-          response.summonerId.should eql(19531813)
-          response.champions.first.first.should eql ["id", 111]
+          champion_stats.class.should == Array
+          champion_stat.class.should == RiotApi::Model::ChampionStat
+          stats.class.should == Array
+          stat.class.should == RiotApi::Model::Statistic
+          champion_stat.id.should == 111
         end
       end
 
       describe 'specifying season' do
-        let(:response) {
-          subject.stats.ranked summoner_id, :season => "SEASON3"
-        }
+        let(:champion_stats) { subject.stats.ranked summoner_id, :season => "SEASON3" }
+        let(:champion_stat)  { champion_stats.first }
+        let(:stats) { champion_stat.stats }
+        let(:stat)  { stats.first }
 
         it 'should return ranked information from the summoner id for the specified season' do
-          response.summonerId.should eql(19531813)
-          response.champions.first.first.should eql ["id", 111]
+          champion_stats.class.should == Array
+          champion_stat.class.should == RiotApi::Model::ChampionStat
+          stats.class.should == Array
+          stat.class.should == RiotApi::Model::Statistic
+          champion_stat.id.should == 111
         end
       end
     end
@@ -133,24 +160,32 @@ describe RiotApi::API, :vcr do
     describe '#summary' do
 
       describe 'omitting season' do
-        let(:response) {
-          subject.stats.summary summoner_id
-        }
+        let(:player_stat_summaries) { subject.stats.summary summoner_id }
+        let(:player_stat_summary)  { player_stat_summaries.first }
+        let(:aggregated_stats) { player_stat_summary.aggregated_stats }
+        let(:aggregated_stat)  { aggregated_stats.first }
 
         it 'should return summary information from the summoner id' do
-          response.summonerId.should eql(19531813)
-          response.playerStatSummaries.first.should include 'aggregated_stats'
+          player_stat_summaries.class.should == Array
+          player_stat_summary.class.should == RiotApi::Model::PlayerStatSummary
+          aggregated_stats.class.should == Array
+          aggregated_stat.class.should == RiotApi::Model::Statistic
+          player_stat_summary.losses.should == 0
         end
       end
 
       describe 'specifying season' do
-        let(:response) {
-          subject.stats.summary summoner_id, :season => "SEASON3"
-        }
+        let(:player_stat_summaries) { subject.stats.summary summoner_id, :season => "SEASON3" }
+        let(:player_stat_summary)  { player_stat_summaries.first }
+        let(:aggregated_stats) { player_stat_summary.aggregated_stats }
+        let(:aggregated_stat)  { aggregated_stats.first }
 
         it 'should return summary information from the summoner id for the specified season' do
-          response.summonerId.should eql(19531813)
-          response.playerStatSummaries.first.should include 'aggregated_stats'
+          player_stat_summaries.class.should == Array
+          player_stat_summary.class.should == RiotApi::Model::PlayerStatSummary
+          aggregated_stats.class.should == Array
+          aggregated_stat.class.should == RiotApi::Model::Statistic
+          player_stat_summary.losses.should == 0
         end
       end
     end
@@ -161,26 +196,26 @@ describe RiotApi::API, :vcr do
     let(:current_champion_count) { 116 }
 
     describe '#list' do
-      let(:response) {
+      let(:champions) {
         subject.champions.list
       }
 
       it 'should return a list of all champions' do
-        response.count.should be >= current_champion_count
-        response.first.respond_to?(:name).should be_true
+        champions.count.should be >= current_champion_count
+        champions.first.respond_to?(:name).should be_true
       end
     end
 
     describe '#free' do
-      let(:response) {
+      let(:champions) {
         subject.champions.free
       }
 
       it 'should return a list of all free champions' do
-        response.count.should be < current_champion_count
-        response.count.should be > 0
-        response.first.respond_to?(:name).should be_true
-        response.first.free_to_play.should be_true
+        champions.should_not be_empty
+        champions.count.should be < current_champion_count
+        champions.first.respond_to?(:name).should be_true
+        champions.first.free_to_play.should be_true
       end
     end
 
@@ -191,13 +226,14 @@ describe RiotApi::API, :vcr do
 
     # Ranked command requires user has played ranked
     describe '#recent' do
-      let(:response) {
-        subject.game.recent summoner_id
-      }
+      let(:games) { subject.game.recent summoner_id }
+      let(:game)  { games.first }
 
       it 'should return a list of recent games played' do
-        response.count.should > 0
-        response.first.respond_to?(:champion_id).should be_true
+        game.class.should == RiotApi::Model::Game
+        game.champion_id.should_not be_nil
+        game.fellow_players.first.class.should == RiotApi::Model::Player
+        game.statistics.first.class.should == RiotApi::Model::Statistic
       end
     end
   end
@@ -206,13 +242,13 @@ describe RiotApi::API, :vcr do
     let(:summoner_id) { '19531813' }
 
     describe '#by_summoner' do
-      let(:response) {
-        subject.league.by_summoner summoner_id
-      }
+      let(:league) { subject.league.by_summoner summoner_id }
 
-      it 'should return leagues data for summoner' do
-        response["entries"].count.should > 0
-        response.tier.should == 'CHALLENGER'
+      it 'should return league object for summoner' do
+        league.class.should == RiotApi::Model::League
+        league.tier.should == 'CHALLENGER'
+        league.entries.count.should > 0
+        league.entries.first.class.should == RiotApi::Model::LeagueEntry
       end
     end
   end
@@ -222,13 +258,34 @@ describe RiotApi::API, :vcr do
     let(:summoner_id) { '19531813' }
 
     describe '#by_summoner' do
-      let(:response) {
-        subject.team.by_summoner summoner_id
-      }
+      let(:teams) { subject.team.by_summoner summoner_id }
+      let(:team)  { teams.first }
+
+      let(:match_history) { team.match_history }
+      let(:match) { match_history.first }
+
+      let(:roster) { team.roster }
+      let(:member_list) { roster.member_list }
+      let(:member) { member_list.first }
+
+      let(:team_stat_summary) { team.team_stat_summary }
+      let(:team_stat_details) { team_stat_summary.team_stat_details }
+      let(:team_stat_detail)  { team_stat_details.first }
+
+      let(:team_id) { team.team_id }
 
       it 'should return team data for summoner' do
-        response.count.should > 0
-        response.first.first.should == ["timestamp", 1387051307170]
+        teams.should_not be_empty
+        team.class.should == RiotApi::Model::Team
+
+        match.assists.should_not be_nil
+
+        roster.owner_id.should_not be_nil
+        member.player_id.should_not be_nil
+
+        team_stat_summary.team_id.should_not be_nil
+        team_stat_detail.wins.should_not be_nil
+        team_stat_detail.team_id.should_not be_nil
       end
     end
   end