bnet_scraper 0.1.3 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog!
 
+## 0.2.0 (Aug 03 2012)
+
+* Adds domain remapping to regions
+* Fixes bug with EU profile scraping due to language selection
+* Parses new player stats (Career Wins, Most Played Type, Games This Season)
+* Parses new league stats (Current/Highest Solo/Team Leagues)
+
 ## 0.1.3 (Jul 26 2012)
 
 * Adds checks to prevent parse issues with accounts that don't ladder

data/README.md

@@ -41,6 +41,13 @@ scraper.scrape
   race: 'Protoss',
   wins: '684',
   achievement_points: '3630',
+  current_solo_league: 'Not Yet Ranked',
+  highest_solo_league: 'Platinum',
+  current_team_league: 'Not Yet Ranked',
+  highest_team_league: 'Diamond',
+  career_games: '1568',
+  games_this_season: '0',
+  most_played: '4v4',
   leagues: [
     {
       name: "1v1 Platinum Rank 95",

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.1.3"
+  s.version     = "0.2.0"
   s.authors     = ["Andrew Nordman"]
   s.email       = ["anordman@majorleaguegaming.com"]
   s.homepage    = "https://github.com/agoragames/bnet_scraper/"

data/lib/bnet_scraper/starcraft2.rb

@@ -12,10 +12,19 @@ module BnetScraper
   module Starcraft2
     REGIONS = {
       'na'  => { domain: 'us.battle.net', dir: 'en', label: 'North America' },
-      'eu'  => { domain: 'eu.battle.net', dir: 'eu', label: 'Europe' },
+      'eu'  => { domain: 'eu.battle.net', dir: 'en', label: 'Europe' },
       'cn'  => { domain: 'www.battlenet.com.cn', dir: 'zh', label: 'China' },
       'sea' => { domain: 'sea.battle.net', dir: 'en', label: 'South-East Asia' },
-      'fea' => { domain: 'tw.battle.net', dir: 'zh', label: 'Korea' } 
+      'fea' => { domain: 'tw.battle.net', dir: 'zh', label: 'Korea' }
+    }
+
+    REGION_DOMAINS = {
+      'us.battle.net' => 'na',
+      'eu.battle.net' => 'eu',
+      'www.battlenet.com.cn' => 'cn',
+      'sea.battle.net' => 'sea',
+      'kr.battle.net' => 'fea',
+      'tw.battle.net' => 'fea'
     }
 
     # This is a convenience method that chains calls to ProfileScraper,

data/lib/bnet_scraper/starcraft2/base_scraper.rb

@@ -20,7 +20,7 @@ module BnetScraper
       def initialize options = {}
         if options[:url]
           extracted_data = options[:url].match(/http:\/\/(.+)\/sc2\/(.+)\/profile\/(.+)\/(\d{1})\/(.[^\/]+)\//)
-          @region = REGIONS.select { |k,v| v[:domain] == extracted_data[1] && v[:dir] == extracted_data[2] }.first.first
+          @region     = REGION_DOMAINS[extracted_data[1]]
           @bnet_id    = extracted_data[3]
           @bnet_index = extracted_data[4]
           @account    = extracted_data[5]
@@ -58,7 +58,7 @@ module BnetScraper
       # converts region short-code to region-based URL information
       #   'na' => { domain: 'us.battle.net', :dir: 'en' }
       def region_info
-        REGIONS[region] 
+        REGIONS[region]
       end
 
       def valid?

data/lib/bnet_scraper/starcraft2/profile_scraper.rb

@@ -12,6 +12,13 @@ module BnetScraper
     #     race: 'Protoss',
     #     wins: '684',
     #     achievement_points: '3630',
+    #     current_solo_league: 'Not Yet Ranked',
+    #     highest_solo_league: 'Platinum',
+    #     current_team_league: 'Not Yet Ranked',
+    #     highest_team_league: 'Diamond',
+    #     career_games: '1568',
+    #     games_this_season: '0',
+    #     most_played: '4v4',
     #     leagues: [
     #       {
     #         name: "1v1 Platinum Rank 95",
@@ -21,7 +28,15 @@ module BnetScraper
     #     ]
     #   }
     class ProfileScraper < BaseScraper
-      attr_reader :achievement_points, :wins, :race, :leagues
+      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
+
+      def initialize options = {}
+        super
+        @leagues = []
+      end
+
       def scrape
         get_profile_data
         get_league_list
@@ -35,12 +50,29 @@ module BnetScraper
         if response.success?
           html = Nokogiri::HTML(response.body)
 
-          if race_div = html.css("#season-snapshot .module-footer a").first()
-            @race = race_div.inner_html()
-          end
 
-          @wins = html.css("#career-stats h2").inner_html()
+          @race = html.css(".stat-block:nth-child(4) h2").inner_html()
           @achievement_points = html.css("#profile-header h3").inner_html()
+          @career_games = html.css(".stat-block:nth-child(3) h2").inner_html()
+          @most_played = html.css(".stat-block:nth-child(2) h2").inner_html()
+          @games_this_season = html.css(".stat-block:nth-child(1) h2").inner_html()
+
+          if html.css("#best-finish-SOLO div")[0]
+            @highest_solo_league = html.css("#best-finish-SOLO div")[0].children[2].inner_text.strip
+            @current_solo_league = html.css("#best-finish-SOLO div")[0].children[8].inner_text.strip
+          else
+            @highest_solo_league = "Not Yet Ranked"
+            @current_solo_league = "Not Yet Ranked"
+          end
+
+          if html.css("#best-finish-TEAM div")[0] 
+            @highest_team_league = html.css("#best-finish-TEAM div")[0].children[2].inner_text.strip
+            @current_team_league = html.css("#best-finish-TEAM div")[0].children[8].inner_text.strip
+          else
+            @highest_team_league = "Not Yet Ranked"
+            @current_team_league = "Not Yet Ranked"
+          end
+
         else
           raise BnetScraper::InvalidProfileError
         end
@@ -70,7 +102,13 @@ module BnetScraper
           account: @account,
           bnet_index: @bnet_index,
           race: @race,
-          wins: @wins,
+          current_solo_league: @current_solo_league,
+          highest_solo_league: @highest_solo_league,
+          current_team_league: @current_team_league,
+          highest_team_league: @highest_team_league,
+          career_games: @career_games,
+          games_this_season: @games_this_season,
+          most_played: @most_played,
           achievement_points: @achievement_points,
           leagues: @leagues
         }  

data/lib/bnet_scraper/starcraft2/status_scraper.rb

@@ -30,9 +30,11 @@ module BnetScraper
         private
         def status? region
           @status ||= fetch
-          @status.select do |r|
-            r[:region] == REGIONS.select { |k,v| k == region.to_s }.first.last[:label]
-          end.first[:status]
+          region_status = @status.find do |r|
+            r[:region] == REGIONS[region.to_s][:label]
+          end
+
+          region_status[:status]
         end
       end
     end

data/spec/starcraft2/profile_scraper_spec.rb

@@ -9,25 +9,27 @@ describe BnetScraper::Starcraft2::ProfileScraper do
   subject { BnetScraper::Starcraft2::ProfileScraper.new(bnet_id: '2377239', account: 'Demon') }
 
   describe '#get_profile_data' do
-    it 'should set the race, wins, and achievements attributes' do
-      subject.instance_variable_get(:@race).should be_nil
-      subject.instance_variable_get(:@achievement_points).should be_nil
-      subject.instance_variable_get(:@wins).should be_nil
-
+    before do
       subject.get_profile_data
-      
-      subject.instance_variable_get(:@race).should == 'Protoss'
-      subject.instance_variable_get(:@achievement_points).should == '3630'
-      subject.instance_variable_get(:@wins).should == '684'
     end
+
+    its(:race) { should == 'Protoss' }
+    its(:achievement_points) { should == '3660' }
+    its(:current_solo_league) { should == 'Not Yet Ranked' }
+    its(:highest_solo_league) { should == 'Platinum' }
+    its(:current_team_league) { should == 'Not Yet Ranked' }
+    its(:highest_team_league) { should == 'Diamond' }
+    its(:career_games) { should == '1568' }
+    its(:games_this_season) { should == '0' }
+    its(:most_played) { should == '4v4' }
   end
 
   describe 'get_league_list' do
     it 'should set an array of leagues' do
-      subject.instance_variable_get(:@leagues).should be_nil
+      subject.should have(0).leagues
       subject.get_league_list
 
-      subject.instance_variable_get(:@leagues).should have(12).leagues
+      subject.should have(12).leagues
     end
   end
 
@@ -59,10 +61,6 @@ describe BnetScraper::Starcraft2::ProfileScraper do
       before do
         scraper.scrape
       end
-
-      it 'should set nil race' do
-        scraper.race.should be_nil
-      end
       
       it 'should have an empty array of leagues' do
         scraper.leagues.should == []
@@ -77,73 +75,94 @@ describe BnetScraper::Starcraft2::ProfileScraper do
         account: 'Demon',
         bnet_index: 1,
         race: 'Protoss',
-        wins: '684',
-        achievement_points: '3630',
+        career_games: '1568',
+        games_this_season: '0',
+        highest_solo_league: 'Platinum',
+        current_solo_league: 'Not Yet Ranked',
+        highest_team_league: 'Diamond',
+        current_team_league: 'Not Yet Ranked',
+        most_played: '4v4',
+        achievement_points: '3660',
         leagues: [
           {
-            name: "1v1 Platinum Rank 95",
-            id:   "96905",
+            name: "1v1 Platinum Rank 95", 
+            id: "96905",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/96905#current-rank"
-          },
+          }, 
           {
-            name: "2v2 Random Platinum ...",
-            id:   "96716",
+            name: "2v2 Random Platinum ...", 
+            id: "96716",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/96716#current-rank"
           },
           {
             name: "2v2 Diamond Rank 45",
-            id:   "98162",
+            id: "98162",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/98162#current-rank"
-          },
+          }, 
           {
             name: "2v2 Silver Rank 8",
-            id:   "97369",
+            id: "97369", 
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/97369#current-rank"
           },
           {
             name: "3v3 Random Gold Rank...",
-            id:   "96828",
+            id: "96828",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/96828#current-rank"
-          },
+          }, 
           {
             name: "3v3 Diamond Rank 56",
-            id:   "97985",
+            id: "97985",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/97985#current-rank"
-          },
+          }, 
           {
             name: "3v3 Silver Rank 5",
-            id:   "98523",
+            id: "98523", 
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/98523#current-rank"
           },
           {
-            name: "3v3 Platinum Rank 88",
-            id:   "96863",
+            name: "3v3 Platinum Rank 88", 
+            id: "96863",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/96863#current-rank"
           },
           {
-            name: "3v3 Gold Rank 75",
-            id:   "97250",
+            name: "3v3 Gold Rank 75", 
+            id: "97250", 
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/97250#current-rank"
           },
           {
             name: "4v4 Random Platinum ...",
-            id:   "96830",
+            id: "96830",
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/96830#current-rank"
           },
           {
             name: "4v4 Gold Rank 38",
-            id:   "98336",
+            id: "98336", 
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/98336#current-rank"
           },
           {
             name: "4v4 Diamond Rank 54",
-            id:   "98936",
+            id: "98936", 
             href: "http://us.battle.net/sc2/en/profile/2377239/1/Demon/ladder/98936#current-rank"
-          }
+          } 
         ]
       }
 
