reve 0.0.109 → 0.0.115

data/lib/reve/classes.rb

@@ -295,6 +295,7 @@ module Reve #:nodoc:
     # * corporation_id ( Fixnum ) - The ID of the Corporation that the victim belongs to.
     # * corporation_name ( String ) - Name of the Corporation that the victim belongs to.
     # * alliance_id ( Fixnum | NilClass ) - The ID of the Alliance that the victim belongs to, if applicable. Will be nil unless the victim was in an Alliance
+    # * alliance_name ( String  | NilClass ) - Name of the Alliance the Character is in, if any.
     # * damage_taken ( Fixnum ) - The amount of damage the victim took before being killed.
     # * ship_type_id ( Fixnum ) - ID of the ship type (references CCP data dump) that the victim was flying.
     # See Also: KillAttacker, Kill, KillLoss, Reve::API#personal_kills, Reve::API#corporate_kills
@@ -306,6 +307,7 @@ module Reve #:nodoc:
         @corporation_id = elem['corporationID']
         @corporation_name = elem['corporationName']
         @alliance_id = elem['allianceID'] == "0" ? nil : elem['allianceID'].to_i
+        @alliance_name = elem['allianceName']
         @damage_taken = elem['damageTaken'].to_i
         @ship_type_id = elem['shipTypeID'].to_i
       end
@@ -604,17 +606,17 @@ module Reve #:nodoc:
     # * id ( Fixnum ) - ID of the ConqurableStation
     # * name ( String ) - Name of the ConqurableStation
     # * type_id ( Fixnum ) - What kind of ConqurableStation Station it is (Refer to CCP database dump invtypes).
-    # * type_name ( String ) - Name of the kind of Station this ConqurableStation is. (May not be present??)
+    # * system_id ( Fixnum ) - ID of the system where the ConqurableStation is located.
     # * corporation_id ( Fixnum ) - ID of the Corporation that owns the ConqurableStation
     # * corporation_name ( String ) - Name of the Corporation that owns the ConqurableStation.
     # See Also: Sovereignty, Reve::API#conqurable_stations, Reve::API#sovereignty, Reve::API#corporation_sheet, CorporationSheet
     class ConqurableStation
-      attr_reader :id, :name, :type_id, :type_name, :system_id, :system_name, :corporation_id, :corporation_name
+      attr_reader :id, :name, :type_id, :system_id, :corporation_id, :corporation_name
       def initialize(elem) #:nodoc:
         @id = elem['stationID'].to_i
         @name = elem['stationName']
         @type_id = elem['stationTypeID'].to_i
-        @type_name = elem['stationTypeName']
+        @system_id = elem['solarSystemID'].to_i
         @corporation_id = elem['corporationID'].to_i
         @corporation_name = elem['corporationName']
       end
@@ -1040,6 +1042,22 @@ module Reve #:nodoc:
         @name = elem['refTypeName']
       end
     end
+    
+    # ServerStatus object. Simple
+    # Attributes:
+    # * open ( Boolean ) - true if the server is up, false if it's down
+    # * players ( Numeric ) - Number of players online
+    # See Also: Reve::API#server_status
+    class ServerStatus
+      attr_reader :open, :players
+      def initialize(open,online) #:nodoc:
+        @open = open.downcase == "true"
+        @players = online.to_i
+      end
+      def open?
+        @open
+      end
+    end
 
     # A Skill is used in the CharacterSheet for Reve::API#character_sheet call.
     # Attributes
@@ -1141,7 +1159,7 @@ module Reve #:nodoc:
     # Attributes
     # * system_id ( Fixnum ) - ID of the System
     # * alliance_id ( Fixnum ) - ID of the Alliance that controls the System
-    # * constellation_sovereignty ( String ) - Not sure? Maybe this is if the System falls under a Constellation Sovereignty setup?
+    # * constellation_sovereignty ( Fixnum ) - ID of the Alliance that has Constellation Sovereignty for a given System's Constellation
     # * level ( Fixnum ) - Not sure? Level of Constellation Sovereignty
     # * faction_id ( Fixnum ) - ID of the Faction that controls the System
     # * system_name ( String ) - Name of the System
@@ -1152,7 +1170,7 @@ module Reve #:nodoc:
       def initialize(elem) #:nodoc:
         @system_id                 = elem['solarSystemID'].to_i
         @alliance_id               = elem['allianceID'] == '0' ? nil : elem['allianceID'].to_i
-        @constellation_sovereignty = elem['constellationSovereignty']
+        @constellation_sovereignty = elem['constellationSovereignty'].to_i
         @level                     = elem['sovereigntyLevel'].to_i if elem['sovereigntyLevel']
         @faction_id                = elem['factionID'] == '0' ? nil : elem['factionID'].to_i
         @system_name               = elem['solarSystemName']

data/lib/reve.rb

@@ -84,6 +84,7 @@ module Reve
     @@character_medals_url         = 'http://api.eve-online.com/char/Medals.xml.aspx'
     @@corporate_medals_url         = 'http://api.eve-online.com/corp/Medals.xml.aspx'
     @@corp_member_medals_url       = 'http://api.eve-online.com/corp/MemberMedals.xml.aspx'
+    @@server_status_url            = 'http://api.eve-online.com/Server/ServerStatus.xml.aspx'
 
     cattr_accessor :character_sheet_url, :training_skill_url, :characters_url, :personal_wallet_journal_url,
                    :corporate_wallet_journal_url, :personal_wallet_trans_url, :corporate_wallet_trans_url,
