eve_online 0.20.0 → 0.21.0

data/TODO.md

@@ -5,3 +5,4 @@
 * Add caching timeout
 * Add 420 error status
 * Add errors limits
+* gem install fasterer

data/eve_online.gemspec

@@ -15,6 +15,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/evemonk/eve_online'
   spec.license       = 'MIT'
 
+  spec.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'
+  }
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
   spec.require_paths = ['lib']
 
@@ -30,6 +38,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mdl'
 
   spec.add_runtime_dependency 'activesupport', '>= 4.2.0'
-  spec.add_runtime_dependency 'json'
-  spec.add_runtime_dependency 'memoist'
 end

data/lib/eve_online.rb

@@ -17,6 +17,8 @@ require 'eve_online/exceptions/no_content'
 # ESI API
 require 'eve_online/esi/base'
 
+require 'eve_online/esi/response_with_etag'
+
 require 'eve_online/esi/alliances'
 require 'eve_online/esi/alliance'
 require 'eve_online/esi/alliance_corporations'
@@ -71,21 +73,21 @@ require 'eve_online/esi/character_skills'
 
 require 'eve_online/esi/server_status'
 
-require 'eve_online/esi/ancestries'
+require 'eve_online/esi/universe_ancestries'
 require 'eve_online/esi/universe_asteroid_belt'
-require 'eve_online/esi/bloodlines'
+require 'eve_online/esi/universe_bloodlines'
 require 'eve_online/esi/universe_categories'
 require 'eve_online/esi/universe_category'
 require 'eve_online/esi/universe_constellations'
 require 'eve_online/esi/universe_constellation'
-require 'eve_online/esi/factions'
+require 'eve_online/esi/universe_factions'
 require 'eve_online/esi/universe_graphics'
 require 'eve_online/esi/universe_graphic'
 require 'eve_online/esi/universe_groups'
 require 'eve_online/esi/universe_group'
 require 'eve_online/esi/universe_planet'
 require 'eve_online/esi/universe_moon'
-require 'eve_online/esi/races'
+require 'eve_online/esi/universe_races'
 require 'eve_online/esi/universe_regions'
 require 'eve_online/esi/universe_region'
 require 'eve_online/esi/universe_stargate'
@@ -107,6 +109,9 @@ require 'eve_online/esi/war_killmails'
 
 # Models
 require 'eve_online/esi/models/base'
+
+require 'eve_online/esi/models/model_with_etag'
+
 require 'eve_online/esi/models/position'
 require 'eve_online/esi/models/loyalty_point'
 require 'eve_online/esi/models/skill_queue_entry'

data/lib/eve_online/esi/alliance.rb

@@ -7,6 +7,8 @@ module EveOnline
     class Alliance < Base
       extend Forwardable
 
+      include ResponseWithEtag
+
       API_ENDPOINT = 'https://esi.evetech.net/v3/alliances/%<alliance_id>s/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
@@ -19,10 +21,10 @@ module EveOnline
 
       def_delegators :model, :as_json, :creator_corporation_id, :creator_id,
                      :date_founded, :executor_corporation_id, :faction_id,
-                     :name, :ticker
+                     :name, :ticker, :etag
 
       def model
-        @model ||= Models::Alliance.new(response)
+        @model ||= Models::Alliance.new(response_with_etag)
       end
 
       def scope; end

data/lib/eve_online/esi/alliances.rb

@@ -9,6 +9,10 @@ module EveOnline
         response
       end
 
+      def etag
+        current_etag
+      end
+
       def scope; end
 
       def url

data/lib/eve_online/esi/base.rb

@@ -3,15 +3,12 @@
 require 'net/http'
 require 'openssl'
 require 'json'
-require 'memoist'
 require 'active_support/time'
 
 module EveOnline
   module ESI
     class Base
-      extend Memoist
-
-      attr_reader :token, :parser, :_read_timeout, :_open_timeout, :etag,
+      attr_reader :token, :parser, :_read_timeout, :_open_timeout, :_etag,
                   :datasource, :language
 
       def initialize(options = {})
@@ -19,7 +16,7 @@ module EveOnline
         @parser = options.fetch(:parser, JSON)
         @_read_timeout = options.fetch(:read_timeout, 60)
         @_open_timeout = options.fetch(:open_timeout, 60)
-        @etag = options.fetch(:etag, nil)
+        @_etag = options.fetch(:etag, nil)
         @datasource = options.fetch(:datasource, 'tranquility')
         @language = options.fetch(:language, 'en-us')
       end
@@ -57,7 +54,7 @@ module EveOnline
       end
 
       def current_etag
-        resource.header['Etag']&.gsub('"', '')
+        resource.header['Etag']&.gsub('W/', '')&.gsub('"', '')
       end
 
       def page; end
@@ -86,7 +83,7 @@ module EveOnline
           request['Accept'] = 'application/json'
           request['Accept-Language'] = language
           request['Authorization'] = "Bearer #{ token }" if token
-          request['If-None-Match'] = "\"#{ etag }\"" if etag
+          request['If-None-Match'] = _etag if _etag
           request['Content-Type'] = 'application/json' if http_method == 'Post'
           request.body = payload if http_method == 'Post'
 
@@ -102,13 +99,14 @@ module EveOnline
         @resource ||= client.request(request)
       end
 
-      def no_content?
+      def not_modified?
         resource.is_a?(Net::HTTPNotModified)
       end
 
       def content
         case resource
         when Net::HTTPOK
+          # TODO: memoize resource.body as @content
           resource.body
         when Net::HTTPCreated
           # TODO: write
@@ -141,12 +139,10 @@ module EveOnline
       rescue Net::OpenTimeout, Net::ReadTimeout
         raise EveOnline::Exceptions::Timeout
       end
