reve 0.0.77 → 0.0.80

data/lib/reve/exceptions.rb

@@ -339,5 +339,8 @@ module Reve
     # this is an Exception to do with the connection to the Eve server failing
     class ReveNetworkStatusException < StandardError
     end
+    # used when something is encountered in XML that we didn't expect
+    class ReveUnexpectedEntityEncountered < StandardError
+    end
   end
 end

data/lib/reve/extensions.rb

@@ -83,7 +83,7 @@ module Reve #:nodoc:
       def to_time(form = :utc)
         begin
           ::Time.send(form, *ParseDate.parsedate(self))
-        rescue TypeError
+        rescue Exception
           self
         end
       end
@@ -93,20 +93,6 @@ end
 
 class String #:nodoc:
   include Reve::Extensions::String
-  
-  # Try to make an Integer from a string. Will make sure that there's
-  # actually an integer there. "ponies".to_i will return "ponies" since it
-  # isn't an Integer. Yeah, probably not the best way but I do this with
-  # to_time and to_date. Deal with it - at least it doesn't raise an
-  # Exception.
-  # (Have to redefine this method as it already exists in base String class)
-  def to_i
-    begin
-      Integer(self).to_s == self ? Integer(self) : self
-    rescue ArgumentError
-      self
-    end
-  end
 end
 
 class Class #:nodoc:

data/lib/reve.rb

@@ -247,7 +247,7 @@ module Reve
       args = postfields(opts)
       h = compute_hash(args.merge(:url => @@corporate_market_orders_url))
       return h if h
-      process_query(Reve::Classes::PersonalMarketOrder, opts[:url] || @@corporate_market_orders_url, false, args)
+      process_query(Reve::Classes::CorporateMarketOrder, opts[:url] || @@corporate_market_orders_url, false, args)
     end
     
     # Returns a list of Reve::Classes::PersonalIndustryJob objects.
@@ -610,8 +610,6 @@ module Reve
             thing = Reve::Classes::PerceptionEnhancer
           when 'willpowerBonus'
             thing = Reve::Classes::WillpowerEnhancer
-          else
-            thing = Reve::Classes::AttributeEnhancer
           end
           (enh/kind.downcase.intern).each do |b|
             name = (b/:augmentatorname).inner_html
@@ -694,11 +692,10 @@ module Reve
 
       return xml if just_xml
       return [] if xml.nil? # No XML document returned. We should panic.
-      ret = []
-      xml.search("//rowset/row").each do |elem|
-        ret << klass.new(elem)
-      end
-      ret
+      
+      # Create the array of klass objects to return, assume we start with an empty set from the XML search for rows
+      # and build from there.
+      xml.search("//rowset/row").inject([]) { |ret,elem| ret << klass.new(elem) }
     end
     
     # Turns a hash into ?var=baz&bam=boo
@@ -790,4 +787,4 @@ module Reve
       File.join(@save_path,@userid.to_s,method,( @cached_until || Time.now.utc).to_i.to_s + '.xml')
     end
   end
-end
+end

data/test/test_reve.rb

@@ -1,24 +1,8 @@
-=begin
-  TODO: Test:
-  * market orders with closed, pending and character deleted status
-  * errors
-  * corporate_market_orders
-  * corporate_wallet_balance
-  * corporate_wallet_transactions
-  * corporate_wallet_journal
-  * corporate_assets_list
-  * personal_kills (with contained losses)
-  * corporate_kills
-  * character_sheet with a generic AttributeEnhancer (or remove the option and raise an exception)
-  * test get_xml when a nil object is passed to test ReveNetworkStatusException
-  * check check_xml to try and provoke a failure in the search
-=end
-
 require 'test/unit'
 require 'reve'
 require 'fileutils' # for saving downloaded XML
 
-XML_BASE = File.join(File.dirname(__FILE__),'/xml/')
+XML_BASE = File.join(File.dirname(__FILE__),'xml/')
 SAVE_PATH = File.join(File.dirname(__FILE__),'downloads')
 
 class TestReve < Test::Unit::TestCase
