eve_online 0.11.0 → 0.12.0

data/gemfiles/activesupport_51.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '~> 5.1.0'
+
+gemspec :path => '../'

data/gemfiles/activesupport_edge.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', git: 'https://github.com/rails/rails', require: 'activesupport'
+
+gemspec :path => '../'

data/lib/eve_online.rb

@@ -1,7 +1,9 @@
 require 'eve_online/version'
 
-require 'eve_online/exceptions/exception'
+require 'eve_online/exceptions/base'
 require 'eve_online/exceptions/timeout_exception'
+require 'eve_online/exceptions/unauthorized_exception'
+require 'eve_online/exceptions/invalid_character_id_exception'
 
 require 'eve_online/base'
 require 'eve_online/base_xml'
@@ -26,56 +28,60 @@ require 'eve_online/standing'
 require 'eve_online/contact_notification'
 require 'eve_online/wallet_journal_entry'
 require 'eve_online/market_order'
-require 'eve_online/account_type_object'
-
-require 'eve_online/account/api_key_info'
-require 'eve_online/account/characters'
-require 'eve_online/account/status'
-
-require 'eve_online/characters/account_balance'
-require 'eve_online/characters/asset_list'
-require 'eve_online/characters/blueprints'
-require 'eve_online/characters/bookmarks'
-require 'eve_online/characters/calendar_event_attendees'
-require 'eve_online/characters/contact_list'
-require 'eve_online/characters/contact_notifications'
-require 'eve_online/characters/medals'
-require 'eve_online/characters/character_sheet'
-require 'eve_online/characters/upcoming_calendar_events'
-require 'eve_online/characters/skill_in_training'
-require 'eve_online/characters/standings'
-require 'eve_online/characters/contracts'
-require 'eve_online/characters/chat_channels'
-require 'eve_online/characters/contract_bids'
-require 'eve_online/characters/contract_items'
-require 'eve_online/characters/fac_war_stats'
-require 'eve_online/characters/industry_jobs'
-require 'eve_online/characters/industry_jobs_history'
-require 'eve_online/characters/kill_mails'
-require 'eve_online/characters/locations'
-require 'eve_online/characters/mail_bodies'
-require 'eve_online/characters/mailing_lists'
-require 'eve_online/characters/mail_messages'
-require 'eve_online/characters/market_orders'
-require 'eve_online/characters/notifications'
-require 'eve_online/characters/notification_texts'
-require 'eve_online/characters/planetary_colonies'
-require 'eve_online/characters/planetary_links'
-require 'eve_online/characters/planetary_pins'
-require 'eve_online/characters/planetary_routes'
-require 'eve_online/characters/research'
-require 'eve_online/characters/skill_queue'
-require 'eve_online/characters/wallet_journal'
-require 'eve_online/characters/wallet_transactions'
-
-require 'eve_online/corporations/market_orders'
 
 require 'eve_online/eve/character_id'
-require 'eve_online/server/status'
 
 require 'eve_online/sovereignty/campaigns'
 
+# XML API
+require 'eve_online/xml/base'
+require 'eve_online/xml/account_status'
+require 'eve_online/xml/api_key_info'
+require 'eve_online/xml/account_characters'
+require 'eve_online/xml/character_account_balance'
+require 'eve_online/xml/character_asset_list'
+require 'eve_online/xml/character_blueprints'
+require 'eve_online/xml/character_bookmarks'
+require 'eve_online/xml/character_sheet'
+require 'eve_online/xml/character_medals'
+require 'eve_online/xml/character_skill_queue'
+require 'eve_online/xml/character_chat_channels'
+require 'eve_online/xml/character_calendar_event_attendees'
+require 'eve_online/xml/character_contact_list'
+require 'eve_online/xml/character_contact_notifications'
+require 'eve_online/xml/character_upcoming_calendar_events'
+require 'eve_online/xml/character_skill_in_training'
+require 'eve_online/xml/character_standings'
+require 'eve_online/xml/character_contracts'
+require 'eve_online/xml/character_contract_bids'
+require 'eve_online/xml/character_contract_items'
+require 'eve_online/xml/character_fac_war_stats'
+require 'eve_online/xml/character_industry_jobs'
+require 'eve_online/xml/character_industry_jobs_history'
+require 'eve_online/xml/character_kill_mails'
+require 'eve_online/xml/character_locations'
+require 'eve_online/xml/character_mail_bodies'
+require 'eve_online/xml/character_mailing_lists'
+require 'eve_online/xml/character_mail_messages'
+require 'eve_online/xml/character_market_orders'
+require 'eve_online/xml/character_notifications'
+require 'eve_online/xml/character_notification_texts'
+require 'eve_online/xml/character_planetary_colonies'
+require 'eve_online/xml/character_planetary_links'
+require 'eve_online/xml/character_planetary_pins'
+require 'eve_online/xml/character_planetary_routes'
+require 'eve_online/xml/character_research'
+require 'eve_online/xml/character_wallet_journal'
+require 'eve_online/xml/character_wallet_transactions'
+
+require 'eve_online/xml/server_status'
+
+require 'eve_online/xml/corporation_market_orders'
+
+require 'eve_online/xml/models/account_status'
+require 'eve_online/xml/models/api_key_info'
 require 'eve_online/xml/models/skill_queue_entry'
