dota 0.0.12 → 0.0.14

data/lib/dota/api/league.rb

@@ -1,13 +1,11 @@
 module Dota
   module API
-    class League
-      include Utilities::Inspectable
-
-      attr_reader :raw
-
-      def initialize(raw)
-        @raw = raw
-      end
+    class League < Entity
+      TIERS = {
+        1 => "Amateur",
+        2 => "Professional",
+        3 => "Premier"
+      }
 
       def id
         raw["leagueid"]

data/lib/dota/api/live_match.rb

@@ -1,72 +1,66 @@
 module Dota
   module API
-    class LiveMatch
-      LEAGUE_TIERS = {
-        1 => "Amateur",
-        2 => "Professional",
-        3 => "Premier"
-      }
-
-      include Utilities::Inspectable
+    class LiveMatch < BasicMatch
+      def duration
+        raw["scoreboard"]["duration"]
+      end
 
-      attr_reader :raw
+      def league_id
+        raw["league_id"]
+      end
 
-      def initialize(raw)
-        @raw = raw
+      def league_tier
+        League::TIERS[raw["league_tier"]]
       end
 
       def lobby_id
         raw["lobby_id"]
       end
 
-      def id
-        raw["match_id"]
-      end
-
       def spectators_count
         raw["spectators"]
       end
 
-      def league_id
-        raw["league_id"]
-      end
-
       def stream_delay
         raw["stream_delay_s"]
       end
 
-      def radiant_wins
-        raw["radiant_series_wins"]
+      def series_type
+        raw["series_type"]
       end
 
-      def dire_wins
-        raw["dire_series_wins"]
+      def roshan_timer
+        raw["scoreboard"]["roshan_respawn_timer"]
       end
 
       def radiant
-        Side.new(raw["radiant_team"])
+        @radiant ||= Side.new(raw_side(:radiant))
       end
 
       def dire
-        Side.new(raw["dire_team"])
+        @dire ||= Side.new(raw_side(:dire))
       end
 
-      def series_type
-        raw["series_type"]
-      end
+      private
 
-      def league_tier
-        LEAGUE_TIERS[raw["league_tier"]]
+      def raw_side(type)
+        raw_side = raw["#{type}_team"]
+          .merge(raw["scoreboard"]["#{type}"])
+          .merge("series_wins" => raw["#{type}_series_wins"])
+        merge_player_names(raw_side)
       end
 
-      def players
-        raw["players"].map do |raw_player|
-          Player.new(raw_player)
+      def merge_player_names(raw_side)
+        raw_side["players"].map! do |player|
+          id = player["account_id"]
+          player.merge("name" => player_name_from_id(id))
         end
+        raw_side
       end
 
-      def scoreboard
-        Scoreboard.new(raw["scoreboard"])
+      def player_name_from_id(id)
+        player = raw["players"].detect { |p| id == p["account_id"] }
+        player["name"]
       end
     end
   end

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

@@ -1,38 +1,45 @@
 module Dota
   module API
     class LiveMatch
-      class Player
-        include Utilities::Inspectable
+      class Player < BasicPlayer
+        def slot
+          raw["player_slot"]
+        end
 
-        attr_reader :raw
+        def name
+          raw["name"]
+        end
 
-        def initialize(raw)
-          @raw = raw
+        def deaths
+          raw["death"]
         end
 
-        def id
-          raw["account_id"]
+        def ultimate_state
+          raw["ultimate_state"]
         end
 
-        def name
-          raw["name"]
+        def ultimate_cooldown
+          raw["ultimate_cooldown"]
+        end
+
+        def position_x
+          raw["position_x"]
+        end
+
+        def position_y
+          raw["position_y"]
+        end
+
+        def net_worth
+          raw["net_worth"]
         end
 
-        def hero
-          Hero.new(raw["hero_id"])
+        def respawn_timer
+          raw["respawn_timer"]
         end
 
-        def team
-          case raw["team"]
-          when 0
-            :radiant
-          when 1
-            :dire
-          when 2
-            :broadcaster
-          when 4
-            :unassigned
-          end
+        def items
+          (0..5).map { |i| Item.new(raw["item#{i}"]) }
         end
       end
     end

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

@@ -1,23 +1,15 @@
 module Dota
   module API
     class LiveMatch
-      class Side
-        include Utilities::Inspectable
-
-        attr_reader :raw
-
-        def initialize(raw)
-          @raw = raw
+      class Side < Entity
+        def id
+          raw["team_id"]
         end
 
         def name
           raw["team_name"]
         end
 
-        def id
-          raw["team_id"]
-        end
-
         def logo_id
           raw["team_logo"]
         end
@@ -25,6 +17,28 @@ module Dota
         def complete?
           raw["complete"]
         end
+
+        def tower_status
+          raw["tower_state"]
+        end
+
+        def barracks_status
+          raw["barracks_state"]
+        end
+
+        def series_wins
+          raw["series_wins"]
+        end
+
+        def players
+          raw["players"].map do |raw_player|
+            Player.new(raw_player)
+          end
+        end
+
+        def score
+          raw["score"]
+        end
       end
     end
   end