@@ -105,6 +89,30 @@ class TestReve < Test::Unit::TestCase
     assert_equal 0, Dir.glob(File.join(SAVE_PATH,'alliances','*.xml')).size # no XML saved
   end
   
+  # File.split exists and File is not a String or URI class as permitted in Reve::API#get_xml.
+  # This means as a parameter it will pass through Reve::API#compute_hash method and
+  # get to Reve::API#get_xml
+  def test_for_bad_uri_passed_to_method
+    assert_raise Reve::Exceptions::ReveNetworkStatusException do
+      @api.character_sheet :url => File
+    end
+  end
+  
+  def test_check_exception_with_bad_xml_document
+    assert_raise ArgumentError do
+      @api.send(:check_exception,nil)
+    end
+  end
+  
+  def test_errors_api_call
+    errors = nil
+    assert_nothing_raised do
+      errors = @api.errors :url => File.join(XML_BASE,'errors.xml')
+    end
+    assert errors.all? { |e| e.kind_of?(Reve::Classes::APIError) }
+    assert_equal 61, errors.size # 61 errors in total    
+  end
+  
   def test_corporation_sheet_clean
     Reve::API.corporation_sheet_url = XML_BASE + 'corporation_sheet.xml'
     corporation = nil
@@ -226,6 +234,7 @@ class TestReve < Test::Unit::TestCase
     end
     assert_equal 18, assets.size # 18 single and 1 container
     assert_equal 1, assets.inject(0) { |memo,a| memo += a.assets.size } # We have one container and it happens to have 1 asset
+    assert assets.all? { |a| a.kind_of?(Reve::Classes::AssetContainer) }
   end
 
 
@@ -239,6 +248,14 @@ class TestReve < Test::Unit::TestCase
     end
     assert_equal 10, kills.size
     assert_equal 10, kills.collect { |k| k.victim.name }.nitems # i should have 10 good victim names
+    
+    # Process the Kills here to get the number of "Contained Losses" - KillLoss that are contained within another
+    # KillLoss (like a Giant Secure Container); there should only be one contained loss and should be 
+    # 63 losses (not including the contained_losses)
+    losses = kills.collect { |k| k.losses }.flatten
+    assert_equal 63, losses.size
+    contained_losses = losses.collect { |loss| loss.contained_losses  }.flatten
+    assert_equal 1, contained_losses.size
 
     attacker_names = kills.collect { |k| k.attackers.collect { |a| a.name } }.flatten
     assert_equal 25, attacker_names.size # total of 25 attackers (24 players + 1 NPC)
@@ -252,6 +269,36 @@ class TestReve < Test::Unit::TestCase
       assert_nil kill.moon_id # the ones in the kills.xml are all nil
     end
   end
+  
+  def test_corporate_kills_clean
+    Reve::API.corporate_kills_url = XML_BASE + 'kills.xml'
+    kills = nil
+    assert_nothing_raised do
+      kills = @api.corporate_kills
+    end
+    assert_equal 10, kills.size
+    assert_equal 10, kills.collect { |k| k.victim.name }.nitems # i should have 10 good victim names
+    
+    # Process the Kills here to get the number of "Contained Losses" - KillLoss that are contained within another
+    # KillLoss (like a Giant Secure Container); there should only be one contained loss and should be 
+    # 63 losses (not including the contained_losses)
+    losses = kills.collect { |k| k.losses }.flatten
+    assert_equal 63, losses.size
+    contained_losses = losses.collect { |loss| loss.contained_losses  }.flatten
+    assert_equal 1, contained_losses.size    
+
+    attacker_names = kills.collect { |k| k.attackers.collect { |a| a.name } }.flatten
+    assert_equal 25, attacker_names.size # total of 25 attackers (24 players + 1 NPC)
+    assert_equal 1, attacker_names.grep(nil).size # npc exists once
+    assert_equal 24, attacker_names.nitems # 24 player attackers
+    
+    kills.each do |kill|
+      assert_kind_of Integer, kill.id
+      assert_kind_of Integer, kill.system_id
+      assert_kind_of Time, kill.created_at
+      assert_nil kill.moon_id # the ones in the kills.xml are all nil
+    end    
+  end
 
   def test_characters_clean
     Reve::API.characters_url = XML_BASE + 'characters.xml'
