eaal 0.1.10 → 0.1.11

data/Manifest.txt

@@ -11,12 +11,17 @@ lib/eaal/cache/memcached.rb
 lib/eaal/exception.rb
 lib/eaal/result.rb
 lib/eaal/rowset.rb
-script/console
-script/destroy
-script/generate
 test/fixtures/test/test/account/Characters/Request_.xml
+test/fixtures/test/test/char/CharacterSheet/Request_.xml
+test/fixtures/test/test/char/CharacterSheet/Request_characterID_12345.xml
 test/fixtures/test/test/char/Killlog/Request_.xml
-test/fixtures/test/test/char/Killlog/Request_characterID:12345.xml
+test/fixtures/test/test/char/Killlog/Request_characterID_12345.xml
+test/fixtures/test/test/char/SkillInTraining/Request_characterID_12345.xml
+test/fixtures/test/test/char/SkillQueue/Request_characterID_12345.xml
+test/fixtures/test/test/char/Standings/Request_.xml
+test/fixtures/test/test/char/Standings/Request_characterID_12345.xml
+test/fixtures/test/test/corp/CorporationSheet/Request_corporationID_150212025.xml
 test/fixtures/test/test/eve/AllianceList/Request_.xml
+test/fixtures/test/test/server/ServerStatus/Request_.xml
 test/test_eaal.rb
 test/test_helper.rb

data/Rakefile

