bnet 0.0.3 → 0.0.4

data/lib/bnet.rb

@@ -22,8 +22,12 @@ require 'bnet/diablo3/career'
 require 'bnet/diablo3/item'
 require 'bnet/diablo3/hero'
 require 'bnet/diablo3/skill'
-# require 'bnet/community'
+require 'bnet/diablo3/follower'
+# require 'bnet/community' #TODO remove?
 require 'bnet/starcraft2'
+# require 'bnet/starcraft2/ladder'
+require 'bnet/starcraft2/match'
+require 'bnet/starcraft2/career'
 require 'bnet/starcraft2/profile'
 require 'bnet/wow'
 require 'bnet/wow/data'

data/lib/bnet/diablo3/career.rb

@@ -2,18 +2,18 @@ class Bnet::Diablo3::Career < Bnet::BnetResource
 
   attr_accessor :heroes, :last_hero_played, :last_updated, :kills, :time_played,
     :fallen_heroes, :paragon_level, :paragon_level_hardcore, :battle_tag,
-    :progression, :region
+    :progression, :region, :raw_attributes
 
   PARAMS_MAPPING =  {
-      "lastHeroPlayed" => :last_hero_played,
-      "lastUpdated" => :last_updated,
-      "kills" => :kills,
-      "timePlayed" => :time_played,
-      "fallenHeroes" => :fallen_heroes,
-      "paragonLevel" => :paragon_level,
-      "paragonLevelHardcore" => :paragon_level_hardcore,
-      "battleTag" => :battle_tag,
-      "progression" => :progression
+    "lastHeroPlayed" => :last_hero_played,
+    "lastUpdated" => :last_updated,
+    "kills" => :kills,
+    "timePlayed" => :time_played,
+    "fallenHeroes" => :fallen_heroes,
+    "paragonLevel" => :paragon_level,
+    "paragonLevelHardcore" => :paragon_level_hardcore,
+    "battleTag" => :battle_tag,
+    "progression" => :progression
   }
 
   def battle_tag
@@ -50,42 +50,46 @@ class Bnet::Diablo3::Career < Bnet::BnetResource
     base_api = Bnet::Diablo3.new(region: region)
     call_url = base_api.url + "profile/#{battle_tag}/?apikey=#{api_key}&locale=#{locale}"
 
-    # NOTE common tasks below - marker for easier method extraction
-    response = JSON.parse( URI.parse(call_url).read )
+    begin
+      data = open(call_url)
+      raw_response = JSON.parse(data.read)
 
-    data = open(call_url)
-    raw_response = JSON.parse(data.read)
+      if Bnet::API.valid_call?(data.status, raw_response)
+        career = from_api(raw_response)
+        career.raw_attributes = raw_response
+        career.region = region
 
-    if Bnet::API.valid_call?(data.status, raw_response)
-      career = from_api(raw_response)
-    else
+        assign_heroes_from_raw_heroes(career, raw_response["heroes"]) if raw_response["heroes"]
+      else
+        career = nil
+      end
+
+    rescue OpenURI::HTTPError => e
       career = nil
     end
-    # NOTE end of common tasks
 
-    if career
-      career.battle_tag = battle_tag
-      career.region = region
+    return career
+  end
 
-      # Association tasks (TODO: convert to hook)
-      if raw_response["heroes"]
-        heroes = response["heroes"].collect do |raw_hero_attrs|
-          hero = Bnet::Diablo3::Hero.from_api(raw_hero_attrs)
-          hero.career = career
-          hero.battle_tag = career.battle_tag
-          hero.region = career.region
-          hero.reload
-          hero
-        end
+  def self.from_api(response)
+    career = super(response)
+    career.raw_attributes = response
+    return career
+  end
 
-        career.heroes = heroes
-      end
-      # End of association tasks
+  private
 
+  def self.assign_heroes_from_raw_heroes(career, raw_heroes)
+    career.heroes = raw_heroes.collect do |raw_hero_attrs|
+      hero = Bnet::Diablo3::Hero.from_api(raw_hero_attrs)
+      hero.career = career
+      hero.battle_tag = career.battle_tag
+      hero.region = career.region
+      hero.reload
+      hero
     end
 
     return career
   end
 