@@ -365,7 +412,7 @@ class TestReve < Test::Unit::TestCase
     end
     assert_not_nil @api.last_hash
     assert_not_nil @api.cached_until
-    assert_equal 9, orders.size    
+    assert_equal 11, orders.size    
     buys = sells = 0
     orders.each do |order|
       assert_not_nil order.id
@@ -375,7 +422,66 @@ class TestReve < Test::Unit::TestCase
       sells += 1 if   order.bid        
     end
     assert_equal 4, buys
-    assert_equal 5, sells
+    assert_equal 7, sells
+  end
+
+  def test_corporate_market_orders_clean
+    orders = nil
+    assert_nothing_raised do
+      orders = @api.corporate_market_orders :url => File.join(XML_BASE,'corporate_market_orders.xml')  
+    end
+    assert_not_nil @api.last_hash
+    assert_not_nil @api.cached_until
+    assert_equal 1, orders.size    
+    buys = sells = 0
+    orders.each do |order|
+      assert_not_nil order.id
+      assert_kind_of Time, order.created_at
+      assert [TrueClass, FalseClass].include?(order.bid.class)
+      buys  += 1 if ! order.bid
+      sells += 1 if   order.bid        
+    end
+    assert_equal 1, buys
+    assert_equal 0, sells    
+  end
+  
+  def test_corporate_wallet_transactions
+    trans = nil
+    assert_nothing_raised do
+      trans = @api.corporate_wallet_transactions :url => File.join(XML_BASE,'corporate_wallet_transactions.xml')
+    end
+    assert_equal 1, trans.size
+    assert_kind_of Reve::Classes::CorporateWalletTransaction, trans.first
+  end
+  
+  def test_corporate_wallet_balance_clean
+    balance = nil
+    assert_nothing_raised do
+      balance = @api.corporate_wallet_balance :url => File.join(XML_BASE, 'corporate_wallet_balance.xml')
+    end
+    assert balance.all? { |b| b.kind_of?(Reve::Classes::WalletBalance) }
+    assert_equal 18004409.84, balance.select { |b| b.account_key == '1000' }.first.balance
+    balance.select { |b| b.account_key != '1000' }.each do |non_tested_account|
+      assert_equal 0.00, non_tested_account.balance
+    end
+  end
+  
+  def test_corporate_wallet_journal_clean
+    journal = nil
+    assert_nothing_raised do
+      journal = @api.corporate_wallet_journal :url => File.join(XML_BASE,'corporate_wallet_journal.xml')
+    end
+    assert_equal 2, journal.size
+    assert journal.all? { |j| j.kind_of?(Reve::Classes::WalletJournal) }    
+  end
+  
+  def test_corporate_assets_list_clean
+    assets = nil
+    assert_nothing_raised do
+      assets = @api.corporate_assets_list :url => File.join(XML_BASE,'corporate_assets_list.xml')
+    end
+    assert_equal 2, assets.size
+    assert assets.all? { |a| a.kind_of?(Reve::Classes::AssetContainer) }
   end
   
   def test_map_jumps_clean

data/test/xml/corporate_assets_list.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currenttime>2008-02-03 14:51:15</currenttime>
+  <result>
+    <rowset columns="itemID,locationID,typeID,quantity,flag,singleton" name="assets" key="itemID">
+      <row typeid="215" itemid="1454093021" singleton="0" quantity="100" flag="62" locationid="60003838">
+    </row>
+    <row typeid="649" itemid="543447240" singleton="1" quantity="1" flag="4" locationid="60003913">
+      <rowset columns="itemID,typeID,quantity,flag,singleton" name="contents" key="itemID">
+        <row typeid="11489" itemid="782544272" singleton="1" quantity="1" flag="5">
+      </row></rowset>
+    </row>
+    </rowset>
+  </result>
+  <cacheduntil>2008-02-04 13:51:15</cacheduntil>
+</eveapi>

