elekk 0.0.3 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.1.0
+-- Get Achievements
+-- 
+
 v0.0.1
 -- Connect to Armory for basic character information
 -- Connect to Wowhead for searches

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/elekk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elekk}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaac Wasileski"]
-  s.date = %q{2010-06-04}
+  s.date = %q{2010-06-05}
   s.description = %q{A simple library for World of Warcraft data in Ruby.}
   s.email = %q{agnoster@gmail.com}
   s.files = [
@@ -19,12 +19,14 @@ Gem::Specification.new do |s|
      "VERSION",
      "elekk.gemspec",
      "lib/elekk.rb",
+     "lib/elekk/achievement.rb",
      "lib/elekk/armory.rb",
      "lib/elekk/character.rb",
      "lib/elekk/data.rb",
      "lib/elekk/http.rb",
      "lib/elekk/wowhead.rb",
      "readme.md",
+     "spec/achievement_spec.rb",
      "spec/armory_spec.rb",
      "spec/character_spec.rb",
      "spec/klass_spec.rb",
@@ -36,7 +38,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple library for World of Warcraft data in Ruby.}
   s.test_files = [
-    "spec/armory_spec.rb",
+    "spec/achievement_spec.rb",
+     "spec/armory_spec.rb",
      "spec/character_spec.rb",
      "spec/klass_spec.rb",
      "spec/wowhead_spec.rb"

data/lib/elekk.rb

@@ -16,3 +16,4 @@ require File.dirname(__FILE__) + '/elekk/http'
 require File.dirname(__FILE__) + '/elekk/armory'
 require File.dirname(__FILE__) + '/elekk/wowhead'
 require File.dirname(__FILE__) + '/elekk/character'
+require File.dirname(__FILE__) + '/elekk/achievement'

data/lib/elekk/achievement.rb

@@ -0,0 +1,39 @@
+module Elekk
+  class Achievement
+    attr_accessor :id, :title, :points, :icon, :description, :category, :completed
+    
+    def initialize(id, opts={})
+      @id = id
+      @title = opts[:title]
+      @points = opts[:points]
+      @icon = opts[:icon]
+      @description = opts[:description]
+      @category = opts[:category]
+      @completed = opts[:completed]
+    end
+    
+    def self.from_xml(node)
+      a = self.new(node['id'].to_i, {
+        :title => node['title'].to_s,
+        :points => node['points'].to_i,
+        :icon => node['icon'].to_s,
+        :description => node['description'].to_s,
+        :category => Achievements[node['categoryId'].to_i]
+      })
+      a.completed = Time.parse(node['dateCompleted'].to_s) if node['dateCompleted']
+      a
+    end
+    
+    def complete?
+      return !!completed
+    end
+    
+    def wowhead
+      Wowhead::Result.new(@id, @title, Wowhead::Kind['Achievement'], @icon)
+    end
+  end
+  
+  class Achievements < Enum
+    add_item 'Raid', 168
+  end
+end

data/lib/elekk/armory.rb

@@ -26,11 +26,14 @@ module Elekk
     end
 
     def get_xml(resource, params=nil)
-      response = HTTP.request(url(resource+'.xml'), params, {
+      response = HTTP.xml(url(resource+'.xml'), params, {
         :cache_timeout => 24*3600,
         :user_agent => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.9) Gecko/20100315 Firefox/3.5.9'
       })
-      Nokogiri::XML(response.body)
+    end
+    
+    def self.icon_url(icon)
+      "http://us.wowarmory.com/wow-icons/_images/51x51/#{icon}.jpg"
     end
     
     def url(path)

data/lib/elekk/character.rb

@@ -20,8 +20,16 @@ module Elekk
       @sheet ||= xml :sheet
     end
     
-    def xml(resource)
-      self.armory.get_xml "character-#{resource}", :r => @realm, :cn => @name
+    def achievements(category)
+      @achievements ||= {}
+      @achievements[category.to_sym] ||=
+        xml(:achievements, :c => category.to_i).css('achievement').map {|x| Achievement.from_xml x}
+      
+    end
+    
+    def xml(resource, opts={})
+      opts = {:r => @realm, :cn => @name}.merge opts
+      self.armory.get_xml "character-#{resource}", opts
     end
     
     def klass

data/lib/elekk/http.rb

@@ -29,13 +29,36 @@ module Elekk
     # default verb is GET
     def self.request(url, params=nil, opts={})
       self.init
-      opts = {:method => :get, :params => params, :timeout => 1000}.merge opts
+      opts = {:method => :get, :params => params, :timeout => 10000}.merge opts
       
       request = Typhoeus::Request.new(url, opts)
-
+      
       @hydra.queue request
       @hydra.run
-      request.response
+      request
+    end
+    
+    def self.xml(url, params=nil, opts={})
+      request = self.request(url, params, opts)
+      xml = Nokogiri::XML(request.response.body)
+      if xml.errors.length > 0
+        $stderr.write "XML Parse errors:\n"
+        p xml.errors
+        @cache.delete request.cache_key
+      end
+      xml
+    end
+    
+    def self.json(url, params=nil, opts={})
+      request = self.request(url, params, opts)
+      begin
+        json = JSON request.response.body
+        raise if json.nil?
+      rescue
+        $stderr.write "JSON Parse errors:\n"
+        @cache.delete request.cache_key
+      end
+      json
     end
     
   end

data/lib/elekk/wowhead.rb

@@ -3,8 +3,7 @@ require 'json'
 module Elekk
   class Wowhead
     def self.search(term)
-      response = HTTP.request('http://www.wowhead.com/search', {:q => term, :opensearch => nil}, :cache_timeout => 60)
-      resp = JSON.parse(response.body)
+      resp = HTTP.json('http://www.wowhead.com/search', {:q => term, :opensearch => nil}, :cache_timeout => 60)
       data = []
       resp[1].each_with_index do |v,i|
         d = resp[7][i]
@@ -15,7 +14,7 @@ module Elekk
     end
     
     class Result
-      attr_reader :name, :id, :kind, :icon, :quality
+      attr_reader :id, :name, :kind, :icon, :quality
       
       def initialize(id, name, kind, icon=nil, quality=nil)
         @id = id
@@ -39,7 +38,7 @@ module Elekk
       end
       
       def icon_url(size=:medium) # :small, :medium, or :large
-        "http://static.wowhead.com/images/wow/icons/#{size}/#{icon}.jpg" if icon
+        "http://static.wowhead.com/images/wow/icons/#{size}/#{icon.gsub(/'/,'-')}.jpg" if icon
       end
       
       def self.from_html(mkp)

data/spec/achievement_spec.rb

@@ -0,0 +1,54 @@
+require 'elekk'
+include Elekk
+
+describe Achievement do
+  before :each do
+    @achievements = Character.new('Fyrbard','Uldaman').achievements(Achievements::Raid)
+    @oncebitten = @achievements.find {|a| a.id == 4539 }
+    @bane = @achievements.find {|a| a.id == 4608 }
+  end
+
+  it "should give a list of achievements" do
+    @oncebitten.should_not be_nil
+    @bane.should_not be_nil
+  end
+  
+  it "should have the correct title" do
+    @oncebitten.title.should == 'Once Bitten, Twice Shy (10 player)'
+  end
+  
+  it "should have the correct icon" do
+    @oncebitten.icon.should == 'achievement_boss_lanathel'
+  end
+  
+  it "should have the correct category" do
+    @oncebitten.category.should == Achievements::Raid
+  end
+  
+  it "should have the correct point total as an integer" do
+    @oncebitten.points.should == 10
+  end
+  
+  it "should have the correct time of completion" do
+    @oncebitten.completed.to_i.should == 1274250840
+    @bane.completed.should be_nil
+  end
+  
+  it "should show correct completion state" do
+    @oncebitten.complete?.should == true
+    @bane.complete?.should == false
+  end
+  
+  it "should get the correct information to display on wowhead" do
+    @oncebitten.wowhead.url.should == 'http://www.wowhead.com/achievement=4539'
+    @oncebitten.wowhead.icon_url(:large).should == 'http://static.wowhead.com/images/wow/icons/large/achievement_boss_lanathel.jpg'
+  end
+  
+  it "should look bitchin when I print them all" do
+    @achievements.select {|a| a.complete?}.sort_by {|a| -a.completed.to_i}.each do |a|
+      puts "<a href=\"#{a.wowhead.url}\"><img src=\"#{Armory.icon_url(a.icon)}\" /> <img src=\"#{a.wowhead.icon_url(:large)}\" /> #{a.title}</a><br />"
+    end
+  end
+end
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elekk
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Isaac Wasileski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +02:00
+date: 2010-06-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,14 @@ files:
 - VERSION
 - elekk.gemspec
 - lib/elekk.rb
+- lib/elekk/achievement.rb
 - lib/elekk/armory.rb
 - lib/elekk/character.rb
 - lib/elekk/data.rb
 - lib/elekk/http.rb
 - lib/elekk/wowhead.rb
 - readme.md
+- spec/achievement_spec.rb
 - spec/armory_spec.rb
 - spec/character_spec.rb
 - spec/klass_spec.rb
@@ -134,6 +136,7 @@ signing_key:
 specification_version: 3
 summary: A simple library for World of Warcraft data in Ruby.
 test_files: 
+- spec/achievement_spec.rb
 - spec/armory_spec.rb
 - spec/character_spec.rb
 - spec/klass_spec.rb