-      subject.output.should == { bnet_id: '2377239', account: 'Demon', bnet_index: 1, race: nil, wins: nil, achievement_points: nil, leagues: nil }
+      subject.output.should == { 
+        bnet_id: '2377239', 
+        account: 'Demon',
+        bnet_index: 1,
+        race: nil,
+        career_games: nil,
+        games_this_season: nil,
+        most_played: nil,
+        highest_solo_league: nil, 
+        current_solo_league: nil, 
+        highest_team_league: nil,
+        current_team_league: nil,
+        achievement_points: nil, 
+        leagues: [] 
+      }
+
       subject.scrape
       subject.output.should == expected
     end

data/spec/starcraft2_spec.rb

@@ -8,8 +8,14 @@ describe BnetScraper::Starcraft2 do
         :account=>"Demon", 
         :bnet_index=>1, 
         :race=>"Protoss", 
-        :wins=>"684", 
-        :achievement_points=>"3630", 
+        :career_games => '1568',
+        :games_this_season => '0',
+        :most_played => '4v4',
+        :current_solo_league => 'Not Yet Ranked',
+        :highest_solo_league => 'Platinum',
+        :current_team_league => 'Not Yet Ranked',
+        :highest_team_league => 'Diamond',
+        :achievement_points=>"3660", 
         :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"},

