smite_ruby 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25feb61882b2f684c7b2c3a719151693dd57f673
-  data.tar.gz: 935a446bc3a1d8688d254de67faf4c8a43c1d9a8
+  metadata.gz: ccff694141365296222915e4cc61decb5162e706
+  data.tar.gz: 38f300318daa9cc1c80cd8e70fce3df846cf148e
 SHA512:
-  metadata.gz: ccccf5f6c6bc2c47de9ad36bfba1a811a794d958fe4a92c1762d79b65ca91f406d4919b9cfd54443ab9e31398d0b614235a5d7e877002db765f08a9610139c96
-  data.tar.gz: d82637008babe01c8a05129083c20dcb69a10918bd0b2ce5faf42431e8eb75e3b45c74337834f372d917b03847f65b18a3d86e48e71732e55c808721919539d5
+  metadata.gz: a73210acf092f72f83cfa9edf71bf007d383d282c487777e3d6801822a0819c70f2e1d73fbfc17c2e1247162c2ab21f611070391790647bad47e877819422e06
+  data.tar.gz: 658baadac807264383473292c98f37725baceee364111b4e06810a355249727f103074fd3c90407311a048563933591e86a15be677e374bf4631e552e829502f

data/lib/smite.rb

@@ -4,21 +4,23 @@ require 'active_support'
 module Smite
 end
 
-require_relative './smite/object.rb'
-require_relative './smite/queue.rb'
-require_relative './smite/motd.rb'
-require_relative './smite/recommended_items.rb'
-require_relative './smite/achievements.rb'
-require_relative './smite/ability.rb'
-require_relative './smite/god_rank.rb'
-require_relative './smite/god_stats.rb'
-require_relative './smite/god.rb'
-require_relative './smite/item_effect.rb'
-require_relative './smite/item.rb'
-require_relative './smite/friend.rb'
-require_relative './smite/data_transform.rb'
-require_relative './smite/match.rb'
-require_relative './smite/recent_match.rb'
-require_relative './smite/player.rb'
-require_relative './smite/game.rb'
-require_relative './smite/client.rb'
+require 'smite/object.rb'
+require 'smite/queue.rb'
+require 'smite/motd.rb'
+require 'smite/recommended_items.rb'
+require 'smite/achievements.rb'
+require 'smite/ability.rb'
+require 'smite/god_rank.rb'
+require 'smite/god_stats.rb'
+require 'smite/god.rb'
+require 'smite/item_effect.rb'
+require 'smite/item.rb'
+require 'smite/friend.rb'
+require 'smite/data_transform.rb'
+require 'smite/match_achievements.rb'
+require 'smite/competitor.rb'
+require 'smite/full_match.rb'
+require 'smite/match_summary.rb'
+require 'smite/player.rb'
+require 'smite/game.rb'
+require 'smite/client.rb'

data/lib/smite/client.rb

@@ -1,6 +1,6 @@
 module Smite
   class Client
-    attr_reader :dev_id, :auth_key, :session_id, :lang
+    attr_reader :dev_id, :auth_key, :session_id, :lang, :created
     include HTTParty
     base_uri 'http://api.smitegame.com/smiteapi.svc/'
 
@@ -8,6 +8,7 @@ module Smite
       @dev_id     = dev_id
       @auth_key   = auth_key
       @lang       = [1,2,3,7,9,10,11,12,13].include?(lang) ? lang : 1
+      @created    = Time.now - 20 * 60
       create_session
     end
 
@@ -106,17 +107,20 @@ module Smite
     def create_session
       return @session_id if valid_session?
 
-      response    = api_call('createsession', [], false)
-      @session_id = response['session_id']
+      response      = api_call('createsession', [], false)
+      @session_id   = response['session_id']
+      @created      = Time.now
     end
 
     def valid_session?
-      !!(test_session =~ /successful/i)
+      (created + (15 * 60)) > Time.now
     end
 
     private
 
     def api_call(method, params = [], session = true)
+      create_session if !valid_session? && session
+
       request = request_str(method, params, session)
       self.class.get(request)
     end

data/lib/smite/competitor.rb

@@ -0,0 +1,31 @@
+module Smite
+  class Competitor < Smite::Object
+    def initialize(data)
+      data['Queue'] = data['name']
+      super
+      @data = DataTransform.transform_items(@data)
+      @data = DataTransform.transform_match_achievements(@data)
+      @data = DataTransform.transform_match_summary(@data)
+    end
+
+    def to_player
+      Smite::Game.player(player_id)
+    end
+
+    def partied?
+      party_id != 0
+    end
+    
+    def winner?
+      win_status == 'Winner'
+    end
+
+    def loser?
+      !winner?
+    end
+
+    def inspect
+      "#<Smite::Competitor '#{match}' '#{player_name}'>"
+    end
+  end
+end