data/test/xml/corporate_market_orders.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currenttime>2008-02-03 14:50:26</currenttime>
+  <result>
+    <rowset columns="orderID,charID,stationID,volEntered,volRemaining,minVolume,orderState,typeID,range,accountKey,duration,escrow,price,bid,issued" name="orders" key="orderID">
+      <row minvolume="1" price="2.50" orderid="640467432" typeid="215" volremaining="50" issued="2008-02-03 14:47:15" stationid="60003838" volentered="50" escrow="0.00" charid="892804655" orderstate="0" bid="0" accountkey="1000" range="32767" duration="90">
+    </row></rowset>
+  </result>
+  <cacheduntil>2008-02-03 15:50:26</cacheduntil>
+</eveapi>

data/test/xml/corporate_wallet_balance.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currenttime>2008-02-03 14:50:39</currenttime>
+  <result>
+    <rowset columns="accountID,accountKey,balance" name="accounts" key="accountID">
+      <row accountid="9161533" accountkey="1000" balance="18004409.84">
+      </row><row accountid="13679725" accountkey="1001" balance="0.00">
+      </row><row accountid="13679726" accountkey="1002" balance="0.00">
+      </row><row accountid="13679727" accountkey="1003" balance="0.00">
+      </row><row accountid="13679728" accountkey="1004" balance="0.00">
+      </row><row accountid="13679729" accountkey="1005" balance="0.00">
+      </row><row accountid="13679730" accountkey="1006" balance="0.00">
+    </row></rowset>
+  </result>
+  <cacheduntil>2008-02-03 15:05:39</cacheduntil>
+</eveapi>

data/test/xml/corporate_wallet_journal.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currenttime>2008-02-03 14:51:03</currenttime>
+  <result>
+    <rowset columns="date,refID,refTypeID,ownerName1,ownerID1,ownerName2,ownerID2,argName1,argID1,amount,balance,reason" name="entries" key="refID">
+      <row date="2008-02-03 14:47:00" argid1="1" argname1="EVE System" amount="-100.00" ownerid1="892804655" refid="922128913" ownername1="Liquidator Brunt" reftypeid="46" ownerid2="1000035" reason="" ownername2="Caldari Navy" balance="18004409.84">
+      </row><row date="2008-02-03 14:47:00" argid1="0" argname1="" amount="-270.00" ownerid1="892804655" refid="922126594" ownername1="Liquidator Brunt" reftypeid="42" ownerid2="0" reason="" ownername2="" balance="18004509.84">
+    </row></rowset>
+  </result>
+  <cacheduntil>2008-02-03 15:51:03</cacheduntil>
+</eveapi>

data/test/xml/corporate_wallet_transactions.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currenttime>2008-02-03 14:50:52</currenttime>
+  <result>
+    <rowset columns="transactionDateTime,transactionID,quantity,typeName,typeID,price,clientID,clientName,characterID,characterName,stationID,stationName,transactionType,transactionFor" name="transactions" key="transactionID">
+      <row charactername="Liquidator Brunt" price="2.70" transactiontype="buy" typeid="215" transactionid="545372452" transactiondatetime="2008-02-03 14:47:00" transactionfor="corporation" stationid="60003838" characterid="892804655" clientname="Ceredrif" quantity="100" stationname="Sarekuwa III - Moon 8 - Caldari Navy Assembly Plant" typename="Iron Charge S" clientid="1710698307">
+    </row></rowset>
+  </result>
+  <cacheduntil>2008-02-03 15:50:52</cacheduntil>
+</eveapi>

