eve_online 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d121f03da2c06b0a64adb322326bdf11c59503e9
-  data.tar.gz: 821144d4bef4b9731f4fda3636e5a90194acd2ff
+  metadata.gz: fa0f57b29bc9c6d56a9df5c336044116b4bdb07d
+  data.tar.gz: 87deec1074a0c526c0e1a0516f882fe0df146d46
 SHA512:
-  metadata.gz: 1c4d35c4a0d7a425b9d80b8f7ef720d127524ca146e057bb1cf31d9d0d9d4b92438e8f036bc7fe6aad34ec0d2d0ea04b95c578706f9e83a570c6c20fd2c65c53
-  data.tar.gz: e875425cc51014b9da72ce01f4b41e89a5fba0b57748c09e66a1d7f9c08afaaaa50de0f0c4ac128cc6b9bbeea9a51acbdcf20b90f0071cb9c8eb34bc7c6fca55
+  metadata.gz: 2bffc8580c0780b0625ff0757842db30667a50d38b01edad2469dcee4aa39ff3c1c9dd910ef100f7ea552f9edd5e07d5a5931003f4c49caf8dac81ef3967ab01
+  data.tar.gz: 178fc0021e6838c2885d0b570238b5394d8e8d6d3c0a77e38cf64e75abbb00db8f629778076495197f167ba2b53e827df2f557b15f5d49106fc58d643351f6e0

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
+  - 2.0
+  - 2.1
   - 2.2
+
 before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in eveonline.gemspec
 gemspec
+
+gem 'codeclimate-test-reporter', group: :test, require: false

data/README.md

@@ -1,7 +1,11 @@
 # EveOnline API (XML and CREST)
 