-
 end

data/lib/bnet/diablo3/follower.rb

@@ -0,0 +1,42 @@
+class Bnet::Diablo3::Follower < Bnet::BnetResource
+  attr_accessor :follower_type, :level, :raw_attributes,
+    :magic_find, :gold_find, :experience_bonus,
+
+    #associations
+    :items, :skills
+
+  def self.from_api(follower_type, raw_response)
+    follower = new(follower_type: follower_type)
+    follower.raw_attributes = raw_response
+    follower.level = raw_response["level"]
+
+    assign_items_from_raw_items(follower, raw_response["items"]) if raw_response["items"]
+    assign_skills_from_raw_skills(follower, raw_response["skills"]) if raw_response["skills"]
+
+    follower.magic_find = raw_response["stats"]["magicFind"]
+    follower.gold_find = raw_response["stats"]["goldFind"]
+    follower.experience_bonus =  raw_response["stats"]["experienceBonus"]
+
+    return follower
+  end
+
+  private
+
+  def self.assign_items_from_raw_items(follower, raw_items)
+    follower.items = raw_items.collect do |location, item_props|
+      Bnet::Diablo3::Item.from_api(location, item_props)
+    end
+
+    return follower
+  end
+
+  def self.assign_skills_from_raw_skills(follower, raw_skills)
+    follower.skills = raw_skills.collect do |raw_skill|
+      Bnet::Diablo3::Skill.from_api(raw_skill) unless raw_skill.empty?
+    end
+
+    follower.skills = follower.skills.compact
+
+    return follower
+  end
+end

data/lib/bnet/diablo3/hero.rb

@@ -3,7 +3,7 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
   attr_accessor :paragon_level, :seasonal, :name, :hero_id,
     :level, :hardcore, :gender, :dead, :hero_class, :last_update,
     :active_skills, :passive_skills, :region, :battle_tag, :career,
-    :items,
+    :items, :followers, :raw_attributes,
 
     # stats
     :life, :damage, :attack_speed, :armor, :strength, :dexterity, :vitality,
@@ -24,7 +24,7 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
     "gender" => :gender,
     "dead" => :dead,
     "class" => :hero_class,
-    "last-updated" => :last_updated,
+    "last-updated" => :last_updated
   }
 
 
@@ -111,10 +111,13 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
   def self.from_api(response)
     hero = super(response)
 
+    hero.raw_attributes = response
+
     if hero
       assign_skills_from_raw_skills(hero, response["skills"]) if response["skills"]
       assign_stats_from_raw_stats(hero, response["stats"]) if response["stats"]
       assign_items_from_raw_items(hero, response["items"]) if response["items"]
+      assign_followers_from_raw_followers(hero, response["followers"]) if response["followers"]
     end
 
     return hero
@@ -122,37 +125,29 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
 
   private
 
+  def self.assign_followers_from_raw_followers(hero, raw_followers)
+    hero.followers = raw_followers.collect do |follower_type, follower_props|
+      Bnet::Diablo3::Follower.from_api(follower_type, follower_props)
+    end
+
+    return hero
+  end
+
   def self.assign_items_from_raw_items(hero, raw_items)
     hero.items = raw_items.collect do |location, item_props|
-      item = Bnet::Diablo3::Item.new
-      item.location = location
-      item.item_id = item_props["id"]
-      item.name = item_props["name"]
-      item
+      Bnet::Diablo3::Item.from_api(location, item_props)
     end
 
     return hero
   end
 
   def self.assign_skills_from_raw_skills(hero, raw_skills)
-    hero.active_skills = raw_skills["active"].collect do |active|
-      skill = Bnet::Diablo3::Skill.new
-      if active["skill"]
-        skill.name = active["skill"]["name"]
-      end
-      if active["rune"]
-        skill.rune = active["rune"]["name"]
-      end
-
-      skill
+    hero.active_skills = raw_skills["active"].collect do |active_skill|
+      Bnet::Diablo3::Skill.from_api(active_skill) unless active_skill.empty?
     end
 