data/test/xml/errors.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currenttime>2008-02-03 13:58:00</currenttime>
+  <result>
+    <rowset columns="errorCode,errorText" name="errors" key="errorCode">
+      <row errortext="Expected before ref/trans ID = 0: wallet not previously loaded." errorcode="100">
+      </row><row errortext="Wallet exhausted: retry after {0}." errorcode="101">
+      </row><row errortext="Expected before ref/trans ID [{0}] but supplied [{1}]: wallet previously loaded." errorcode="102">
+      </row><row errortext="Already returned one week of data: retry after {0}." errorcode="103">
+      </row><row errortext="Invalid characterID." errorcode="105">
+      </row><row errortext="Must provide userID parameter for authentication." errorcode="106">
+      </row><row errortext="Invalid beforeRefID provided." errorcode="107">
+      </row><row errortext="Invalid accountKey provided." errorcode="108">
+      </row><row errortext="Invalid accountKey: must be in the range 1000 to 1006." errorcode="109">
+      </row><row errortext="Invalid beforeTransID provided." errorcode="110">
+      </row><row errortext="'{0}' is not a valid integer." errorcode="111">
+      </row><row errortext="Version mismatch." errorcode="112">
+      </row><row errortext="Version escalation is not allowed at this time." errorcode="113">
+      </row><row errortext="Invalid itemID provided." errorcode="114">
+      </row><row errortext="Assets already downloaded: retry after {0}." errorcode="115">
+      </row><row errortext="Industry jobs already downloaded: retry after {0}." errorcode="116">
+      </row><row errortext="Market orders already downloaded: retry after {0}." errorcode="117">
+      </row><row errortext="Expected beforeKillID = 0: wallet not previously loaded." errorcode="118">
+      </row><row errortext="Kills exhausted: retry after {0}." errorcode="119">
+      </row><row errortext="Expected beforeKillID [{0}] but supplied [{1}]: kills previously loaded." errorcode="120">
+      </row><row errortext="Invalid beforeKillID provided." errorcode="121">
+      </row><row errortext="Current security level not high enough." errorcode="200">
+      </row><row errortext="Character does not belong to account." errorcode="201">
+      </row><row errortext="Cached API key authentication failure." errorcode="202">
+      </row><row errortext="Authentication failure." errorcode="203">
+      </row><row errortext="Authentication failure." errorcode="204">
+      </row><row errortext="Authentication failure (final pass)." errorcode="205">
+      </row><row errortext="Character must have Accountant or Junior Accountant roles." errorcode="206">
+      </row><row errortext="Not available for NPC corporations." errorcode="207">
+      </row><row errortext="Character must have Accountant, Junior Accountant, or Trader roles." errorcode="208">
+      </row><row errortext="Character must be a Director or CEO." errorcode="209">
+      </row><row errortext="Authentication failure." errorcode="210">
+      </row><row errortext="Login denied by account status." errorcode="211">
+      </row><row errortext="Authentication failure (final pass)." errorcode="212">
+      </row><row errortext="Character must have Factory Manager role." errorcode="213">
+      </row><row errortext="Corporation is not part of alliance." errorcode="214">
+      </row><row errortext="GetID({0}) is invalid or not loaded." errorcode="501">
+      </row><row errortext="GetSkillpointsForLevel({0}, {1}): invalid input." errorcode="503">
+      </row><row errortext="GetRace({0}): invalid race." errorcode="504">
+      </row><row errortext="GetGender({0}): invalid gender." errorcode="505">
+      </row><row errortext="GetBloodline({0}): invalid bloodline." errorcode="506">
+      </row><row errortext="GetAttributeName({0}): invalid attribute." errorcode="507">
+      </row><row errortext="GetRefType({0}): invalid reftype." errorcode="508">
+      </row><row errortext="attributeID {0} has null data components." errorcode="509">
+      </row><row errortext="Character does not appear to have a corporation.  Not loaded?" errorcode="510">
+      </row><row errortext="AccountCanQuery({0}): invalid accountKey." errorcode="511">
+      </row><row errortext="Invalid charID passed to CharData.GetCharacter()." errorcode="512">
+      </row><row errortext="Failed to get character roles in corporation." errorcode="513">
+      </row><row errortext="Invalid corpID passed to CorpData.GetCorporation()." errorcode="514">
+      </row><row errortext="Failed getting user information." errorcode="516">
+      </row><row errortext="CSV header/row count mismatch." errorcode="517">
+      </row><row errortext="Unable to get current TQ time." errorcode="518">
+      </row><row errortext="Failed getting starbase detail information." errorcode="519">
+      </row><row errortext="Unexpected failure accessing database." errorcode="520">
+      </row><row errortext="Invalid username and/or password passed to UserData.LoginWebUser()." errorcode="521">
+      </row><row errortext="Failed getting character information." errorcode="522">
+      </row><row errortext="Failed getting corporation information." errorcode="523">
+      </row><row errortext="Web site database temporarily disabled." errorcode="901">
+      </row><row errortext="EVE backend database temporarily disabled." errorcode="902">
+      </row><row errortext="Rate limited [{0}]: please obey all cachedUntil timers." errorcode="903">
+      </row><row errortext="User forced test error condition." errorcode="999">
+    </row></rowset>
+  </result>
+  <cacheduntil>2008-02-03 14:58:00</cacheduntil>
+</eveapi>