data/lib/smite/data_transform.rb

@@ -24,7 +24,8 @@ module Smite
 
         data['abilities'] = ability_fields.values.map do |ability_data|
           data_attrs = ability_data.slice('Id', 'Summary', 'URL')
-          desc       = ability_data['Description']['itemDescription']
+          desc       = ability_data['Description']
+          desc       = desc.nil? ? {} : desc['itemDescription']
 
           Ability.new(data_attrs.merge(desc))
         end
@@ -32,13 +33,13 @@ module Smite
         data.except(*ability_filter_fields)
       end
 
-      def transform_recent_match(data)
+      def transform_match_summary(data)
         return data unless data['queue']
 
         if data['queue'] =~ /League/
           data
         else
-          data.except(*recent_match_filter_fields)
+          data.except(*match_summary_filter_fields)
         end
       end
 
@@ -67,8 +68,40 @@ module Smite
         data
       end
 
+      def transform_match_achievements(data)
+        ach_fields = data.slice(*match_achievement_map_fields)
+        return data if ach_fields.empty?
+
+        data['match_achievements'] = MatchAchievements.new(ach_fields)
+        data.except(*match_achievement_filter_fields)
+      end
+
       private
 
+      def match_achievement_map_fields
+        %w[
+          kills_bot
+          kills_double
+          kills_fire_giant
+          kills_first_blood
+          kills_gold_fury
+          kills_penta
+          kills_phoenix
+          kills_player
+          kills_quadra
+          kills_siege_juggernaut
+          kills_single
+          kills_triple
+          kills_wild_juggernaut
+          player_name
+          match
+        ]
+      end
+
+      def match_achievement_filter_fields
+        match_achievement_map_fields - %w(player_name match)
+      end
+
       def item_map_fields
         %w(
           active_id1 active_id2 item_id1 item_id2
@@ -80,6 +113,9 @@ module Smite
         item_map_fields + %w(
           item_1 item_2 item_3 item_4 item_5
           item_6 active_1 active_2 active_3
+          item_active_1 item_active_2 item_active_3
+          item_purch_1 item_purch_2 item_purch_3
+          item_purch_4 item_purch_5 item_purch_6
         )
       end
 
@@ -98,7 +134,7 @@ module Smite
         )
       end
 
