eve_online 0.12.0 → 0.13.0

data/eve_online.gemspec

@@ -8,28 +8,28 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Igor Zubkov']
   spec.email         = ['igor.zubkov@gmail.com']
 
-  spec.summary       = 'EveOnline API. XML, CREST and ESI. And SDE.'
-  spec.description   = 'EveOnline API. XML, CREST and ESI. And SDE.'
+  spec.summary       = 'EveOnline API. XML, ESI and SDE.'
+  spec.description   = 'EveOnline API. XML, ESI and SDE.'
   spec.homepage      = 'https://github.com/biow0lf/eve_online'
   spec.license       = 'MIT'
 
   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 = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'codeclimate-test-reporter'
 
   spec.add_runtime_dependency 'activesupport', '>= 3.0.0'
-  spec.add_runtime_dependency 'nori', '~> 2.6'
+  spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'memoist'
+  spec.add_runtime_dependency 'nori', '~> 2.6'
   # spec.add_runtime_dependency 'bitset'
   # spec.add_runtime_dependency 'hashformer'
-  spec.add_runtime_dependency 'memoist'
-  spec.add_runtime_dependency 'faraday'
 end

data/lib/eve_online.rb

@@ -7,82 +7,25 @@ require 'eve_online/exceptions/invalid_character_id_exception'
 
 require 'eve_online/base'
 require 'eve_online/base_xml'
-require 'eve_online/base_crest'
 
-require 'eve_online/blueprint'
 require 'eve_online/bookmark'
 require 'eve_online/bookmark_folder'
-require 'eve_online/character'
 require 'eve_online/event'
 require 'eve_online/event_response_object'
-require 'eve_online/item'
-require 'eve_online/implant'
-require 'eve_online/skill'
-require 'eve_online/jump_clone'
-require 'eve_online/jump_clone_implant'
-require 'eve_online/character_skills'
-require 'eve_online/character_implants'
-require 'eve_online/character_jump_clones'
-require 'eve_online/character_jump_clone_implants'
-require 'eve_online/standing'
 require 'eve_online/contact_notification'
 require 'eve_online/wallet_journal_entry'
 require 'eve_online/market_order'
 
-require 'eve_online/eve/character_id'
-
-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'
 
@@ -91,11 +34,56 @@ 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/character_wallet'
+require 'eve_online/esi/character_assets'
+require 'eve_online/esi/character_attributes'
+require 'eve_online/esi/character_industry_jobs'
+require 'eve_online/esi/character_clones'
+require 'eve_online/esi/character_implants'
+require 'eve_online/esi/character_blueprints'
+require 'eve_online/esi/character_standings'
+require 'eve_online/esi/character_fatigue'
+
+require 'eve_online/esi/corporation'
+require 'eve_online/esi/corporation_industry_jobs'
+
+require 'eve_online/esi/alliance'
+require 'eve_online/esi/alliance_icon'
+
+require 'eve_online/esi/dogma_attributes'
+require 'eve_online/esi/dogma_attribute'
+
 require 'eve_online/esi/server_status'
+require 'eve_online/esi/races'
+require 'eve_online/esi/bloodlines'
+require 'eve_online/esi/factions'
 
+require 'eve_online/esi/models/base'
 require 'eve_online/esi/models/loyalty_point'
 require 'eve_online/esi/models/skill_queue_entry'
 require 'eve_online/esi/models/skill'
+require 'eve_online/esi/models/asset'
+require 'eve_online/esi/models/attributes'
+require 'eve_online/esi/models/character'
+require 'eve_online/esi/models/industry_job'
+require 'eve_online/esi/models/character_portrait'
+require 'eve_online/esi/models/blueprint'
+require 'eve_online/esi/models/standing'
+require 'eve_online/esi/models/fatigue'
+require 'eve_online/esi/models/jump_clone'
+require 'eve_online/esi/models/home_location'
+require 'eve_online/esi/models/server_status'
+
+require 'eve_online/esi/models/corporation'
+
+require 'eve_online/esi/models/alliance'
+require 'eve_online/esi/models/alliance_icon'
+
+require 'eve_online/esi/models/dogma_attribute'
+
+require 'eve_online/esi/models/race'
+require 'eve_online/esi/models/bloodline'
+require 'eve_online/esi/models/faction'
 
 # SDE
 require 'eve_online/sde/base'
@@ -103,7 +91,6 @@ require 'eve_online/sde/base'
 require 'eve_online/sde/agt_agent_types'
 require 'eve_online/sde/agt_agents'
 require 'eve_online/sde/agt_research_agents'
-require 'eve_online/sde/chr_races'
 require 'eve_online/sde/inv_flags'
 require 'eve_online/sde/inv_items'
 require 'eve_online/sde/inv_names'
@@ -112,7 +99,6 @@ require 'eve_online/sde/inv_positions'
 require 'eve_online/sde/models/agt_agent_type'
 require 'eve_online/sde/models/agt_agent'
 require 'eve_online/sde/models/agt_research_agent'
-require 'eve_online/sde/models/chr_race'
 require 'eve_online/sde/models/inv_flag'
 require 'eve_online/sde/models/inv_item'
 require 'eve_online/sde/models/inv_name'

data/lib/eve_online/esi/alliance.rb