data/lib/dota/api/match.rb

@@ -1,57 +1,12 @@
 module Dota
   module API
-    class Match
-      include Utilities::Inspectable
-
-      TYPES = {
-        -1 => "Invalid",
-        0 => "Public Matchmaking",
-        1 => "Practice",
-        2 => "Tournament",
-        3 => "Tutorial",
-        4 => "Co-op with Bots",
-        5 => "Team Match",
-        6 => "Solo Queue",
-        7 => "Ranked"
-      }.freeze
-
-      MODES = {
-        0 => "None",
-        1 => "All Pick",
-        2 => "Captain's Mode",
-        3 => "Random Draft",
-        4 => "Single Draft",
-        5 => "All Random",
-        6 => "Intro",
-        7 => "Diretide",
-        8 => "Reverse Captain's Mode",
-        9 => "The Greeviling",
-        10 => "Tutorial",
-        11 => "Mid Only",
-        12 => "Least Played",
-        13 => "New Player Pool",
-        14 => "Compendium Matchmaking",
-        15 => "Custom",
-        16 => "Captain's Draft",
-        17 => "Balanced Draft",
-        18 => "Ability Draft"
-      }.freeze
-
-      SKILL_LEVELS = {
-        0 => "Any",
-        1 => "Normal",
-        2 => "High",
-        3 => "Very High"
-      }.freeze
-
-      attr_reader :raw
-
-      def initialize(raw)
-        @raw = raw
-      end
-
-      def id
-        raw["match_id"]
+    class Match < BasicMatch
+      def duration
+        raw["duration"]
+      end
+
+      def league_id
+        raw["leagueid"]
       end
 
       def mode
@@ -70,18 +25,6 @@ module Dota
         raw["lobby_type"]
       end
 
-      def drafts
-        raw["picks_bans"].map do |raw_draft|
-          Draft.new(raw_draft)
-        end
-      end
-
-      def players
-        raw["players"].map do |raw_player|
-          Player.new(raw_player)
-        end
-      end
-
       def sequence
         raw["match_seq_num"]
       end
@@ -90,10 +33,6 @@ module Dota
         Time.at(raw["start_time"])
       end
 
-      def duration
-        raw["duration"]
-      end
-
       def first_blood
         raw["first_blood_time"]
       end
@@ -114,10 +53,6 @@ module Dota
         raw["season"]
       end
 
-      def league_id
-        raw["leagueid"]
-      end
-
       def players_count
         raw["human_players"]
       end
@@ -126,60 +61,38 @@ module Dota
         raw["cluster"]
       end
 
-      def radiant_tower_status
-        raw["tower_status_radiant"]
-      end
-
-      def dire_tower_status
-        raw["tower_status_dire"]
-      end
-
-      def radiant_barracks_status
-        raw["barracks_status_radiant"]
-      end
-
-      def dire_barracks_status
-        raw["barracks_status_dire"]
-      end
-
-      def radiant_id
-        raw["radiant_team_id"]
-      end
-
-      def radiant_name
-        raw["radiant_name"]
-      end
-
-      def radiant_logo_id
-        raw["radiant_logo"]
-      end
-
-      def radiant_complete?
-        raw["radiant_team_complete"] == 1
-      end
-
-      def radiant_captain_id
-        raw["radiant_captain"]
+      def drafts
+        @drafts ||= raw["picks_bans"].map do |raw_draft|
+          Draft.new(raw_draft)
+        end
       end
 
-      def dire_id
-        raw["dire_team_id"]
+      def radiant
+        @radiant ||= Side.new(raw_side(:radiant))
       end
 
-      def dire_name
-        raw["dire_name"]
+      def dire
+        @dire ||= Side.new(raw_side(:dire))
       end
 
-      def dire_logo_id
-        raw["dire_logo"]
-      end
+      private
 
-      def dire_complete?
-        raw["dire_team_complete"] == 1
+      def raw_side(type)
+        pattern = /^#{type}_|_#{type}$/
+        raw_side = raw.select { |k, v| k.to_s.match(pattern) }
+        raw_side = Hash[raw_side.map { |k, v| [k.sub(pattern, ""), v] }]
+        raw_side.merge("players" => players_for_side(type))
       end
 
-      def dire_captain_id
-        raw["dire_captain"]
+      def players_for_side(type)
+        raw["players"].select do |player|
+          case type
+          when :radiant
+            player["player_slot"] < Player::SLOT_GAP
+          when :dire
+            player["player_slot"] >= Player::SLOT_GAP
+          end
+        end
       end
     end
   end

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

@@ -1,15 +1,7 @@
 module Dota
   module API
     class Match
-      class Draft
-        include Utilities::Inspectable
-
-        attr_reader :raw
-
-        def initialize(raw)
-          @raw = raw
-        end
-
+      class Draft < Entity
         def order
           raw["order"] + 1
         end