eve_online 0.20.0 → 0.21.0

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

@@ -4,12 +4,15 @@ module EveOnline
   module ESI
     module Models
       class Stargate < Base
+        include ModelWithEtag
+
         def as_json
           {
             name: name,
             stargate_id: stargate_id,
             system_id: system_id,
-            type_id: type_id
+            type_id: type_id,
+            etag: etag
           }
         end
 

data/lib/eve_online/esi/response_with_etag.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module ResponseWithEtag
+      def response_with_etag
+        @response_with_etag ||= response.merge('etag' => current_etag)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/server_status.rb

@@ -12,9 +12,8 @@ module EveOnline
       def_delegators :model, :as_json, :start_time, :players, :server_version, :vip
 
       def model
-        Models::ServerStatus.new(response)
+        @model ||= Models::ServerStatus.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/{ancestries.rb → universe_ancestries.rb}

@@ -2,17 +2,23 @@
 
 module EveOnline
   module ESI
-    class Ancestries < Base
+    class UniverseAncestries < Base
       API_ENDPOINT = 'https://esi.evetech.net/v1/universe/ancestries/?datasource=%<datasource>s'
 
       def ancestries
-        output = []
-        response.each do |ancestry|
-          output << Models::Ancestry.new(ancestry)
-        end
-        output
+        @ancestries ||=
+          begin
+            output = []
+            response.each do |ancestry|
+              output << Models::Ancestry.new(ancestry)
+            end
+            output
+          end
+      end
+
+      def etag
+        current_etag
       end
-      memoize :ancestries
 
       def scope; end
 

data/lib/eve_online/esi/{bloodlines.rb → universe_bloodlines.rb}

@@ -2,17 +2,23 @@
 
 module EveOnline
   module ESI
-    class Bloodlines < Base
+    class UniverseBloodlines < Base
       API_ENDPOINT = 'https://esi.evetech.net/v1/universe/bloodlines/?datasource=%<datasource>s'
 
       def bloodlines
-        output = []
-        response.each do |bloodline|
-          output << Models::Bloodline.new(bloodline)
-        end
-        output
+        @bloodlines ||=
+          begin
+            output = []
+            response.each do |bloodline|
+              output << Models::Bloodline.new(bloodline)
+            end
+            output
+          end
+      end
+
+      def etag
+        current_etag
       end
-      memoize :bloodlines
 
       def scope; end
 

data/lib/eve_online/esi/universe_constellation.rb

@@ -21,9 +21,8 @@ module EveOnline
                      :systems, :position
 
       def model
-        Models::Constellation.new(response)
+        @model ||= Models::Constellation.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/{factions.rb → universe_factions.rb}

@@ -2,17 +2,23 @@
 
 module EveOnline
   module ESI
-    class Factions < Base
+    class UniverseFactions < Base
       API_ENDPOINT = 'https://esi.evetech.net/v2/universe/factions/?datasource=%<datasource>s'
 
       def factions
-        output = []
-        response.each do |faction|
-          output << Models::Faction.new(faction)
-        end
-        output
+        @factions ||=
+          begin
+            output = []
+            response.each do |faction|
+              output << Models::Faction.new(faction)
+            end
+            output
+          end
+      end
+
+      def etag
+        current_etag
       end
-      memoize :factions
 
       def scope; end
 

data/lib/eve_online/esi/{races.rb → universe_races.rb}

@@ -2,17 +2,23 @@
 
 module EveOnline
   module ESI
-    class Races < Base
+    class UniverseRaces < Base
       API_ENDPOINT = 'https://esi.evetech.net/v1/universe/races/?datasource=%<datasource>s'
 
       def races
-        output = []
-        response.each do |race|
-          output << Models::Race.new(race)
-        end
-        output
+        @races ||=
+          begin
+            output = []
+            response.each do |race|
+              output << Models::Race.new(race)
+            end
+            output
+          end
+      end
+
+      def etag
+        current_etag
       end
-      memoize :races
 
       def scope; end
 

data/lib/eve_online/esi/universe_region.rb

@@ -21,9 +21,8 @@ module EveOnline
                      :region_id
 
       def model
-        Models::Region.new(response)
+        @model ||= Models::Region.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/universe_star.rb

@@ -7,6 +7,8 @@ module EveOnline
     class UniverseStar < Base
       extend Forwardable
 
+      include ResponseWithEtag
+
       API_ENDPOINT = 'https://esi.evetech.net/v1/universe/stars/%<star_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
@@ -18,12 +20,12 @@ module EveOnline
       end
 
       def_delegators :model, :as_json, :age, :luminosity, :name, :radius,
-                     :solar_system_id, :spectral_class, :temperature, :type_id
+                     :solar_system_id, :spectral_class, :temperature,
+                     :type_id, :etag
 
       def model
-        Models::Star.new(response)
+        @model ||= Models::Star.new(response_with_etag)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/universe_stargate.rb

@@ -7,6 +7,8 @@ module EveOnline
     class UniverseStargate < Base
       extend Forwardable
 
+      include ResponseWithEtag
+
       API_ENDPOINT = 'https://esi.evetech.net/v1/universe/stargates/%<stargate_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
@@ -18,12 +20,11 @@ module EveOnline
       end
 
       def_delegators :model, :as_json, :name, :stargate_id, :system_id,
-                     :type_id, :destination, :position
+                     :type_id, :destination, :position, :etag
 
       def model
