eve_online 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6606ce1e9e2c4fa66b22b44de0941fc5810b9e34ad104f33644404d6e3397dfc
-  data.tar.gz: 31847a6f29eab2746e37f4cdf214d273c4560d078fc9b88c648c2210ed391a49
+  metadata.gz: b2ea58ee7651e8044fcc6389c021e3579e795cbc322e3dab599cc6c18e17860c
+  data.tar.gz: 16fd748597ca626cb82142536b9a22065254f35c2745e8b8b8159c9ee4c0765a
 SHA512:
-  metadata.gz: 68fd517c71c5e9d453fe9002e3f844cd352dcd423ff22b548e47be2dcf8df7760b01eb82149075599e3625725f3807ed5a9ba5be3798f048784ca2223b30e15a
-  data.tar.gz: ab3481b5c5c58695ca7fd28dd7747e28e0ce82e7ce91895bf2afb915251a28c5fa1a608ac5e9d4ad0cd693b4a3d7880862afc9e4bb3f1df82ff243e8a676a406
+  metadata.gz: bbb1f79a76a8bccb09cd51b836ee38368ca3b0db2b62b74740478c051c575df3aff3904a9042fe054112eaa0d00fa23cd7bbd037a2df4bb5b744024151deccff
+  data.tar.gz: 48d1c9783e47538ea164f80b00f503b3ca6d6d7cbc370865ba891b4d91df8a1e194e314d0b6a36c1794e39d5c788cd52975ef7a64f71b1b9c563b1cdcfb6a20e

data/.travis.yml

@@ -14,6 +14,10 @@ gemfile:
   - gemfiles/activesupport_52.gemfile
   - gemfiles/activesupport_edge.gemfile
 
+addons:
+  apt:
+    update: true
+
 matrix:
   exclude:
     - rvm: ruby-head
@@ -23,19 +27,19 @@ matrix:
     - rvm: 2.3.7
       gemfile: gemfiles/activesupport_edge.gemfile
   include:
-    - rvm: jruby-9.1.16.0
+    - rvm: jruby-9.2.0.0
       gemfile: gemfiles/activesupport_42.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
-    - rvm: jruby-9.1.16.0
+    - rvm: jruby-9.2.0.0
       gemfile: gemfiles/activesupport_50.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
-    - rvm: jruby-9.1.16.0
+    - rvm: jruby-9.2.0.0
       gemfile: gemfiles/activesupport_51.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
-    - rvm: jruby-9.1.16.0
+    - rvm: jruby-9.2.0.0
       gemfile: gemfiles/activesupport_52.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
@@ -62,7 +66,7 @@ matrix:
 
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.1.16.0
+    - rvm: jruby-9.2.0.0
     - rvm: jruby-head
   fast_finish: true
 

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 ## Changelog
 
+**v0.16.0**
+
+* Add `EveOnline::ESI::UniverseTypes`
+* Add `EveOnline::ESI::UniverseType`
+* Add `EveOnline::ESI::Models::Type`
+* Rails 5.2.0
+* Sync with new ESI API
+* JRuby 9.1.17.0
+* Add exception for 204 status `EveOnline::Exceptions::NoContent`
+* Add exception for 400 status `EveOnline::Exceptions::BadRequest`
+* Add exception for 401 status `EveOnline::Exceptions::Unauthorized`
+* Add exception for 403 status `EveOnline::Exceptions::Forbidden`
+* Add exception for 404 status `EveOnline::Exceptions::ResourceNotFound`
+* Add exception for 500 status `EveOnline::Exceptions::InternalServerError`
+* Add exception for 502 status `EveOnline::Exceptions::BadGateway`
+* Add exception for 503 status `EveOnline::Exceptions::ServiceUnavailable`
+* Add open/read timeouts. Default to 60s.
+* Add `EveOnline::ESI::Base#read_timeout`
+* Add `EveOnline::ESI::Base#read_timeout=`
+* Add `EveOnline::ESI::Base#open_timeout`
+* Add `EveOnline::ESI::Base#open_timeout=`
+* Add `EveOnline::ESI::Base#client`
+* Remove `EveOnline::Exceptions::InvalidCharacterIDException`
+* Remove `EveOnline::Exceptions::UnauthorizedException`
+* Rename `EveOnline::Exceptions::TimeoutException` to `EveOnline::Exceptions::Timeout`
+* JRuby 9.2.0.0
+
 **v0.15.0**
 
 * Add `EveOnline::ESI::Alliances`