+require 'eve_online/xml/models/account_type_object'
 
 # ESI API
 require 'eve_online/esi/base'
@@ -85,6 +91,7 @@ require 'eve_online/esi/character_portrait'
 require 'eve_online/esi/character_skills'
 require 'eve_online/esi/character_skill_queue'
 require 'eve_online/esi/character_loyalty_points'
+require 'eve_online/esi/server_status'
 
 require 'eve_online/esi/models/loyalty_point'
 require 'eve_online/esi/models/skill_queue_entry'

data/lib/eve_online/esi/character.rb

@@ -1,7 +1,7 @@
 module EveOnline
   module ESI
     class Character < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/latest/characters/%s/?datasource=tranquility'.freeze
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%s/?datasource=tranquility'.freeze
 
       attr_reader :character_id
 
@@ -26,43 +26,45 @@ module EveOnline
       end
 
       def corporation_id
-        response.fetch('corporation_id')
+        response['corporation_id']
       end
 
       def birthday
-        parse_datetime_with_timezone(response.fetch('birthday'))
+        birthday = response['birthday']
+
+        parse_datetime_with_timezone(birthday) if birthday
       end
 
       def name
-        response.fetch('name')
+        response['name']
       end
 
       def gender
-        response.fetch('gender')
+        response['gender']
       end
 
       def race_id
-        response.fetch('race_id')
+        response['race_id']
       end
 
       def bloodline_id
-        response.fetch('bloodline_id')
+        response['bloodline_id']
       end
 
       def description
-        response.fetch('description')
+        response['description']
       end
 
       def alliance_id
-        response.fetch('alliance_id')
+        response['alliance_id']
       end
 
       def ancestry_id
-        response.fetch('ancestry_id')
+        response['ancestry_id']
       end
 
       def security_status
-        response.fetch('security_status')
+        response['security_status']
       end
 
       def scope; end

data/lib/eve_online/esi/character_loyalty_points.rb

@@ -1,7 +1,7 @@
 module EveOnline
   module ESI
     class CharacterLoyaltyPoints < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/latest/characters/%s/loyalty/points/?datasource=tranquility'.freeze
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%s/loyalty/points/?datasource=tranquility'.freeze
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_portrait.rb

@@ -1,7 +1,7 @@
 module EveOnline
   module ESI
     class CharacterPortrait < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/latest/characters/%s/portrait/?datasource=tranquility'.freeze
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%s/portrait/?datasource=tranquility'.freeze
 
       attr_reader :character_id
 
@@ -30,19 +30,19 @@ module EveOnline
       end
 
       def small
-        response.fetch('px64x64')
+        response['px64x64']
       end
 
       def medium
-        response.fetch('px128x128')
+        response['px128x128']
       end
 
       def large
-        response.fetch('px256x256')
+        response['px256x256']
       end
 
       def huge
-        response.fetch('px512x512')
+        response['px512x512']
       end
 
       def gigantic

data/lib/eve_online/esi/models/loyalty_point.rb

@@ -16,11 +16,11 @@ module EveOnline
         end
 
         def corporation_id
-          options.fetch('corporation_id')
+          options['corporation_id']
         end
 
         def loyalty_points
-          options.fetch('loyalty_points')
+          options['loyalty_points']
         end
       end
     end

data/lib/eve_online/esi/models/skill.rb

@@ -17,15 +17,15 @@ module EveOnline
         end
 
         def skill_id
-          options.fetch('skill_id')
+          options['skill_id']
         end
 
         def skillpoints_in_skill
-          options.fetch('skillpoints_in_skill')
+          options['skillpoints_in_skill']
         end
 
         def current_skill_level
