eve_online 0.13.0 → 0.14.0

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

@@ -4,29 +4,44 @@ module EveOnline
       class Alliance < Base
         def as_json
           {
-            alliance_name: alliance_name,
+            name: name,
             ticker: ticker,
+            creator_id: creator_id,
+            creator_corporation_id: creator_corporation_id,
+            executor_corporation_id: executor_corporation_id,
             date_founded: date_founded,
-            executor_corp: executor_corp
+            faction_id: faction_id
           }
         end
 
-        def alliance_name
-          options['alliance_name']
+        def name
+          options['name']
         end
 
         def ticker
           options['ticker']
         end
 
+        def creator_id
+          options['creator_id']
+        end
+
+        def creator_corporation_id
+          options['creator_corporation_id']
+        end
+
+        def executor_corporation_id
+          options['executor_corporation_id']
+        end
+
         def date_founded
           date_founded = options['date_founded']
 
           parse_datetime_with_timezone(date_founded) if date_founded
         end
 
-        def executor_corp
-          options['executor_corp']
+        def faction_id
+          options['faction_id']
         end
       end
     end

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

@@ -5,12 +5,12 @@ module EveOnline
         def as_json
           {
             type_id: type_id,
+            quantity: quantity,
             location_id: location_id,
             location_type: location_type,
             item_id: item_id,
             location_flag: location_flag,
-            is_singleton: is_singleton,
-            quantity: quantity
+            is_singleton: is_singleton
           }
         end
 
@@ -18,6 +18,10 @@ module EveOnline
           options['type_id']
         end
 
+        def quantity
+          options['quantity']
+        end
+
         def location_id
           options['location_id']
         end
@@ -37,10 +41,6 @@ module EveOnline
         def is_singleton
           options['is_singleton']
         end
-
-        def quantity
-          options['quantity']
-        end
       end
     end
   end

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

@@ -13,7 +13,8 @@ module EveOnline
             description: description,
             alliance_id: alliance_id,
             ancestry_id: ancestry_id,
-            security_status: security_status
+            security_status: security_status,
+            faction_id: faction_id
           }
         end
 
@@ -58,6 +59,10 @@ module EveOnline
         def security_status
           options['security_status']
         end
+
+        def faction_id
+          options['faction_id']
+        end
       end
     end
   end

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

@@ -4,64 +4,74 @@ module EveOnline
       class Corporation < Base
         def as_json
           {
-            alliance_id: alliance_id,
-            ceo_id: ceo_id,
-            corporation_description: corporation_description,
-            corporation_name: corporation_name,
-            creation_date: creation_date,
-            creator_id: creator_id,
-            faction: faction,
+            name: name,
+            ticker: ticker,
             member_count: member_count,
+            ceo_id: ceo_id,
+            alliance_id: alliance_id,
+            description: description,
             tax_rate: tax_rate,
-            ticker: ticker,
-            corporation_url: corporation_url
+            date_founded: date_founded,
+            creator_id: creator_id,
+            corporation_url: corporation_url,
+            faction_id: faction_id,
+            home_station_id: home_station_id,
+            shares: shares
           }
         end
 
-        def alliance_id
-          options['alliance_id']
+        def name
+          options['name']
+        end
+
+        def ticker
+          options['ticker']
+        end
+
+        def member_count
+          options['member_count']
         end
 
         def ceo_id
           options['ceo_id']
         end
 
-        def corporation_description
-          options['corporation_description']
+        def alliance_id
+          options['alliance_id']
         end
 
-        def corporation_name
-          options['corporation_name']
+        def description
+          options['description']
         end
 
-        def creation_date
-          creation_date = options['creation_date']
+        def tax_rate
+          options['tax_rate']
+        end
 
-          parse_datetime_with_timezone(creation_date) if creation_date
+        def date_founded
+          date_founded = options['date_founded']
+
+          parse_datetime_with_timezone(date_founded) if date_founded
         end
 
         def creator_id
           options['creator_id']
         end
 
-        def faction
-          options['faction']
-        end
-
-        def member_count
-          options['member_count']
+        def corporation_url
+          options['url']
         end
 
-        def tax_rate
-          options['tax_rate']
+        def home_station_id
+          options['home_station_id']
         end
 
-        def ticker
-          options['ticker']
+        def faction_id
+          options['faction_id']
         end
 
-        def corporation_url
-          options['url']
+        def shares
+          options['shares']
         end
       end
     end

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

@@ -26,6 +26,7 @@ module EveOnline
             station_id: station_id,
             status: status,
             successful_runs: successful_runs
+            # location_id WTF???
           }
         end
 

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

@@ -4,12 +4,22 @@ module EveOnline
       class JumpClone < Base
         def as_json
           {
+            jump_clone_id: jump_clone_id,
+            name: name,
             location_id: location_id,
             location_type: location_type,
             implants: implants
           }
         end
 
+        def jump_clone_id
+          options['jump_clone_id']
+        end
+
+        def name
+          options['name']
+        end
+
         def location_id
           options['location_id']
         end

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

@@ -0,0 +1,44 @@
+module EveOnline
+  module ESI
+    module Models
+      class MarketHistory < Base
+        def as_json
+          {
+            date: date,
+            order_count: order_count,
+            volume: volume,
+            highest: highest,
+            average: average,
+            lowest: lowest
+          }
+        end
+
+        def date
+          date = options['date']
+
+          parse_datetime_with_timezone(date) if date
+        end
+
+        def order_count
+          options['order_count']
+        end
+
+        def volume
+          options['volume']
+        end
+
+        def highest
+          options['highest']
+        end
+
+        def average
+          options['average']
+        end
+
+        def lowest
+          options['lowest']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module EveOnline
+  module ESI
+    module Models
+      class Online < Base
+        def as_json
+          {
+            online: online,
+            last_login: last_login,
+            last_logout: last_logout,
+            logins: logins
+          }
+        end
+
+        def online
+          options['online']
+        end
+
+        def last_login
+          last_login = options['last_login']
+
+          parse_datetime_with_timezone(last_login) if last_login
+        end
+
+        def last_logout
+          last_logout = options['last_logout']
+
+          parse_datetime_with_timezone(last_logout) if last_logout
+        end
+
+        def logins
+          options['logins']
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,8 @@ module EveOnline
           {
             skill_id: skill_id,
             skillpoints_in_skill: skillpoints_in_skill,
-            current_skill_level: current_skill_level
+            trained_skill_level: trained_skill_level,
+            active_skill_level: active_skill_level
           }
         end
 
@@ -18,8 +19,12 @@ module EveOnline
           options['skillpoints_in_skill']
         end
 
-        def current_skill_level
-          options['current_skill_level']
+        def trained_skill_level
+          options['trained_skill_level']
+        end
+
+        def active_skill_level
+          options['active_skill_level']
         end
       end
     end

data/lib/eve_online/version.rb

@@ -1,3 +1,3 @@
 module EveOnline
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.14.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ files:
 - gemfiles/activesupport_42.gemfile
 - gemfiles/activesupport_50.gemfile
 - gemfiles/activesupport_51.gemfile
+- gemfiles/activesupport_52.gemfile
 - gemfiles/activesupport_edge.gemfile
 - lib/eve_online.rb
 - lib/eve_online/base.rb
@@ -207,16 +208,19 @@ files:
 - lib/eve_online/esi/character_implants.rb
 - lib/eve_online/esi/character_industry_jobs.rb
 - lib/eve_online/esi/character_loyalty_points.rb
+- lib/eve_online/esi/character_online.rb
 - lib/eve_online/esi/character_portrait.rb
 - lib/eve_online/esi/character_skill_queue.rb
 - lib/eve_online/esi/character_skills.rb
 - lib/eve_online/esi/character_standings.rb
 - lib/eve_online/esi/character_wallet.rb
 - lib/eve_online/esi/corporation.rb
+- lib/eve_online/esi/corporation_blueprints.rb
 - lib/eve_online/esi/corporation_industry_jobs.rb
 - lib/eve_online/esi/dogma_attribute.rb
 - lib/eve_online/esi/dogma_attributes.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
 - lib/eve_online/esi/models/asset.rb
@@ -234,6 +238,8 @@ files:
 - 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
+- lib/eve_online/esi/models/online.rb
 - lib/eve_online/esi/models/race.rb
 - lib/eve_online/esi/models/server_status.rb
 - lib/eve_online/esi/models/skill.rb
@@ -273,6 +279,7 @@ files:
 - lib/eve_online/xml/character_wallet_journal.rb
 - lib/eve_online/xml/corporation_market_orders.rb
 - mutant.sh
+- server.http
 homepage: https://github.com/biow0lf/eve_online
 licenses:
 - MIT
@@ -293,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: EveOnline API. XML, ESI and SDE.