@@ -1,25 +1,35 @@
-%w[hoe rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/eaal.rb'
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler.require
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
+
+# Gives us the gem:spec rake task to generate a gemspec file
+Hoe.plugin :gemspec
+
 $hoe = Hoe.spec 'eaal' do |p|
   p.developer('Peter Petermann', 'ppetermann80@googlemail.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = p.name
   p.extra_deps         = [
-    ['activesupport','>= 2.0.2'], ['hpricot', '>= 0.6'], ['memcache-client','>= 1.7.1']
+    ['hpricot', '>= 0.6'], 
+    ['memcache-client','>= 1.7.1'],
+    ['faraday', '>= 0.8.4']
   ]
+
   p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
+    ['hoe'],
+    ['hoe-gemspec']
   ]
+
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
   p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
   p.rsync_args = '-av --delete --ignore-errors'
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 # TODO - want other tests/tasks run by default? Add them to the list

data/lib/eaal.rb

@@ -21,11 +21,10 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
 # External libs
 require 'rubygems'
 require 'hpricot'
-require 'active_support'
-require 'active_support/core_ext'
-require 'net/http'
-require 'uri'
 require 'cgi'
+require 'faraday'
+require 'time'
+
 # And now EAAL stuff
 require 'eaal/cache/base'
 require 'eaal/cache/file'
@@ -33,14 +32,38 @@ require 'eaal/cache/memcached'
 require 'eaal/exception'
 require 'eaal/result'
 require 'eaal/rowset'
+
 module EAAL
-  mattr_reader :version_string
-  VERSION = "0.1.10" # fix for Hoe.spec 2.x
+  VERSION = "0.1.11" # fix for Hoe.spec 2.x
   @@version_string = "EAAL" +  VERSION # the version string, used as client name in http requests
 
-  mattr_accessor :api_base, :additional_request_parameters, :cache
-  @@api_base = "http://api.eve-online.com/"  # the url used as basis for all requests, you might want to use gatecamper url or a personal proxy instead
+  @@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
   @@additional_request_parameters = {}       # hash, if :key => value pairs are added those will be added to each request
   @@cache = EAAL::Cache::NoCache.new         # caching object, see EAAL::Cache::FileCache for an Example
+
+  def self.version_string
+    @@version_string
+  end
+  def self.version_string=(val)
+    @@version_string = val
+  end
+  def self.api_base
+    @@api_base
+  end
+  def self.api_base=(val)
+    @@api_base = val
+  end
+  def self.additional_request_parameters
+    @@additional_request_parameters
+  end
+  def self.additional_request_parameters=(val)
+    @@additional_request_parameters = val
+  end
+  def self.cache
+    @@cache
+  end
+  def self.cache=(val)
+    @@cache = val
+  end
 end
 require 'eaal/api'

data/lib/eaal/api.rb

@@ -1,4 +1,3 @@
-
 # EAAL::API class
 # Usage Example:
 #  api = EAAL::API.new("my keyID", "my API key")
@@ -28,8 +27,9 @@ class EAAL::API
   def method_missing(method, *args)
     scope = self.scope
     args_hash = args.first
+    cache_only = (args_hash && args_hash.delete(:cache_only)) || false
     args_hash = {} unless args_hash
-    self.request_xml(scope, method.id2name, args_hash)
+    self.request_xml(scope, method.id2name, args_hash, cache_only)
   end
 
   # make a request to the api. will use cache if set.
@@ -37,45 +37,46 @@ class EAAL::API
   # * scope (String)
   # * name (String)
   # * opts (Hash)
-  def request_xml(scope, name, opts)
+  def request_xml(scope, name, opts, cache_only = false)
     opts = EAAL.additional_request_parameters.merge(opts)
     xml = EAAL.cache.load(self.keyid, self.vcode, scope, name,opts)
-    if not xml
-      source = URI.parse(EAAL.api_base + scope + '/' + name +'.xml.aspx')
-      req_path = source.path + format_url_request(opts.merge({
-        :keyid => self.keyid,
-        :vcode => self.vcode}))
-      req = Net::HTTP::Get.new(req_path)
-      req[EAAL.version_string]
-      res = Net::HTTP.new(source.host, source.port).start {|http| http.request(req) } #one request for now
-      case res
-      when Net::HTTPOK
-      when Net::HTTPNotFound
+
+    if (not xml) && (not cache_only)
+      
+      conn = Faraday.new(:url => "#{EAAL.api_base}") do |faraday|
+        faraday.request :url_encoded
+        faraday.adapter Faraday.default_adapter
+      end
+
+      response = conn.get(
+        request_path(name), 
+        opts.merge({
+          :keyid => self.keyid,
+          :vcode => self.vcode}))
+      
+      case response.status
+      when 200
+        # Nothing
+      when 404
         raise EAAL::Exception::APINotFoundError.new("The requested API (#{scope} / #{name}) could not be found.")
       else
-        raise EAAL::Exception::HTTPError.new("An HTTP Error occured, body: " + res.body)
+        raise EAAL::Exception::HTTPError.new("An HTTP Error occured, body: " + response.body)
       end
-      EAAL.cache.save(self.keyid, self.vcode, scope,name,opts, res.body)
-      xml = res.body
-    end
-    doc = Hpricot.XML(xml)
-    result = EAAL::Result.new(scope.capitalize + name, doc)
-  end
 
-  # Turns a hash into ?var=baz&bam=boo
-  # stolen from Reve (thx lisa)
-  # * opts (Hash)
-  def format_url_request(opts)
-    req = ''
-
-    opts.delete_if {|k,v| v.nil? }
-    return req if opts.empty?
+      EAAL.cache.save(self.keyid, self.vcode, scope,name,opts, response.body)
+      xml = response.body
+    end
 
-    opts.stringify_keys!
-    opts = opts.keys.sort.map do |key|
-      "#{CGI.escape(key.to_s)}=#{CGI.escape(opts[key].to_s)}"
+    if xml
+      doc = Hpricot.XML(xml)
+      result = EAAL::Result.new(scope.capitalize + name, doc)
+    else 
+      result = nil
     end
-    req = '?' + opts.join('&')
+  end
+
+  def request_path(name)
+    "/#{scope}/#{name}.xml.aspx"
   end
 
 end

data/lib/eaal/cache/file.rb

@@ -21,8 +21,11 @@ class EAAL::Cache::FileCache
   def filename(userid, apikey, scope, name, args)
     ret =""
     args.delete_if { |k,v| (v || "").to_s.length == 0 }
-    h = args.stringify_keys
-    ret += h.sort.flatten.collect{ |e| e.to_s }.join('_')
+#    h = args.stringify_keys
+    args.keys.each do |key|
+      args[key.to_s] = args.delete(key)
+    end
+    ret += args.sort.flatten.collect{ |e| e.to_s }.join('_')
     hash = ret.gsub(/_$/,'')
     "#{@basepath}#{userid}/#{apikey}/#{scope}/#{name}/Request_#{hash}.xml"
   end
@@ -46,7 +49,7 @@ class EAAL::Cache::FileCache
   # validate cached datas cachedUntil
   def validate_cache(xml, name)
     doc = Hpricot.XML(xml)
-    cached_until = (doc/"/eveapi/cachedUntil").inner_html.to_time
+    cached_until = Time.parse((doc/"/eveapi/cachedUntil").inner_html)
     if name == "WalletJournal"
       result = Time.at(cached_until.to_i + 3600) > Time.now.utc
     else

data/lib/eaal/cache/memcached.rb

@@ -17,7 +17,7 @@ class EAAL::Cache::MemcachedCache
   # the key when we can go get a new copy.
   def save(userid, apikey, scope, name, args, xml)
     k = key(userid, apikey, scope, name, args)
-    cached_until = xml.match(/<cachedUntil>(.+)<\/cachedUntil>/)[1].to_time
+    cached_until = Time.parse(xml.match(/<cachedUntil>(.+)<\/cachedUntil>/)[1])
     expires_in = (name=='WalletJournal' ? cached_until.to_i+3600 : cached_until.to_i )
     $cache.delete(k)
     $cache.add(k,xml,expires_in)

data/lib/eaal/result.rb

@@ -78,7 +78,8 @@ module EAAL
                         }
                         value = container
                     else