-        Models::Stargate.new(response)
+        @model ||= Models::Stargate.new(response_with_etag)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/universe_station.rb

@@ -23,9 +23,8 @@ module EveOnline
                      :services, :station_id, :system_id, :type_id, :position
 
       def model
-        Models::Station.new(response)
+        @model ||= Models::Station.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/universe_system_jumps.rb

@@ -6,13 +6,15 @@ module EveOnline
       API_ENDPOINT = 'https://esi.evetech.net/v1/universe/system_jumps/?datasource=%<datasource>s'
 
       def system_jumps
-        output = []
-        response.each do |system_jump|
-          output << Models::SystemJump.new(system_jump)
-        end
-        output
+        @system_jumps ||=
+          begin
+            output = []
+            response.each do |system_jump|
+              output << Models::SystemJump.new(system_jump)
+            end
+            output
+          end
       end
-      memoize :system_jumps
 
       def scope; end
 

data/lib/eve_online/esi/universe_system_kills.rb

@@ -6,13 +6,15 @@ module EveOnline
       API_ENDPOINT = 'https://esi.evetech.net/v2/universe/system_kills/?datasource=%<datasource>s'
 
       def system_kills
-        output = []
-        response.each do |system_kill|
-          output << Models::SystemKill.new(system_kill)
-        end
-        output
+        @system_kills ||=
+          begin
+            output = []
+            response.each do |system_kill|
+              output << Models::SystemKill.new(system_kill)
+            end
+            output
+          end
       end
-      memoize :system_kills
 
       def scope; end
 

data/lib/eve_online/esi/universe_type.rb

@@ -23,9 +23,8 @@ module EveOnline
                      :type_id, :volume, :dogma_attributes, :dogma_effects
 
       def model
-        Models::Type.new(response)
+        @model ||= Models::Type.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/war_killmails.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def killmails
-        output = []
-        response.each do |killmail|
-          output << Models::KillmailShort.new(killmail)
-        end
-        output
+        @killmails ||=
+          begin
+            output = []
+            response.each do |killmail|
+              output << Models::KillmailShort.new(killmail)
+            end
+            output
+          end
       end
-      memoize :killmails
 
       def scope; end
 

data/lib/eve_online/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,34 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: memoist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: EveOnline ESI API.
 email:
 - igor.zubkov@gmail.com
@@ -200,9 +172,7 @@ files:
 - lib/eve_online/esi/alliance_corporations.rb
 - lib/eve_online/esi/alliance_icon.rb
 - lib/eve_online/esi/alliances.rb
-- lib/eve_online/esi/ancestries.rb
 - lib/eve_online/esi/base.rb
-- lib/eve_online/esi/bloodlines.rb
 - lib/eve_online/esi/character.rb
 - lib/eve_online/esi/character_assets.rb
 - lib/eve_online/esi/character_assets_locations.rb
@@ -238,7 +208,6 @@ files:
 - lib/eve_online/esi/dogma_attributes.rb
 - lib/eve_online/esi/dogma_effect.rb
 - lib/eve_online/esi/dogma_effects.rb
-- lib/eve_online/esi/factions.rb
 - lib/eve_online/esi/market_history.rb
 - lib/eve_online/esi/models/alliance.rb
 - lib/eve_online/esi/models/alliance_icon.rb
@@ -283,6 +252,7 @@ files:
 - lib/eve_online/esi/models/killmail_short.rb
 - lib/eve_online/esi/models/loyalty_point.rb
 - lib/eve_online/esi/models/market_history.rb
+- lib/eve_online/esi/models/model_with_etag.rb
 - lib/eve_online/esi/models/moon.rb
 - lib/eve_online/esi/models/notification.rb
 - lib/eve_online/esi/models/online.rb
@@ -305,19 +275,23 @@ files:
 - lib/eve_online/esi/models/system_kill.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/response_with_etag.rb
 - lib/eve_online/esi/server_status.rb
+- lib/eve_online/esi/universe_ancestries.rb
 - lib/eve_online/esi/universe_asteroid_belt.rb
+- lib/eve_online/esi/universe_bloodlines.rb
 - lib/eve_online/esi/universe_categories.rb
 - lib/eve_online/esi/universe_category.rb
 - lib/eve_online/esi/universe_constellation.rb
 - lib/eve_online/esi/universe_constellations.rb
+- lib/eve_online/esi/universe_factions.rb
 - lib/eve_online/esi/universe_graphic.rb
 - lib/eve_online/esi/universe_graphics.rb
 - lib/eve_online/esi/universe_group.rb
 - lib/eve_online/esi/universe_groups.rb
 - lib/eve_online/esi/universe_moon.rb
 - lib/eve_online/esi/universe_planet.rb
+- lib/eve_online/esi/universe_races.rb
 - lib/eve_online/esi/universe_region.rb
 - lib/eve_online/esi/universe_regions.rb
 - lib/eve_online/esi/universe_star.rb
@@ -344,11 +318,15 @@ files:
 - lib/eve_online/exceptions/unauthorized.rb
 - lib/eve_online/version.rb
 - mutant.sh
-- server.http
 homepage: https://github.com/evemonk/eve_online
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/evemonk/eve_online/issues
+  changelog_uri: https://github.com/evemonk/eve_online/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/evemonk/eve_online/blob/master/README.md
+  homepage_uri: https://github.com/evemonk/eve_online
+  source_code_uri: https://github.com/evemonk/eve_online
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -364,8 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: EveOnline ESI API.