-    hero.passive_skills = raw_skills["passive"].collect do |passive|
-      skill =  Bnet::Diablo3::Skill.new
-      if passive["skill"]
-        skill.name = passive["skill"]["name"]
-      end
-      skill
+    hero.passive_skills = raw_skills["passive"].collect do |passive_skill|
+      Bnet::Diablo3::Skill.from_api(passive_skill) unless passive_skill.empty?
     end
 
     return hero

data/lib/bnet/diablo3/item.rb

@@ -1,3 +1,11 @@
-class Bnet::Diablo3::Item
+class Bnet::Diablo3::Item < Bnet::BnetResource
   attr_accessor :item_id, :location, :name
+
+  def self.from_api(location, raw_response)
+    item = new(location: location)
+    item.item_id = raw_response["id"]
+    item.name = raw_response["name"]
+
+    return item
+  end
 end

data/lib/bnet/diablo3/skill.rb

@@ -11,9 +11,13 @@ class Bnet::Diablo3::Skill < Bnet::BnetResource
   #
   # Returns:
   #
-  # #<Bnet::Diablo3::Skill:0x007fd111396360 @name: "", @rune=>
+  # #<Bnet::Diablo3::Skill:0x007fd111396360 @name: "", @rune: "">
   def self.from_api(response)
-    new(name: response['skill']['name'], rune: response['rune']['name'])
+    skill = new
+    skill.name = response['skill']['name']
+    skill.rune = response['rune']['name'] if response["rune"]
+
+    return skill
   end
 
 end

data/lib/bnet/starcraft2/career.rb

@@ -0,0 +1,21 @@
+class Bnet::Starcraft2::Career < Bnet::BnetResource
+  attr_accessor :primary_race, :terran_wins, :protoss_wins, :zerg_wins,
+    :highest_1v1_rank, :highest_team_rank, :season_total_games,
+    :career_total_games
+
+  PARAMS_MAPPING = {
+    'primaryRace'       => :primary_race,
+    'terranWins'        => :terran_wins,
+    'protosswins'       => :protoss_wins,
+    'zergWins'          => :zerg_wins,
+    'highest1v1Rank'    => :highest_1v1_rank,
+    'highestTeamRank'   => :highest_team_rank,
+    "seasonTotalGames"  => :season_total_games,
+    "careerTotalGames"  => :career_total_games
+  }
+
+  def self.from_api(raw_response)
+    career = super(raw_response)
+    return career
+  end
+end

data/lib/bnet/starcraft2/match.rb

@@ -0,0 +1,48 @@
+class Bnet::Starcraft2::Match < Bnet::BnetResource
+  attr_accessor :map, :match_type, :decision, :speed, :date, :raw_attributes
+
+  PARAMS_MAPPING = {
+    "map" => :map,
+    "type" => :match_type,
+    "decision" => :decision,
+    "speed" => :speed,
+    "date" => :date
+  }
+
+  def self.all(profile, args = {})
+    profile_id = profile.profile_id
+    name = profile.name
+    realm = profile.realm || '1'
+    locale = args[:locale] || 'en_US'
+    api_key  = args[:api_key] || Bnet.configuration.api_key
+
+    client = Bnet::Starcraft2.new(region: profile.region)
+    call_url = client.url + "profile/#{profile_id}/#{realm}/#{name}/matches?apikey=#{api_key}&locale=#{locale}"
+
+    begin
+      data = open(call_url)
+      raw_collection_response = JSON.parse(data.read)
+
+      if Bnet::API.valid_call?(data.status, raw_collection_response)
+        matches = raw_collection_response["matches"].collect do |raw_response|
+          match = from_api(raw_response)
+          match
+        end
+      else
+        matches = []
+      end
+
+    rescue OpenURI::HTTPError => e
+      matches = []
+    end
+
+    return matches
+
+  end
+
+  def self.from_api(raw_response)
+    match = super(raw_response)
+    match.raw_attributes = raw_response
+    match
+  end
+end

data/lib/bnet/starcraft2/profile.rb

@@ -1,17 +1,17 @@
 # TODO: Associations for career, current_season
 class Bnet::Starcraft2::Profile < Bnet::BnetResource
 