-      def recent_match_filter_fields
+      def match_summary_filter_fields
         %w(
           ban1 ban2 ban3 ban4 ban5 ban6
           ban1_id ban2_id ban3_id

data/lib/smite/full_match.rb

@@ -0,0 +1,57 @@
+module Smite
+  class FullMatch < Smite::Object
+    attr_accessor :queue, :match
+
+    def initialize(data)
+      data = { 'competitors' => data.map { |k, v| Smite::Competitor.new(k) } }
+      super
+      @queue = competitors[0].queue
+      @match = competitors[0].match
+    end
+
+    def teams
+      { team1: team1, team2: team2 }
+    end
+
+    def parties
+      competitors.group_by(&:party_id)
+    end
+
+    def players
+      competitors
+    end
+
+    def size
+      competitors.count
+    end
+
+    def ranked?
+      queue =~ /Ranked/
+    end
+
+    def size_str
+      "#{size/2} v #{size/2}"
+    end
+
+    def team1
+      competitors[0...size/2]
+    end
+
+    def team2
+      competitors[size/2..-1]
+    end
+
+    def winning_team
+      return @winner unless @winner.nil?
+
+      @winner = teams.find do |team, competitors|
+        competitors.all? { |competitor| competitor.winner? }
+      end
+      @winner = @winner[0]
+    end
+
+    def inspect
+      "#<Smite::FullMatch #{match} #{queue}>"
+    end
+  end
+end

data/lib/smite/game.rb

@@ -22,12 +22,13 @@ module Smite
       end
 
       def match(match_id)
-        @matches           ||= {}
-        @matches[match_id] ||= Match.new(client.match_details(match_id))
+        match_data = client.match_details(match_id)
+        match_data.empty? ? nil : FullMatch.new(match_data)
       end
 
-      def player(player_name)
-        Player.new(player_name)
+      def player(player_name_or_id)
+        player_data = client.player(player_name_or_id)
+        player_data.empty? ? nil : Player.new(player_data[0])
       end
 
       def motd_now

data/lib/smite/god_rank.rb

@@ -5,16 +5,11 @@ module Smite
     end
 
     def level
-      case rank
-      when 0      then  'none'
-      when (1..4) then  'gold'
-      when (5..9) then  'legendary'
-      when 10     then  'diamond'
-      end
+      self.class.level(rank)
     end
 
     def mastery
-      mastered ? 'mastered' : 'unmastered'
+      mastered? ? 'mastered' : 'unmastered'
     end
 
     def mastered?
@@ -24,5 +19,14 @@ module Smite
     def inspect
       "#<Smite::GodRank '#{god.name}' Lvl. #{rank} (#{level})>"
     end
+
+    def self.level(rank)
+      case rank
+      when 0      then  'none'
+      when (1..4) then  'gold'
+      when (5..9) then  'legendary'
+      when 10     then  'diamond'
+      end
+    end
   end
 end

data/lib/smite/god_stats.rb

@@ -6,7 +6,7 @@ module Smite
       super(data)
       @name   = god_name
       @items  = params[:items] || []
-      @level  = (params[:level].to_i - 1) % 20
+      @level  = [[(params[:level].to_i - 1), 19].min, 0].max
     end
 
     def at_level(new_level)
@@ -18,14 +18,15 @@ module Smite
     end
 
     def movement_speed
-      from_items = item_bonus[:movement_speed]
+      from_items = bonus_from_items[:movement_speed]
       base       = data['movement_speed']
+      scaling    = movement_speed_per_level * level
 
-      from_items + base
+      from_items + base + scaling
     end
 
     def health
-      from_items  = item_bonus[:health]
+      from_items  = bonus_from_items[:health]
       base        = data['health']
       scaling     = health_per_level * level
 
@@ -33,7 +34,7 @@ module Smite
     end
 
     def mana
-      from_items  = item_bonus[:mana]
+      from_items  = bonus_from_items[:mana]
       base        = data['mana']
       scaling     = mana_per_level * level
 
@@ -41,7 +42,7 @@ module Smite
     end
 
     def mp5
-      from_items  = item_bonus[:mp5]
+      from_items  = bonus_from_items[:mp5]
       base        = data['mp5']
       scaling     = (mp5_per_level * level.to_f).to_i
       
@@ -49,7 +50,7 @@ module Smite
     end
 
     def hp5
-      from_items  = item_bonus[:hp5]
+      from_items  = bonus_from_items[:hp5]
       base        = data['hp5']
       scaling     = (hp5_per_level * level.to_f).to_i
       
@@ -57,38 +58,46 @@ module Smite
     end
 
     def attack_speed
-      from_items  = item_bonus[:attack_speed]
+      from_items  = bonus_from_items[:attack_speed]
       base        = data['attack_speed']
       scaling     = (attack_speed_per_level * level.to_f).to_i
       
       from_items + base + scaling
     end
 
-    def magic_power
-      from_items  = item_bonus[:magic_power]
-      base        = data['magic_power']
-      scaling     = magic_power_per_level * level
+    def magical_power
+      from_items  = bonus_from_items[:magical_power]
+      base        = data['magical_power']
+      scaling     = magical_power_per_level * level
       
       from_items + base + scaling
     end
 
     def magic_protection
-      from_items  = item_bonus[:magic_protection]
+      from_items  = bonus_from_items[:magic_protection]
       base        = data['magic_protection']
       scaling     = (magic_protection_per_level * level.to_f).to_i
       
       from_items + base + scaling
     end
 
+    def physical_power
+      from_items  = bonus_from_items[:physical_power]
+      base        = data['physical_power']
+      scaling     = physical_power_per_level * level
+      
+      from_items + base + scaling
+    end
+
     def physical_protection
-      from_items  = item_bonus[:physical_protection]
+      from_items  = bonus_from_items[:physical_protection]
       base        = data['physical_protection']
       scaling     = (physical_protection_per_level * level.to_f).to_i
       
       from_items + base + scaling
     end
 
-    def item_bonus
+    def bonus_from_items
       return @item_bonus unless @item_bonus.nil?
 
       @item_bonus = default_bonus
@@ -115,5 +124,9 @@ module Smite
     def default_bonus
       @default_bonus ||= attributes.each_with_object({}) { |attr, hash| hash[attr.to_sym] = 0 }
     end
+
+    def movement_speed_per_level
+      0
+    end
   end
 end

data/lib/smite/item_effect.rb

@@ -1,6 +1,6 @@
 module Smite
   class ItemEffect < Smite::Object
-    attr_reader :device_name, :percentage
+    attr_reader :device_name
 
     def initialize(item, data)
       @device_name = item
@@ -8,7 +8,7 @@ module Smite
     end
 
     def percentage?
-      !@percentage.nil?
+      !percentage.nil?
     end
 
     def inspect