eve_online 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a39ee09d550505d456e8e575bbf9fb0a18db38ab7513e992b1872bcdba81af
-  data.tar.gz: 9d4ed75fa443df9ed52fe614e1d361097ce94a1cace3887c8f65f6e55ec40209
+  metadata.gz: 63f18b7165f625908db58cebbc9ebaa15b026cc5a0841cf443a8749f588112dd
+  data.tar.gz: 5808d20b3e10be75d73b756b4a32574a4f68dcebedb7782752225391e49d1040
 SHA512:
-  metadata.gz: 2157fec0480eae0caa3257bcd6ae171be21fc9d2be56cb4c5be243660e0d9369f643e96865dfb97107cacf1a55d69c88eaa253d2a7739d0fc8d62f692e9b46f2
-  data.tar.gz: d71e58fdf17b70f5e4d1caea56b6a61097133ac2d699d11e2c23fe0531f957507757ba0b35fc01940c370059057cf3f730e444e7a2beff51d8d54ec9cba1231b
+  metadata.gz: 2f7350038b2d81059ba064e68a8036438716947ba2f51b520bdd244ba8f2635278cf78bad8776205e59f13cf96d4242b66380211d23ef3af2a0bbcccf1129cf4
+  data.tar.gz: 36c7e707c931ebc095cae90a89c4d68ebd16b0f4f7cd1fd4c06d7c37772397f6edd42329cf4a82992bc84e6931fd82ca08600d04882559a773445a034d4d4cef

data/.rubocop_rspec.yml

@@ -1,5 +1,9 @@
 # rubocop-rspec cops
 
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/features/**/*.rb'
+
 # Enable it later
 RSpec/NamedSubject:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.6.0
+2.6.1

data/.travis.yml

@@ -5,9 +5,8 @@ rvm:
   - 2.3.8
   - 2.4.5
   - 2.5.3
-  - 2.6.0
+  - 2.6.1
   - ruby-head
-  - rbx-3
 
 gemfile:
   - gemfiles/activesupport_42.gemfile
@@ -24,7 +23,7 @@ matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/activesupport_42.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       gemfile: gemfiles/activesupport_42.gemfile
     - rvm: 2.5.3
       gemfile: gemfiles/activesupport_42.gemfile
@@ -33,19 +32,19 @@ matrix:
     - rvm: 2.4.5
       gemfile: gemfiles/activesupport_edge.gemfile
   include:
-    - rvm: jruby-9.2.5.0
+    - rvm: jruby-9.2.6.0
       gemfile: gemfiles/activesupport_42.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
-    - rvm: jruby-9.2.5.0
+    - rvm: jruby-9.2.6.0
       gemfile: gemfiles/activesupport_50.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
-    - rvm: jruby-9.2.5.0
+    - rvm: jruby-9.2.6.0
       gemfile: gemfiles/activesupport_51.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