+[![Gem Version](https://badge.fury.io/rb/eve_online.svg)](https://badge.fury.io/rb/eve_online)
 [![Code Climate](https://codeclimate.com/github/biow0lf/eve_online/badges/gpa.svg)](https://codeclimate.com/github/biow0lf/eve_online)
 [![Test Coverage](https://codeclimate.com/github/biow0lf/eve_online/badges/coverage.svg)](https://codeclimate.com/github/biow0lf/eve_online/coverage)
+[![Build Status](https://travis-ci.org/biow0lf/eve_online.svg?branch=master)](https://travis-ci.org/biow0lf/eve_online)
+[![Dependency Status](https://gemnasium.com/biow0lf/eve_online.svg)](https://gemnasium.com/biow0lf/eve_online)
+[![security](https://hakiri.io/github/biow0lf/eve_online/master.svg)](https://hakiri.io/github/biow0lf/eve_online/master)
 
 This gem implement Ruby API for EveOnline MMORPG. Both, XML and CREST API.
 
@@ -21,9 +25,42 @@ Or install it yourself as:
 
     $ gem install eve_online
 
+## Supported ruby versions:
+
+ * MRI 2.0
+ * MRI 2.1
+ * MRI 2.2
+
 ## Usage
 
-TODO: Write usage instructions here
+Server status:
+
+```ruby
+status = EveOnline::Server::Status.new
+status.as_json # => {:current_time=>"2015-11-20 22:18:59", :cached_until=>"2015-11-20 22:20:50", :server_open=>true, :online_players=>25192}
+
+status.current_time # => "2015-11-20 22:18:59"
+status.cached_until # => "2015-11-20 22:20:50"
+status.server_open? # => true
+status.online_players # => 25192
+```
+
+Account status:
+
+```ruby
+key_id = '1234567'
+v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
+account_status = EveOnline::Account::Status.new(key_id, v_code)
+account_status.as_json
+# => {:current_time=>"2015-11-20 23:02:48", :paid_until=>"2015-11-28 18:12:56", :create_date=>"2010-01-15 15:11:00", :logon_count=>388, :logon_minutes=>15598, :cached_until=>"2015-11-20 23:59:48"}
+
+account_status.current_time # => "2015-11-20 23:02:48"
+account_status.paid_until # => "2015-11-28 18:12:56"
+account_status.create_date # => "2010-01-15 15:11:00"
+account_status.logon_count # => 388
+account_status.logon_minutes # => 15598
+account_status.cached_until # => "2015-11-20 23:59:48"
+```
 
 ## Development
 
@@ -37,9 +74,133 @@ Issue reports and pull requests are welcome on GitHub at https://github.com/biow
 
 ## Changelog
 
-v0.2.0: AccountBalance XML API, APIKeyInfo XML API, AccountStatus XML API.
+v0.3.0: [Account Characters XML](http://wiki.eve-id.net/APIv2_Account_Characters_XML). Refactoring and bugfixes.
+
+v0.2.0: [Character Account Balance XML](http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML), [Account APIKeyInfo XML](http://wiki.eve-id.net/APIv2_Account_APIKeyInfo_XML), [Account Status XML](http://wiki.eve-id.net/APIv2_Account_AccountStatus_XML).
+
+v0.1.0: [Server Status XML](http://wiki.eve-id.net/APIv2_Server_ServerStatus_XML).
+
+## Implementation check list:
+
+### Account
+
+- [x] [Account Status XML](http://wiki.eve-id.net/APIv2_Account_AccountStatus_XML)
+- [x] [API Key Info XML](http://wiki.eve-id.net/APIv2_Account_APIKeyInfo_XML)
+- [x] [Characters (List of) XML](http://wiki.eve-id.net/APIv2_Account_Characters_XML)
+
+----
+
+### Api
+
+- [ ] [Call List (Access Mask reference) XML](http://wiki.eve-id.net/APIv2_API_CallList_XML)
+
+----
+
+### Character
+
+- [x] [Account Balance XML](http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML)
+- [ ] [Asset List XML](http://wiki.eve-id.net/APIv2_Char_AssetList_XML)
+- [ ] [Calendar Event Attendees XML](http://wiki.eve-id.net/APIv2_Char_CalendarEventAttendees_XML)
+- [ ] [Character Sheet XML](http://wiki.eve-id.net/APIv2_Char_CharacterSheet_XML)
+- [ ] [Contact List XML](http://wiki.eve-id.net/APIv2_Char_ContactList_XML)
+- [ ] [Contact Notifications XML](http://wiki.eve-id.net/APIv2_Char_ContactNotifications_XML)
+- [ ] [Contracts XML](http://wiki.eve-id.net/APIv2_Char_Contracts_XML)
+- [ ] [ContractItems XML](http://wiki.eve-id.net/APIv2_Char_ContractItems_XML)
+- [ ] [ContractBids XML](http://wiki.eve-id.net/APIv2_Char_ContractBids_XML)
+- [ ] [Factional Warfare Stats XML](http://wiki.eve-id.net/APIv2_Char_Factional_Warfare_Stats_XML)
+- [ ] [Industry Jobs XML](http://wiki.eve-id.net/APIv2_Char_IndustryJobs_XML)
+- [ ] [Kill Log (Kill Mails) XML](http://wiki.eve-id.net/APIv2_Char_KillLog_XML)
+- [ ] [Locations XML](http://wiki.eve-id.net/APIv2_Char_Locations_XML)
+- [ ] [Mail Bodies XML](http://wiki.eve-id.net/APIv2_Char_MailBodies_XML)
+- [ ] [Mailing Lists XML](http://wiki.eve-id.net/APIv2_Char_mailinglists_XML)
+- [ ] [Mail Messages (Headers) XML](http://wiki.eve-id.net/APIv2_Char_MailMessages_XML)
+- [ ] [Market Orders XML](http://wiki.eve-id.net/APIv2_Char_MarketOrders_XML)
+- [ ] [Medals XML](http://wiki.eve-id.net/APIv2_Char_Medals_XML)
+- [ ] [Notifications XML](http://wiki.eve-id.net/APIv2_Char_Notifications_XML)
+- [ ] [NotificationTexts XML](http://wiki.eve-id.net/APIv2_Char_NotificationTexts_XML)
+- [ ] [Research XML](http://wiki.eve-id.net/APIv2_Char_Research_XML)
+- [ ] [Skill in Training XML](http://wiki.eve-id.net/APIv2_Char_SkillInTraining_XML)
+- [ ] [Skill Queue XML](http://wiki.eve-id.net/APIv2_Char_SkillQueue_XML)
+- [ ] [Standings (NPC) XML](http://wiki.eve-id.net/APIv2_Char_Standings_XML)
+- [ ] [Upcoming Calendar Events XML](http://wiki.eve-id.net/APIv2Char_UpcomingCalendarEvents_XML)
+- [ ] [Wallet Journal XML](http://wiki.eve-id.net/APIv2_Char_JournalEntries_XML)
+- [ ] [Wallet Transactions XML](http://wiki.eve-id.net/APIv2_Char_MarketTransactions_XML)
+
+----
+
+### Corporation
+
+- [ ] [Account Balance XML](http://wiki.eve-id.net/APIv2_Corp_AccountBalance_XML)
+- [ ] [Asset List XML](http://wiki.eve-id.net/APIv2_Corp_AssetList_XML)
+- [ ] [Contact List XML](http://wiki.eve-id.net/APIv2_Corp_ContactList_XML)
+- [ ] [Container Log XML](http://wiki.eve-id.net/APIv2_Corp_ContainerLog_XML)
+- [ ] [Contracts XML](http://wiki.eve-id.net/APIv3_Corp_Contracts_XML)
+- [ ] [ContractItems XML](http://wiki.eve-id.net/APIv2_Corp_ContractItems_XML)
+- [ ] [ContractBids XML](http://wiki.eve-id.net/APIv2_Char_ContractBids_XML)
+- [ ] [Corporation Sheet XML](http://wiki.eve-id.net/APIv2_Corp_CorporationSheet_XML)
+- [ ] [Factional Warfare Stats XML](http://wiki.eve-id.net/APIv2_Corp_Factional_Warfare_Stats_XML)
+- [ ] [Industry Jobs XML](http://wiki.eve-id.net/APIv2_Corp_IndustryJobs_XML)
+- [ ] [Kill Log (Kill Mails) XML](http://wiki.eve-id.net/APIv2_Corp_KillLog_XML)
+- [ ] [Locations XML](http://wiki.eve-id.net/APIv2_Corp_Locations_XML)
+- [ ] [Market Orders XML](http://wiki.eve-id.net/APIv2_Corp_MarketOrders_XML)
+- [ ] [Medals XML](http://wiki.eve-id.net/APIv2_Corp_Medals_XML)
+- [ ] [Member Medals XML](http://wiki.eve-id.net/APIv2_Corp_MemberMedals_XML)
+- [ ] [Member Security XML](http://wiki.eve-id.net/APIv2_Corp_MemberSecurity_XML)
+- [ ] [Member Security Log XML](http://wiki.eve-id.net/APIv2_Corp_MemberSecurityLog_XML)
+- [ ] [Member Tracking XML](http://wiki.eve-id.net/APIv2_Corp_MemberTracking_XML)
+- [ ] [Outpost List XML](http://wiki.eve-id.net/APIv2_Corp_OutpostList_XML)
+- [ ] [Outpost Service Detail XML](http://wiki.eve-id.net/APIv2_Corp_OutpostServiceDetail_XML)
+- [ ] [Shareholders XML](http://wiki.eve-id.net/APIv2_Corp_Shareholders_XML)
+- [ ] [Standings (NPC) XML](http://wiki.eve-id.net/APIv2_Corp_Standings_XML)
+- [ ] [StarbaseDetail Details (POS) XML](http://wiki.eve-id.net/APIv2_Corp_StarbaseDetail_XML)
+- [ ] [Starbase List (POS) XML](http://wiki.eve-id.net/APIv2_Corp_StarbaseList_XML)
+- [ ] [Titles XML](http://wiki.eve-id.net/APIv2_Corp_CorporationTitles_XML)
+- [ ] [Wallet Journal XML](http://wiki.eve-id.net/APIv2_Corp_JournalEntries_XML)
+- [ ] [Wallet Transactions XML](http://wiki.eve-id.net/APIv2_Corp_MarketTransactions_XML)
+
+----
+
+### Eve
+
+- [ ] [Alliance List XML](http://wiki.eve-id.net/APIv2_Eve_AllianceList_XML)
+- [ ] [Certificate Tree XML](http://wiki.eve-id.net/APIv2_Certificate_Tree_XML)
+- [ ] [Character Affiliation XML](http://wiki.eve-id.net/APIv2_Page_Index?title=APIv2_Eve_CharacterAffiliation_XML&action=edit&redlink=1)
+- [ ] [Character ID (Name to ID Conversion) XML](http://wiki.eve-id.net/APIv2_Eve_CharacterID_XML)
+- [ ] [Character Info XML](http://wiki.eve-id.net/APIv2_Eve_CharacterInfo_XML)
+- [ ] [Character Name (ID to Name Conversion) XML](http://wiki.eve-id.net/APIv2_Eve_CharacterName_XML)
+- [ ] [Conquerable Station List (Includes Outposts) XML](http://wiki.eve-id.net/APIv2_Eve_ConquerableStationList_XML)
+- [ ] [Error List XML](http://wiki.eve-id.net/APIv2_Eve_ErrorList_XML)
+- [ ] [Factional Warfare Stats XML](http://wiki.eve-id.net/APIv2_Factional_Warfare_Stats_XML)
+- [ ] [Factional Warfare Top100 Stats XML](http://wiki.eve-id.net/APIv2_Factional_Warfare_Top100_Stats_XML)
+- [ ] [RefTypes List XML](http://wiki.eve-id.net/APIv2_Eve_RefTypes_XML)
+- [ ] [Skill Tree XML](http://wiki.eve-id.net/APIv2_Eve_SkillTree_XML)
+- [ ] [Type Name XML](http://wiki.eve-id.net/APIv2_Eve_TypeName_XML)
+
+----
+
+### Map
+
+- [ ] [Factional Warfare Systems (Occupancy Map) XML](http://wiki.eve-id.net/APIv2_Factional_Warfare_Occupancy_XML)
+- [ ] [Jumps XML](http://wiki.eve-id.net/APIv2_Map_Jumps_XML)
+- [ ] [Kills XML](http://wiki.eve-id.net/APIv2_Map_Kills_XML)
+- [ ] [Sovereignty XML](http://wiki.eve-id.net/APIv2_Map_Sovereignty_XML)
+- [ ] [Sovereignty Status (API disabled) XML](http://wiki.eve-id.net/APIv2_Map_Sovereignty_Status_XML)
+
+----
+
+### Misc
+
+- [ ] [Image (ID to Character Portrait and Corporation/Alliance Logo)](http://wiki.eve-id.net/APIv2_Eve_Image_Service)
+- [ ] [Old Portraits](http://wiki.eve-id.net/APIv2_Old_Portraits)
+
+----
+
+### Server
+
+- [x] [Server Status XML](http://wiki.eve-id.net/APIv2_Server_ServerStatus_XML)
+
+----
 
-v0.1.0: ServerStatus XML API.
 
 ## License
 

data/eve_online.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
@@ -24,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock'
 
   spec.add_runtime_dependency 'nori', '~> 2.6'
+  # https://github.com/sparklemotion/nokogiri/blob/v1.6.6.4/CHANGELOG.rdoc
+  spec.add_runtime_dependency 'nokogiri', '>= 1.6.4.4'
 end

data/lib/eve_online.rb

@@ -1,9 +1,10 @@
 require 'eve_online/version'
 require 'eve_online/base'
-require 'eve_online/account_balance'
-require 'eve_online/account_status'
-require 'eve_online/api_key_info'
-require 'eve_online/server_status'
+require 'eve_online/account/status'
+require 'eve_online/account/api_key_info'
+require 'eve_online/account/characters'
+require 'eve_online/character/account_balance'
+require 'eve_online/server/status'
 
 module EveOnline
 end

data/lib/eve_online/account/api_key_info.rb

@@ -0,0 +1,72 @@
+module EveOnline
+  module Account
+    # http://wiki.eve-id.net/APIv2_Account_APIKeyInfo_XML
+    class ApiKeyInfo < Base
+      API_ENDPOINT = 'https://api.eveonline.com/account/APIKeyInfo.xml.aspx'
+
+      def character_id
+        row.fetch('@characterID').to_i
+      end
+
+      def character_name
+        row.fetch('@characterName')
+      end
+
+      def corporation_id
+        row.fetch('@corporationID').to_i
+      end
+
+      def corporation_name
+        row.fetch('@corporationName')
+      end
+
+      def alliance_id
+        row.fetch('@allianceID').to_i
+      end
+
+      def alliance_name
+        row.fetch('@allianceName')
+      end
+
+      def faction_id
+        row.fetch('@factionID').to_i
+      end
+
+      def faction_name
+        row.fetch('@factionName')
+      end
+
+      def row
+        rowset.fetch('row')
+      end
+
+      def rowset
+        key.fetch('rowset')
+      end
+
+      def expires
+        key.fetch('@expires')
+      end
+
+      def type
+        key.fetch('@type')
+      end
+
+      def access_mask
+        key.fetch('@accessMask').to_i
+      end
+
+      def key
+        result.fetch('key')
+      end
+
+      def version
+        eveapi.fetch('@version').to_i
+      end
+
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
+      end
+    end
+  end
+end

data/lib/eve_online/account/characters.rb

@@ -0,0 +1,56 @@
+module EveOnline
+  module Account
+    # http://wiki.eve-id.net/APIv2_Account_Characters_XML
+    class Characters < Base
+      API_ENDPOINT = 'https://api.eveonline.com/account/Characters.xml.aspx'
+
+      def version
+        eveapi.fetch('@version').to_i
+      end
+
+      def name
+        row.fetch('@name')
+      end
+
+      def character_id
+        row.fetch('@characterID').to_i
+      end
+
+      def corporation_name
+        row.fetch('@corporationName')
+      end
+
+      def corporation_id
+        row.fetch('@corporationID').to_i
+      end
+
+      def alliance_id
+        row.fetch('@allianceID').to_i
+      end
+
+      def alliance_name
+        row.fetch('@allianceName')
+      end
+
+      def faction_id
+        row.fetch('@factionID').to_i
+      end
+
+      def faction_name
+        row.fetch('@factionName')
+      end
+
+      def row
+        rowset.fetch('row')
+      end
+
+      def rowset
+        result.fetch('rowset')
+      end
+
+      def url
+        "#{ API_ENDPOINT}?keyID=#{ key_id }&vCode=#{ v_code }"
+      end
+    end
+  end
+end

data/lib/eve_online/account/status.rb

@@ -0,0 +1,45 @@
+module EveOnline
+  module Account
+    # http://wiki.eve-id.net/APIv2_Account_AccountStatus_XML
+    class Status < Base
+      API_ENDPOINT = 'https://api.eveonline.com/account/AccountStatus.xml.aspx'
+
+      def as_json
+        {
+          current_time: current_time,
+          paid_until: paid_until,
+          create_date: create_date,
+          logon_count: logon_count,
+          logon_minutes: logon_minutes,
+          cached_until: cached_until
+        }
+      end
+
+      def paid_until
+        # TODO: time in "(GMT) Monrovia, Reykjavik".
+        result.fetch('paidUntil')
+      end
+
+      def create_date
+        # TODO: time in "(GMT) Monrovia, Reykjavik".
+        result.fetch('createDate')
+      end
+
+      def logon_count
+        result.fetch('logonCount').to_i
+      end
+
+      def logon_minutes
+        result.fetch('logonMinutes').to_i
+      end
+
+      def version
+        eveapi.fetch('@version').to_i
+      end
+
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
+      end
+    end
+  end
+end

data/lib/eve_online/base.rb

@@ -1,3 +1,6 @@
+require 'open-uri'
+require 'nori'
+
 module EveOnline
   class Base
     attr_reader :key_id, :v_code, :parser
@@ -8,6 +11,29 @@ module EveOnline
       @parser = parser
     end
 
+    def result
+      eveapi.fetch('result')
+    end
+
+    def cached_until
+      # TODO: time in "(GMT) Monrovia, Reykjavik".
+      eveapi.fetch('cachedUntil')
+    end
+
+    def current_time
+      # TODO: time in "(GMT) Monrovia, Reykjavik".
+      eveapi.fetch('currentTime')
+    end
+
+    def version
+      # TODO: check all API for version
+      raise NotImplementedError
+    end
+
+    def eveapi
+      response.fetch('eveapi')
+    end
+
     def url
       raise NotImplementedError
     end

data/lib/eve_online/character/account_balance.rb

@@ -0,0 +1,36 @@
+module EveOnline
+  module Character
+    # http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML
+    class AccountBalance < Base
+      API_ENDPOINT = 'https://api.eveonline.com/char/AccountBalance.xml.aspx'
+
+      def account_id
+        row.fetch('@accountID').to_i
+      end
+
+      def account_key
+        row.fetch('@accountKey')
+      end
+
+      def balance
+        row.fetch('@balance')
+      end
+
+      def row
+        rowset.fetch('row')
+      end
+
+      def rowset
+        result.fetch('rowset')
+      end
+
+      def version
+        eveapi.fetch('@version').to_i
+      end
+
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
+      end
+    end
+  end
+end

data/lib/eve_online/server/status.rb

@@ -0,0 +1,33 @@
+module EveOnline
+  module Server
+    # http://wiki.eve-id.net/APIv2_Server_ServerStatus_XML
+    class Status < Base
+      API_ENDPOINT = 'https://api.eveonline.com/Server/ServerStatus.xml.aspx'
+
+      def as_json
+        {
+          current_time: current_time,
+          cached_until: cached_until,
+          server_open: server_open?,
+          online_players: online_players
+        }
+      end
+
+      def server_open?
+        result.fetch('serverOpen') == 'True'
+      end
+
+      def online_players
+        result.fetch('onlinePlayers').to_i
+      end
+
+      def version
+        eveapi.fetch('@version').to_i
+      end
+
+      def url
+        API_ENDPOINT
+      end
+    end
+  end
+end

data/lib/eve_online/version.rb

@@ -1,3 +1,3 @@
 module EveOnline
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4.4
 description: EveOnline API. XML and CREST.
 email:
 - igor.zubkov@gmail.com
@@ -112,11 +126,12 @@ files:
 - Rakefile
 - eve_online.gemspec
 - lib/eve_online.rb
-- lib/eve_online/account_balance.rb
-- lib/eve_online/account_status.rb
-- lib/eve_online/api_key_info.rb
+- lib/eve_online/account/api_key_info.rb
+- lib/eve_online/account/characters.rb
+- lib/eve_online/account/status.rb
 - lib/eve_online/base.rb
-- lib/eve_online/server_status.rb
+- lib/eve_online/character/account_balance.rb
+- lib/eve_online/server/status.rb
 - lib/eve_online/version.rb
 homepage: https://github.com/biow0lf/eve_online
 licenses:
@@ -130,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/eve_online/account_balance.rb

@@ -1,53 +0,0 @@
-require 'open-uri'
-
-module EveOnline
-  # http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML
-  class AccountBalance < Base
-    API_ENDPOINT = 'https://api.eveonline.com/char/AccountBalance.xml.aspx'
-
-    def current_time
-      # TODO: time in "(GMT) Monrovia, Reykjavik".
-      eveapi.fetch('currentTime')
-    end
-
-    def account_id
-      row.fetch('@accountID').to_i
-    end
-
-    def account_key
-      row.fetch('@accountKey')
-    end
-
-    def balance
-      row.fetch('@balance')
-    end
-
-    def row
-      rowset.fetch('row')
-    end
-
-    def rowset
-      result.fetch('rowset')
-    end
-
-    def cached_until
-      eveapi.fetch('cachedUntil')
-    end
-
-    def version
-      eveapi.fetch('@version').to_i
-    end
-
-    def result
-      eveapi.fetch('result')
-    end
-
-    def eveapi
-      response.fetch('eveapi')
-    end
-
-    def url
-      "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
-    end
-  end
-end

data/lib/eve_online/account_status.rb

@@ -1,47 +0,0 @@
-require 'open-uri'
-
-module EveOnline
-  class AccountStatus < Base
-    API_ENDPOINT = 'https://api.eveonline.com/account/AccountStatus.xml.aspx'
-
-    def current_time
-      eveapi.fetch('currentTime')
-    end
-
-    def paid_until
-      result.fetch('paidUntil')
-    end
-
-    def create_date
-      result.fetch('createDate')
-    end
-
-    def logon_count
-      result.fetch('logonCount').to_i
-    end
-
-    def logon_minutes
-      result.fetch('logonMinutes').to_i
-    end
-
-    def cached_until
-      eveapi.fetch('cachedUntil')
-    end
-
-    def version
-      eveapi.fetch('@version').to_i
-    end
-
-    def result
-      eveapi.fetch('result')
-    end
-
-    def eveapi
-      response.fetch('eveapi')
-    end
-
-    def url
-      "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
-    end
-  end
-end

data/lib/eve_online/api_key_info.rb

@@ -1,89 +0,0 @@
-require 'open-uri'
-
-module EveOnline
-  # http://wiki.eve-id.net/APIv2_Account_APIKeyInfo_XML
-  class ApiKeyInfo < Base
-    API_ENDPOINT = 'https://api.eveonline.com/account/APIKeyInfo.xml.aspx'
-
-    def character_id
-      row.fetch('@characterID').to_i
-    end
-
-    def character_name
-      row.fetch('@characterName')
-    end
-
-    def corporation_id
-      row.fetch('@corporationID').to_i
-    end
-
-    def corporation_name
-      row.fetch('@corporationName')
-    end
-
-    def alliance_id
-      row.fetch('@allianceID').to_i
-    end
-
-    def alliance_name
-      row.fetch('@allianceName')
-    end
-
-    def faction_id
-      row.fetch('@factionID').to_i
-    end
-
-    def faction_name
-      row.fetch('@factionName')
-    end
-
-    def row
-      rowset.fetch('row')
-    end
-
-    def rowset
-      key.fetch('rowset')
-    end
-
-    def expires
-      key.fetch('@expires')
-    end
-
-    def type
-      key.fetch('@type')
-    end
-
-    def access_mask
-      key.fetch('@accessMask')
-    end
-
-    def key
-      result.fetch('key')
-    end
-
-    def current_time
-      # TODO: time in "(GMT) Monrovia, Reykjavik".
-      eveapi.fetch('currentTime')
-    end
-
-    def cached_until
-      eveapi.fetch('cachedUntil')
-    end
-
-    def version
-      eveapi.fetch('@version').to_i
-    end
-
-    def result
-      eveapi.fetch('result')
-    end
-
-    def eveapi
-      response.fetch('eveapi')
-    end
-
-    def url
-      "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
-    end
-  end
-end

data/lib/eve_online/server_status.rb

@@ -1,42 +0,0 @@
-require 'open-uri'
-
-module EveOnline
-  # http://wiki.eve-id.net/APIv2_Server_ServerStatus_XML
-  class ServerStatus < Base
-    API_ENDPOINT = 'https://api.eveonline.com/Server/ServerStatus.xml.aspx'
-
-    def current_time
-      # TODO: time in "(GMT) Monrovia, Reykjavik".
-      eveapi.fetch('currentTime')
-    end
-
-    def server_open?
-      result.fetch('serverOpen') == 'True'
-    end
-
-    def online_players
-      result.fetch('onlinePlayers').to_i
-    end
-
-    def cached_until
-      # TODO: time in "(GMT) Monrovia, Reykjavik".
-      eveapi.fetch('cachedUntil')
-    end
-
-    def version
-      eveapi.fetch('@version').to_i
-    end
-
-    def result
-      eveapi.fetch('result')
-    end
-
-    def eveapi
-      response.fetch('eveapi')
-    end
-
-    def url
-      API_ENDPOINT
-    end
-  end
-end