data/spec/support/no_ladder.html

@@ -125,6 +125,7 @@ _gaq.push(['_trackPageLoadTime']);
 <a href="/sc2/en/" rel="np">
 StarCraft II
 </a>
+<span class="breadcrumb-arrow"></span>
 </li>
 <li class="last">
 <a href="/sc2/en/profile/3354437/1/ClarkeKent/" rel="np">
@@ -230,54 +231,96 @@ ClarkeKent
         <div id="profile-right">
 
         <div class="profile-module">
+
 			<div class="module-top">
 				<div class="module-bot">
 					<div class="module-left" id="season-snapshot">
 						<div class="module-title">
-							<h3 class="title-globe">
-								Season 8 <span>-</span>
-								Snapshot
-							</h3>
+							<h3 class="title-globe">Player Stats</h3>
 						</div>
 
+							<div class="module-body snapshot-terran">
+
+								<div class="stat-block">
+									<h3>Games Played This Season</h3>
+									<h2>0</h2>
+								</div>
+
+								<div class="stat-block">
+									<h3>Most Played Mode</h3>
+									<h2>1v1</h2>
+								</div>
+
+								<div class="stat-block">
+									<h3>Total Career Games</h3>
+									<h2>2</h2>
+								</div>
+
+								<div class="stat-block">
+									<h3>Most Played Race</h3>
+									<h2 class="race">Terran</h2>
+								</div>
 
