battlenet_info 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 27e137e29486a3824c7c4f1653b7ab3fe9ef2388
+  data.tar.gz: cb40755126edfebafbd9d6fe594023ad10c364eb
+SHA512:
+  metadata.gz: 0cab450782e73e00d334d9585c7caaddefc317537172f6af38bc6912070335011b3fd10c86d45ab9235404cbfd9e5ff553ebaec73bef3dadc5b2ac40acca46eb
+  data.tar.gz: a626d94de1a67b5c75bddbefd530f6c7fac8f9deb37a0abe94d5a203c86a3c96e0cb4cabff119c1ee51f54272aeafa65728d5fc6515bffcb9dfdf185e2371a2f

data/lib/battlenet_info.rb

@@ -1,10 +1,13 @@
 require 'net/http'
+require "nokogiri"
 require 'exceptions.rb'
 
 class BattleNetInfo
 
   EXCEPTION_MESSAGE = 'Profile not found or Battle.Net temporary unavailable'
 
+  attr_reader :profile_url, :ladder_url
+
   def initialize(url)
     @profile_url = url
     splitter = '/' unless @profile_url[-1, 1] == '/'
@@ -19,40 +22,36 @@ class BattleNetInfo
     @ladder_content ||= download_ladder_content
   end
 
-  # <b>DEPRECATED:</b> Now calls from each method if needed
-  def download_data
-    warn "[DEPRECATION] `download_data` is deprecated. Now calls from each method if needed."
-  end
-
   def valid_url?
     (@profile_url =~ /http:\/\/\w+\.battle.net\/sc2\/\w+\/profile\/\d+\/\d\/\w+/i) != nil
   end
 
   def server
     match_data = /http:\/\/(?<server>\w+)/i.match @profile_url
-    
+
     match_data[:server]
   end
 
   def player_name
     match_data = /profile\/\d+\/\d\/(?<name>\w+)/i.match @profile_url
-    
+
     match_data[:name]
   end
 
   def achievement_points
-    download_profile_content if self.profile_content.empty?
     match_data = /<h3>(?<achievement_points>\d+)<\/h3>/i.match self.profile_content
-    
+
     match_data[:achievement_points].to_i
   end
 
   def race
+    raise RaceTemporaryUnvailable
     match_data = /class=\Wrace-(?<race>\w+)\W/i.match self.profile_content
-    
+
     match_data[:race]
   end
 
+  # TODO: calculate loses again
   def stats
     match_data = /<div\s+class=\Wtooltip-title\W>#{self.player_name}<\/div>[\n\t\s]+<strong>[\w\s]+\W<\/strong>\s*\d+<br\s*\/>[\t\n\s]+<strong>[\w\s]+\W\s*<\/strong>\s*\w+\s*<\/div>[\t\n\s]+<\/td>[\t\n\s]+<td\sclass=\Walign-center\W>(?<points>\d+)<\/td>[\t\n\s]+<td\sclass=\Walign-center\W>(?<wins>\d+)<\/td>/mi.match self.ladder_content
 
@@ -68,8 +67,9 @@ class BattleNetInfo
   end
 
   def league
-    expr = /badge-(?<league>\w+)\sbadge-medium-(?<top>\d+)\W>\s+<\/span>\s+<\/a>\s+<div\sid=\Wbest-team-1/im
-    match_data = expr.match self.profile_content
+    html_doc = Nokogiri::HTML(profile_content)
+    badge_data = html_doc.at_css("#season-snapshot").children.css(".badge-item").first.at_css("span.badge")[:class]
+    match_data = /badge-(?<league>\w+)\sbadge-medium-(?<top>\d+)/.match badge_data
 
     "#{match_data[:league]}_#{match_data[:top]}"
   end
@@ -77,7 +77,7 @@ class BattleNetInfo
   def portrait_html_style(new_path)
     match_data = /<span\s+class=\Wicon-frame\s+\W[\s\t\n]+(?<picture_style>\w+\=[\w\s\W]+portraits[\w\s\W]+90px;)\W>[\t\n\s]+<\/span>/im.match self.profile_content
 
-    match_data[:picture_style].sub('/sc2/static/local-common/images/sc2/portraits/', new_path)
+    match_data[:picture_style].sub('http://media.blizzard.com/sc2/portraits/', new_path)
   end
 
   def to_hash
@@ -93,22 +93,22 @@ class BattleNetInfo
       :rank => self.rank,
       :league => self.league
     }
-
-    player_data
   end
 
   private
 
   def download_profile_content
-    response = Net::HTTP.get_response(URI.parse(@profile_url)) if self.valid_url?
-    raise ProfileNotFound.new(EXCEPTION_MESSAGE) unless response.is_a? Net::HTTPOK
-    @profile_content = response.body
+    @profile_content = get_content(@profile_url)
   end
 
   def download_ladder_content
-    response = Net::HTTP.get_response(URI.parse(@ladder_url)) if self.valid_url?
+    @ladder_content = get_content(@ladder_url)
+  end
+
+  def get_content(url)
+    response = Net::HTTP.get_response(URI.parse(url)) if self.valid_url?
     raise ProfileNotFound.new(EXCEPTION_MESSAGE) unless response.is_a? Net::HTTPOK
-    @ladder_content = response.body
+    response.body
   end
 
 end

data/lib/exceptions.rb

@@ -1,2 +1,2 @@
-class ProfileNotFound < Exception
-end
+class ProfileNotFound < StandardError; end
+class RaceTemporaryUnvailable < StandardError; end

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: battlenet_info
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Vitaly Tatarintsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
-dependencies: []
+date: 2013-03-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.6
 description: A simple Battle.Net info parser gem
 email: Kalastiuz@gmail.com
 executables: []
@@ -21,26 +34,25 @@ files:
 - lib/exceptions.rb
 homepage: https://github.com/ck3g/battlenet_info
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Battle.Net info
 test_files: []