bnet_scraper 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog!
 
+## 0.3.0 (Sep 22 2012)
+
+* Adds portrait name scraping to ProfileScraper
+
 ## 0.2.1 (Aug 04 2012)
 
 * Adds race condition for profile scraping accounts playing in their first season

data/bnet_scraper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "bnet_scraper"
-  s.version     = "0.2.1"
+  s.version     = "0.3.0"
   s.authors     = ["Andrew Nordman"]
   s.email       = ["anordman@majorleaguegaming.com"]
   s.homepage    = "https://github.com/agoragames/bnet_scraper/"

data/lib/bnet_scraper/starcraft2.rb

@@ -27,6 +27,58 @@ module BnetScraper
       'tw.battle.net' => 'fea'
     }
 
+    # The armory uses spritemaps that are sequentially named and have a fixed
+    # 6x6 grid. We'll simply use the portrait names, left to right, top to
+    # bottom.
+    #
+    # Note: I couldn't identify the exact names of some of these and instead of
+    # guessing, I didn't name them. Some appear in multiple files too, which 
+    # is odd.
+    #
+    # I decided th pad the arrays even if there are no images to make various
+    # helping functionality (e.g. retrieving position for a name) easier.
+    # I've also kept them in 6x6 here for better overview.
+    PORTRAITS = [
+      # http://eu.battle.net/sc2/static/local-common/images/sc2/portraits/0-75.jpg?v42
+      ['Kachinsky', 'Cade', 'Thatcher', 'Hall', 'Tiger Marine', 'Panda Marine', 
+      'General Warfield', 'Jim Raynor', 'Arcturus Mengsk', 'Sarah Kerrigan', 'Kate Lockwell', 'Rory Swann', 
+      'Egon Stetmann', 'Hill', 'Adjutant', 'Dr. Ariel Hanson', 'Gabriel Tosh', 'Matt Horner', 
+      # Could not identify in order: Raynor in a Suit? Bullmarine? Nova? 
+      # Fiery Marine?
+      'Tychus Findlay', 'Zeratul', 'Valerian Mengsk', 'Spectre', '?', '?',
+      '?', '?', 'SCV', 'Firebat', 'Vulture', 'Hellion', 
+      'Medic', 'Spartan Company', 'Wraith', 'Diamondback', 'Probe', 'Scout'],
+
+      # http://eu.battle.net/sc2/static/local-common/images/sc2/portraits/1-75.jpg?v42
+      # Special Rewards - couldn't identify most of these.
+      ['?', '?', '?', '?', '?', 'PanTerran Marine', 
+      '?', '?', '?', '?', '', '',
+      '', '', '', '', '', '',
+      '', '', '', '', '', '',
+      '', '', '', '', '', '',
+      '', '', '', '', '', ''],
+
+      # http://eu.battle.net/sc2/static/local-common/images/sc2/portraits/2-75.jpg?v42
+      ['Ghost', 'Thor', 'Battlecruiser', 'Nova', 'Zealot', 'Stalker', 
+      'Phoenix', 'Immortal', 'Void Ray', 'Colossus', 'Carrier', 'Tassadar',
+      'Reaper', 'Sentry', 'Overseer', 'Viking', 'High Templar', 'Mutalisk',
+      # Unidentified: Bird? Dog? Robot?
+      'Banshee', 'Hybrid Destroyer', 'Dark Voice', '?', '?', '?',
+      # Unidentified: Worgen? Goblin? Chef?
+      'Orian', 'Wolf Marine', 'Murloc Marine', '?', '?', 'Zealot Chef', 
+      # Unidentified: KISS Marine? Dragon Marine? Dragon? Another Raynor?
+      'Stank', 'Ornatus', '?', '?', '?', '?'],
+
+      # http://eu.battle.net/sc2/static/local-common/images/sc2/portraits/3-75.jpg?v42
+      ['Urun', 'Nyon', 'Executor', 'Mohandar', 'Selendis', 'Artanis', 
+      'Drone', 'Infested Colonist', 'Infested Marine', 'Corruptor', 'Aberration', 'Broodlord', 
+      'Overmind', 'Leviathan', 'Overlord', 'Hydralisk Marine', "Zer'atai Dark Templar", 'Goliath', 
+      # Unidentified: Satan Marine?
+      'Lenassa Dark Templar', 'Mira Han', 'Archon', 'Hybrid Reaver', 'Predator', '?',
+      'Zergling', 'Roach', 'Baneling', 'Hydralisk', 'Queen', 'Infestor', 
+      'Ultralisk', 'Queen of Blades', 'Marine', 'Marauder', 'Medivac', 'Siege Tank']
+    ]
+
     # This is a convenience method that chains calls to ProfileScraper,
     # followed by a scrape of each league returned in the `leagues` array
     # in the profile_data.  The end result is a fully scraped profile with

