eve_online 0.12.0 → 0.13.0

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

@@ -1,13 +1,7 @@
 module EveOnline
   module ESI
     module Models
-      class LoyaltyPoint
-        attr_reader :options
-
-        def initialize(options)
-          @options = options
-        end
-
+      class LoyaltyPoint < Base
         def as_json
           {
             corporation_id: corporation_id,

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

@@ -0,0 +1,32 @@
+module EveOnline
+  module ESI
+    module Models
+      class Race < Base
+        def as_json
+          {
+            race_id: race_id,
+            name: name,
+            description: description,
+            alliance_id: alliance_id
+          }
+        end
+
+        def race_id
+          options['race_id']
+        end
+
+        def name
+          options['name']
+        end
+
+        def description
+          options['description']
+        end
+
+        def alliance_id
+          options['alliance_id']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module EveOnline
+  module ESI
+    module Models
+      class ServerStatus < Base
+        def as_json
+          {
+            start_time: start_time,
+            players: players,
+            server_version: server_version,
+            vip: vip
+          }
+        end
+
+        def start_time
+          start_time = options['start_time']
+
+          parse_datetime_with_timezone(start_time) if start_time
+        end
+
+        def players
+          options['players']
+        end
+
+        def server_version
+          options['server_version']
+        end
+
+        def vip
+          options['vip']
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,7 @@
 module EveOnline
   module ESI
     module Models
-      class Skill
-        attr_reader :options
-
-        def initialize(options)
-          @options = options
-        end
-
+      class Skill < Base
         def as_json
           {
             skill_id: skill_id,

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

@@ -1,15 +1,7 @@
-require 'active_support/time'
-
 module EveOnline
   module ESI
     module Models
-      class SkillQueueEntry
-        attr_reader :options
-
-        def initialize(options)
-          @options = options
-        end
-
+      class SkillQueueEntry < Base
         def as_json
           {
             skill_id: skill_id,
@@ -24,35 +16,39 @@ module EveOnline
         end
 
         def skill_id
-          options.fetch('skill_id')
+          options['skill_id']
         end
 
         def finished_level
-          options.fetch('finished_level')
+          options['finished_level']
         end
 
         def queue_position
-          options.fetch('queue_position')
+          options['queue_position']
         end
 
         def finish_date
-          ActiveSupport::TimeZone['UTC'].parse(options.fetch('finish_date'))
+          finish_date = options['finish_date']
+
+          parse_datetime_with_timezone(finish_date) if finish_date
         end
 
         def start_date
-          ActiveSupport::TimeZone['UTC'].parse(options.fetch('start_date'))
+          start_date = options['start_date']
+
+          parse_datetime_with_timezone(start_date) if start_date
         end
 
         def training_start_sp
-          options.fetch('training_start_sp')
+          options['training_start_sp']
         end
 
         def level_end_sp
-          options.fetch('level_end_sp')
+          options['level_end_sp']
         end
 
         def level_start_sp
-          options.fetch('level_start_sp')
+          options['level_start_sp']
         end
       end
     end

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

@@ -0,0 +1,27 @@
+module EveOnline
+  module ESI
+    module Models
+      class Standing < Base
+        def as_json
+          {
+            from_id: from_id,
+            from_type: from_type,
+            standing: standing
+          }
+        end
+
+        def from_id
+          options['from_id']
+        end
+
+        def from_type
+          options['from_type']
+        end
+
+        def standing
+          options['standing']
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/races.rb

@@ -0,0 +1,22 @@
+module EveOnline
+  module ESI
+    class Races < Base
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/races/?datasource=tranquility&language=en-us'.freeze
+
+      def races
+        output = []
+        response.each do |race|
+          output << Models::Race.new(race)
+        end
+        output
+      end
+      memoize :races
+
+      def scope; end
+
+      def url
+        API_ENDPOINT
+      end
+    end
+  end
+end

data/lib/eve_online/esi/server_status.rb

@@ -1,34 +1,18 @@
+require 'forwardable'
+
 module EveOnline
   module ESI
     class ServerStatus < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/status/?datasource=tranquility'.freeze
-
-      def as_json
-        {
-          start_time: start_time,
-          players: players,
-          server_version: server_version,
-          vip: vip
-        }
-      end
-
-      def start_time
-        start_time = response['start_time']
+      extend Forwardable
 
-        parse_datetime_with_timezone(start_time) if start_time
-      end
-
-      def players
-        response['players']
-      end
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/status/?datasource=tranquility'.freeze
 
-      def server_version
-        response['server_version']
-      end
+      def_delegators :model, :as_json, :start_time, :players, :server_version, :vip
 
-      def vip
-        response['vip']
+      def model
+        Models::ServerStatus.new(response)
       end
+      memoize :model
 
       def scope; end
 

data/lib/eve_online/version.rb

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

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: nori
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -151,32 +151,34 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: EveOnline API. XML, CREST and ESI. And SDE.
+        version: '2.6'
+description: EveOnline API. XML, ESI and SDE.
 email:
 - igor.zubkov@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".editorconfig"
 - ".gitignore"
-- ".rspec"
+- ".rubocop-thread_safety.yml"
 - ".rubocop.yml"
+- ".rubocop_general.yml"
+- ".rubocop_rspec.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -188,44 +190,68 @@ files:
 - gemfiles/activesupport_edge.gemfile
 - lib/eve_online.rb
 - lib/eve_online/base.rb
-- lib/eve_online/base_crest.rb
 - lib/eve_online/base_xml.rb
-- lib/eve_online/blueprint.rb
 - lib/eve_online/bookmark.rb
 - lib/eve_online/bookmark_folder.rb
-- lib/eve_online/character.rb
-- lib/eve_online/character_implants.rb
-- lib/eve_online/character_jump_clone_implants.rb
-- lib/eve_online/character_jump_clones.rb
-- lib/eve_online/character_skills.rb
 - lib/eve_online/contact_notification.rb
+- lib/eve_online/esi/alliance.rb
+- lib/eve_online/esi/alliance_icon.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_attributes.rb
+- lib/eve_online/esi/character_blueprints.rb
+- lib/eve_online/esi/character_clones.rb
+- lib/eve_online/esi/character_fatigue.rb
+- 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_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_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/models/alliance.rb
+- lib/eve_online/esi/models/alliance_icon.rb
+- lib/eve_online/esi/models/asset.rb
+- lib/eve_online/esi/models/attributes.rb
+- lib/eve_online/esi/models/base.rb
+- lib/eve_online/esi/models/bloodline.rb
+- lib/eve_online/esi/models/blueprint.rb
+- lib/eve_online/esi/models/character.rb
+- lib/eve_online/esi/models/character_portrait.rb
+- lib/eve_online/esi/models/corporation.rb
+- lib/eve_online/esi/models/dogma_attribute.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/race.rb
+- lib/eve_online/esi/models/server_status.rb
 - lib/eve_online/esi/models/skill.rb
 - lib/eve_online/esi/models/skill_queue_entry.rb
+- lib/eve_online/esi/models/standing.rb
+- lib/eve_online/esi/races.rb
 - lib/eve_online/esi/server_status.rb
-- lib/eve_online/eve/character_id.rb
 - lib/eve_online/event.rb
 - lib/eve_online/event_response_object.rb
 - lib/eve_online/exceptions/base.rb
 - lib/eve_online/exceptions/invalid_character_id_exception.rb
 - lib/eve_online/exceptions/timeout_exception.rb
 - lib/eve_online/exceptions/unauthorized_exception.rb
-- lib/eve_online/implant.rb
-- lib/eve_online/item.rb
-- lib/eve_online/jump_clone.rb
-- lib/eve_online/jump_clone_implant.rb
 - lib/eve_online/market_order.rb
 - lib/eve_online/sde/agt_agent_types.rb
 - lib/eve_online/sde/agt_agents.rb
 - lib/eve_online/sde/agt_research_agents.rb
 - lib/eve_online/sde/base.rb
-- lib/eve_online/sde/chr_races.rb
 - lib/eve_online/sde/inv_flags.rb
 - lib/eve_online/sde/inv_items.rb
 - lib/eve_online/sde/inv_names.rb
@@ -233,61 +259,19 @@ files:
 - lib/eve_online/sde/models/agt_agent.rb
 - lib/eve_online/sde/models/agt_agent_type.rb
 - lib/eve_online/sde/models/agt_research_agent.rb
-- lib/eve_online/sde/models/chr_race.rb
 - lib/eve_online/sde/models/inv_flag.rb
 - lib/eve_online/sde/models/inv_item.rb
 - lib/eve_online/sde/models/inv_name.rb
 - lib/eve_online/sde/models/inv_position.rb
-- lib/eve_online/skill.rb
-- lib/eve_online/sovereignty/campaigns.rb
-- lib/eve_online/standing.rb
 - lib/eve_online/version.rb
 - lib/eve_online/wallet_journal_entry.rb
-- lib/eve_online/xml/account_characters.rb
-- lib/eve_online/xml/account_status.rb
-- lib/eve_online/xml/api_key_info.rb
 - lib/eve_online/xml/base.rb
-- lib/eve_online/xml/character_account_balance.rb
-- lib/eve_online/xml/character_asset_list.rb
-- lib/eve_online/xml/character_blueprints.rb
 - lib/eve_online/xml/character_bookmarks.rb
-- lib/eve_online/xml/character_calendar_event_attendees.rb
-- lib/eve_online/xml/character_chat_channels.rb
-- lib/eve_online/xml/character_contact_list.rb
 - lib/eve_online/xml/character_contact_notifications.rb
-- lib/eve_online/xml/character_contract_bids.rb
-- lib/eve_online/xml/character_contract_items.rb
-- lib/eve_online/xml/character_contracts.rb
-- lib/eve_online/xml/character_fac_war_stats.rb
-- lib/eve_online/xml/character_industry_jobs.rb
-- lib/eve_online/xml/character_industry_jobs_history.rb
-- lib/eve_online/xml/character_kill_mails.rb
-- lib/eve_online/xml/character_locations.rb
-- lib/eve_online/xml/character_mail_bodies.rb
-- lib/eve_online/xml/character_mail_messages.rb
-- lib/eve_online/xml/character_mailing_lists.rb
 - lib/eve_online/xml/character_market_orders.rb
-- lib/eve_online/xml/character_medals.rb
-- lib/eve_online/xml/character_notification_texts.rb
-- lib/eve_online/xml/character_notifications.rb
-- lib/eve_online/xml/character_planetary_colonies.rb
-- lib/eve_online/xml/character_planetary_links.rb
-- lib/eve_online/xml/character_planetary_pins.rb
-- lib/eve_online/xml/character_planetary_routes.rb
-- lib/eve_online/xml/character_research.rb
-- lib/eve_online/xml/character_sheet.rb
-- lib/eve_online/xml/character_skill_in_training.rb
-- lib/eve_online/xml/character_skill_queue.rb
-- lib/eve_online/xml/character_standings.rb
 - lib/eve_online/xml/character_upcoming_calendar_events.rb
 - lib/eve_online/xml/character_wallet_journal.rb
-- lib/eve_online/xml/character_wallet_transactions.rb
 - lib/eve_online/xml/corporation_market_orders.rb
-- lib/eve_online/xml/models/account_status.rb
-- lib/eve_online/xml/models/account_type_object.rb
-- lib/eve_online/xml/models/api_key_info.rb
-- lib/eve_online/xml/models/skill_queue_entry.rb
-- lib/eve_online/xml/server_status.rb
 - mutant.sh
 homepage: https://github.com/biow0lf/eve_online
 licenses:
@@ -301,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -309,8 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
-summary: EveOnline API. XML, CREST and ESI. And SDE.
+summary: EveOnline API. XML, ESI and SDE.
 test_files: []