-    - rvm: jruby-9.2.5.0
+    - rvm: jruby-9.2.6.0
       gemfile: gemfiles/activesupport_52.gemfile
       jdk: oraclejdk8
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
@@ -73,7 +72,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-3
   fast_finish: true
 
 before_script:

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v0.24.0
+
+* Remove `implants` from `EveOnline::ESI::Models::JumpClone#as_json`
+* Rename `EveOnline::ESI::Models::JumpClone#implants` to `#implant_ids`
+* Add `EveOnline::ESI::Models::Coordinates`
+* Remove `coordinate_x` from `EveOnline::ESI::Models::Bookmark#as_json`
+* Remove `coordinate_y` from `EveOnline::ESI::Models::Bookmark#as_json`
+* Remove `coordinate_z` from `EveOnline::ESI::Models::Bookmark#as_json`
+* Remove `EveOnline::ESI::Models::Bookmark#coordinate_x`
+* Remove `EveOnline::ESI::Models::Bookmark#coordinate_y`
+* Remove `EveOnline::ESI::Models::Bookmark#coordinate_z`
+* Add `EveOnline::ESI::Models::Bookmark#coordinates`
+* Drop Rubinius support
+* Add ruby 2.6.0 write_timeout and write_timeout= support (#201)
+
 ## v0.23.0
 
 * Sync with new ESI API

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eve_online (0.23.0)
+    eve_online (0.24.0)
       activesupport (>= 4.2.0)
 
 GEM
@@ -12,7 +12,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     awesome_print (1.8.0)
@@ -23,7 +23,7 @@ GEM
     diff-lcs (1.3)
     docile (1.3.1)
     hashdiff (0.3.8)
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.1.0)
@@ -40,8 +40,8 @@ GEM
       tomlrb
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -66,7 +66,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.62.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -74,7 +74,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.31.0)
+    rubocop-rspec (1.32.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
     safe_yaml (1.0.4)

data/Gemfile.mutant.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eve_online (0.23.0)
+    eve_online (0.24.0)
       activesupport (>= 4.2.0)
 
 GEM
@@ -16,9 +16,9 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    anima (0.3.0)
+    anima (0.3.1)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2)
       equalizer (~> 0.0.11)
@@ -33,7 +33,7 @@ GEM
     docile (1.3.1)
     equalizer (0.0.11)
     hashdiff (0.3.8)
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)

data/README.md

@@ -51,9 +51,8 @@ gem install eve_online
 * MRI 2.5
 * MRI 2.6
 * MRI (head)
-* JRuby 9.2.5.0
+* JRuby 9.2.6.0
 * JRuby (head)
-* Rubinuis (latest)
 
 ## Supported rails versions
 
@@ -259,9 +258,6 @@ character_bookmarks.bookmarks.size # => 20
 bookmark = character_bookmarks.bookmarks.first
 
 bookmark.as_json # => {:bookmark_id=>4,
-                 #     :coordinate_x=>-144951231521.81625,
-                 #     :coordinate_y=>164030047870.25558,
-                 #     :coordinate_z=>211467631848.1311,
                  #     :created=>Mon, 09 Jul 2012 22:38:31 UTC +00:00,
                  #     :creator_id=>2112625428,
                  #     :folder_id=>5,
@@ -272,9 +268,6 @@ bookmark.as_json # => {:bookmark_id=>4,
                  #     :notes=>"This is a stargate"}
 
 bookmark.bookmark_id # => 4
-bookmark.coordinate_x # => -144951231521.81625
-bookmark.coordinate_y # => 164030047870.25558
-bookmark.coordinate_z # => 211467631848.1311
 bookmark.created # => Mon, 09 Jul 2012 22:38:31 UTC +00:00
 bookmark.creator_id # => 2112625428
 bookmark.folder_id # => 5
@@ -284,6 +277,10 @@ bookmark.label # => "Stargate"
 bookmark.location_id # => 30003430
 bookmark.notes # => "This is a stargate"
 
+bookmark.coordinates.as_json # => {:x=>-144951231521.81625,
+                             #     :y=>164030047870.25558,
+                             #     :z=>211467631848.1311}
+
 # TODO: character_bookmarks.etag
 ```
 
@@ -566,18 +563,18 @@ character_clones.jump_clones.size # => 2
 
 jump_clone = character_clones.jump_clones.first
 
-jump_clone.as_json # => {:implants=>[22118],
-                   #     :jump_clone_id=>22357400,
+jump_clone.as_json # => {:jump_clone_id=>22357400,
                    #     :location_id=>61000032,
                    #     :location_type=>"station",
                    #     :name=>nil}
 
-jump_clone.implants # => [22118]
 jump_clone.jump_clone_id # => 22357400
 jump_clone.location_id # => 61000032
 jump_clone.location_type # => "station"
 jump_clone.name # => nil
 
+jump_clone.implant_ids # => [22118]
+
 character_clones.last_clone_jump_date # => Fri, 27 Jul 2012 14:50:11 UTC +00:00
 
 character_clones.last_station_change_date # => Tue, 30 Jun 2015 21:51:13 UTC +00:00
@@ -812,7 +809,7 @@ dogma_attribute.published # => nil
 dogma_attribute.stackable # => true
 dogma_attribute.unit_id # => nil
 
-# TODO: dogma_attribute.etag
+dogma_attribute.etag # => "acc1e563574a55f79ebe4a2a99845dd6c28f4e412e11fd084b8485fd"
 ```
 
 #### Get dynamic item information