-                        value = element.inner_html.gsub(/\W+/, "") #Mainly to filter tags within description element in corporationsheet.
+                        # Mainly to filter HTML tags within description element in corporationsheet.
+                        value = element.inner_html.gsub(/(<|&lt;)(.|\n)*?(>|&gt;)/, "")
                     end
                     re = ResultElement.new(key, value)
                     if element.attributes.to_hash.length > 0

data/test/fixtures/test/test/char/CharacterSheet/Request_.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2009-08-26 08:23:27</currentTime>
+  <error code="106">Must provide userID parameter for authentication.</error>
+  <cachedUntil>2009-08-26 08:28:27</cachedUntil>
+</eveapi>

data/test/fixtures/test/test/char/CharacterSheet/Request_characterID_12345.xml

@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2007-06-18 22:49:01</currentTime>
+  <result>
+    <characterID>12345</characterID>
+    <name>corpslave</name>
+    <race>Minmatar</race>
+    <bloodLine>Brutor</bloodLine>
+    <gender>Female</gender>
+    <corporationName>corpexport Corp</corporationName>
+    <corporationID>150337746</corporationID>
+    <cloneName>Clone Grade Pi</cloneName>
+    <cloneSkillPoints>54600000</cloneSkillPoints>
+    <balance>190210393.87</balance>
+    <attributeEnhancers>
+      <intelligenceBonus>
+        <augmentatorName>Snake Delta</augmentatorName>
+        <augmentatorValue>3</augmentatorValue>
+      </intelligenceBonus>
+      <memoryBonus>
+        <augmentatorName>Halo Beta</augmentatorName>
+        <augmentatorValue>3</augmentatorValue>
+      </memoryBonus>
+    </attributeEnhancers>
+    <attributes>
+      <intelligence>6</intelligence>
+      <memory>4</memory>
+      <charisma>7</charisma>
+      <perception>12</perception>
+      <willpower>10</willpower>
+    </attributes>
+    <rowset name="skills" key="typeID" columns="typeID,skillpoints,level,unpublished">
+      <row typeID="3431" skillpoints="8000" level="3"/>
+      <row typeID="3413" skillpoints="8000" level="3"/>
+      <row typeID="21059" skillpoints="500" level="1"/>
+      <row typeID="3416" skillpoints="8000" level="3"/>
+      <row typeID="3445" skillpoints="277578" unpublished="1"/>
+    </rowset>
+    <rowset name="certificates" key="certificateID" columns="certificateID">
+      <row certificateID="1"/>
+      <row certificateID="5"/>
+      <row certificateID="19"/>
+      <row certificateID="239"/>
+      <row certificateID="282"/>
+      <row certificateID="32"/>
+      <row certificateID="258"/>
+    </rowset>
+    <rowset name="corporationRoles" key="roleID" columns="roleID,roleName">
+      <row roleID="1" roleName="roleDirector" />
+    </rowset>
+    <rowset name="corporationRolesAtHQ" key="roleID" columns="roleID,roleName">
+      <row roleID="1" roleName="roleDirector" />
+    </rowset>
+    <rowset name="corporationRolesAtBase" key="roleID" columns="roleID,roleName">
+      <row roleID="1" roleName="roleDirector" />
+    </rowset>
+    <rowset name="corporationRolesAtOther" key="roleID" columns="roleID,roleName">
+      <row roleID="1" roleName="roleDirector" />
+    </rowset>
+    <rowset name="corporationTitles" key="titleID" columns="titleID,titleName">
+      <row titleID="1" titleName="Member" />
+    </rowset>
+  </result>
+  <cachedUntil>2207-06-18 23:49:01</cachedUntil>
+</eveapi>