data/Gemfile

@@ -8,7 +8,5 @@ gemspec
 gem 'nokogiri'
 gem 'awesome_print', require: 'ap'
 gem 'pry'
-gem 'mutant'
-gem 'mutant-rspec'
 gem 'rubocop', require: false
 gem 'rubocop-rspec', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eve_online (0.15.0)
+    eve_online (0.16.0)
       activesupport (>= 4.2.0)
       faraday
       json
@@ -10,116 +10,71 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract_type (0.0.7)
-    activesupport (5.1.6)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    anima (0.3.0)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2)
-      equalizer (~> 0.0.11)
     ast (2.4.0)
     awesome_print (1.8.0)
     codeclimate-test-reporter (1.0.7)
       simplecov
     coderay (1.1.2)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    docile (1.3.0)
-    equalizer (0.0.11)
-    faraday (0.14.0)
+    docile (1.3.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     hashdiff (0.3.7)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     json (2.1.0)
     memoist (0.16.0)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    morpher (0.2.6)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      anima (~> 0.3.0)
-      ast (~> 2.2)
-      concord (~> 0.1.5)
-      equalizer (~> 0.0.9)
-      ice_nine (~> 0.11.0)
-      procto (~> 0.0.2)
     multipart-post (2.0.0)
-    mutant (0.8.14)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      anima (~> 0.3.0)
-      ast (~> 2.2)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.3)
-      equalizer (~> 0.0.9)
-      ice_nine (~> 0.11.1)
-      memoizable (~> 0.4.2)
-      morpher (~> 0.2.6)
-      parallel (~> 1.3)
-      parser (>= 2.3.1.4, < 2.5)
-      procto (~> 0.0.2)
-      regexp_parser (~> 0.4.3)
-      unparser (~> 0.2.5)
-    mutant-rspec (0.8.14)
-      mutant (~> 0.8.14)
-      rspec-core (>= 3.4.0, < 3.7.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
-    procto (0.0.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
     rainbow (3.0.0)
     rake (12.3.1)
-    regexp_parser (0.4.12)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.52.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.56.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.23.0)
-      rubocop (>= 0.52.1)
+    rubocop-rspec (1.25.1)
+      rubocop (>= 0.53.0)
     ruby-progressbar (1.9.0)
     safe_yaml (1.0.4)
     simplecov (0.16.1)
@@ -130,17 +85,9 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    unparser (0.2.7)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.3)
-      equalizer (~> 0.0.9)
-      parser (>= 2.3.1.2, < 2.6)
-      procto (~> 0.0.2)
+    unicode-display_width (1.3.3)
     vcr (4.0.0)
