reve 0.0.83 → 0.0.86

data/lib/reve.rb

@@ -768,8 +768,8 @@ module Reve
         $stderr.puts "Fatal error ((#{e.to_s})): Couldn't search the XML document ((#{xml})) for any potential error messages! Is your Hpricot broken?"
         exit 1
       end
-      @current_time = (x/:currenttime).inner_html.to_time rescue Time.now.utc # Shouldn't need to rescue this but one never knows
-      @cached_until = (x/:cacheduntil).inner_html.to_time rescue nil # Errors aren't always cached
+      @current_time = (x/:currentTime).inner_html.to_time rescue Time.now.utc # Shouldn't need to rescue this but one never knows
+      @cached_until = (x/:cachedUntil).inner_html.to_time rescue nil # Errors aren't always cached
       return x if out.size < 1
       code = out.first['code'].to_i
       str  = out.first.inner_html

data/test/test_reve.rb

@@ -135,7 +135,7 @@ class TestReve < Test::Unit::TestCase
       corporation = @api.corporation_sheet :characterid => 123
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 150212025, corporation.id
     assert_equal "Banana Republic", corporation.name
     assert_equal "BR", corporation.ticker
@@ -179,7 +179,7 @@ class TestReve < Test::Unit::TestCase
   
     assert_equal 3, stations.size
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     
     stations.each do |station|
       assert_not_nil station.id
@@ -312,7 +312,7 @@ class TestReve < Test::Unit::TestCase
       chars = @api.characters
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 1, chars.size
     chars.each do |char|
       assert_not_nil(char.name)