data/test/fixtures/test/test/char/SkillInTraining/Request_characterID_12345.xml

@@ -0,0 +1,14 @@
+<eveapi version="2">
+  <currentTime>2008-08-17 06:43:00</currentTime>
+  <result>
+    <currentTQTime offset="0">2008-08-17 06:43:00</currentTQTime>
+    <trainingEndTime>2008-08-17 15:29:44</trainingEndTime>
+    <trainingStartTime>2008-08-15 04:01:16</trainingStartTime>
+    <trainingTypeID>3305</trainingTypeID>
+    <trainingStartSP>24000</trainingStartSP>
+    <trainingDestinationSP>135765</trainingDestinationSP>
+    <trainingToLevel>4</trainingToLevel>
+    <skillInTraining>1</skillInTraining>
+  </result>
+  <cachedUntil>2108-08-17 06:58:00</cachedUntil>
+</eveapi>

data/test/fixtures/test/test/char/SkillQueue/Request_characterID_12345.xml

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2009-03-18 13:19:43</currentTime>
+  <result>
+    <rowset name="skillqueue" key="queuePosition" columns="queuePosition,typeID,level,startSP,endSP,startTime,endTime">
+      <row queuePosition="1" typeID="11441" level="3" startSP="7072" endSP="40000" startTime="2009-03-18 02:01:06" endTime="2009-03-18 15:19:21" />
+      <row queuePosition="2" typeID="20533" level="4" startSP="112000" endSP="633542" startTime="2009-03-18 15:19:21" endTime="2009-03-30 03:16:14" />
+    </rowset>
+  </result>
+  <cachedUntil>2109-03-18 13:34:43</cachedUntil>
+</eveapi>

data/test/fixtures/test/test/char/Standings/Request_.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2008-12-08 15:19:28</currentTime>
+  <error code="105">Invalid characterID.</error>
+  <cachedUntil>2020-12-08 16:02:25</cachedUntil>
+</eveapi>

data/test/fixtures/test/test/char/Standings/Request_characterID_12345.xml

