dota 0.0.12 → 0.0.14

data/lib/dota/api/match/player.rb

@@ -1,80 +1,28 @@
 module Dota
   module API
     class Match
-      class Player
-        include Utilities::Inspectable
-
-        attr_reader :raw
-
-        def initialize(raw)
-          @raw = raw
-        end
-
-        def id
-          raw["account_id"]
-        end
+      class Player < BasicPlayer
+        # See https://wiki.teamfortress.com/wiki/WebAPI/GetMatchHistory#Player_Slot
+        SLOT_GAP = 128
 
         def slot
-          raw["player_slot"]
+          slot = raw["player_slot"]
+          slot -= SLOT_GAP if slot >= SLOT_GAP
+          slot + 1
         end
 
         def status
-          case raw["leaver_status"]
-          when 0
-            :played
-          when 1
-            :left_safe
-          when 2
-            :abandoned
-          else
-            :bot
-          end
-        end
-
-        def hero
-          Hero.new(raw["hero_id"])
-        end
-
-        def level
-          raw["level"]
-        end
-
-        def kills
-          raw["kills"]
+          STATUS[raw["leaver_status"]]
         end
 
         def deaths
           raw["deaths"]
         end
 
-        def assists
-          raw["assists"]
-        end
-
-        def last_hits
-          raw["last_hits"]
-        end
-
-        def denies
-          raw["denies"]
-        end
-
-        def gold
-          raw["gold"]
-        end
-
         def gold_spent
           raw["gold_spent"]
         end
 
-        def gpm
-          raw["gold_per_min"]
-        end
-
-        def xpm
-          raw["xp_per_min"]
-        end
-
         def hero_damage
           raw["hero_damage"]
         end

data/lib/dota/api/match/side.rb

@@ -0,0 +1,41 @@
+module Dota
+  module API
+    class Match
+      class Side < Entity
+        def id
+          raw["team_id"]
+        end
+
+        def name
+          raw["name"]
+        end
+
+        def logo_id
+          raw["logo"]
+        end
+
+        def complete?
+          raw["team_complete"] == 1
+        end
+
+        def tower_status
+          raw["tower_status"]
+        end
+
+        def barracks_status
+          raw["barracks_status"]
+        end
+
+        def players
+          raw["players"].map do |raw_player|
+            Player.new(raw_player)
+          end
+        end
+
+        def captain_id
+          raw["captain"]
+        end
+      end
+    end
+  end
+end

data/lib/dota/api/scheduled_match.rb

@@ -0,0 +1,32 @@
+module Dota
+  module API
+    class ScheduledMatch < Entity
+      def league_id
+        raw["league_id"]
+      end
+
+      def game_id
+        raw["game_id"]
+      end
+
+      def teams
+        raw["teams"].map do |raw_team|
+          raw_team["name"] = raw_team.delete("team_name")
+          Team.new(raw_team)
+        end
+      end
+
+      def starts_at
+        Time.at(raw["starttime"])
+      end
+
+      def description
+        raw["comment"]
+      end
+
+      def final?
+        raw["final"]
+      end
+    end
+  end
+end

data/lib/dota/api/team.rb

@@ -1,14 +1,6 @@
 module Dota
   module API
-    class Team
-      include Utilities::Inspectable
-
-      attr_reader :raw
-
-      def initialize(raw)
-        @raw = raw
-      end
-
+    class Team < Entity
       def id
         raw["team_id"]
       end

data/lib/dota/version.rb

@@ -1,3 +1,3 @@
 module Dota
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

data/spec/dota/api/cosmetic/rarity_spec.rb

@@ -5,8 +5,8 @@ describe Dota::API::Cosmetic::Rarity do
     end
   end
 
-  specify("#id")    { expect(rarity.id).to    eq 7 }
+  specify("#id")    { expect(rarity.id).to eq 7 }
   specify("#order") { expect(rarity.order).to eq 6 }
   specify("#color") { expect(rarity.color).to eq "#e4ae39" }