-    webmock (3.3.0)
+    webmock (3.4.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -153,8 +100,6 @@ DEPENDENCIES
   bundler
   codeclimate-test-reporter
   eve_online!
-  mutant
-  mutant-rspec
   nokogiri
   pry
   rake
@@ -167,4 +112,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/Gemfile.mutant

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in eveonline.gemspec
+gemspec
+
+gem 'nokogiri'
+gem 'awesome_print', require: 'ap'
+gem 'pry'
+gem 'mutant'
+gem 'mutant-rspec'
+gem 'rubocop', require: false
+gem 'rubocop-rspec', require: false

data/README.md

@@ -9,6 +9,8 @@
 
 This gem implement Ruby API for EveOnline MMORPG (ESI).
 
+Looking for [EveOnline SSO OAuth2 Strategy for OmniAuth](https://github.com/biow0lf/omniauth-eve_online-sso)?
+
 This gem was extracted from [EveMonk](http://evemonk.com). Source code of evemonk backend published [here](https://github.com/biow0lf/evemonk).
 
 ## TOC
@@ -47,7 +49,7 @@ Or install it yourself as:
  * MRI 2.4
  * MRI 2.5
  * MRI (head)
- * JRuby 9.1.16.0
+ * JRuby 9.2.0.0
  * JRuby (head)
 
 ## Supported rails versions
@@ -1420,8 +1422,62 @@ race.alliance_id # => 500002
 
 #### Get types
 
+```ruby
+types = EveOnline::ESI::UniverseTypes.new
+
+types.scope # => nil
+
+types.universe_types_ids.size # => 1000
+
+types.universe_types_ids.first # => 0
+
+# TODO: add pagination
+```
+
 #### Get type information
 
+```ruby
+options = { type_id: 192 }
+
+type = EveOnline::ESI::UniverseType.new(options)
+
+type.scope # => nil
+
+type.as_json # => {:type_id=>192,
+             #     :name=>"Phased Plasma M",
+             #     :description=>"Medium Projectile Ammo...",
+             #     :published=>true,
+             #     :group_id=>83,
+             #     :market_group_id=>112,
+             #     :radius=>1.0,
+             #     :volume=>0.0125,
+             #     :packaged_volume=>0.0125,
+             #     :icon_id=>1297,
+             #     :capacity=>0.0,
+             #     :portion_size=>100,
+             #     :mass=>1.0,
+             #     :graphic_id=>1297}
+
+type.type_id # => 192
+type.name # => "Phased Plasma M"
+type.description # => "Medium Projectile Ammo..."
+type.published # => true
+type.group_id # => 83
+type.market_group_id # => 112
+type.radius # => 1.0
+type.volume # => 0.0125
+type.packaged_volume # => 0.0125
+type.icon_id # => 1297
+type.capacity # => 0.0
+type.portion_size # => 100
+type.mass # => 1.0
+type.graphic_id # => 1297
+
+# TODO: dogma_attributes
+# TODO: dogma_effects
+# TODO: add localization
+```
+
 ### User Interface
 
 #### Set Autopilot Waypoint
@@ -1512,37 +1568,27 @@ If you want to catch all exceptions `rescue` `EveOnline::Exceptions::Base`. E.g.
 
 ```ruby
 begin
-  key_id = 1234567
-  v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
-  options = { character_id: 90729314 }
+  races = EveOnline::ESI::Races.new
 
-  account_balance = EveOnline::XML::CharacterAccountBalance.new(key_id, v_code, options)
+  race = races.races.first
 
-  account_balance.as_json
+  race.as_json
 rescue EveOnline::Exceptions::Base
   # some logic for handle exception
 end
 ```
 
-If api key (XML) have many characters and you miss `character_id` you will get `EveOnline::Exceptions::InvalidCharacterIDException`.
-
-If api key (XML) invalid (wrong key_id/v_code or key is expired) you will get `EveOnline::Exceptions::UnauthorizedException`. E.g.:
-
-```ruby
-begin
-  key_id = 1234567
-  v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
-  options = { character_id: 90729314 }
-
-  account_balance = EveOnline::XML::CharacterAccountBalance.new(key_id, v_code, options)
-
-  account_balance.as_json
-rescue EveOnline::Exceptions::UnauthorizedException
-  # some logic for handle exception. e.g. mark api keys as invalid
-end
-```
+List of exceptions:
 
-Timeout. `EveOnline::Exceptions::TimeoutException`.
+* `EveOnline::Exceptions::NoContent` when response returns status 204 without body.
+* `EveOnline::Exceptions::BadRequest` when response returns status 400.
+* `EveOnline::Exceptions::Unauthorized` when response returns status 401.
+* `EveOnline::Exceptions::Forbidden` when response returns status 403.
+* `EveOnline::Exceptions::ResourceNotFound` when response returns status 404.
+* `EveOnline::Exceptions::InternalServerError` when response returns status 500.
+* `EveOnline::Exceptions::BadGateway` when response returns status 502.
+* `EveOnline::Exceptions::ServiceUnavailable` when response returns status 503.
+* `EveOnline::Exceptions::Timeout` when timeout.
 
 ## Timeouts
 
@@ -1555,6 +1601,26 @@ faraday.options.timeout = 60
 faraday.options.open_timeout = 60
 ```
 
+You can configure default timeouts with adding `read_timeout:` and `open_timeout:` to default hash with options:
+```ruby
+options = { read_timeout: 120, open_timeout: 120 } # 120 seconds
+
+races = EveOnline::ESI::Races.new(options)
+```
+
+Or, dynamically:
+```ruby
+races = EveOnline::ESI::Races.new
+
+races.open_timeout # => 60
+races.open_timeout = 120
+races.open_timeout # => 120
+
+races.read_timeout # => 60
+races.read_timeout = 120
+races.read_timeout # => 120
+```
+
 ## Useful links
 
 * [BREAKING CHANGES AND YOU - HOW TO USE ALT-ROUTES TO ENHANCE YOUR SANITY](https://developers.eveonline.com/blog/article/breaking-changes-and-you)

data/gemfiles/activesupport_52.gemfile

@@ -2,6 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'activesupport', '~> 5.2.0.rc2'
+gem 'activesupport', '~> 5.2.0'
 
 gemspec path: '../'

data/lib/eve_online.rb

@@ -4,9 +4,15 @@ require 'eve_online/version'
 
 # Exceptions
 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/exceptions/timeout'
+require 'eve_online/exceptions/unauthorized'
+require 'eve_online/exceptions/resource_not_found'
+require 'eve_online/exceptions/bad_request'
+require 'eve_online/exceptions/forbidden'
+require 'eve_online/exceptions/internal_server_error'
+require 'eve_online/exceptions/bad_gateway'
+require 'eve_online/exceptions/service_unavailable'
+require 'eve_online/exceptions/no_content'
 
 # ESI API
 require 'eve_online/esi/base'
@@ -54,6 +60,8 @@ require 'eve_online/esi/races'
 require 'eve_online/esi/bloodlines'
 require 'eve_online/esi/factions'
 require 'eve_online/esi/ancestries'
+require 'eve_online/esi/universe_types'
+require 'eve_online/esi/universe_type'
 
 require 'eve_online/esi/models/base'
 require 'eve_online/esi/models/loyalty_point'
@@ -73,6 +81,7 @@ require 'eve_online/esi/models/standing'
 require 'eve_online/esi/models/fatigue'
 require 'eve_online/esi/models/notification'
 require 'eve_online/esi/models/event'
+require 'eve_online/esi/models/type'
 require 'eve_online/esi/models/jump_clone'
 require 'eve_online/esi/models/wallet_journal_entry'
 require 'eve_online/esi/models/corporation_order'

data/lib/eve_online/esi/base.rb

@@ -10,11 +10,13 @@ module EveOnline
     class Base
       extend Memoist
 
-      attr_reader :token, :parser
+      attr_reader :token, :parser, :_read_timeout, :_open_timeout
 
       def initialize(options = {})
         @token = options[:token]
         @parser = JSON
+        @_read_timeout = options[:read_timeout] || 60
+        @_open_timeout = options[:open_timeout] || 60
       end
 
       def url
@@ -29,17 +31,72 @@ module EveOnline
         "EveOnline API (https://github.com/biow0lf/eve_online) v#{ VERSION }"
       end
 
-      def content
-        faraday = Faraday.new
+      def read_timeout
+        client.options.timeout
+      end
+
+      def read_timeout=(value)
+        client.options.timeout = value
+      end
 
-        faraday.headers[:user_agent] = user_agent
-        faraday.authorization(:Bearer, token) if token
-        faraday.options.timeout = 60
-        faraday.options.open_timeout = 60
+      def open_timeout
+        client.options.open_timeout
+      end
+
+      def open_timeout=(value)
+        client.options.open_timeout = value
+      end
 
-        faraday.get(url).body
+      def client
+        @client ||= begin
+          faraday = Faraday.new
+
+          faraday.headers[:user_agent] = user_agent
+          faraday.authorization(:Bearer, token) if token
+          faraday.options.timeout = _read_timeout
+          faraday.options.open_timeout = _open_timeout
+          faraday
+        end
+      end
+
+      def resource
+        @resource ||= client.get(url)
+      end
+
+      def content
+        case resource.status
+        when 200
+          resource.body
+        when 201
+          # TODO: write
+          raise NotImplementedError
+        when 204
+          # TODO: write
+          # raise NotImplementedError
+          raise EveOnline::Exceptions::NoContent
+        when 304
+          # TODO: write
+          raise NotImplementedError
+        when 400
+          raise EveOnline::Exceptions::BadRequest
+        when 401
+          raise EveOnline::Exceptions::Unauthorized
+        when 403
+          raise EveOnline::Exceptions::Forbidden
+        when 404
+          raise EveOnline::Exceptions::ResourceNotFound
+        when 500
+          raise EveOnline::Exceptions::InternalServerError
+        when 502
+          raise EveOnline::Exceptions::BadGateway
+        when 503
+          raise EveOnline::Exceptions::ServiceUnavailable
+        else
+          # raise EveOnline::Exceptions::UnknownStatus
+          raise NotImplementedError
+        end
       rescue Faraday::TimeoutError
-        raise EveOnline::Exceptions::TimeoutException
+        raise EveOnline::Exceptions::Timeout
       end
       memoize :content
 

data/lib/eve_online/esi/character_notifications.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterNotifications < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/notifications/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/notifications/?datasource=tranquility'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/corporation_blueprints.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CorporationBlueprints < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/corporations/%<corporation_id>s/blueprints/?datasource=tranquility&page=1'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/corporations/%<corporation_id>s/blueprints/?datasource=tranquility&page=1'
 
       attr_reader :corporation_id
 

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

@@ -7,13 +7,13 @@ module EveOnline
         def as_json
           {
             item_id: item_id,
-            location_flag: location_flag,
+            type_id: type_id,
             location_id: location_id,
-            material_efficiency: material_efficiency,
             quantity: quantity,
-            runs: runs,
             time_efficiency: time_efficiency,
-            type_id: type_id
+            material_efficiency: material_efficiency,
+            runs: runs,
+            location_flag: location_flag
           }
         end
 
@@ -21,32 +21,32 @@ module EveOnline
           options['item_id']
         end
 
-        def location_flag
-          options['location_flag']
+        def type_id
+          options['type_id']
         end
 
         def location_id
           options['location_id']
         end
 
-        def material_efficiency
-          options['material_efficiency']
-        end
-
         def quantity
           options['quantity']
         end
 
-        def runs
-          options['runs']
-        end
-
         def time_efficiency
           options['time_efficiency']
         end
 
-        def type_id
-          options['type_id']
+        def material_efficiency
+          options['material_efficiency']
+        end
+
+        def runs
+          options['runs']
+        end
+
+        def location_flag
+          options['location_flag']
         end
       end
     end

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

@@ -7,12 +7,12 @@ module EveOnline
         def as_json
           {
             notification_id: notification_id,
-            type: type,
             sender_id: sender_id,
             sender_type: sender_type,
             timestamp: timestamp,
             is_read: is_read,
-            text: text
+            text: text,
+            type: type
           }
         end
 
@@ -20,10 +20,6 @@ module EveOnline
           options['notification_id']
         end
 
-        def type
-          options['type']
-        end
-
         def sender_id
           options['sender_id']
         end
@@ -45,6 +41,10 @@ module EveOnline
         def text
           options['text']
         end
+
+        def type
+          options['type']
+        end
       end
     end
   end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class Type < Base
+        def as_json
+          {
+            type_id: type_id,
+            name: name,
+            description: description,
+            published: published,
+            group_id: group_id,
+            market_group_id: market_group_id,
+            radius: radius,
+            volume: volume,
+            packaged_volume: packaged_volume,
+            icon_id: icon_id,
+            capacity: capacity,
+            portion_size: portion_size,
+            mass: mass,
+            graphic_id: graphic_id
+            # TODO: dogma_attributes
+            # TODO: dogma_effects
+          }
+        end
+
+        def type_id
+          options['type_id']
+        end
+
+        def name
+          options['name']
+        end
+
+        def description
+          options['description']
+        end
+
+        def published
+          options['published']
+        end
+
+        def group_id
+          options['group_id']
+        end
+
+        def market_group_id
+          options['market_group_id']
+        end
+
+        def radius
+          options['radius']
+        end
+
+        def volume
+          options['volume']
+        end
+
+        def packaged_volume
+          options['packaged_volume']
+        end
+
+        def icon_id
+          options['icon_id']
+        end
+
+        def capacity
+          options['capacity']
+        end
+
+        def portion_size
+          options['portion_size']
+        end
+
+        def mass
+          options['mass']
+        end
+
+        def graphic_id
+          options['graphic_id']
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/universe_type.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module EveOnline
+  module ESI
+    class UniverseType < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/universe/types/%<type_id>s/?datasource=tranquility&language=en-us'
+
+      attr_reader :type_id
+
+      def initialize(options)
+        super
+
+        @type_id = options[:type_id]
+      end
+
+      def_delegators :model, :as_json, :name, :description,
+                     :published, :group_id, :market_group_id, :radius, :volume,
+                     :packaged_volume, :icon_id, :capacity, :portion_size,
+                     :mass, :graphic_id
+
+      def model
+        Models::Type.new(response)
+      end
+      memoize :model
+
+      def scope; end
+
+      def url
+        format(API_ENDPOINT, type_id: type_id)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/universe_types.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class UniverseTypes < Base
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/types/?datasource=tranquility&page=1'
+
+      def universe_types_ids
+        response
+      end
+
+      def scope; end
+
+      def url
+        API_ENDPOINT
+      end
+    end
+  end
+end

data/lib/eve_online/exceptions/{timeout_exception.rb → bad_gateway.rb}

@@ -2,7 +2,7 @@
 
 module EveOnline
   module Exceptions
-    class TimeoutException < Base
+    class BadGateway < Base
     end
   end
 end

data/lib/eve_online/exceptions/{unauthorized_exception.rb → bad_request.rb}

@@ -2,7 +2,7 @@
 
 module EveOnline
   module Exceptions
-    class UnauthorizedException < Base
+    class BadRequest < Base
     end
   end
 end

data/lib/eve_online/exceptions/{invalid_character_id_exception.rb → forbidden.rb}

@@ -2,7 +2,7 @@
 
 module EveOnline
   module Exceptions
-    class InvalidCharacterIDException < Base
+    class Forbidden < Base
     end
   end
 end

data/lib/eve_online/exceptions/internal_server_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Exceptions
+    class InternalServerError < Base
+    end
+  end
+end

data/lib/eve_online/exceptions/no_content.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Exceptions
+    class NoContent < Base
+    end
+  end
+end

data/lib/eve_online/exceptions/resource_not_found.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Exceptions
+    class ResourceNotFound < Base
+    end
+  end
+end

data/lib/eve_online/exceptions/service_unavailable.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Exceptions
+    class ServiceUnavailable < Base
+    end
+  end
+end

data/lib/eve_online/exceptions/timeout.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Exceptions
+    class Timeout < Base
+    end
+  end
+end

data/lib/eve_online/exceptions/unauthorized.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Exceptions
+    class Unauthorized < Base
+    end
+  end
+end

data/lib/eve_online/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EveOnline
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,6 +196,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Gemfile.mutant
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -275,13 +276,22 @@ files:
 - lib/eve_online/esi/models/skill.rb
 - lib/eve_online/esi/models/skill_queue_entry.rb
 - lib/eve_online/esi/models/standing.rb
+- lib/eve_online/esi/models/type.rb
 - lib/eve_online/esi/models/wallet_journal_entry.rb
 - lib/eve_online/esi/races.rb
 - lib/eve_online/esi/server_status.rb
+- lib/eve_online/esi/universe_type.rb
+- lib/eve_online/esi/universe_types.rb
+- lib/eve_online/exceptions/bad_gateway.rb
+- lib/eve_online/exceptions/bad_request.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/exceptions/forbidden.rb
+- lib/eve_online/exceptions/internal_server_error.rb
+- lib/eve_online/exceptions/no_content.rb
+- lib/eve_online/exceptions/resource_not_found.rb
+- lib/eve_online/exceptions/service_unavailable.rb
+- lib/eve_online/exceptions/timeout.rb
+- lib/eve_online/exceptions/unauthorized.rb
 - lib/eve_online/version.rb
 - mutant.sh
 - server.http
@@ -305,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: EveOnline ESI API.