@@ -96,7 +97,7 @@ module Reve
                    :personal_faction_war_stats_url, :corporate_faction_war_stats_url,
                    :general_faction_war_stats_url, :top_faction_war_stats_url, :faction_war_occupancy_url,
                    :certificate_tree_url, :character_medals_url, :corporate_medals_url, 
-                   :corp_member_medals_url
+                   :corp_member_medals_url, :server_status_url
 
 
     attr_accessor :key, :userid, :charid
@@ -133,6 +134,20 @@ module Reve
       @save_path = p
     end
     
+    # Get the server status of Tranquility as a Reve::Classes::ServerStatus 
+    # object.
+    # See Also: Reve::Classes::ServerStatus
+    def server_status(opts = {})
+      args = postfields(opts)
+      h = compute_hash(  opts.merge(:url => @@server_status_url) )
+      return h if h
+      xml = process_query(nil,opts[:url] || @@server_status_url,true,opts)
+      Reve::Classes::ServerStatus.new(
+        xml.search("/eveapi/result/serverOpen/").first.to_s,
+        xml.search("/eveapi/result/onlinePlayers/").first.to_s
+      )
+    end
+    
     # Convert a list of names to their ids.
     # Expects a Hash as a parameter with these keys:
     # * names ( Array ) - An Array of Names to fetch the IDs of.

data/test/test_reve.rb

@@ -190,7 +190,7 @@ class TestReve < Test::Unit::TestCase
       assert_not_nil station.id
       assert_not_nil station.name
       assert_not_nil station.type_id
-      assert_not_nil station.type_name
+      assert_not_nil station.system_id
       assert_not_nil station.corporation_id
       assert_not_nil station.corporation_name
     end
@@ -919,6 +919,18 @@ class TestReve < Test::Unit::TestCase
     end
   end
   
+  def test_server_status
+    Reve::API.server_status_url = XML_BASE + 'server_status.xml'
+    status = nil
+    assert_nothing_raised do
+      status = @api.server_status
+    end
+    assert_kind_of(Reve::Classes::ServerStatus, status)
+    assert_equal(34444, status.players)
+    assert status.open?
+    assert status.open
+  end
+  
   def test_character_medals
     Reve::API.character_medals_url = XML_BASE + 'char_medals.xml'
     obj = nil

data/test/xml/conqurable_stations.xml

@@ -1,11 +1,12 @@
-<eveapi version="1">
-  <currentTime>2007-08-29 13:37:24</currentTime>
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2009-02-17 16:33:24</currentTime>
   <result>
-    <rowset name="outposts" key="stationID" columns="stationID,stationName,stationTypeID,stationTypeName,solarSystemID,solarSystemName,corporationID,corporationName">
-      <row stationID="61000001" stationName="DB1R-4 II - duperTum Corp Minmatar Service Outpost" stationTypeID="21646" stationTypeName="Minmatar Service Outpost" solarSystemID="30004470" solarSystemName="DB1R-4" corporationID="150020944" corporationName="duperTum Corp"/>
-      <row stationID="61000002" stationName="ZS-2LT XI - duperTum Corp Minmatar Service Outpost" stationTypeID="21646" stationTypeName="Minmatar Service Outpost" solarSystemID="30004469" solarSystemName="ZS-2LT" corporationID="150020944" corporationName="duperTum Corp"/>
-      <row stationID="61000003" stationName="JZL-VB VIII - duperTum Corp Minmatar Service Outpost" stationTypeID="21646" stationTypeName="Minmatar Service Outpost" solarSystemID="30004952" solarSystemName="JZL-VB" corporationID="150020944" corporationName="duperTum Corp"/>
+    <rowset name="outposts" key="stationID" columns="stationID,stationName,stationTypeID,solarSystemID,corporationID,corporationName">
+      <row stationID="61000095" stationName="Mindframe Savings and Loan" stationTypeID="21646" solarSystemID="30003230" corporationID="709221692" corporationName="Blueprint Haus" />
+      <row stationID="61000096" stationName="Q3 Manlove Division" stationTypeID="21644" solarSystemID="30000324" corporationID="1639878825" corporationName="Initiative Holding" />
+      <row stationID="61000097" stationName="3L Elrac's Bag of Nuts" stationTypeID="21646" solarSystemID="30000448" corporationID="1519479143" corporationName="Scorched Earth Holdings" />
     </rowset>
   </result>
-  <cachedUntil>2007-08-29 14:37:24</cachedUntil>
+  <cachedUntil>2009-02-17 17:33:24</cachedUntil>
 </eveapi>

data/test/xml/server_status.xml

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2008-11-27 21:58:53</currentTime>
+  <result>
+    <serverOpen>True</serverOpen>
+    <onlinePlayers>34444</onlinePlayers>
+  </result>
+  <cachedUntil>2008-11-27 22:01:53</cachedUntil>
+</eveapi>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reve
 version: !ruby/object:Gem::Version 
-  version: 0.0.109
+  version: 0.0.115
 platform: ruby
 authors: 
 - Lisa Seelye
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 -05:00
+date: 2009-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,6 +174,7 @@ test_files:
 - test/xml/member_tracking.xml
 - test/xml/nonmember_corpsheet.xml
 - test/xml/reftypes.xml
+- test/xml/server_status.xml
 - test/xml/skill_in_training-amarr-titan.xml
 - test/xml/skill_in_training-none.xml
 - test/xml/skilltree.xml