@@ -330,7 +330,7 @@ class TestReve < Test::Unit::TestCase
       bases = @api.starbases(:characterid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 4, bases.size
     bases.each do |starbase|
       assert_instance_of Reve::Classes::Starbase, starbase
@@ -349,7 +349,7 @@ class TestReve < Test::Unit::TestCase
       fuels = @api.starbase_fuel(:starbaseid => 1,:characterid => 2)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 14, fuels.size
     fuels.each do |fuel|
       assert_equal 1, fuel.starbase_id
@@ -365,7 +365,7 @@ class TestReve < Test::Unit::TestCase
       alliances = @api.alliances
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 3, alliances.size
     corpsize = 0
     alliances.each do |alliance|
@@ -388,7 +388,7 @@ class TestReve < Test::Unit::TestCase
       sovereignties = @api.sovereignty
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 7, sovereignties.size
     sovereignties.each do |sovereignty|
       assert_instance_of Reve::Classes::Sovereignty, sovereignty
@@ -405,7 +405,7 @@ class TestReve < Test::Unit::TestCase
       reftypes = @api.ref_types
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 6, reftypes.size
     reftypes.each do |reftype|
       assert_not_nil reftype.id
@@ -420,7 +420,7 @@ class TestReve < Test::Unit::TestCase
       orders = @api.personal_market_orders
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 11, orders.size    
     buys = sells = 0
     orders.each do |order|
@@ -443,7 +443,7 @@ class TestReve < Test::Unit::TestCase
       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_kind_of Time, @api.cached_until
     assert_equal 1, orders.size    
     buys = sells = 0
     orders.each do |order|
@@ -524,7 +524,7 @@ class TestReve < Test::Unit::TestCase
       mapjumps = @api.map_jumps
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 5, mapjumps.size
     mapjumps.each do |jump|
       assert_not_nil jump.system_id
@@ -539,7 +539,7 @@ class TestReve < Test::Unit::TestCase
       mapkills = @api.map_kills
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 4, mapkills.size
     mapkills.each do |kill|
       assert_not_nil kill.system_id
@@ -556,7 +556,7 @@ class TestReve < Test::Unit::TestCase
       skilltrees = @api.skill_tree
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 2, skilltrees.size
     skilltrees.each do |skill|
       assert_not_nil skill.type_id
@@ -582,7 +582,7 @@ class TestReve < Test::Unit::TestCase
       balance = @api.personal_wallet_balance(:characterid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 7, balance.size
     balance.each do |bal|
       assert_not_nil bal.account_id
@@ -598,7 +598,7 @@ class TestReve < Test::Unit::TestCase
       trans = @api.personal_wallet_transactions(:characterid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_instance_of Reve::Classes::PersonalWalletTransaction, trans.first
     assert_equal 9, trans.size
     trans.each do |t|
@@ -622,7 +622,7 @@ class TestReve < Test::Unit::TestCase
       journal = @api.personal_wallet_journal(:characterid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 8, journal.size
     journal.each do |j|
       assert_not_nil j.date
@@ -644,7 +644,7 @@ class TestReve < Test::Unit::TestCase
       members = @api.member_tracking(:characterid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 2, members.size
     members.each do |member|
       assert_not_nil member.character_id
@@ -671,7 +671,7 @@ class TestReve < Test::Unit::TestCase
       sheet = @api.corporation_sheet
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 7, sheet.divisions.size
     assert_equal 7, sheet.wallet_divisions.size
   end
@@ -683,7 +683,7 @@ class TestReve < Test::Unit::TestCase
       sheet = @api.corporation_sheet :corporationid => 134300597
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal 0, sheet.divisions.size
     assert_equal 0, sheet.wallet_divisions.size
   end
@@ -695,7 +695,7 @@ class TestReve < Test::Unit::TestCase
       skill = @api.skill_in_training(:characterid => 1, :url => XML_BASE + 'skill_in_training-none.xml')
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal false, skill.skill_in_training
   end
 
@@ -706,7 +706,7 @@ class TestReve < Test::Unit::TestCase
       skill = @api.skill_in_training(:characterid => 123, :url => URI.parse('http://svn.crudvision.com/reve/trunk/test/xml/skill_in_training-none.xml'))
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert_equal false, skill.skill_in_training
   end
 
@@ -717,7 +717,7 @@ class TestReve < Test::Unit::TestCase
       skill = @api.skill_in_training(:characerid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     assert skill.skill_in_training
     assert_not_nil skill.start_time
     assert_not_nil skill.type_id
@@ -734,7 +734,7 @@ class TestReve < Test::Unit::TestCase
       sheet = @api.character_sheet(:characterid => 1)
     end
     assert_not_nil @api.last_hash
-    assert_not_nil @api.cached_until
+    assert_kind_of Time, @api.cached_until
     
     assert_not_nil sheet.name
     assert_not_nil sheet.race

data/test/xml/assets.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="2">
-  <currenttime>2007-12-18 18:27:27</currenttime>
+  <currentTime>2007-12-18 18:27:27</currentTime>
   <result>
     <rowset columns="itemID,locationID,typeID,quantity,flag,singleton" name="assets" key="itemID">
       <row typeid="222" itemid="427545405" singleton="0" quantity="100" flag="4" locationid="60004390">

data/test/xml/charactername.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eveapi version="2">
-  <currenttime>2008-01-19 13:06:24</currenttime>
-  <result>
-    <rowset columns="name,characterID" name="characters" key="characterID">
-      <row name="CCP Garthagk" characterid="797400947">
-      </row><row name="Raquel Smith" characterid="892008733">
-    </row></rowset>
-  </result>
-  <cacheduntil>2008-02-19 13:06:24</cacheduntil>
+<?xml version="1.0" encoding="UTF-8"?>
+<eveapi version="2">
+  <currentTime>2008-01-19 13:06:24</currentTime>
+  <result>
+    <rowset columns="name,characterID" name="characters" key="characterID">
+      <row name="CCP Garthagk" characterid="797400947">
+      </row><row name="Raquel Smith" characterid="892008733">
+    </row></rowset>
+  </result>
+  <cacheduntil>2008-02-19 13:06:24</cacheduntil>
 </eveapi>

data/test/xml/corporate_assets_list.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="2">
-  <currenttime>2008-02-03 14:51:15</currenttime>
+  <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">

data/test/xml/corporate_market_orders.xml

@@ -1,10 +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>
+<?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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="2">
-  <currenttime>2008-02-03 14:50:39</currenttime>
+  <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">

data/test/xml/corporate_wallet_journal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="2">
-  <currenttime>2008-02-03 14:51:03</currenttime>
+  <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">

data/test/xml/corporate_wallet_transactions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="2">
-  <currenttime>2008-02-03 14:50:52</currenttime>
+  <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">

data/test/xml/errors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="2">
-  <currenttime>2008-02-03 13:58:00</currenttime>
+  <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">

data/test/xml/industryjobs.xml

@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<eveapi version="2">
-  <currentTime>2007-12-15 13:45:14</currentTime>
-  <result>
-    <rowset name="jobs" key="jobID" columns="jobID,assemblyLineID,containerID,installedItemID,installedItemLocationID,installedItemQuantity,installedItemProductivityLevel,installedItemMaterialLevel,installedItemLicensedProductionRunsRemaining,outputLocationID,installerID,runs,licensedProductionRuns,installedInSolarSystemID,containerLocationID,materialMultiplier,charMaterialMultiplier,timeMultiplier,charTimeMultiplier,installedItemTypeID,outputTypeID,containerTypeID,installedItemCopy,completed,completedSuccessfully,installedItemFlag,outputFlag,activityID,completedStatus,installTime,beginProductionTime,endProductionTime,pauseProductionTime">
-      <row jobID="10590126" assemblyLineID="33966" containerID="60003865" installedItemID="111397161" installedItemLocationID="60003865" installedItemQuantity="1" installedItemProductivityLevel="50" installedItemMaterialLevel="50" installedItemLicensedProductionRunsRemaining="-1" outputLocationID="60003865" installerID="837727449" runs="180" licensedProductionRuns="0" installedInSolarSystemID="30001403" containerLocationID="30001403" materialMultiplier="1" charMaterialMultiplier="1" timeMultiplier="1" charTimeMultiplier="0.8" installedItemTypeID="806" outputTypeID="205" containerTypeID="1529" installedItemCopy="0" completed="0" completedSuccessfully="0" installedItemFlag="4" outputFlag="4" activityID="1" completedStatus="0" installTime="2007-07-29 12:05:00" beginProductionTime="2007-07-29 12:05:00" endProductionTime="2007-07-29 21:44:00" pauseProductionTime="0001-01-01 00:00:00" />
-      <row jobID="10149805" assemblyLineID="33951" containerID="60003865" installedItemID="638992720" installedItemLocationID="60003865" installedItemQuantity="1" installedItemProductivityLevel="0" installedItemMaterialLevel="0" installedItemLicensedProductionRunsRemaining="1" outputLocationID="60003865" installerID="837727449" runs="1" licensedProductionRuns="0" installedInSolarSystemID="30001403" containerLocationID="30001403" materialMultiplier="1" charMaterialMultiplier="1" timeMultiplier="1" charTimeMultiplier="0.8" installedItemTypeID="17637" outputTypeID="17636" containerTypeID="1529" installedItemCopy="1" completed="1" completedSuccessfully="0" installedItemFlag="4" outputFlag="4" activityID="1" completedStatus="1" installTime="2007-07-15 20:21:00" beginProductionTime="2007-07-15 20:21:00" endProductionTime="2007-07-16 00:21:00" pauseProductionTime="0001-01-01 00:00:00" />
-    </rowset>
-  </result>
-  <cachedUntil>2007-12-15 14:00:14</cachedUntil>
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2007-12-15 13:45:14</currentTime>
+  <result>
+    <rowset name="jobs" key="jobID" columns="jobID,assemblyLineID,containerID,installedItemID,installedItemLocationID,installedItemQuantity,installedItemProductivityLevel,installedItemMaterialLevel,installedItemLicensedProductionRunsRemaining,outputLocationID,installerID,runs,licensedProductionRuns,installedInSolarSystemID,containerLocationID,materialMultiplier,charMaterialMultiplier,timeMultiplier,charTimeMultiplier,installedItemTypeID,outputTypeID,containerTypeID,installedItemCopy,completed,completedSuccessfully,installedItemFlag,outputFlag,activityID,completedStatus,installTime,beginProductionTime,endProductionTime,pauseProductionTime">
+      <row jobID="10590126" assemblyLineID="33966" containerID="60003865" installedItemID="111397161" installedItemLocationID="60003865" installedItemQuantity="1" installedItemProductivityLevel="50" installedItemMaterialLevel="50" installedItemLicensedProductionRunsRemaining="-1" outputLocationID="60003865" installerID="837727449" runs="180" licensedProductionRuns="0" installedInSolarSystemID="30001403" containerLocationID="30001403" materialMultiplier="1" charMaterialMultiplier="1" timeMultiplier="1" charTimeMultiplier="0.8" installedItemTypeID="806" outputTypeID="205" containerTypeID="1529" installedItemCopy="0" completed="0" completedSuccessfully="0" installedItemFlag="4" outputFlag="4" activityID="1" completedStatus="0" installTime="2007-07-29 12:05:00" beginProductionTime="2007-07-29 12:05:00" endProductionTime="2007-07-29 21:44:00" pauseProductionTime="0001-01-01 00:00:00" />
+      <row jobID="10149805" assemblyLineID="33951" containerID="60003865" installedItemID="638992720" installedItemLocationID="60003865" installedItemQuantity="1" installedItemProductivityLevel="0" installedItemMaterialLevel="0" installedItemLicensedProductionRunsRemaining="1" outputLocationID="60003865" installerID="837727449" runs="1" licensedProductionRuns="0" installedInSolarSystemID="30001403" containerLocationID="30001403" materialMultiplier="1" charMaterialMultiplier="1" timeMultiplier="1" charTimeMultiplier="0.8" installedItemTypeID="17637" outputTypeID="17636" containerTypeID="1529" installedItemCopy="1" completed="1" completedSuccessfully="0" installedItemFlag="4" outputFlag="4" activityID="1" completedStatus="1" installTime="2007-07-15 20:21:00" beginProductionTime="2007-07-15 20:21:00" endProductionTime="2007-07-16 00:21:00" pauseProductionTime="0001-01-01 00:00:00" />
+    </rowset>
+  </result>
+  <cachedUntil>2007-12-15 14:00:14</cachedUntil>
 </eveapi>

data/test/xml/mapjumps.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="1">
-  <currenttime>2007-12-12 20:47:52</currenttime>
+  <currentTime>2007-12-12 20:47:52</currentTime>
   <result>
     <rowset columns="solarSystemID,jumps" name="solarSystems" key="solarSystemID">
       <row solarsystemid="30034971" shipjumps="10">
@@ -11,5 +11,5 @@
       </rowset>
     <datatime>2007-12-12 20:36:42</datatime>
   </result>
-  <cacheduntil>2007-12-12 21:47:52</cacheduntil>
+  <cachedUntil>2007-12-12 21:47:52</cachedUntil>
 </eveapi>

data/test/xml/mapkills.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eveapi version="1">
-  <currenttime>2007-12-12 20:35:50</currenttime>
+  <currentTime>2007-12-12 20:35:50</currentTime>
   <result>
     <rowset columns="solarSystemID,shipKills,factionKills,podKills" name="solarSystems" key="solarSystemID">
       <row factionkills="17" shipkills="1" solarsystemid="30001723" podkills="0">
@@ -11,6 +11,6 @@
     </rowset>
     <datatime>2007-12-12 20:32:27</datatime>
   </result>
-  <cacheduntil>2007-12-12 21:35:50</cacheduntil>
+  <cachedUntil>2007-12-12 21:35:50</cachedUntil>
 </eveapi>
       

data/test/xml/skilltree.xml

@@ -37,4 +37,5 @@
       </row>
     </rowset>
   </result>
+  <cachedUntil>2007-06-21 10:57:20</cachedUntil>
 </eveapi>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: reve
 version: !ruby/object:Gem::Version 
-  version: 0.0.83
-date: 2008-03-07 00:00:00 +00:00
+  version: 0.0.86
+date: 2008-03-11 00:00:00 +00:00
 summary: Reve is a Ruby library to interface with the Eve Online API
 require_paths: 
 - lib