data/lib/bnet_scraper/starcraft2/profile_scraper.rb

@@ -30,7 +30,7 @@ module BnetScraper
     class ProfileScraper < BaseScraper
       attr_reader :achievement_points, :career_games, :race, :leagues, :most_played,
         :games_this_season, :highest_solo_league, :current_solo_league, :highest_team_league,
-        :current_team_league
+        :current_team_league, :portrait
 
       def initialize options = {}
         super
@@ -50,6 +50,16 @@ module BnetScraper
         if response.success?
           html = Nokogiri::HTML(response.body)
 
+          # Portraits use spritemaps, so we extract positions and map to 
+          # PORTRAITS.
+          @portrait = begin
+            portrait = html.css("#profile-header #portrait span").attr('style').to_s.scan(/url\('(.*?)'\) ([\-\d]+)px ([\-\d]+)px/).flatten
+            portrait_map, portrait_size = portrait[0].scan(/(\d)\-(\d+)\.jpg/)[0]
+            portrait_position = (((0-portrait[2].to_i) / portrait_size.to_i) * 6) + ((0-portrait[1].to_i) / portrait_size.to_i + 1)
+            PORTRAITS[portrait_map.to_i][portrait_position-1]
+          rescue 
+            nil
+          end
 
           @race = html.css(".stat-block:nth-child(4) h2").inner_html()
           @achievement_points = html.css("#profile-header h3").inner_html()
@@ -118,7 +128,8 @@ module BnetScraper
           games_this_season: @games_this_season,
           most_played: @most_played,
           achievement_points: @achievement_points,
-          leagues: @leagues
+          leagues: @leagues,
+          portrait: @portrait
         }  
       end
     end

data/spec/starcraft2/profile_scraper_spec.rb

@@ -96,6 +96,7 @@ describe BnetScraper::Starcraft2::ProfileScraper do
         current_team_league: 'Not Yet Ranked',
         most_played: '4v4',
         achievement_points: '3660',
+        portrait: 'Mohandar',
         leagues: [
           {
             name: "1v1 Platinum Rank 95", 
@@ -173,7 +174,8 @@ describe BnetScraper::Starcraft2::ProfileScraper do
         highest_team_league: nil,
         current_team_league: nil,
         achievement_points: nil, 
-        leagues: [] 
+        leagues: [],
+        portrait: nil
       }
 
       subject.scrape

data/spec/starcraft2_spec.rb

@@ -15,7 +15,8 @@ describe BnetScraper::Starcraft2 do
         :highest_solo_league => 'Platinum',
         :current_team_league => 'Not Yet Ranked',
         :highest_team_league => 'Diamond',
-        :achievement_points=>"3660", 
+        :achievement_points => '3660',
+        :portrait => 'Mohandar',
         :leagues=>[
           {:season=>"6", :size=>"4v4", :name=>"Aleksander Pepper", :division=>"Diamond", :random=>false, :bnet_id=>"2377239", :account=>"Demon"},
           {:season=>"6", :size=>"4v4", :name=>"Aleksander Pepper", :division=>"Diamond", :random=>false, :bnet_id=>"2377239", :account=>"Demon"},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bnet_scraper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70323869785380 !ruby/object:Gem::Requirement
+  requirement: &70190591320380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323869785380
+  version_requirements: *70190591320380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70323869784840 !ruby/object:Gem::Requirement
+  requirement: &70190591319800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323869784840
+  version_requirements: *70190591319800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70323869784280 !ruby/object:Gem::Requirement
+  requirement: &70190591319280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323869784280
+  version_requirements: *70190591319280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70323869783500 !ruby/object:Gem::Requirement
+  requirement: &70190591318580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323869783500
+  version_requirements: *70190591318580
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70323869782080 !ruby/object:Gem::Requirement
+  requirement: &70190591317300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323869782080
+  version_requirements: *70190591317300
 description: BnetScraper is a Nokogiri-based scraper of Battle.net profile information.
   Currently this only includes Starcraft2.
 email:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047051916263475144
+      hash: -114027561748751341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047051916263475144
+      hash: -114027561748751341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17