@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2008-09-03 12:20:19</currentTime>
+  <result>
+    <standingsTo>
+      <rowset name="characters" key="toID" columns="toID,toName,standing">
+        <row toID="123456" toName="Test Ally" standing="1" />
+        <row toID="234567" toName="Test Friend" standing="0.5" />
+        <row toID="345678" toName="Test Enemy" standing="-0.8" />
+      </rowset>
+      <rowset name="corporations" key="toID" columns="toID,toName,standing">
+        <row toID="456789" toName="Test Bad Guy Corp" standing="-1" />
+      </rowset>
+    </standingsTo>
+    <standingsFrom>
+      <rowset name="agents" key="fromID" columns="fromID,fromName,standing">
+        <row fromID="3009841" fromName="Pausent Ansin" standing="0.1" />
+        <row fromID="3009846" fromName="Charie Octienne" standing="0.19" />
+      </rowset>
+      <rowset name="NPCCorporations" key="fromID" columns="fromID,fromName,standing">
+        <row fromID="1000061" fromName="Freedom Extension" standing="0" />
+        <row fromID="1000064" fromName="Carthum Conglomerate" standing="0.34" />
+        <row fromID="1000094" fromName="TransStellar Shipping" standing="0.02" />
+      </rowset>
+      <rowset name="factions" key="fromID" columns="fromID,fromName,standing">
+        <row fromID="500003" fromName="Amarr Empire" standing="-0.1" />
+        <row fromID="500020" fromName="Serpentis" standing="-1" />
+      </rowset>
+    </standingsFrom>
+  </result>
+  <cachedUntil>2025-09-03 15:20:19</cachedUntil>
+</eveapi>
+

data/test/fixtures/test/test/corp/CorporationSheet/Request_corporationID_150212025.xml

@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2007-12-02 19:43:40</currentTime>
+  <result>
+    <corporationID>150212025</corporationID>
+    <corporationName>Banana Republic</corporationName>
+    <ticker>BR</ticker>
+    <ceoID>150208955</ceoID>
+    <ceoName>Mark Roled</ceoName>
+    <stationID>60003469</stationID>
+    <stationName>Jita IV - Caldari Business Tribunal Information Center</stationName>
+    <description>Garth's testing corp of awesome sauce, win sauce as it were. In this
+                 corp...&lt;br&gt;&lt;br&gt;IT HAPPENS ALL OVER</description>
+    <url>some url</url>
+    <allianceID>150430947</allianceID>
+    <allianceName>The Dead Rabbits</allianceName>
+    <taxRate>93.7</taxRate>
+    <memberCount>3</memberCount>
+    <memberLimit>6300</memberLimit>
+    <shares>1</shares>
+    <rowset name="divisions" key="accountKey" columns="accountKey,description">
+      <row accountKey="1000" description="1ST DIVISION" />
+      <row accountKey="1001" description="2ND DIVISION" />
+      <row accountKey="1002" description="HELLO" />
+      <row accountKey="1003" description="DIVISION" />
+      <row accountKey="1004" description="SWEET" />
+      <row accountKey="1005" description="6TH DIVISION" />
+      <row accountKey="1006" description="7TH DIVISION" />
+    </rowset>
+    <rowset name="walletDivisions" key="accountKey" columns="accountKey,description">
+      <row accountKey="1000" description="Master Wallet" />
+      <row accountKey="1001" description="2nd Wallet Division" />
+      <row accountKey="1002" description="3rd Wallet Division" />
+      <row accountKey="1003" description="AYE WALLET?" />
+      <row accountKey="1004" description="5th Wallet Division" />
+      <row accountKey="1005" description="6th Wallet Division" />
+      <row accountKey="1006" description="7th Wallet Division" />
+    </rowset>
+    <logo>
+      <graphicID>0</graphicID>
+      <shape1>448</shape1>
+      <shape2>0</shape2>
+      <shape3>418</shape3>
+      <color1>681</color1>
+      <color2>676</color2>
+      <color3>0</color3>
+    </logo>
+  </result>
+  <cachedUntil>2107-12-03 01:43:40</cachedUntil>
+</eveapi>

data/test/fixtures/test/test/server/ServerStatus/Request_.xml

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="2">
+  <currentTime>2009-08-26 09:56:41</currentTime>
+  <result>
+    <serverOpen>True</serverOpen>
+    <onlinePlayers>22347</onlinePlayers>
+  </result>
+  <cachedUntil>2109-08-26 09:59:41</cachedUntil>
+</eveapi>

data/test/test_eaal.rb