-  specify("#name")  { expect(rarity.name).to  eq "Immortal" }
+  specify("#name")  { expect(rarity.name).to eq "Immortal" }
 end

data/spec/dota/api/hero_spec.rb

@@ -1,14 +1,10 @@
 describe Dota::API::Hero do
-  let(:hero) do
-    VCR.use_cassette("GetMatchDetails") do
-      test_client.matches(sample_match_id).players.first.hero
-    end
-  end
+  let(:hero) { described_class.new(69) }
 
   specify ".all" do
     heroes = described_class.all
     expect(heroes.first).to be_a described_class
-    expect(heroes.count).to eq 108
+    expect(heroes.count).to eq 109
   end
 
   specify "#id" do

data/spec/dota/api/item_spec.rb

@@ -1,9 +1,5 @@
 describe Dota::API::Item do
-  let(:item) do
-    VCR.use_cassette("GetMatchDetails") do
-      test_client.matches(sample_match_id).players.first.items.first
-    end
-  end
+  let(:item) { described_class.new(1) }
 
   specify ".all" do
     items = described_class.all

data/spec/dota/api/live_match/player_spec.rb

@@ -1,12 +1,12 @@
 describe Dota::API::LiveMatch::Player do
-  let(:player) do
+  let(:live_match) do
     VCR.use_cassette("GetLiveLeagueGames") do
-      matches = test_client.live_matches
-      first_match = matches.first
-      players = first_match.players
-      players.first
+      test_client.live_matches.first
     end
   end
+  let(:player) do
+    live_match.radiant.players.at(3)
+  end
 
   specify "#id" do
     expect(player.id).to eq 34145091
@@ -20,7 +20,75 @@ describe Dota::API::LiveMatch::Player do
     expect(player.hero).to be_a Dota::API::Hero
   end
 
-  specify "#team" do
-    expect(player.team).to eq :radiant
+  specify "#kills" do
+    expect(player.kills).to eq 4
+  end
+
+  specify "#deaths" do
+    expect(player.deaths).to eq 6
+  end
+
+  specify "#assists" do
+    expect(player.assists).to eq 15
+  end
+
+  specify "#slot" do
+    expect(player.slot).to eq 4
+
+    expect(live_match.radiant.players.map(&:slot)).to eq [1, 2, 3, 4, 5]
+    expect(live_match.dire.players.map(&:slot)).to eq [1, 2, 3, 4, 5]
+  end
+
+  specify "#last_hits" do
+    expect(player.last_hits).to eq 42
+  end
+
+  specify "#denies" do
+    expect(player.denies).to eq 3
+  end
+
+  specify "#gold" do
+    expect(player.gold).to eq 3131
+  end
+
+  specify "#level" do
+    expect(player.level).to eq 19
+  end
+
+  specify "#gpm" do
+    expect(player.gpm).to eq 279
+  end
+
+  specify "#xpm" do
+    expect(player.xpm).to eq 409
+  end
+
+  specify "#ultimate_state" do
+    expect(player.ultimate_state).to eq 3
+  end
+
+  specify "#ultimate_cooldown" do
+    expect(player.ultimate_cooldown).to eq 0
+  end
+
+  specify "#items" do
+    expect(player.items.count).to eq 6
+    expect(player.items.first).to be_an Dota::API::Item
+  end
+
+  specify "#respawn_timer" do
+    expect(player.respawn_timer).to eq 0
+  end
+
+  specify "#position_x" do
+    expect(player.position_x).to eq -4874.2314453125
+  end
+
+  specify "#position_y" do
+    expect(player.position_y).to eq -4778.44677734375
+  end
+
+  specify "#net_worth" do
+    expect(player.net_worth).to eq 11531
   end
-end
+end

data/spec/dota/api/live_match/side_spec.rb