-          options.fetch('current_skill_level')
+          options['current_skill_level']
         end
       end
     end

data/lib/eve_online/esi/server_status.rb

@@ -0,0 +1,40 @@
+module EveOnline
+  module ESI
+    class ServerStatus < Base
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/status/?datasource=tranquility'.freeze
+
+      def as_json
+        {
+          start_time: start_time,
+          players: players,
+          server_version: server_version,
+          vip: vip
+        }
+      end
+
+      def start_time
+        start_time = response['start_time']
+
+        parse_datetime_with_timezone(start_time) if start_time
+      end
+
+      def players
+        response['players']
+      end
+
+      def server_version
+        response['server_version']
+      end
+
+      def vip
+        response['vip']
+      end
+
+      def scope; end
+
+      def url
+        API_ENDPOINT
+      end
+    end
+  end
+end

data/lib/eve_online/exceptions/{exception.rb → base.rb}

@@ -2,7 +2,7 @@ module EveOnline
   module Exceptions
     # This is base EveOnline exception class. Rescue it if you want to
     # catch any exceptions from EveOnline.
-    class Exception < RuntimeError
+    class Base < RuntimeError
     end
   end
 end

data/lib/eve_online/exceptions/invalid_character_id_exception.rb

@@ -0,0 +1,6 @@
+module EveOnline
+  module Exceptions
+    class InvalidCharacterIDException < Base
+    end
+  end
+end

data/lib/eve_online/exceptions/timeout_exception.rb

@@ -1,6 +1,6 @@
 module EveOnline
   module Exceptions
-    class TimeoutException < Exception
+    class TimeoutException < Base
     end
   end
 end

data/lib/eve_online/exceptions/unauthorized_exception.rb

@@ -0,0 +1,6 @@
+module EveOnline
+  module Exceptions
+    class UnauthorizedException < Base
+    end
+  end
+end

data/lib/eve_online/version.rb

@@ -1,3 +1,3 @@
 module EveOnline
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/lib/eve_online/{account/characters.rb → xml/account_characters.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Account
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/account/account_characters.html
-    class Characters < BaseXML
+    class AccountCharacters < Base
       API_ENDPOINT = 'https://api.eveonline.com/account/Characters.xml.aspx'.freeze
 
       attr_reader :key_id, :v_code

data/lib/eve_online/xml/account_status.rb

@@ -0,0 +1,31 @@
+require 'forwardable'
+
+module EveOnline
+  module XML
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/account/account_accountstatus.html
+    class AccountStatus < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://api.eveonline.com/account/AccountStatus.xml.aspx'.freeze
+
+      attr_reader :key_id, :v_code, :model
+
+      def_delegators :model, :as_json, :paid_until, :create_date, :logon_count, :logon_minutes
+
+      def initialize(key_id, v_code)
+        super()
+        @key_id = key_id
+        @v_code = v_code
+      end
+
+      def model
+        Models::AccountStatus.new(result)
+      end
+      memoize :model
+
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
+      end
+    end
+  end
+end

data/lib/eve_online/{account → xml}/api_key_info.rb

@@ -1,26 +1,27 @@
+require 'forwardable'
+
 module EveOnline
-  module Account
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/account/account_apikeyinfo.html
-    class ApiKeyInfo < BaseXML
+    class ApiKeyInfo < Base
+      extend Forwardable
+
       API_ENDPOINT = 'https://api.eveonline.com/account/APIKeyInfo.xml.aspx'.freeze
 
       attr_reader :key_id, :v_code
 
+      def_delegators :model, :as_json, :expires, :api_key_type, :access_mask
+
       def initialize(key_id, v_code)
         super()
         @key_id = key_id
         @v_code = v_code
       end
 
-      def as_json
-        {
-          expires: expires,
-          api_key_type: api_key_type,
-          access_mask: access_mask,
-          current_time: current_time,
-          cached_until: cached_until
-        }
+      def model
+        Models::ApiKeyInfo.new(key)
       end
+      memoize :model
 
       def characters
         case row
@@ -38,18 +39,6 @@ module EveOnline
       end
       memoize :characters
 
-      def expires
-        parse_datetime_with_timezone(key.fetch('@expires'))
-      end
-
-      def api_key_type
-        AccountTypeObject.new(key.fetch('@type')).value
-      end
-
-      def access_mask
-        key.fetch('@accessMask').to_i
-      end
-
       def url
         "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
       end