-  attr_accessor :profile_id, :realm, :display_name, :clan_name, :clan_tag,
+  attr_accessor :profile_id, :realm, :name, :clan_name, :clan_tag,
     :achievement_points, :swarm_level, :terran_level, :zerg_level,
-    :protoss_level, :acievement_points
+    :protoss_level, :acievement_points, :career, :region,
+    :raw_attributes
 
   PARAMS_MAPPING = {
       "id" => :profile_id,
       "realm" =>  :realm,
-      "displayName" => :display_name,
+      "displayName" => :name,
       "clanName" => :clan_name,
-      "clanTag" => :clan_tag,
-      "career" => :career
+      "clanTag" => :clan_tag
     }
 
   def initialize args
@@ -25,13 +25,14 @@ class Bnet::Starcraft2::Profile < Bnet::BnetResource
   #
   # Hash Params:
   #   Required
-  #     :realm      - (required but defaults to '1')
-  #     :profile_id - ID (Honestly i do not know why Blizzard still needs this if
-  #                   localized Battletag is unique enough)
-  #     :name       - Just the name string in the Battle tag.
+  #     :realm         - (required but defaults to '1')
+  #     :profile_id    - ID (Honestly i do not know why Blizzard still needs this if
+  #                      localized Battletag is unique enough)
+  #     :name  - Just the name string in the Battle tag.
+  #
   #   Optional
-  #     :locale     - (defaults to 'en_US')
-  #     :api_key    - the api key
+  #     :locale        - (defaults to 'en_US')
+  #     :api_key       - the api key
   #
   # Example: If US account 'Playerone#1309' the profile can be accessible via
   # web from 'http://us.battle.net/sc2/en/profile/2143215/1/PlayerOne/'
@@ -40,16 +41,16 @@ class Bnet::Starcraft2::Profile < Bnet::BnetResource
   #
   # Returns a Profile object with the following attributes
   #
-  #      :profile_id, :realm, :display_name, :clan_name, :clan_tag,
+  #      :profile_id, :realm, :name, :clan_name, :clan_tag,
   #      :achievement_points, :swarm_level, :terran_level, :zerg_level,
   #      :protoss_level, :acievement_points
   def self.find args
-    region     = args.delete(:region)
-    profile_id = args.delete(:profile_id)
-    name       = args.delete(:name)
-    realm      = args.delete(:realm) || '1'
-    locale     = args.delete(:locale) || 'en_US'
-    api_key        = args.delete(:api_key) || Bnet.configuration.api_key
+    region     = args[:region]
+    profile_id = args[:profile_id]
+    name       = args[:name]
+    realm      = args[:realm] || '1'
+    locale     = args[:locale] || 'en_US'
+    api_key        = args[:api_key] || Bnet.configuration.api_key
 
     base_api = Bnet::Starcraft2.new(region: region)
     call_url = base_api.url + "profile/#{profile_id}/#{realm}/#{name}/?locale=#{locale}&apikey=#{api_key}"
@@ -60,6 +61,8 @@ class Bnet::Starcraft2::Profile < Bnet::BnetResource
 
       if Bnet::API.valid_call?(data.status, raw_response)
         bnet_object = from_api(raw_response)
+        bnet_object.raw_attributes = raw_response
+        bnet_object.region = region
       else
         bnet_object = nil
       end
@@ -76,6 +79,14 @@ class Bnet::Starcraft2::Profile < Bnet::BnetResource
     @career ||= []
   end
 
+  def matches
+    @matches ||= Bnet::Starcraft2::Match.all(self)
+  end
+
+  def ladders
+    # @ladders ||=
+  end
+
   def self.from_api(response)
     bnet_resource = super(response)
     if bnet_resource && response["achievements"]
@@ -89,6 +100,16 @@ class Bnet::Starcraft2::Profile < Bnet::BnetResource
       bnet_resource.zerg_level    = response["swarmLevels"]["zerg"]["level"]
     end
 
+    assign_career_from_raw_career(bnet_resource, response["career"]) if response["career"]
+
     bnet_resource
   end
+
+  private
+
+  def self.assign_career_from_raw_career(profile, raw_career)
+    profile.career = Bnet::Starcraft2::Career.from_api(raw_career)
+    return profile
+  end
+
 end