eve_online 0.11.0 → 0.12.0

data/lib/eve_online/{characters/skill_in_training.rb → xml/character_skill_in_training.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Characters
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_skillintraining.html
-    class SkillInTraining < BaseXML
+    class CharacterSkillInTraining < Base
       API_ENDPOINT = 'https://api.eveonline.com/char/SkillInTraining.xml.aspx'.freeze
 
       ACCESS_MASK = 131_072

data/lib/eve_online/{characters/skill_queue.rb → xml/character_skill_queue.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Characters
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.io/en/latest/xmlapi/character/char_skillqueue.html
-    class SkillQueue < BaseXML
+    class CharacterSkillQueue < Base
       API_ENDPOINT = 'https://api.eveonline.com/char/SkillQueue.xml.aspx'.freeze
 
       ACCESS_MASK = 262_144

data/lib/eve_online/{characters/standings.rb → xml/character_standings.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Characters
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.io/en/latest/xmlapi/character/char_standings.html
-    class Standings < BaseXML
+    class CharacterStandings < Base
       API_ENDPOINT = 'https://api.eveonline.com/char/Standings.xml.aspx'.freeze
 
       ACCESS_MASK = 524_288

data/lib/eve_online/{characters/upcoming_calendar_events.rb → xml/character_upcoming_calendar_events.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Characters
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_upcomingcalendarevents.html
-    class UpcomingCalendarEvents < BaseXML
+    class CharacterUpcomingCalendarEvents < Base
       API_ENDPOINT = 'https://api.eveonline.com/char/UpcomingCalendarEvents.xml.aspx'.freeze
 
       ACCESS_MASK = 1_048_576

data/lib/eve_online/{characters/wallet_journal.rb → xml/character_wallet_journal.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Characters
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.io/en/latest/xmlapi/character/char_walletjournal.html
-    class WalletJournal < BaseXML
+    class CharacterWalletJournal < Base
       API_ENDPOINT = 'https://api.eveonline.com/char/WalletJournal.xml.aspx'.freeze
 
       ACCESS_MASK = 2_097_152

data/lib/eve_online/{characters/wallet_transactions.rb → xml/character_wallet_transactions.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Characters
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.io/en/latest/xmlapi/character/char_wallettransactions.html
-    class WalletTransactions < BaseXML
+    class CharacterWalletTransactions < Base
       API_ENDPOINT = 'https://api.eveonline.com/char/WalletTransactions.xml.aspx'.freeze
 
       ACCESS_MASK = 4_194_304

data/lib/eve_online/{corporations/market_orders.rb → xml/corporation_market_orders.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Corporations
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.io/en/latest/xmlapi/index.html
-    class MarketOrders < BaseXML
+    class CorporationMarketOrders < Base
       API_ENDPOINT = 'https://api.eveonline.com/corp/MarketOrders.xml.aspx'.freeze
 
       ACCESS_MASK = 4_096

data/lib/eve_online/xml/models/account_status.rb

@@ -0,0 +1,40 @@
+require 'active_support/time'
+
+module EveOnline
+  module XML
+    module Models
+      class AccountStatus
+        attr_reader :options
+
+        def initialize(options)
+          @options = options
+        end
+
+        def as_json
+          {
+            paid_until: paid_until,
+            create_date: create_date,
+            logon_count: logon_count,
+            logon_minutes: logon_minutes
+          }
+        end
+
+        def paid_until
+          ActiveSupport::TimeZone['UTC'].parse(options.fetch('paidUntil'))
+        end
+
+        def create_date
+          ActiveSupport::TimeZone['UTC'].parse(options.fetch('createDate'))
+        end
+
+        def logon_count
+          options.fetch('logonCount').to_i
+        end
+
+        def logon_minutes
+          options.fetch('logonMinutes').to_i
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/xml/models/account_type_object.rb

@@ -0,0 +1,22 @@
+module EveOnline
+  module XML
+    module Models
+      class AccountTypeObject
+        STATUSES = { 'Character' => :character, 'Account' => :account,
+                     'Corporation' => :corporation }.freeze
+
+        attr_reader :input
+
+        def initialize(input)
+          @input = input
+        end
+
+        def value
+          raise ArgumentError unless STATUSES.key?(input)
+
+          @value ||= STATUSES.fetch(input)
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/xml/models/api_key_info.rb

@@ -0,0 +1,35 @@
+require 'active_support/time'
+
+module EveOnline
+  module XML
+    module Models
+      class ApiKeyInfo
+        attr_reader :options
+
+        def initialize(options)
+          @options = options
+        end
+
+        def as_json
+          {
+            access_mask: access_mask,
+            api_key_type: api_key_type,
+            expires: expires
+          }
+        end
+
+        def access_mask
+          options.fetch('@accessMask').to_i
+        end
+
+        def api_key_type
+          AccountTypeObject.new(options.fetch('@type')).value
+        end
+
+        def expires
+          ActiveSupport::TimeZone['UTC'].parse(options.fetch('@expires'))
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/{server/status.rb → xml/server_status.rb}

@@ -1,7 +1,7 @@
 module EveOnline
-  module Server
+  module XML
     # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/server/serv_serverstatus.html
-    class Status < BaseXML
+    class ServerStatus < Base
       API_ENDPOINT = 'https://api.eveonline.com/Server/ServerStatus.xml.aspx'.freeze
 
       def as_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,11 +184,9 @@ files:
 - eve_online.gemspec
 - gemfiles/activesupport_42.gemfile
 - gemfiles/activesupport_50.gemfile
+- gemfiles/activesupport_51.gemfile
+- gemfiles/activesupport_edge.gemfile
 - lib/eve_online.rb
-- lib/eve_online/account/api_key_info.rb
-- lib/eve_online/account/characters.rb
-- lib/eve_online/account/status.rb
-- lib/eve_online/account_type_object.rb
 - lib/eve_online/base.rb
 - lib/eve_online/base_crest.rb
 - lib/eve_online/base_xml.rb
@@ -200,43 +198,7 @@ files:
 - lib/eve_online/character_jump_clone_implants.rb
 - lib/eve_online/character_jump_clones.rb
 - lib/eve_online/character_skills.rb
-- lib/eve_online/characters/account_balance.rb
-- lib/eve_online/characters/asset_list.rb
-- lib/eve_online/characters/blueprints.rb
-- lib/eve_online/characters/bookmarks.rb
-- lib/eve_online/characters/calendar_event_attendees.rb
-- lib/eve_online/characters/character_sheet.rb
-- lib/eve_online/characters/chat_channels.rb
-- lib/eve_online/characters/contact_list.rb
-- lib/eve_online/characters/contact_notifications.rb
-- lib/eve_online/characters/contract_bids.rb
-- lib/eve_online/characters/contract_items.rb
-- lib/eve_online/characters/contracts.rb
-- lib/eve_online/characters/fac_war_stats.rb
-- lib/eve_online/characters/industry_jobs.rb
-- lib/eve_online/characters/industry_jobs_history.rb
-- lib/eve_online/characters/kill_mails.rb
-- lib/eve_online/characters/locations.rb
-- lib/eve_online/characters/mail_bodies.rb
-- lib/eve_online/characters/mail_messages.rb
-- lib/eve_online/characters/mailing_lists.rb
-- lib/eve_online/characters/market_orders.rb
-- lib/eve_online/characters/medals.rb
-- lib/eve_online/characters/notification_texts.rb
-- lib/eve_online/characters/notifications.rb
-- lib/eve_online/characters/planetary_colonies.rb
-- lib/eve_online/characters/planetary_links.rb
-- lib/eve_online/characters/planetary_pins.rb
-- lib/eve_online/characters/planetary_routes.rb
-- lib/eve_online/characters/research.rb
-- lib/eve_online/characters/skill_in_training.rb
-- lib/eve_online/characters/skill_queue.rb
-- lib/eve_online/characters/standings.rb
-- lib/eve_online/characters/upcoming_calendar_events.rb
-- lib/eve_online/characters/wallet_journal.rb
-- lib/eve_online/characters/wallet_transactions.rb
 - lib/eve_online/contact_notification.rb
-- lib/eve_online/corporations/market_orders.rb
 - lib/eve_online/esi/base.rb
 - lib/eve_online/esi/character.rb
 - lib/eve_online/esi/character_loyalty_points.rb
@@ -246,11 +208,14 @@ files:
 - lib/eve_online/esi/models/loyalty_point.rb
 - lib/eve_online/esi/models/skill.rb
 - lib/eve_online/esi/models/skill_queue_entry.rb
+- lib/eve_online/esi/server_status.rb
 - lib/eve_online/eve/character_id.rb
 - lib/eve_online/event.rb
 - lib/eve_online/event_response_object.rb
-- lib/eve_online/exceptions/exception.rb
+- lib/eve_online/exceptions/base.rb
+- lib/eve_online/exceptions/invalid_character_id_exception.rb
 - lib/eve_online/exceptions/timeout_exception.rb
+- lib/eve_online/exceptions/unauthorized_exception.rb
 - lib/eve_online/implant.rb
 - lib/eve_online/item.rb
 - lib/eve_online/jump_clone.rb
@@ -273,13 +238,56 @@ files:
 - lib/eve_online/sde/models/inv_item.rb
 - lib/eve_online/sde/models/inv_name.rb
 - lib/eve_online/sde/models/inv_position.rb
-- lib/eve_online/server/status.rb
 - lib/eve_online/skill.rb
 - lib/eve_online/sovereignty/campaigns.rb
 - lib/eve_online/standing.rb
 - lib/eve_online/version.rb
 - lib/eve_online/wallet_journal_entry.rb
+- lib/eve_online/xml/account_characters.rb
+- lib/eve_online/xml/account_status.rb
+- lib/eve_online/xml/api_key_info.rb
+- lib/eve_online/xml/base.rb
+- lib/eve_online/xml/character_account_balance.rb
+- lib/eve_online/xml/character_asset_list.rb
+- lib/eve_online/xml/character_blueprints.rb
+- lib/eve_online/xml/character_bookmarks.rb
+- lib/eve_online/xml/character_calendar_event_attendees.rb
+- lib/eve_online/xml/character_chat_channels.rb
+- lib/eve_online/xml/character_contact_list.rb
+- lib/eve_online/xml/character_contact_notifications.rb
+- lib/eve_online/xml/character_contract_bids.rb
+- lib/eve_online/xml/character_contract_items.rb
+- lib/eve_online/xml/character_contracts.rb
+- lib/eve_online/xml/character_fac_war_stats.rb
+- lib/eve_online/xml/character_industry_jobs.rb
+- lib/eve_online/xml/character_industry_jobs_history.rb
+- lib/eve_online/xml/character_kill_mails.rb
+- lib/eve_online/xml/character_locations.rb
+- lib/eve_online/xml/character_mail_bodies.rb
+- lib/eve_online/xml/character_mail_messages.rb
+- lib/eve_online/xml/character_mailing_lists.rb
+- lib/eve_online/xml/character_market_orders.rb
+- lib/eve_online/xml/character_medals.rb
+- lib/eve_online/xml/character_notification_texts.rb
+- lib/eve_online/xml/character_notifications.rb
+- lib/eve_online/xml/character_planetary_colonies.rb
+- lib/eve_online/xml/character_planetary_links.rb
+- lib/eve_online/xml/character_planetary_pins.rb
+- lib/eve_online/xml/character_planetary_routes.rb
+- lib/eve_online/xml/character_research.rb
+- lib/eve_online/xml/character_sheet.rb
+- lib/eve_online/xml/character_skill_in_training.rb
+- lib/eve_online/xml/character_skill_queue.rb
+- lib/eve_online/xml/character_standings.rb
+- lib/eve_online/xml/character_upcoming_calendar_events.rb
+- lib/eve_online/xml/character_wallet_journal.rb
+- lib/eve_online/xml/character_wallet_transactions.rb
+- lib/eve_online/xml/corporation_market_orders.rb
+- lib/eve_online/xml/models/account_status.rb
+- lib/eve_online/xml/models/account_type_object.rb
+- lib/eve_online/xml/models/api_key_info.rb
 - lib/eve_online/xml/models/skill_queue_entry.rb
+- lib/eve_online/xml/server_status.rb
 - mutant.sh
 homepage: https://github.com/biow0lf/eve_online
 licenses:
@@ -301,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: EveOnline API. XML, CREST and ESI. And SDE.

data/lib/eve_online/account/status.rb

@@ -1,47 +0,0 @@
-module EveOnline
-  module Account
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/account/account_accountstatus.html
-    class Status < BaseXML
-      API_ENDPOINT = 'https://api.eveonline.com/account/AccountStatus.xml.aspx'.freeze
-
-      attr_reader :key_id, :v_code
-
-      def initialize(key_id, v_code)
-        super()
-        @key_id = key_id
-        @v_code = v_code
-      end
-
-      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
-        parse_datetime_with_timezone(result.fetch('paidUntil'))
-      end
-
-      def create_date
-        parse_datetime_with_timezone(result.fetch('createDate'))
-      end
-
-      def logon_count
-        result.fetch('logonCount').to_i
-      end
-
-      def logon_minutes
-        result.fetch('logonMinutes').to_i
-      end
-
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
-      end
-    end
-  end
-end

data/lib/eve_online/account_type_object.rb

@@ -1,18 +0,0 @@
-module EveOnline
-  class AccountTypeObject
-    STATUSES = { 'Character' => :character, 'Account' => :account,
-                 'Corporation' => :corporation }.freeze
-
-    attr_reader :input
-
-    def initialize(input)
-      @input = input
-    end
-
-    def value
-      raise ArgumentError unless STATUSES.key?(input)
-
-      @value ||= STATUSES.fetch(input)
-    end
-  end
-end