@@ -824,11 +821,11 @@ dogma_effects = EveOnline::ESI::DogmaEffects.new
 
 dogma_effects.scope # => nil
 
-dogma_effects.effects_ids.size # => 4123
+dogma_effects.effect_ids.size # => 4166
 
-dogma_effects.effects_ids.first # => 4
+dogma_effects.effect_ids.first # => 4
 
-# TODO: dogma_effects.etag
+dogma_effects.etag # => "5c9218218aca123ef8c106f6607bfe8e6e086d2fc2b972bbd8ff03d2"
 ```
 
 #### Get effect information
@@ -900,7 +897,7 @@ modifier.modified_attribute_id # => 73
 modifier.modifying_attribute_id # => 2458
 modifier.operator # => 6
 
-# TODO: dogma_effect.etag
+dogma_effect.etag # => "acc1e563574a55f79ebe4a2a99845dd6c28f4e412e11fd084b8485fd"
 ```
 
 ### Faction Warfare
@@ -1206,7 +1203,7 @@ character_online.last_logout # => Sun, 15 Jan 2017 11:31:22 UTC +00:00
 character_online.logins # => 370
 character_online.online # => false
 
-# TODO: character_online.etag
+character_online.etag # => "43c82cdefedc4275da30d7731200df96b905dc94b8486d55bedb5fe6"
 ```
 
 #### Get current ship
@@ -1368,25 +1365,25 @@ market_history.scope # => nil
 
 statistics = market_history.history
 
-statistics.size # => 417
+statistics.size # => 412
 
 stats_today = statistics.last
 
-stats_today.as_json # => {:average=>754702326.19,
-                    #     :date=>Fri, 24 Nov 2017 00:00:00 UTC +00:00,
-                    #     :highest=>769999999.99,
-                    #     :lowest=>701100002.49,
-                    #     :order_count=>52,
-                    #     :volume=>52}
+stats_today.as_json # => {:average=>602326589.84,
+                    #     :date=>Wed, 16 Jan 2019 00:00:00 UTC +00:00,
+                    #     :highest=>620169950.0,
+                    #     :lowest=>579060022.71,
+                    #     :order_count=>44,
+                    #     :volume=>44}
 
-stats_today.average # => 754702326.19
-stats_today.date # => Fri, 24 Nov 2017 00:00:00 UTC +00:00
-stats_today.highest # => 769999999.99
-stats_today.lowest # => 701100002.49
-stats_today.order_count # => 52
-stats_today.volume # => 52
+stats_today.average # => 602326589.84
+stats_today.date # => Wed, 16 Jan 2019 00:00:00 UTC +00:00
+stats_today.highest # => 620169950.0
+stats_today.lowest # => 579060022.71
+stats_today.order_count # => 44
+stats_today.volume # => 44
 
-# TODO: market_history.etag
+market_history.etag # => "01636947a53db63a0369aab78bbc98bae94a49cd6aa3950c29d588ae"
 ```
 
 #### List orders in a region
@@ -2498,12 +2495,14 @@ http = Net::HTTP.new
 
 http.read_timeout = 60
 http.open_timeout = 60