@@ -1,25 +1,59 @@
 describe Dota::API::LiveMatch::Side do
-  let(:side) do
+  let(:live_match) do
     VCR.use_cassette("GetLiveLeagueGames") do
-      matches = test_client.live_matches
-      first_match = matches.first
-      first_match.dire
+      test_client.live_matches.first
     end
   end
+  let(:radiant) { live_match.radiant }
+  let(:dire) { live_match.dire }
 
   specify "#id" do
-    expect(side.id).to eq 1846074
+    expect(radiant.id).to eq 1677303
+    expect(dire.id).to eq 1846074
   end
 
   specify "#name" do
-    expect(side.name).to eq "Haunti Gaming"
+    expect(radiant.name).to eq "ReallyCoolGuys"
+    expect(dire.name).to eq "Haunti Gaming"
   end
 
   specify "#logo_id" do
-    expect(side.logo_id).to eq 547513665869798854
+    expect(radiant.logo_id).to eq 29595255080842763
+    expect(dire.logo_id).to eq 547513665869798854
   end
 
   specify "#complete?" do
-    expect(side.complete?).to eq false
+    expect(radiant.complete?).to eq false
+    expect(dire.complete?).to eq false
+  end
+
+  specify "#score" do
+    expect(radiant.score).to eq 42
+    expect(dire.score).to eq 54
+  end
+
+  specify "#series_wins" do
+    expect(radiant.series_wins).to eq 0
+    expect(dire.series_wins).to eq 0
+  end
+
+  specify "#tower_status" do
+    expect(radiant.tower_status).to eq 1540
+    expect(dire.tower_status).to eq 1958
+  end
+
+  specify "#barracks_status" do
+    expect(radiant.barracks_status).to eq 3
+    expect(dire.barracks_status).to eq 63
+  end
+
+  specify "#players" do
+    players = radiant.players
+    expect(players.count).to eq 5
+    expect(players.first).to be_a Dota::API::LiveMatch::Player
+
+    players = dire.players
+    expect(players.count).to eq 5
+    expect(players.first).to be_a Dota::API::LiveMatch::Player
   end
 end

data/spec/dota/api/live_match_spec.rb

@@ -1,8 +1,7 @@
 describe Dota::API::LiveMatch do
   let(:live_match) do
     VCR.use_cassette("GetLiveLeagueGames") do
-      matches = test_client.live_matches
-      matches.first
+      test_client.live_matches.first
     end
   end
 
@@ -26,14 +25,6 @@ describe Dota::API::LiveMatch do
     expect(live_match.stream_delay).to eq 120
   end
 
-  specify "#radiant_wins" do
-    expect(live_match.radiant_wins).to eq 0
-  end
-
-  specify "#dire_wins" do
-    expect(live_match.dire_wins).to eq 0
-  end
-
   specify "#radiant" do
     expect(live_match.radiant).to be_a Dota::API::LiveMatch::Side
   end
@@ -50,13 +41,11 @@ describe Dota::API::LiveMatch do
     expect(live_match.league_tier).to eq "Amateur"
   end
 
-  specify "#players" do
-    players = live_match.players
-    expect(players.count).to eq 11
-    expect(players.first).to be_a Dota::API::LiveMatch::Player
+  specify "#duration" do
+    expect(live_match.duration).to eq 2840.2998046875
   end
 
-  specify "#scoreboard" do
-    expect(live_match.scoreboard).to be_a Dota::API::LiveMatch::Scoreboard
+  specify "#roshan_timer" do
+    expect(live_match.roshan_timer).to eq 278
   end
 end

data/spec/dota/api/match/draft_spec.rb

@@ -1,7 +1,10 @@
 describe Dota::API::Match::Draft do
   let(:draft) do
     VCR.use_cassette("GetMatchDetails") do
-      test_client.matches(sample_match_id).drafts.last
+      test_client
+        .matches(sample_match_id)
+        .drafts
+        .last
     end
   end