-							<div class="module-body snapshot-empty">
-								<h3>No games have been played.</h3>
 							</div>
 					</div>
 
 					<div class="module-right" id="career-stats">
-						<div class="module-title">
-							<h3 class="title-graph">Career Stats</h3>
-						</div>
+						<div class="module-title"></div>
 
+						 <div class="module-body">
+	
 
 
-						<div class="module-body campaign-unearned">
-							<h4>League Wins</h4>
-							<h2>0</h2>
 
-							<br />
-							<h4>Games Won</h4>
-
-							<ul>
-								<li>
-									<span>0</span>
-									Custom Games
-								</li>
-								<li>
-									<span>0</span>
-									FFA
-								</li>
-								<li>
-									<span>0</span>
-									Co-Op vs AI
-								</li>
-							</ul>
+	<div class="badge-item" data-tooltip="#best-finish-SOLO">
+
+		<div class="badge">
+
+	<span class="badge badge-none badge-medium-1">
+	</span>
+		</div>
+		<div class="mode">1V1</div>
+		<div class="league-name">
+				No Career Finishes
+		</div>
+
+		<div id="best-finish-SOLO"  style="display: none">
+				Not Yet Ranked
+		</div>
+	</div>
+
+	
+
+
+
+	<div class="badge-item" data-tooltip="#best-finish-TEAM">
+
+		<div class="badge">
+
+	<span class="badge badge-none badge-medium-1">
+	</span>
+		</div>
+		<div class="mode">TEAM</div>
+		<div class="league-name">
+				No Career Finishes
+		</div>
+
+		<div id="best-finish-TEAM"  style="display: none">
+				Not Yet Ranked
+		</div>
+	</div>
 
 							<br />
 
-							<h4>Campaign Not Complete</h4>
+
+
+	<div class="badge-item campaign">
+		<div class="badge unearned"></div>
+		<div class="mode">Wings of Liberty</div>
+		<div class="rank">Campaign Not Complete</div>
+	</div>
+
+	<span class="clear"><!-- --></span>
 						</div>
 					</div>
 
@@ -880,10 +923,18 @@ Login.embeddedUrl = 'https://us.battle.net/login/login.frag';
 </script>
 <script type="text/javascript" src="/sc2/static/local-common/js/menu.js?v42"></script>
 <script type="text/javascript" src="/sc2/static/js/sc2.js?v21"></script>
+<!--[if IE 6]> <script type="text/javascript" src="/sc2/static/local-common/js/third-party/DD_belatedPNG.js?v42"></script>
+<script type="text/javascript">
+//<![CDATA[
+DD_belatedPNG.fix('.icon');
+//]]>
+</script>
+<![endif]-->
 <script type="text/javascript">
 //<![CDATA[
 $(function(){
 Menu.initialize('/data/menu.json?v42');
+Search.initialize('/sc2/en/search/ta');
 Tooltip.options.useTable = true;
 });
 //]]>
@@ -913,3 +964,4 @@ s.parentNode.insertBefore(ga, s.nextSibling);
 </script>
 </body>
 </html>
+