+# if ruby >= 2.6.0
+http.write_timeout = 60
 ```
 
-You can configure default timeouts with adding `read_timeout:` and `open_timeout:` to default hash with options:
+You can configure default timeouts with adding `read_timeout:` and `open_timeout:` (and `write_timeout` for ruby >= 2.6.0) to default hash with options:
 
 ```ruby
-options = { read_timeout: 120, open_timeout: 120 } # 120 seconds
+options = { read_timeout: 120, open_timeout: 120, write_timeout: 120 } # 120 seconds
 
 races = EveOnline::ESI::UniverseRaces.new(options)
 ```
@@ -2520,6 +2519,11 @@ races.open_timeout # => 120
 races.read_timeout # => 60
 races.read_timeout = 120
 races.read_timeout # => 120
+
+# if ruby >= 2.6.0
+races.write_timeout # => 60
+races.write_timeout = 120
+races.write_timeout # => 120
 ```
 
 ## Datasource

data/lib/eve_online.rb

@@ -110,6 +110,7 @@ require 'eve_online/esi/war_killmails'
 require 'eve_online/esi/models/base'
 
 require 'eve_online/esi/models/position'
+require 'eve_online/esi/models/coordinates'
 require 'eve_online/esi/models/loyalty_point'
 require 'eve_online/esi/models/skill_queue_entry'
 require 'eve_online/esi/models/skill'

data/lib/eve_online/esi/alliance.rb

@@ -7,7 +7,7 @@ module EveOnline
     class Alliance < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v3/alliances/%<alliance_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v3/alliances/%<alliance_id>s/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
 
@@ -28,7 +28,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, alliance_id: alliance_id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", alliance_id: alliance_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/alliance_corporations.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class AllianceCorporations < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/alliances/%<alliance_id>s/corporations/?datasource=%<datasource>s'
+      API_PATH = '/v1/alliances/%<alliance_id>s/corporations/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
 
@@ -20,7 +20,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, alliance_id: alliance_id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", alliance_id: alliance_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/alliance_icon.rb

@@ -7,7 +7,7 @@ module EveOnline
     class AllianceIcon < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v1/alliances/%<alliance_id>s/icons/?datasource=%<datasource>s'
+      API_PATH = '/v1/alliances/%<alliance_id>s/icons/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
 
@@ -26,7 +26,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, alliance_id: alliance_id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", alliance_id: alliance_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/alliances.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Alliances < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/alliances/?datasource=%<datasource>s'
+      API_PATH = '/v1/alliances/?datasource=%<datasource>s'
 
       def alliance_ids
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/base.rb

@@ -8,14 +8,23 @@ require 'active_support/time'
 module EveOnline
   module ESI
     class Base
+      API_HOST = 'https://esi.evetech.net'
+
       attr_reader :token, :parser, :_read_timeout, :_open_timeout, :_etag,
                   :datasource, :language
 
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+        attr_reader :_write_timeout
+      end
+
       def initialize(options = {})
         @token = options.fetch(:token, nil)
         @parser = options.fetch(:parser, JSON)
         @_read_timeout = options.fetch(:read_timeout, 60)
         @_open_timeout = options.fetch(:open_timeout, 60)
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+          @_write_timeout = options.fetch(:write_timeout, 60)
+        end
         @_etag = options.fetch(:etag, nil)
         @datasource = options.fetch(:datasource, 'tranquility')
         @language = options.fetch(:language, 'en-us')
@@ -53,6 +62,16 @@ module EveOnline
         client.open_timeout = value
       end
 
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+        def write_timeout
+          client.write_timeout
+        end
+
+        def write_timeout=(value)
+          client.write_timeout = value
+        end
+      end
+
       def etag=(value)
         @_etag = value
       end
@@ -72,6 +91,9 @@ module EveOnline
           http = Net::HTTP.new(uri.host, uri.port)
           http.read_timeout = _read_timeout
           http.open_timeout = _open_timeout
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+            http.write_timeout = _write_timeout
+          end
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
           # http.set_debug_output($stdout)