eaal 0.1.11 → 0.1.12

data/lib/eaal.rb

@@ -34,7 +34,7 @@ require 'eaal/result'
 require 'eaal/rowset'
 
 module EAAL
-  VERSION = "0.1.11" # fix for Hoe.spec 2.x
+  VERSION = "0.1.12" # fix for Hoe.spec 2.x
   @@version_string = "EAAL" +  VERSION # the version string, used as client name in http requests
 
   @@api_base = "https://api.eveonline.com"  # the url used as basis for all requests, you might want to use gatecamper url or a personal proxy instead

data/lib/eaal/result.rb

@@ -14,10 +14,11 @@ module EAAL
 
         # Result Container class, ...
         class ResultContainer
-            attr_accessor :container
+            attr_accessor :container, :attribs
 
             def initialize
                 self.container = {}
+                self.attribs = {}
             end
 
             def add_element(key, val)
@@ -25,7 +26,11 @@ module EAAL
             end
 
             def method_missing(method, *args)
-                self.container[method.id2name]
+                if self.attribs.has_key?(method.id2name)
+                    self.attribs[method.id2name]
+                else
+                    self.container[method.id2name]
+                end
             end
 
             def to_hash
@@ -84,6 +89,9 @@ module EAAL
                     re = ResultElement.new(key, value)
                     if element.attributes.to_hash.length > 0
                         re.attribs.merge!(element.attributes.to_hash)
+                        if re.value.respond_to?(:attribs)
+                            re.value.attribs.merge!(element.attributes.to_hash)
+                        end
                     end
                 end
                 re
@@ -105,6 +113,7 @@ module EAAL
             elements = (xml/"eveapi/result").first.containers
             elements.each {|element|
                 el = EAAL::Result::ResultElement.parse_element(prefix, element)
+
                 members << el.name
                 if el.kind_of? EAAL::Rowset::RowsetBase
                     values.merge!({el.name => el})
@@ -124,6 +133,15 @@ module EAAL
             result.request_time = (xml/"eveapi/currentTime").first.inner_html
             result.cached_until = (xml/"eveapi/cachedUntil").first.inner_html
             values.each { |key,value|
+                # This class may have been set up with some missing keys if the original
+                # response that trigged its creation didn't contain certain elements
+                # For example, some CharacterSheets don't have an "allianceName" element
+                # if the character isn't in an alliance.  This adds them if they're missing
+                if(!result.respond_to?("#{key}=".to_sym))
+                    result.class.class_eval do
+                        attr_accessor key.to_sym
+                    end
+                end
                 result.send(key + "=", value)
             }
             result

data/test/test_eaal.rb

@@ -57,6 +57,18 @@ class TestEaal < Test::Unit::TestCase
    assert_kind_of EAAL::Rowset::RowsetBase, @api.AllianceList.alliances.first.memberCorporations
   end
 
+  # test for ApiKeyInfo.xml
+  def test_api_key
+    @api.scope = "account"
+    assert_equal @api.APIKeyInfo.key.characters.length, 1
+    assert_equal @api.APIKeyInfo.key.characters[0].characterID, '12345'
+    assert_equal @api.APIKeyInfo.key.characters[0].characterName, 'Tester'
+    assert_equal @api.APIKeyInfo.key.characters[0].corporationID, '45678'
+    assert_equal @api.APIKeyInfo.key.accessMask, '59760264'
+    assert_equal @api.APIKeyInfo.key.type, 'Character'
+    assert_equal @api.APIKeyInfo.key.expires, '2011-09-11 00:00:00'
+  end
+
   # test for Standings.xml
   def test_standings
     @api.scope = "account"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eaal
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors: