eve_online 0.16.0 → 0.17.0

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

@@ -6,71 +6,75 @@ module EveOnline
       class WalletJournalEntry < Base
         def as_json
           {
-            date: date,
-            ref_id: ref_id,
-            ref_type: ref_type,
-            first_party_id: first_party_id,
-            first_party_type: first_party_type,
-            second_party_id: second_party_id,
-            second_party_type: second_party_type,
             amount: amount,
             balance: balance,
+            context_id: context_id,
+            context_id_type: context_id_type,
+            date: date,
+            description: description,
+            first_party_id: first_party_id,
+            id: id,
             reason: reason,
-            tax_receiver_id: tax_receiver_id,
-            tax: tax
-            # TODO: add extra_info
+            ref_type: ref_type,
+            second_party_id: second_party_id,
+            tax: tax,
+            tax_receiver_id: tax_receiver_id
           }
         end
 
-        def date
-          date = options['date']
-
-          parse_datetime_with_timezone(date) if date
+        def amount
+          options['amount']
         end
 
-        def ref_id
-          options['ref_id']
+        def balance
+          options['balance']
         end
 
-        def ref_type
-          options['ref_type']
+        def context_id
+          options['context_id']
         end
 
-        def first_party_id
-          options['first_party_id']
+        def context_id_type
+          options['context_id_type']
         end
 
-        def first_party_type
-          options['first_party_type']
-        end
+        def date
+          date = options['date']
 
-        def second_party_id
-          options['second_party_id']
+          parse_datetime_with_timezone(date) if date
         end
 
-        def second_party_type
-          options['second_party_type']
+        def description
+          options['description']
         end
 
-        def amount
-          options['amount']
+        def first_party_id
+          options['first_party_id']
         end
 
-        def balance
-          options['balance']
+        def id
+          options['id']
         end
 
         def reason
           options['reason']
         end
 
-        def tax_receiver_id
-          options['tax_receiver_id']
+        def ref_type
+          options['ref_type']
+        end
+
+        def second_party_id
+          options['second_party_id']
         end
 
         def tax
           options['tax']
         end
+
+        def tax_receiver_id
+          options['tax_receiver_id']
+        end
       end
     end
   end

data/lib/eve_online/esi/races.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Races < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/races/?datasource=tranquility&language=en-us'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/races/?datasource=%<datasource>s&language=en-us'
 
       def races
         output = []
@@ -17,7 +17,7 @@ module EveOnline
       def scope; end
 
       def url
-        API_ENDPOINT
+        format(API_ENDPOINT, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/server_status.rb

@@ -7,7 +7,7 @@ module EveOnline
     class ServerStatus < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/status/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/status/?datasource=%<datasource>s'
 
       def_delegators :model, :as_json, :start_time, :players, :server_version, :vip
 
@@ -19,7 +19,7 @@ module EveOnline
       def scope; end
 
       def url
-        API_ENDPOINT
+        format(API_ENDPOINT, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_type.rb

@@ -7,20 +7,20 @@ module EveOnline
     class UniverseType < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/universe/types/%<type_id>s/?datasource=tranquility&language=en-us'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/universe/types/%<type_id>s/?datasource=%<datasource>s&language=en-us'
 
-      attr_reader :type_id
+      attr_reader :id
 
       def initialize(options)
         super
 
-        @type_id = options[:type_id]
+        @id = options.fetch(: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_delegators :model, :as_json, :capacity, :description, :graphic_id,
+                     :group_id, :icon_id, :market_group_id, :mass, :name,
+                     :packaged_volume, :portion_size, :published, :radius,
+                     :type_id, :volume
 
       def model
         Models::Type.new(response)
@@ -30,7 +30,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, type_id: type_id)
+        format(API_ENDPOINT, type_id: id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_types.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class UniverseTypes < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/types/?datasource=tranquility&page=1'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/types/?datasource=%<datasource>s&page=1'
 
       def universe_types_ids
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        API_ENDPOINT
+        format(API_ENDPOINT, datasource: datasource)
       end
     end
   end

data/lib/eve_online/version.rb

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

data/mutant.sh

@@ -1,4 +1,4 @@
 #! /bin/sh
 
-bundle exec mutant --include lib --require eve_online --use rspec EveOnline*
+BUNDLE_GEMFILE=Gemfile.mutant bundle exec mutant --include lib --require eve_online --use rspec EveOnline*
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: mdl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,6 +186,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".mdlrc"
 - ".rubocop-thread_safety.yml"
 - ".rubocop.yml"
 - ".rubocop_general.yml"
@@ -197,9 +198,11 @@ files:
 - Gemfile
 - Gemfile.lock
 - Gemfile.mutant
+- Gemfile.mutant.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - eve_online.gemspec
 - gemfiles/activesupport_42.gemfile
 - gemfiles/activesupport_50.gemfile
@@ -211,7 +214,6 @@ 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/alliances_names.rb
 - lib/eve_online/esi/ancestries.rb
 - lib/eve_online/esi/base.rb
 - lib/eve_online/esi/bloodlines.rb
@@ -256,16 +258,17 @@ files:
 - lib/eve_online/esi/models/bookmark.rb
 - lib/eve_online/esi/models/bookmark_folder.rb
 - lib/eve_online/esi/models/character.rb
+- lib/eve_online/esi/models/character_industry_job.rb
 - lib/eve_online/esi/models/character_order.rb
 - lib/eve_online/esi/models/character_portrait.rb
 - lib/eve_online/esi/models/corporation.rb
+- lib/eve_online/esi/models/corporation_industry_job.rb
 - lib/eve_online/esi/models/corporation_order.rb
 - lib/eve_online/esi/models/dogma_attribute.rb
 - lib/eve_online/esi/models/event.rb
 - lib/eve_online/esi/models/faction.rb
 - lib/eve_online/esi/models/fatigue.rb
 - lib/eve_online/esi/models/home_location.rb
-- lib/eve_online/esi/models/industry_job.rb
 - lib/eve_online/esi/models/jump_clone.rb
 - lib/eve_online/esi/models/loyalty_point.rb
 - lib/eve_online/esi/models/market_history.rb

data/lib/eve_online/esi/alliances_names.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module EveOnline
-  module ESI
-    class AlliancesNames < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/alliances/names/?alliance_ids=%<alliance_ids>s&datasource=tranquility'
-
-      attr_reader :alliance_ids
-
-      def initialize(options)
-        super
-
-        @alliance_ids = options[:alliance_ids]
-      end
-
-      def alliances
-        output = []
-        response.each do |alliance|
-          output << Models::AllianceShort.new(alliance)
-        end
-        output
-      end
-      memoize :alliances
-
-      def scope; end
-
-      def url
-        format(API_ENDPOINT, alliance_ids: alliance_ids.join(','))
-      end
-    end
-  end
-end