@@ -0,0 +1,33 @@
+require 'forwardable'
+
+module EveOnline
+  module ESI
+    class Alliance < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/alliances/%s/?datasource=tranquility'.freeze
+
+      attr_reader :alliance_id
+
+      def initialize(options)
+        super
+
+        @alliance_id = options[:alliance_id]
+      end
+
+      def_delegators :model, :as_json, :alliance_name,
+                     :ticker, :date_founded, :executor_corp
+
+      def model
+        Models::Alliance.new(response)
+      end
+      memoize :model
+
+      def scope; end
+
+      def url
+        API_ENDPOINT % alliance_id
+      end
+    end
+  end
+end

data/lib/eve_online/esi/alliance_icon.rb

@@ -0,0 +1,32 @@
+require 'forwardable'
+
+module EveOnline
+  module ESI
+    class AllianceIcon < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/%s/icons/?datasource=tranquility'.freeze
+
+      attr_reader :alliance_id
+
+      def initialize(options)
+        super
+
+        @alliance_id = options[:alliance_id]
+      end
+
+      def_delegators :model, :as_json, :small, :medium
+
+      def model
+        Models::AllianceIcon.new(response)
+      end
+      memoize :model
+
+      def scope; end
+
+      def url
+        API_ENDPOINT % alliance_id
+      end
+    end
+  end
+end

data/lib/eve_online/esi/base.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'memoist'
 require 'active_support/time'
 
@@ -8,8 +9,8 @@ module EveOnline
 
       attr_reader :token, :parser
 
-      def initialize(token = nil)
-        @token = token
+      def initialize(options = {})
+        @token = options[:token]
         @parser = JSON
       end
 

data/lib/eve_online/esi/bloodlines.rb

@@ -0,0 +1,22 @@
+module EveOnline
+  module ESI
+    class Bloodlines < Base
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/bloodlines/?datasource=tranquility&language=en-us'.freeze
+
+      def bloodlines
+        output = []
+        response.each do |bloodline|
+          output << Models::Bloodline.new(bloodline)
+        end
+        output
+      end
+      memoize :bloodlines
+
+      def scope; end
+
+      def url
+        API_ENDPOINT
+      end
+    end
+  end
+end

data/lib/eve_online/esi/character.rb

@@ -1,71 +1,28 @@
+require 'forwardable'
+
 module EveOnline
   module ESI
     class Character < Base
+      extend Forwardable
+
       API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%s/?datasource=tranquility'.freeze
 
       attr_reader :character_id
 
-      def initialize(character_id)
-        super()
-        @character_id = character_id
-      end
-
-      def as_json
-        {
-          corporation_id: corporation_id,
-          birthday: birthday,
-          name: name,
-          gender: gender,
-          race_id: race_id,
-          bloodline_id: bloodline_id,
-          description: description,
-          alliance_id: alliance_id,
-          ancestry_id: ancestry_id,
-          security_status: security_status
-        }
-      end
+      def initialize(options)
+        super
 
-      def corporation_id
-        response['corporation_id']
+        @character_id = options[:character_id]
       end
 
-      def birthday
-        birthday = response['birthday']
-
-        parse_datetime_with_timezone(birthday) if birthday
-      end
-
-      def name
-        response['name']
-      end
-
-      def gender
-        response['gender']
-      end
-
-      def race_id
-        response['race_id']
-      end
-
-      def bloodline_id
-        response['bloodline_id']
-      end
-
-      def description
-        response['description']
-      end
-
-      def alliance_id
-        response['alliance_id']
-      end
-
-      def ancestry_id
-        response['ancestry_id']
-      end
+      def_delegators :model, :as_json, :corporation_id, :birthday, :name,
+                     :gender, :race_id, :bloodline_id, :description,
+                     :alliance_id, :ancestry_id, :security_status
 
-      def security_status
-        response['security_status']
+      def model
+        Models::Character.new(response)
       end
+      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/character_assets.rb

@@ -0,0 +1,32 @@
+module EveOnline
+  module ESI
+    class CharacterAssets < Base
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%s/assets/?datasource=tranquility&page=1'.freeze
+
+      attr_reader :character_id
+
+      def initialize(options)
+        super
+
+        @character_id = options[:character_id]
+      end
+
+      def assets
+        output = []
+        response.each do |asset|
+          output << Models::Asset.new(asset)
+        end
+        output
+      end
+      memoize :assets
+
+      def scope
+        'esi-assets.read_assets.v1'
+      end
+
+      def url
+        API_ENDPOINT % character_id
+      end
+    end
+  end
+end

data/lib/eve_online/esi/character_attributes.rb

@@ -0,0 +1,36 @@
+require 'forwardable'
+
+module EveOnline
+  module ESI
+    class CharacterAttributes < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%s/attributes/?datasource=tranquility'.freeze
+
+      attr_reader :character_id
+
+      def initialize(options)
+        super
+
+        @character_id = options[:character_id]
+      end
+
+      def_delegators :model, :as_json, :charisma, :intelligence, :memory,
+                     :perception, :willpower, :bonus_remaps,
+                     :last_remap_date, :accrued_remap_cooldown_date
+
+      def model
+        Models::Attributes.new(response)
+      end
+      memoize :model
+
+      def scope
+        'esi-skills.read_skills.v1'
+      end
+
+      def url
+        API_ENDPOINT % character_id
+      end
+    end
+  end
+end