@@ -28,7 +28,7 @@ class TestEaal < Test::Unit::TestCase
   def test_api_parse_data
     @api.scope = "account"
     assert_equal @api.Characters.characters.first.name, "Test Tester"
-    assert_equal @api.Characters.characters.second.corporationID, "7890"
+    assert_equal @api.Characters.characters[1].corporationID, "7890"
     @api.scope = "char"
     assert_equal @api.Killlog(:characterID => 12345).kills.length, 1
     assert_equal @api.Killlog(:characterID => 12345).kills.first.victim.characterName, "Peter Powers"
@@ -75,6 +75,15 @@ class TestEaal < Test::Unit::TestCase
     assert_equal @api.CorporationSheet(:corporationID => 150212025).walletDivisions[0].description, "Master Wallet"
   end
 
+  def test_cache_only
+    @api.scope = "char"
+    result = @api.ContactList(:characterID => 12345, :cache_only => true)
+    assert_nil result
+
+    assert_not_nil @api.Standings(:characterID => 12345, :cache_only => false)
+    assert_not_nil @api.Standings(:characterID => 12345)
+  end
+
   # Test to ensure Memcached works
   def test_memcached
     # FIXME must check if memcache server is installed... (binary memcache)
@@ -94,13 +103,13 @@ class TestEaal < Test::Unit::TestCase
     @api.scope = 'account'
 
     # store to cache
-    assert_equal EAAL.cache.save(@api.userid,@api.key,@api.scope,'Characters','',xml), "STORED\r\n"
+    assert_equal EAAL.cache.save(@api.keyid,@api.vcode,@api.scope,'Characters','',xml), "STORED\r\n"
 
     # check key in cache
-    assert_equal EAAL.cache.key(@api.userid,@api.key,@api.scope,'Characters',''), "testtestaccountCharacters"
+    assert_equal EAAL.cache.key(@api.keyid,@api.vcode,@api.scope,'Characters',''), "testtestaccountCharacters"
 
     # load from cache
-    assert_equal EAAL.cache.load(@api.userid,@api.key,@api.scope,'Characters',''), xml
+    assert_equal EAAL.cache.load(@api.keyid,@api.vcode,@api.scope,'Characters',''), xml
 
     # FIXME high level tests
     # Should store to cache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eaal
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: hpricot
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: memcache-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
-  name: memcache-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
-  name: newgem
+  name: hoe
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,23 +74,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: ! 'EAAL (Eve API Access Layer) is a ruby library for accessing data of
   the API of
 
@@ -118,16 +118,20 @@ files:
 - lib/eaal/exception.rb
 - lib/eaal/result.rb
 - lib/eaal/rowset.rb
-- script/console
-- script/destroy
-- script/generate
 - test/fixtures/test/test/account/Characters/Request_.xml
+- test/fixtures/test/test/char/CharacterSheet/Request_.xml
+- test/fixtures/test/test/char/CharacterSheet/Request_characterID_12345.xml
 - test/fixtures/test/test/char/Killlog/Request_.xml
-- test/fixtures/test/test/char/Killlog/Request_characterID:12345.xml
+- test/fixtures/test/test/char/Killlog/Request_characterID_12345.xml
+- test/fixtures/test/test/char/SkillInTraining/Request_characterID_12345.xml
+- test/fixtures/test/test/char/SkillQueue/Request_characterID_12345.xml
+- test/fixtures/test/test/char/Standings/Request_.xml
+- test/fixtures/test/test/char/Standings/Request_characterID_12345.xml
+- test/fixtures/test/test/corp/CorporationSheet/Request_corporationID_150212025.xml
 - test/fixtures/test/test/eve/AllianceList/Request_.xml
+- test/fixtures/test/test/server/ServerStatus/Request_.xml
 - test/test_eaal.rb
 - test/test_helper.rb
-- .gemtest
 homepage: http://eaal.rubyforge.org
 licenses: []
 post_install_message: 

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/eaal.rb'}"
-puts "Loading eaal gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)