data/test/xml/kills.xml

@@ -19,7 +19,11 @@
         </rowset>
         <rowset name="items" columns="typeID,flag,qtyDropped,qtyDestroyed">
           <row typeID="3651" flag="0" qtyDropped="0" qtyDestroyed="1" />
-          <row typeID="34" flag="5" qtyDropped="1" qtyDestroyed="0" />
+          <row typeID="11489" flag="5" qtyDropped="1" qtyDestroyed="0">
+            <rowset name="items" columns="typeID,flag,qtyDropped,qtyDestroyed">
+              <row typeID="34" flag="5" qtyDropped="100" qtyDestroyed="0" />              
+            </rowset>
+          </row>
           <row typeID="3636" flag="0" qtyDropped="0" qtyDestroyed="1" />
         </rowset>
       </row>

data/test/xml/marketorders.xml

@@ -29,7 +29,13 @@
            minVolume="1" orderState="0" typeID="27359" range="1" accountKey="1000" duration="1"
            escrow="7771.73" price="250.00" bid="1" issued="2007-12-02 13:58:48" />
       <row orderID="5630656" charID="150208955" stationID="60010783" volEntered="1334" volRemaining="1334"
-           minVolume="1" orderState="0" typeID="27359" range="2" accountKey="1000" duration="1"
+           minVolume="1" orderState="1" typeID="27359" range="2" accountKey="1000" duration="1"
+           escrow="79141.11" price="250.00" bid="1" issued="2007-12-02 13:58:56" />
+      <row orderID="56330656" charID="150208955" stationID="60010783" volEntered="1334" volRemaining="1334"
+           minVolume="1" orderState="4" typeID="34" range="2" accountKey="1000" duration="1"
+           escrow="79141.11" price="250.00" bid="1" issued="2007-12-02 13:58:56" />
+      <row orderID="56230656" charID="150208955" stationID="60010783" volEntered="1334" volRemaining="1334"
+           minVolume="1" orderState="5" typeID="35" range="2" accountKey="1000" duration="1"
            escrow="79141.11" price="250.00" bid="1" issued="2007-12-02 13:58:56" />
     </rowset>
   </result>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: reve
 version: !ruby/object:Gem::Version 
-  version: 0.0.77
-date: 2008-02-03 00:00:00 +00:00
+  version: 0.0.80
+date: 2008-02-17 00:00:00 +00:00
 summary: Reve is a Ruby library to interface with the Eve Online API
 require_paths: 
 - lib
@@ -48,6 +48,11 @@ test_files:
 - test/xml/charactername.xml
 - test/xml/characters.xml
 - test/xml/conqurable_stations.xml
+- test/xml/corporate_assets_list.xml
+- test/xml/corporate_market_orders.xml
+- test/xml/corporate_wallet_balance.xml
+- test/xml/corporate_wallet_journal.xml
+- test/xml/corporate_wallet_transactions.xml
 - test/xml/corporation_sheet.xml
 - test/xml/errors/error_100.xml
 - test/xml/errors/error_101.xml
@@ -115,6 +120,7 @@ test_files:
 - test/xml/errors/error_902.xml
 - test/xml/errors/error_903.xml
 - test/xml/errors/error_999.xml
+- test/xml/errors.xml
 - test/xml/industryjobs.xml
 - test/xml/kills.xml
 - test/xml/mapjumps.xml