-      memoize :content
 
       def response
-        parser.parse(content)
+        @response ||= parser.parse(content)
       end
-      memoize :response
 
       private
 

data/lib/eve_online/esi/character.rb

@@ -22,9 +22,8 @@ module EveOnline
                      :gender, :name, :race_id, :security_status
 
       def model
-        Models::Character.new(response)
+        @model ||= Models::Character.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/character_assets.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def assets
-        output = []
-        response.each do |asset|
-          output << Models::Asset.new(asset)
-        end
-        output
+        @assets ||=
+          begin
+            output = []
+            response.each do |asset|
+              output << Models::Asset.new(asset)
+            end
+            output
+          end
       end
-      memoize :assets
 
       def scope
         'esi-assets.read_assets.v1'

data/lib/eve_online/esi/character_assets_locations.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def assets_locations
-        output = []
-        response.each do |asset_location|
-          output << Models::AssetLocation.new(asset_location)
-        end
-        output
+        @assets_locations ||=
+          begin
+            output = []
+            response.each do |asset_location|
+              output << Models::AssetLocation.new(asset_location)
+            end
+            output
+          end
       end
-      memoize :assets_locations
 
       def http_method
         'Post'

data/lib/eve_online/esi/character_assets_names.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def assets_names
-        output = []
-        response.each do |asset_name|
-          output << Models::AssetName.new(asset_name)
-        end
-        output
+        @assets_names ||=
+          begin
+            output = []
+            response.each do |asset_name|
+              output << Models::AssetName.new(asset_name)
+            end
+            output
+          end
       end
-      memoize :assets_names
 
       def http_method
         'Post'

data/lib/eve_online/esi/character_attributes.rb

@@ -22,9 +22,8 @@ module EveOnline
                      :memory, :perception, :willpower
 
       def model
-        Models::Attributes.new(response)
+        @model ||= Models::Attributes.new(response)
       end
-      memoize :model
 
       def scope
         'esi-skills.read_skills.v1'

data/lib/eve_online/esi/character_blueprints.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def blueprints
-        output = []
-        response.each do |blueprint|
-          output << Models::Blueprint.new(blueprint)
-        end
-        output
+        @blueprints ||=
+          begin
+            output = []
+            response.each do |blueprint|
+              output << Models::Blueprint.new(blueprint)
+            end
+            output
+          end
       end
-      memoize :blueprints
 
       def scope
         'esi-characters.read_blueprints.v1'

data/lib/eve_online/esi/character_bookmark_folders.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def bookmark_folders
-        output = []
-        response.each do |bookmark_folder|
-          output << Models::BookmarkFolder.new(bookmark_folder)
-        end
-        output
+        @bookmark_folders ||=
+          begin
+            output = []
+            response.each do |bookmark_folder|
+              output << Models::BookmarkFolder.new(bookmark_folder)
+            end
+            output
+          end
       end
-      memoize :bookmark_folders
 
       def scope
         'esi-bookmarks.read_character_bookmarks.v1'

data/lib/eve_online/esi/character_bookmarks.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def bookmarks
-        output = []
-        response.each do |bookmark|
-          output << Models::Bookmark.new(bookmark)
-        end
-        output
+        @bookmarks ||=
+          begin
+            output = []
+            response.each do |bookmark|
+              output << Models::Bookmark.new(bookmark)
+            end
+            output
+          end
       end
-      memoize :bookmarks
 
       def scope
         'esi-bookmarks.read_character_bookmarks.v1'

data/lib/eve_online/esi/character_calendar.rb

@@ -14,13 +14,15 @@ module EveOnline
       end
 
       def events
-        output = []
-        response.each do |event|
-          output << Models::Event.new(event)
-        end
-        output
+        @events ||=
+          begin
+            output = []
+            response.each do |event|
+              output << Models::Event.new(event)
+            end
+            output
+          end
       end
-      memoize :events
 
       def scope
         'esi-calendar.read_calendar_events.v1'

data/lib/eve_online/esi/character_clones.rb

@@ -14,18 +14,19 @@ module EveOnline
       end
 
       def home_location
-        Models::HomeLocation.new(response['home_location'])
+        @home_location ||= Models::HomeLocation.new(response['home_location'])
       end
-      memoize :home_location
 
       def jump_clones
-        output = []
-        response['jump_clones'].each do |jump_clone|
-          output << Models::JumpClone.new(jump_clone)
-        end
-        output
+        @jump_clones ||=
+          begin
+            output = []
+            response['jump_clones'].each do |jump_clone|
+              output << Models::JumpClone.new(jump_clone)
+            end
+            output
+          end
       end
-      memoize :jump_clones
 
       def last_clone_jump_date
         last_clone_jump_date = response['last_clone_jump_date']

data/lib/eve_online/esi/character_fatigue.rb

@@ -21,9 +21,8 @@ module EveOnline
                      :last_jump_date, :last_update_date
 
       def model
-        Models::Fatigue.new(response)
+        @model ||= Models::Fatigue.new(response)
       end
-      memoize :model
 
       def scope
         'esi-characters.read_fatigue.v1'

data/lib/eve_online/esi/character_industry_jobs.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def jobs
-        output = []
-        response.each do |job|
-          output << Models::CharacterIndustryJob.new(job)
-        end
-        output
+        @jobs ||=
+          begin
+            output = []
+            response.each do |job|
+              output << Models::CharacterIndustryJob.new(job)
+            end
+            output
+          end
       end
-      memoize :jobs
 
       def scope
         'esi-industry.read_character_jobs.v1'

data/lib/eve_online/esi/character_killmails_recent.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
         'esi-killmails.read_killmails.v1'