reve 0.0.133 → 0.1.0

data/ChangeLog

@@ -1,155 +1 @@
-Revision 61: 2008-01-13
-  Please see http://revetrac.crudvision.com/log/trunk?action=stop_on_copy&rev=61&stop_rev=40&mode=stop_on_copy&verbose=on
-    for ChangeLog
-
-Revision 41: 2007-12-19
-  Add support for the nesting of Corporation under Alliance in 
-    Reve::API#alliances
-  Added missing tests
-
-Revisions 31-37: December 2007
-  Add support for version 2 API stuff.
-
-Revision 30: 2007-11-15
-  Added initial support for the API version 2 CorporationSheet method.
-
-Revision 29: 2007-09-19
-  Removed rolldocs.rake and just put the documentation building into the
-    Rakefile. To build docs just use `rake doc`.
-  Added some rescue statements the internal Reve::API#check_exception to try
-    and handle problems when some things aren't found in the XML document.
-
-Revision 28: 2007-09-09
-  Fixed typos that made the library, uh, not work.
-
-Revision 27: 2007-09-08 21:29:07 +0100 (Sat, 08 Sep 2007)
-  Added preliminary support for the ConqurableStation API, see 
-    Reve::Clases::ConqurableStation class.
-  Migrated subversion to a traditional trunk directory for my sanity. Expect
-    future releases to also be in the tags directory.
-
-Revision 21: 2007-08-28 02:45 (Tue, 28 Augu 2007)
-  Changed all methods to require a Hash of parameters. Please refer to the
-    documentation <http://docs.crudvision.com/reve/> for new method signatures,
-    especially Reve::API main documentation.
-  Add a protected method 'compute_hash' which every other public method calls, 
-    using this new Hash parameter system, to construct a hash to represent the
-    call uniquely. The result of this method should be suitable to store in a
-    database so it can be used in conjunction with the cached_until variable.
-    This hash is computed after each call and is available through the
-    last_hash instance variable (like cached_until)
-  Updated the test suite for these changes
-
-Revision 20: 2007-08-22 23:36:00 +0100 (Wed, 22 Aug 2007)
-  Added this ChangeLog
-
-Revision 19: 2007-08-22 23:33:57 +0100 (Wed, 22 Aug 2007)
-  docs in svn removed. Roll docs with rake -f rolldocs.rake doc
-
-Revision 18: 2007-08-21 09:19:16 +0100 (Tue, 21 Aug 2007)
-  Add Reve::API.cached_until. Users of Reve PLEASE obey this setting! It will
-    be set (overwritten) after each call and should be copied somewhere before
-    another call is made.
-  Change tester.rb to print the cached_until response for each test call.
-  Change Reve::API#postfields to take a hash of post fields and change each
-    Reve::API method accordingly.
-
-Revision 17: 2007-08-16 23:07:00 +0100 (Thu, 16 Aug 2007)
-  RDoc update
-
-Revision 16: 2007-08-16 23:04:56 +0100 (Thu, 16 Aug 2007)
-  Add preliminary support for Reve::API#starbases and Reve::API#starbase_fuel
-  Modify Reve::API#postfields to allow for item_id for Reve::API#starbase_fuel
-  Add Reve::Classes::Starbase and Reve::Classes::StarbaseFuel
-  Add new exceptions: Reve::Exceptions::VersionMismatchException,
-    Reve::Exceptions::InvalidItemIDProvided,
-    Reve::Exceptions::MustBeDirectorOrCEO,
-    Reve::Exceptions::StarbaseDetailFetchFailure,
-    Reve::Exceptions::EveDatabaseConnectionFailure
-
-Revision 15: 2007-08-16 21:23:08 +0100 (Thu, 16 Aug 2007)
-  Add Reve::Exceptions::VersionEscalationException
-
-Revision 14: 2007-08-15 21:58:20 +0100 (Wed, 15 Aug 2007)
-  Fix badxml xml file to actually break it
-  Fix class attributes in Reve::API (wallet transactions) to point to the right
-    place
-  Add a warning to Reve::Exceptions#raise_it for
-    Reve::Exceptions::SecurityLevelNotHighEnough to warn the user that maybe
-    they don't have the full API key
-
-Revision 13: 2007-08-14 22:36:50 +0100 (Tue, 14 Aug 2007)
-  Global attempts to fix when to_time can be nil
-  Add a check in Reve::Classes::WalletTransaction#new to check for the presence
-    of character_id in the return data before trying to use it
-
-Revision 12: 2007-08-14 21:10:26 +0100 (Tue, 14 Aug 2007)
-  Add a test for malformed XML input
-  Subclass Reve::Classes::WalletTransaction for Personal and Corporate 
-    wallet transactions ('transactionFor' in the XML) as per
-    http://myeve.eve-online.com/ingameboard.asp?a=topic&threadID=575626&page=1#1
-  Removed characterID and characterName attributes frm WalletTransaction as 
-    per the above link
-
-Revision 11: 2007-08-10 22:13:46 +0100 (Fri, 10 Aug 2007)
-  Add alliances test xml for test suite
-
-Revision 10: 2007-08-10 22:12:59 +0100 (Fri, 10 Aug 2007)
-  Add a test suite
-  Add Reve::Exceptions::WebsiteOffline
-  Reve::Classes::WalletBalance.account_key now works
-  Reve::Classes::CharacterSheet.skill_in_training is boolean (and now works)
-  Reve::Classes::SkillTree.description now works
-
-
-Revision 9: 2007-08-07 07:22:42 +0100 (Tue, 07 Aug 2007)
-  Add Reve::Exceptions::EveDatabaseOffline for when the Eve DB is offline  
-
-Revision 8: 2007-08-01 22:30:57 +0100 (Wed, 01 Aug 2007)
-  First tarball release
-  Remove Curl dependency in favour of Ruby's built-in Net::HTTP
-  Change Reve::API#postfields and Reve::API#process_query for Curl removal
-  RDoc has inline source with line numbers
-  Document existance of Reve::Classes::PrimaryAttribute, 
-    Reve::Classes::SecondaryAttribute, Reve::Classes::WillpowerEnhancer,
-    Reve::Classes::IntelligenceEnhancer, Reve::Classes::MemoryEnhancer,
-    Reve::Classes::PerceptionEnhancer, Reve::Classes::CharismaEnhancer
-  Add Reve::Exceptions::ReveNetworkStatusException for when the network times
-    out.
-
-Revision 7: 2007-08-01 19:28:52 +0100 (Wed, 01 Aug 2007)
-  Finish the Reve::API#character_sheet method
-  Add Reve::Classes::AttributeEnhancer (and IntelligenceEnhancer,
-    MemoryEnhancer, PerceptionEnhancer, CharismaEnhancer and WillpowerEnhancer
-    subclasses, for implants)
-  Add enhancers (Array) attribute to Reve::Classes::CharacterSheet
-  Add Reve::Extensions::String#to_i in an attempt to make an integer from a
-    String when possible. See the docs for the method for details.
-  Update RDoc
-
-Revision 6: 2007-08-01 08:04:33 +0100 (Wed, 01 Aug 2007)
-  Remove some pretty print debug info.
-
-Revision 5: 2007-07-29 23:08:45 +0100 (Sun, 29 Jul 2007)
-  Change Reve::Classes::Sovereignty to use nil (not 0) for alliance_id and
-    faction_id where applicable.
-
-Revision 4: 2007-07-26 20:07:30 +0100 (Thu, 26 Jul 2007)
-  Add Copyright notice
-  More documentation with brief sample usage in the Reve::API class
-  Change Reve::Extensions::String#to_date to use :utc instead of :local for
-    conversions
-
-Revision 3: 2007-07-22 15:18:06 +0100 (Sun, 22 Jul 2007)
-  Add better 'require reve' support ($:.unshift fun)
-  Add Documentation (RDoc)
-
-Revision 2:2007-07-22 10:06:11 +0100 (Sun, 22 Jul 2007)
-  Add sample "tester.rb"
-  Add Reve::Classes::RequiredAttribute and Primary/Secondary subclass
-    for skill_tree
-  Change Reve::Classes::Alliance's attribute alliance_id to plain id
-  Fix Reve::API.current_time assignment in Reve::API#check_exception
-
-Revision 1: 2007-07-22 02:02:33 +0100 (Sun, 22 Jul 2007)
-  Initial Import
+For a ChangeLog please refer to Github, https://github.com/lisa/reve/commits/master

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008 Lisa Seelye <lisa@thedoh.com>
+Copyright (c) 2007 - 2010 Lisa Seelye <lisa@thedoh.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -10,6 +10,7 @@ Rake::RDocTask.new("doc") { |rdoc|
   rdoc.title = 'Reve API Documentation'
   rdoc.options << '--line-numbers' << '--inline-source' << '--all'
   rdoc.rdoc_files.include('./ChangeLog')
+  rdoc.rdoc_files.include('./README.rdoc')
   rdoc.rdoc_files.include('*.rb')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.include('test/**/*')
@@ -23,7 +24,7 @@ if File.exists?('.git')
       s.rubyforge_project = "reve"
       s.author = "Lisa Seelye"
       s.email = "lisa@thedoh.com"
-      s.homepage = "http://github.com/lisa/reve"
+      s.homepage = "https://github.com/lisa/reve"
       s.platform = Gem::Platform::RUBY
       s.summary = "Reve is a Ruby library to interface with the Eve Online API"
       s.files = FileList["Rakefile","VERSION","LICENSE", "lib/**/*.rb","reve.rb","tester.rb","init.rb"].to_a

data/VERSION

@@ -1 +1 @@
-0.0.133
+0.1.0

data/lib/reve/classes.rb

@@ -6,7 +6,7 @@
 # The author is not adverse to tokens of appreciation in the form of Eve ISK,
 # ships, and feedback. Please use
 # http://www.crudvision.com/reve-ruby-eve-online-api-library/ to provide
-# feedback or send ISK to Raquel Smith in Eve. :-)
+# feedback
 #++
 module Reve #:nodoc:
   module Classes #:nodoc:
@@ -176,6 +176,7 @@ module Reve #:nodoc:
     end
     
     class CorporateContact < PersonalContact; end
+    class AllianceContact < PersonalContact; end
     
     # The status of a System with regards to a FactionWar. Who controls what 
     # and what System is contested
@@ -615,7 +616,7 @@ module Reve #:nodoc:
     class CharacterSheet
       attr_accessor :name, :race, :bloodline, :gender, :id, :corporation_name, :corporation_id, :balance
       attr_accessor :intelligence, :memory, :charisma, :perception, :willpower, :clone_name, :clone_skill_points
-      attr_accessor :skills, :enhancers, :roles, :certificate_ids, :corporate_titles
+      attr_accessor :skills, :enhancers, :roles, :certificate_ids, :corporate_titles, :dob, :ancestry
       attr_accessor :corporationRolesAtHQ, :corporationRoles, :corporationRolesAtBase, :corporationRolesAtOther
       alias_method :corporate_roles_at_hq,    :corporationRolesAtHQ
       alias_method :corporate_roles,          :corporationRoles
@@ -1403,7 +1404,7 @@ module Reve #:nodoc:
     # * balance ( Float ) - New wallet balance after this action
     # * reason ( String ) - Any reason for the action. May be blank (useful in giving ISK)
     class WalletJournal
-      attr_reader :date, :ref_id, :reftype_id, :owner_name1, :owner_id1, :owner_name2, :owner_id2, :arg_name1, :arg_id1, :amount, :balance, :reason
+      attr_reader :date, :ref_id, :reftype_id, :owner_name1, :owner_id1, :owner_name2, :owner_id2, :arg_name1, :arg_id1, :amount, :balance, :reason, :tax_amount, :tax_receiver_id
       alias_method :id, :ref_id
       def initialize(elem) #:nodoc:
         @date        = elem['date'].to_time
@@ -1416,6 +1417,8 @@ module Reve #:nodoc:
         @arg_name1   = elem['argName1']
         @arg_id1     = elem['argID1'].to_i if elem['argID1']
         @amount      = elem['amount'].to_f
+        @tax_amount      = elem['taxAmount'].to_f
+        @tax_receiver_id = elem['taxReceiverID'].to_i if elem['taxReceiverID']
         @balance     = elem['balance'].to_f
         @reason      = elem['reason']
       end
@@ -1439,7 +1442,7 @@ module Reve #:nodoc:
     class WalletTransaction
       attr_reader :created_at, :id, :quantity, :type_name, :type_id, :price, 
                   :client_id, :client_name, :character_id, :station_id, :station_name, :type,
-                  :transaction_for
+                  :transaction_for, :character_name
       def initialize(elem) #:nodoc:
         @created_at       = elem['transactionDateTime'].to_time
         @id               = elem['transactionID'].to_i
@@ -1449,6 +1452,7 @@ module Reve #:nodoc:
         @price            = elem['price'].to_f
         @client_id        = elem['clientID'].to_i if elem['clientID']
         @client_name      = elem['clientName']
+        @character_name   = elem['characterName']
         @station_id       = elem['stationID'].to_i
         @station_name     = elem['stationName']
         @character_id     = elem['characterID'].to_i if elem['characterID'] && elem['characterID'] != '0'
@@ -1566,14 +1570,16 @@ module Reve #:nodoc:
     # * last_known_location ( String ) -
     # * acount_balance ( Float )
     class CharacterInfo
-      attr_reader :id, :name, :race, :bloodline, :corporation_id, :corporation_name, :corporation_date, :alliance_id, :alliance_name, :alliance_date
+      attr_reader :id, :name, :race, :bloodline, :corporation_id, :corporation_name, :corporation_date, :alliance_id, :alliance_name, :alliance_date, :dob, :ancestry
       attr_reader :security_status, :skillpoints, :skill_training_ends, :ship_name, :ship_type_id, :ship_type_name, :last_known_location, :acount_balance
 
       def initialize(elem) #:nodoc:
         @id = (elem/'characterID').inner_html.to_i
         @name = (elem/'characterName').inner_html
+        @dob = (elem/'DoB').inner_html
         @race = (elem/'race').inner_html
         @bloodline = (elem/'bloodline').inner_html
+        @ancestry = (elem/'ancestry').inner_html
         @corporation_id = (elem/'corporationID').inner_html.to_i
         @corporation_name = (elem/'corporation').inner_html
         @corporation_date = Time.parse((elem/'corporationDate').inner_html)

data/lib/reve/exceptions.rb

@@ -6,7 +6,7 @@
 # The author is not adverse to tokens of appreciation in the form of Eve ISK,
 # ships, and feedback. Please use
 # http://www.crudvision.com/reve-ruby-eve-online-api-library/ to provide
-# feedback or send ISK to Raquel Smith in Eve. :-)
+# feedback
 #++
 module Reve
   # Exceptions live here.

data/lib/reve.rb

@@ -3,7 +3,6 @@
 # Contributors at: http://github.com/lisa/reve/contributors
 # This library is licensed under the terms of the MIT license. For full text
 # see the LICENSE file distributed with this package.
-# (Also, send Raquel Smith some ISK if you would like to show appreciation ;-)
 #++
 
 begin
@@ -29,7 +28,7 @@ require 'reve/classes'
 module Reve
   # API Class.
   # Basic Usage:
-  # api = Reve::API.new('my_UserID', 'my_apiKey')
+  # api = Reve::API.new('my_keyID', 'my_vCode')
   # alliances = api.alliances # Returns an array of Reve::Classes::Alliance
   #
   # api.personal_wallet_blanace(:characterid => 892008733) # Returns an array of
@@ -78,8 +77,8 @@ module Reve
     @@corporate_assets_url         = 'http://api.eve-online.com/corp/AssetList.xml.aspx'
     @@personal_kills_url           = 'http://api.eve-online.com/char/KillLog.xml.aspx'
     @@corporate_kills_url          = 'http://api.eve-online.com/corp/KillLog.xml.aspx'
-    @@character_id_url             = 'http://api.eve-online.com/eve/CharacterID.xml.aspx'   # ?names=CCP%20Garthagk,Raquel%20Smith
-    @@character_name_url           = 'http://api.eve-online.com/eve/CharacterName.xml.aspx' # ?ids=797400947,892008733
+    @@character_id_url             = 'http://api.eve-online.com/eve/CharacterID.xml.aspx'   # ?names=CCP%20Garthagk
+    @@character_name_url           = 'http://api.eve-online.com/eve/CharacterName.xml.aspx' # ?ids=797400947
     @@personal_faction_war_stats_url= 'http://api.eve-online.com/char/FacWarStats.xml.aspx'
     @@corporate_faction_war_stats_url= 'http://api.eve-online.com/corp/FacWarStats.xml.aspx'
     @@general_faction_war_stats_url= 'http://api.eve-online.com/eve/FacWarStats.xml.aspx'
@@ -116,22 +115,28 @@ module Reve
                    :account_status_url, :character_info_url
 
 
-    attr_accessor :key, :userid, :charid
+    attr_accessor :key, :keyid, :cak, :charid
+    alias :userid :keyid
+    alias :userid= :keyid=
     attr_accessor :http_user_agent, :save_path, :timeout
     attr_reader :current_time, :cached_until, :last_hash, :reve_version
     
     # Create a new API instance.
     # current_time and cached_until are meaningful only for the LAST call made.
     # Expects:
-    # * userid ( Integer | String ) - Your API userID
-    # * key ( String ) - Your API key (Full key or restricted key)
+    # * keyid ( Integer | String ) - Your Key ID (or legacy key UserID)
+    # * key ( String ) - Your API key verification code (or legacy API Key)
     # * charid ( Integer | String ) - Default characterID for calls requiring it.
+    #
+    # If you are using legacy key ids, you must explicitly set the
+    # cak attribute on the returned API instance to false.
+    #
     # NOTE: All values passed to the constructor are typecasted to a String for safety.
-    def initialize(userid = "", key = "", charid = "")
-      @userid = (userid || "").to_s
+    def initialize(keyid = "", key = "", charid = "")
+      @keyid  = (keyid || "").to_s
       @key    = (key    || "").to_s
       @charid = (charid || "").to_s
-      
+      @cak    = true
       @save_path = nil
       
       @max_tries = 3
@@ -144,7 +149,7 @@ module Reve
       @http_user_agent = "Reve v#{@reve_version}; http://github.com/lisa/reve"
     end
     # Save XML to this directory with the format:
-    # :save_path/:userid/:method/:expires_at_in_unixtime.xml
+    # :save_path/:keyid/:method/:expires_at_in_unixtime.xml
     # eg: ./xml/12345/characters/1200228878.xml
     # or: ./xml/alliances/1200228878.xml
     # If @save_path is nil then XML is not saved.
@@ -314,7 +319,15 @@ module Reve
       args = postfields(opts)
       h = compute_hash(args.merge(:url => @@corporate_contacts_url))
       return h if h
-      process_query(Reve::Classes::PersonalContact, opts[:url] || @@corporate_contacts_url,false,args)
+      xml = process_query(nil, opts[:url] || @@corporate_contacts_url,true,args)
+      contacts = []
+      xml.search("/eveapi/result/rowset[@name='corporateContactList']/row").each do |corporate|
+        contacts << Reve::Classes::CorporateContact.new(corporate)
+      end
+      xml.search("/eveapi/result/rowset[@name='allianceContactList']/row").each do |alliance|
+        contacts << Reve::Classes::AllianceContact.new(alliance)
+      end
+      contacts
     end
         
     # Returns the SkillTree from
@@ -607,15 +620,7 @@ module Reve
       h = compute_hash(args.merge(:url => @@personal_assets_url))
       return h if h
       xml = process_query(nil,opts[:url] || @@personal_assets_url,true,args)
-      assets = []
-      xml.search("/eveapi/result/rowset[@name='assets']/row").each do |container|
-        asset_container = Reve::Classes::AssetContainer.new(container)
-        container.search("rowset[@name='contents']/row").each do |asset|
-          asset_container.assets << Reve::Classes::Asset.new(asset)
-        end
-        assets << asset_container
-      end
-      assets
+      self.recur_through_assets(xml.search("/eveapi/result/rowset[@name='assets']/row"))
     end
     
     # Get a list of the Corporate Assets. Pass the characterid of the Corporate member See also assets_list method
@@ -624,18 +629,10 @@ module Reve
       h = compute_hash(args.merge(:url => @@corporate_assets_url))
       return h if h
       xml = process_query(nil,opts[:url] || @@corporate_assets_url,true,args)
-      assets = []
-      xml.search("/eveapi/result/rowset/row").each do |container|
-        asset_container = Reve::Classes::AssetContainer.new(container)
-        container.search("rowset[@name='contents']/row").each do |asset|
-          asset_container.assets << Reve::Classes::Asset.new(asset)
-        end
-        assets << asset_container
-      end
-      assets
+      self.recur_through_assets(xml.search("/eveapi/result/rowset[@name='assets']/row"))
     end
 
-    # Returns a Character list for the associated key and userid from
+    # Returns a Character list for the associated key from
     # http://api.eve-online.com/account/Characters.xml.aspx
     # See also: Reve::Classes::Character
     def characters(opts = {})
@@ -828,7 +825,7 @@ module Reve
       xml = process_query(nil,opts[:url] || @@corporation_member_security_url,true,args)
 
       cmc = Reve::Classes::CorporationMemberSecurity.new
-      xml.search("/eveapi/result/member").each do |member|
+      xml.search("/eveapi/result/rowset[@name=members]/row").each do |member|
         mem = Reve::Classes::CorporationMember.new(member)
         cmc.members << mem
         [:roles, :grantableRoles, :rolesAtHQ, :grantableRolesAtHQ, :rolesAtBase, :grantableRolesAtBase, :rolesAtOther, :grantableRolesAtOther].each do |rowset|
@@ -897,7 +894,7 @@ module Reve
         cs.enhancers << i
       end
 
-      [ 'characterID', 'name', 'race', 'bloodLine', 'gender','corporationName',
+      [ 'characterID', 'name', 'race', 'bloodLine', 'ancestry', 'dob', 'gender','corporationName',
         'corporationID','balance', 'cloneName', 'cloneSkillPoints' 
       ].each do |field|
         cs.send("#{field.downcase}=",xml.search("/eveapi/result/#{field}/").first.to_s)
@@ -983,12 +980,40 @@ module Reve
     end
 
     protected
+    # Helper method to handle nested assets
+    def recur_through_assets(rows)
+      assets = []
+      rows.each do |container|
+        unless container.empty?  
+          asset_container = Reve::Classes::AssetContainer.new(container)
+          asset_container.assets = self.recur_through_assets(container.search("/rowset/row"))
+          assets << asset_container 
+        else
+          assets << Reve::Classes::Asset.new(container)
+        end
+      end 
+      assets
+    end
+    
     # Sets up the post fields for Net::HTTP::Get hash for process_query method.
     # See also format_url_request
     # TODO: Consider moving this whole thing into process_query to avoid 
     # calling this in every method!
     def postfields(opts = {})
-      ret = { "userid" => @userid, "apikey" => @key, "characterid" => @charid }.merge(opts.stringify_keys)
+      baseargs = { :characterid => @charid }
+      if @cak
+        baseargs[:keyid] = @keyid
+        baseargs[:vcode] = @key
+      else
+        baseargs[:userid] = @keyid
+        baseargs[:apikey] = @key
+      end
+      ret = opts.clone
+      baseargs.each do |k,v|
+        if ret[k].nil?
+          ret[k] = v
+        end
+      end
       ret.inject({}) do |n, (k,v)|
         n[k.downcase] = v.to_s if v
         n
@@ -1033,7 +1058,8 @@ module Reve
       #return h if h
 
       @last_hash = compute_hash(opts.merge({:url => url, :just_hash => true })) # compute hash
-      
+
+
       xml = check_exception(get_xml(url,opts))
       save_xml(xml) if @save_path
 
@@ -1060,7 +1086,7 @@ module Reve
     # Gets the XML from a source.
     # Expects:
     # * source ( String | URI ) - If the +source+ is a String Reve will attempt to load the XML file from the local filesystem by the path specified as +source+. If the +source+ is a URI or is a String starting with http (lowercase) Reve will fetch it from that URI on the web.
-    # * opts ( Hash ) - Hash of parameters for the request, such as userid, apikey and such.
+    # * opts ( Hash ) - Hash of parameters for the request, such as keyid, vcode and such.
     # NOTE: To override the lowercase http -> URI rule make the HTTP part uppercase.
     def get_xml(source,opts)
       xml = ""
@@ -1134,7 +1160,7 @@ module Reve
     end
     def build_save_filename
       method = caller(3).first.match(/\`(.+)'/)[1] # Get the API method that's being called. This is called from save_xml -> process_query -> :real_method
-      File.join(@save_path,@userid.to_s,method,( @cached_until || Time.now.utc).to_i.to_s + '.xml')
+      File.join(@save_path,@keyid.to_s,method,( @cached_until || Time.now.utc).to_i.to_s + '.xml')
     end
 
     # Returns an array of +klass+

data/test/test_reve.rb

@@ -306,13 +306,20 @@ class TestReve < Test::Unit::TestCase
   end
   
   def test_corporate_contacts_clean
-    Reve::API.corporate_contacts_url = XML_BASE + 'char_contacts.xml'
+    Reve::API.corporate_contacts_url = XML_BASE + 'corp_contact.xml'
     contacts = @api.corporate_contacts
     assert_equal(2, contacts.length)
-    assert_equal("Hirento Raikkanen", contacts.first.contact_name )
-    assert_equal(3010913, contacts.first.contact_id )
+    assert_equal("CCP Garthagk", contacts.first.contact_name )
+    assert_equal(797400947, contacts.first.contact_id )
     assert_equal(false, contacts.first.in_watchlist )
-    assert_equal(0, contacts.first.standing )
+    assert_equal(-10, contacts.first.standing )
+    assert_equal(Reve::Classes::CorporateContact, contacts.first.class )
+    
+    assert_equal("CCP Garthagk", contacts.last.contact_name )
+    assert_equal(797400947, contacts.last.contact_id )
+    assert_equal(false, contacts.last.in_watchlist )
+    assert_equal(5, contacts.last.standing )
+    assert_equal(Reve::Classes::AllianceContact, contacts.last.class )
   end
   
   def test_faction_war_system_stats_clean(skip_preamble = false,stats = nil)
@@ -467,21 +474,22 @@ class TestReve < Test::Unit::TestCase
     assert_nothing_raised do
       assets = @api.personal_assets_list
     end
-    assert_equal 18, assets.size # 18 single and 1 container
-    contained_assets = assets.inject([]) { |ass,container| ass << container.assets }.flatten
+    assert_equal 19, assets.size # 18 single and 1 container
+    contained_assets = assets.select { |ass| ass.instance_of? Reve::Classes::AssetContainer}
+
     assert_equal(1, contained_assets.size) # We have a container it happens to have 1 asset in it
     contained_assets.each do |asset|
-      assert_instance_of(Reve::Classes::Asset, asset)
+      assert_instance_of(Reve::Classes::AssetContainer, asset)
       assert_not_nil(asset.item_id)
+      assert_not_nil(asset.location_id)
       assert_not_nil(asset.type_id)
       assert_not_nil(asset.quantity)
       assert_not_nil(asset.flag)
       assert_not_nil(asset.singleton)
     end
-    assets.each do |asset|
-      assert_instance_of(Reve::Classes::AssetContainer, asset)
+    assets.select { |ass| ass.instance_of? Reve::Classes::Asset}.each do |asset|
+      assert_instance_of(Reve::Classes::Asset, asset)
       assert_not_nil(asset.item_id)
-      assert_not_nil(asset.location_id)
       assert_not_nil(asset.type_id)
       assert_not_nil(asset.quantity)
       assert_not_nil(asset.flag)
@@ -695,7 +703,7 @@ class TestReve < Test::Unit::TestCase
     trans.each do |tran|
       [ :created_at, :id, :quantity, :type_name, :type_id, :price, 
         :client_id, :client_name, :character_id, :station_id, :station_name, :type,
-        :transaction_for ].each do |attr|
+        :transaction_for, :character_name ].each do |attr|
       assert_not_nil(tran.send(attr))
     end
     assert_instance_of(Time, tran.created_at)
@@ -724,15 +732,15 @@ class TestReve < Test::Unit::TestCase
     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_equal 3, journal.size
     assert journal.all? { |j| j.kind_of?(Reve::Classes::WalletJournal) }    
     journal.each do |j|
-      [ :date, :ref_id, :reftype_id, :owner_name1, :owner_name2, :arg_name1, :amount, :balance, :reason ].each do |attr|
+      [ :date, :ref_id, :reftype_id, :owner_name1, :owner_name2, :arg_name1, :amount, :balance, :reason , :tax_amount, :tax_receiver_id].each do |attr|
         assert_not_nil(j.send(attr))
       end
     end
   end
-  
+
   def test_corporate_assets_list_clean
     assets = nil
     assert_nothing_raised do
@@ -741,7 +749,30 @@ class TestReve < Test::Unit::TestCase
     assert_equal 2, assets.size
     assert assets.all? { |a| a.kind_of?(Reve::Classes::AssetContainer) }
   end
-  
+
+  def test_corporate_assets_list_nesting_clean
+    assets = nil
+    assert_nothing_raised do
+      assets = @api.corporate_assets_list :url => File.join(XML_BASE,'corporate_assets_list_nesting.xml')
+    end
+
+    assert_equal 3, assets.size
+    assert assets[0].kind_of?(Reve::Classes::Asset)
+    assert assets[1].kind_of?(Reve::Classes::AssetContainer)
+    assert assets[2].kind_of?(Reve::Classes::Asset)
+    
+    first_container = assets[1]
+    assert_equal 2, first_container.type_id
+    assert_equal 2, first_container.assets.size
+    
+    second_container = first_container.assets[0]
+    assert_equal 3, second_container.type_id
+    assert_equal 1, second_container.assets.size
+    assert second_container.assets[0].kind_of?(Reve::Classes::Asset)
+    
+    nested_item = second_container.assets[0]
+    assert_equal 640, nested_item.type_id
+  end
   def test_map_jumps_clean
     Reve::API.map_jumps_url = XML_BASE + 'mapjumps.xml'
     mapjumps = nil
@@ -1100,6 +1131,8 @@ class TestReve < Test::Unit::TestCase
     
     assert_not_nil sheet.name
     assert_not_nil sheet.race
+    assert_not_nil sheet.ancestry
+    assert_not_nil sheet.dob
     assert_not_nil sheet.bloodline
     assert_not_nil sheet.gender
     assert_not_nil sheet.id

data/test/xml/assets.xml

@@ -3,30 +3,30 @@
   <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">
-      <row typeid="649" itemid="543447240" singleton="1" quantity="1" flag="4" locationid="60003913">
+      <row typeID="222" itemID="427545405" singleton="0" quantity="100" flag="4" locationID="60004390" />
+      <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 typeID="11489" itemID="782544272" singleton="1" quantity="1" flag="5" />
+        </rowset>
       </row>
-      </row><row typeid="222" itemid="550639494" singleton="0" quantity="100" flag="4" locationid="60004384">
-      </row><row typeid="7447" itemid="591233762" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="9668" itemid="591233776" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="7409" itemid="591233791" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="5441" itemid="591233797" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="14280" itemid="591233811" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="14358" itemid="591233816" singleton="0" quantity="50" flag="4" locationid="60003865">
-      </row><row typeid="215" itemid="627545204" singleton="0" quantity="1" flag="4" locationid="60002296">
-      </row><row typeid="530" itemid="673815728" singleton="0" quantity="3" flag="4" locationid="60003865">
-      </row><row typeid="444" itemid="673815903" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="533" itemid="681785163" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="11740" itemid="781256936" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="11489" itemid="782544130" singleton="1" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="51" itemid="1125520018" singleton="1" quantity="1" flag="4" locationid="60014545">
-      </row><row typeid="602" itemid="1943266444" singleton="0" quantity="1" flag="4" locationid="60003865">
-      </row><row typeid="12865" itemid="1812312532" singleton="0" quantity="18" flag="4" locationid="60003865">
-      </row><row typeid="25373" itemid="1711554909" singleton="0" quantity="30" flag="4" locationid="60003865">
-      </row></rowset>
+	  <row typeID="222" itemID="550639494" singleton="0" quantity="100" flag="4" locationID="60004384" />
+      <row typeID="7447" itemID="591233762" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="9668" itemID="591233776" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="7409" itemID="591233791" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="5441" itemID="591233797" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="14280" itemID="591233811" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="14358" itemID="591233816" singleton="0" quantity="50" flag="4" locationID="60003865" />
+      <row typeID="215" itemID="627545204" singleton="0" quantity="1" flag="4" locationID="60002296" />
+      <row typeID="530" itemID="673815728" singleton="0" quantity="3" flag="4" locationID="60003865" />
+      <row typeID="444" itemID="673815903" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="533" itemID="681785163" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="11740" itemID="781256936" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="11489" itemID="782544130" singleton="1" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="51" itemID="1125520018" singleton="1" quantity="1" flag="4" locationID="60014545" />
+      <row typeID="602" itemID="1943266444" singleton="0" quantity="1" flag="4" locationID="60003865" />
+      <row typeID="12865" itemID="1812312532" singleton="0" quantity="18" flag="4" locationID="60003865" />
+      <row typeID="25373" itemID="1711554909" singleton="0" quantity="30" flag="4" locationID="60003865" />
+    </rowset>
   </result>
   <cacheduntil>2007-12-19 17:27:27</cacheduntil>
 </eveapi>

data/test/xml/character_sheet.xml

@@ -4,8 +4,10 @@
   <result>
     <characterID>892008733</characterID>
     <name>Raquel Smith</name>
+    <DoB>2009-04-20 00:30:00</DoB>
     <race>Caldari</race>
-    <bloodLine>Civire</bloodLine>
+    <bloodLine>Civire</bloodLine> 
+    <ancestry>Scientists</ancestry>
     <gender>Female</gender>
     <corporationName>Freedom-Technologies</corporationName>
     <corporationID>1668136112</corporationID>

data/test/xml/corp_contact.xml

@@ -0,0 +1,12 @@
+<eveapi version="2">
+  <currentTime>2010-05-29 22:35:46</currentTime>
+  <result>
+    <rowset name="corporateContactList" key="contactID" columns="contactID,contactName,standing">
+      <row contactID="797400947" contactName="CCP Garthagk" standing="-10" />
+    </rowset>
+    <rowset name="allianceContactList" key="contactID" columns="contactID,contactName,standing">
+      <row contactID="797400947" contactName="CCP Garthagk" standing="5" />
+    </rowset>
+  </result>
+  <cachedUntil>2010-05-29 22:50:46</cachedUntil>
+</eveapi>

data/test/xml/corporate_assets_list_nesting.xml

@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2011-02-20 19:24:54</currentTime>
+  <result>
+    <rowset name="assets" key="itemID" columns="itemID,locationID,typeID,quantity,flag,singleton">
+	  <row itemID="1000986294535" typeID="1" quantity="2" flag="64" singleton="0" />
+
+      <row itemID="144702314" locationID="66006338" typeID="2" quantity="1" flag="85" singleton="1">
+        <rowset name="contents" key="itemID" columns="itemID,typeID,quantity,flag,singleton">
+          <row itemID="1000993385751" typeID="3" quantity="1" flag="119" singleton="1">
+            <rowset name="contents" key="itemID" columns="itemID,typeID,quantity,flag,singleton">
+              <row itemID="1000986294535" typeID="640" quantity="1" flag="64" singleton="0" />
+            </rowset>
+          </row>
+		  <row itemID="1000986294535" typeID="4" quantity="1" flag="64" singleton="0" />
+		</rowset>
+      </row>
+	  <row itemID="1000986294535" typeID="5" quantity="1" flag="64" singleton="0" />
+    </rowset>
+  </result>
+  <cachedUntil>2011-02-20 23:08:04</cachedUntil>
+</eveapi>

data/test/xml/corporate_wallet_journal.xml

@@ -3,8 +3,9 @@
   <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 date="2008-08-20 13:10:00" refID="1575178032" refTypeID="85" ownerName1="CONCORD" ownerID1="1000125" ownerName2="anonymous" ownerID2="173993711" argName1="Jita" argID1="30001660" amount="135000.00" balance="609292267.52" reason="29200:15," taxReceiverID="1734917694" taxAmount="15000.00">
+	 </row><row date="2008-08-20 13:10:00" refID="1575178032" refTypeID="85" ownerName1="CONCORD" ownerID1="1000125" ownerName2="anonymous" ownerID2="173993711" argName1="Jita" argID1="30001660" amount="135000.00" balance="609292267.52" reason="29200:15," taxReceiverID="1734917694" taxAmount="15000.00">
+	  </row><row date="2008-08-20 13:10:00" refID="1575178032" refTypeID="85" ownerName1="CONCORD" ownerID1="1000125" ownerName2="anonymous" ownerID2="173993711" argName1="Jita" argID1="30001660" amount="135000.00" balance="609292267.52" reason="29200:15," taxReceiverID="1734917694" taxAmount="15000.00">
     </row></rowset>
   </result>
   <cacheduntil>2008-02-03 15:51:03</cacheduntil>

data/tester.rb

@@ -4,8 +4,8 @@ require 'reve'
 # Create an instance of the API
 api = Reve::API.new
 
-fids = [ 797400947,892008733 ] # converting from these IDs
-fnames = [ 'CCP Garthagk', 'Raquel Smith' ] # converting from these names
+fids = [ 797400947 ] # converting from these IDs
+fnames = [ 'CCP Garthagk' ] # converting from these names
 
 ids = api.character_name({ :ids => fids })
 names = api.character_id({ :names => fnames })

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 133
-  version: 0.0.133
+  version: 0.1.0
 platform: ruby
 authors: 
 - Lisa Seelye
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2012-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ files:
 - tester.rb
 - ChangeLog
 has_rdoc: true
-homepage: http://github.com/lisa/reve
+homepage: https://github.com/lisa/reve
 licenses: []
 
 post_install_message: 
@@ -98,11 +98,13 @@ test_files:
 - test/xml/charactername.xml
 - test/xml/characters.xml
 - test/xml/conqurable_stations.xml
+- test/xml/corp_contact.xml
 - test/xml/corp_facwarstats.xml
 - test/xml/corp_medals.xml
 - test/xml/corp_member_medals.xml
 - test/xml/corp_membersecurity.xml
 - test/xml/corporate_assets_list.xml
+- test/xml/corporate_assets_list_nesting.xml
 - test/xml/corporate_market_orders.xml
 - test/xml/corporate_wallet_balance.xml
 - test/xml/corporate_wallet_journal.xml