eve_online 0.6.0 → 0.7.0

data/lib/eve_online/characters/character_sheet.rb

@@ -1,8 +1,8 @@
 module EveOnline
   module Characters
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/char_charactersheet/
-    class CharacterSheet < Base
-      API_ENDPOINT = 'https://api.eveonline.com/char/CharacterSheet.xml.aspx'
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_charactersheet.html
+    class CharacterSheet < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/char/CharacterSheet.xml.aspx'.freeze
 
       attr_reader :key_id, :v_code, :character_id
 

data/lib/eve_online/characters/contact_list.rb

@@ -1,8 +1,8 @@
 module EveOnline
   module Characters
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/char_contactlist/
-    class ContactList < Base
-      API_ENDPOINT = 'https://api.eveonline.com/char/ContactList.xml.aspx'
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_contactlist.html
+    class ContactList < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/char/ContactList.xml.aspx'.freeze
 
       attr_reader :key_id, :v_code, :character_id
 

data/lib/eve_online/characters/contact_notifications.rb

@@ -1,8 +1,8 @@
 module EveOnline
   module Characters
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/char_contactnotifications/
-    class ContactNotifications < Base
-      API_ENDPOINT = 'https://api.eveonline.com/char/ContactNotifications.xml.aspx'
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_contactnotifications.html
+    class ContactNotifications < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/char/ContactNotifications.xml.aspx'.freeze
 
       attr_reader :key_id, :v_code, :character_id
 

data/lib/eve_online/characters/skill_in_training.rb

@@ -1,9 +1,9 @@
 module EveOnline
   module Characters
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/char_skillintraining/
-    class SkillInTraining < Base
-      API_ENDPOINT = 'https://api.eveonline.com/char/SkillInTraining.xml.aspx'
-      
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_skillintraining.html
+    class SkillInTraining < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/char/SkillInTraining.xml.aspx'.freeze
+
       attr_reader :key_id, :v_code, :character_id
 
       def initialize(key_id, v_code, character_id)
@@ -27,36 +27,33 @@ module EveOnline
       end
 
       def current_tq_time
-        @current_tq_time ||= \
-          ActiveSupport::TimeZone['UTC'].parse(result.fetch('currentTQTime'))
+        @current_tq_time ||= ActiveSupport::TimeZone['UTC'].parse(result.fetch('currentTQTime'))
       end
-      
+
       def training_end_time
-        @training_end_time ||= \
-          ActiveSupport::TimeZone['UTC'].parse(result.fetch('trainingEndTime'))
+        @training_end_time ||= ActiveSupport::TimeZone['UTC'].parse(result.fetch('trainingEndTime'))
       end
-      
+
       def training_start_time
-        @training_start_time ||= \
-          ActiveSupport::TimeZone['UTC'].parse(result.fetch('trainingStartTime'))
+        @training_start_time ||= ActiveSupport::TimeZone['UTC'].parse(result.fetch('trainingStartTime'))
       end
-      
+
       def training_type_id
         @training_type_id ||= result.fetch('trainingTypeID').to_i
       end
-      
+
       def training_start_sp
         @training_start_sp ||= result.fetch('trainingStartSP').to_i
       end
-      
+
       def training_destination_sp
         @training_destination_sp ||= result.fetch('trainingDestinationSP').to_i
       end
-      
+
       def training_to_level
         @training_to_level ||= result.fetch('trainingToLevel').to_i
       end
-      
+
       def skill_in_training
         @skill_in_training ||= result.fetch('skillInTraining').to_i
       end

data/lib/eve_online/characters/upcoming_calendar_events.rb

@@ -1,8 +1,8 @@
 module EveOnline
   module Characters
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/char_upcomingcalendarevents/
-    class UpcomingCalendarEvents < Base
-      API_ENDPOINT = 'https://api.eveonline.com/char/UpcomingCalendarEvents.xml.aspx'
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/character/char_upcomingcalendarevents.html
+    class UpcomingCalendarEvents < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/char/UpcomingCalendarEvents.xml.aspx'.freeze
 
       attr_reader :key_id, :v_code, :character_id
 

data/lib/eve_online/eve/character_id.rb

@@ -0,0 +1,41 @@
+require 'uri'
+
+module EveOnline
+  module Eve
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/eve/eve_characterid.html
+    class CharacterID < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/eve/CharacterID.xml.aspx'.freeze
+
+      attr_reader :input
+
+      def initialize(input)
+        super()
+        @input = input
+      end
+
+      def characters
+        # TODO: implement
+        raise NotImplementedError
+      end
+
+      def names
+        @names ||= case input
+                   when String
+                     input
+                   when Array
+                     input.join(',')
+                   else
+                     raise ArgumentError
+                   end
+      end
+
+      def escaped_input
+        @escaped_input ||= URI.escape(names)
+      end
+
+      def url
+        "#{ API_ENDPOINT }?names=#{ escaped_input }"
+      end
+    end
+  end
+end

data/lib/eve_online/event.rb

@@ -34,8 +34,7 @@ module EveOnline
     end
 
     def event_date
-      @event_date ||= \
-        ActiveSupport::TimeZone['UTC'].parse(options.fetch('@eventDate'))
+      @event_date ||= ActiveSupport::TimeZone['UTC'].parse(options.fetch('@eventDate'))
     end
 
     def event_title

data/lib/eve_online/event_response_object.rb

@@ -1,16 +1,16 @@
 module EveOnline
   class EventResponseObject
     STATUSES = { 'Undecided' => :undecided, 'Accepted' => :accepted,
-                 'Declined' => :declined, 'Tentative' => :tentative }
+                 'Declined' => :declined, 'Tentative' => :tentative }.freeze
 
     attr_reader :input
-    
+
     def initialize(input)
       @input = input
     end
-    
+
     def value
-      raise ArgumentError unless STATUSES.has_key?(input)
+      raise ArgumentError unless STATUSES.key?(input)
 
       @value ||= STATUSES.fetch(input)
     end

data/lib/eve_online/item.rb

@@ -0,0 +1,49 @@
+module EveOnline
+  class Item
+    attr_reader :options
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    def as_json(*args)
+      {
+        item_id: item_id,
+        location_id: location_id,
+        type_id: type_id,
+        quantity: quantity,
+        flag: flag,
+        singleton: singleton,
+        raw_quantity: raw_quantity
+      }
+    end
+
+    def item_id
+      @item_id ||= options.fetch('@itemID').to_i
+    end
+
+    def location_id
+      @location_id ||= options.fetch('@locationID').to_i
+    end
+
+    def type_id
+      @type_id ||= options.fetch('@typeID').to_i
+    end
+
+    def quantity
+      @quantity ||= options.fetch('@quantity').to_i
+    end
+
+    def flag
+      @flag ||= options.fetch('@flag').to_i
+    end
+
+    def singleton
+      @singleton ||= options.fetch('@singleton').to_i
+    end
+
+    def raw_quantity
+      @raw_quantity ||= options.fetch('@rawQuantity').to_i
+    end
+  end
+end

data/lib/eve_online/server/status.rb

@@ -1,8 +1,8 @@
 module EveOnline
   module Server
-    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/serv_serversstatus/
-    class Status < Base
-      API_ENDPOINT = 'https://api.eveonline.com/Server/ServerStatus.xml.aspx'
+    # https://eveonline-third-party-documentation.readthedocs.org/en/latest/xmlapi/server/serv_serverstatus.html
+    class Status < BaseXML
+      API_ENDPOINT = 'https://api.eveonline.com/Server/ServerStatus.xml.aspx'.freeze
 
       def as_json(*args)
         {

data/lib/eve_online/sovereignty/campaigns.rb

@@ -0,0 +1,28 @@
+module EveOnline
+  module Sovereignty
+    # TODO: WTF? where docs???
+    # https://developers.eveonline.com/blog/article/aegis-sovereignty-api-changes
+    class Campaigns < BaseCREST
+      API_ENDPOINT = 'https://crest-tq.eveonline.com/sovereignty/campaigns/'.freeze
+
+      # TODO: return array of objects
+      def items
+        @items ||= response.fetch('items')
+      end
+
+      # TODO: recheck this and maybe remove as unneeded
+      def page_count
+        response.fetch('pageCount')
+      end
+
+      # TODO: recheck this and maybe remove as unneeded
+      def total_count
+        response.fetch('totalCount')
+      end
+
+      def url
+        API_ENDPOINT
+      end
+    end
+  end
+end

data/lib/eve_online/version.rb

@@ -1,3 +1,3 @@
 module EveOnline
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.5.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.5.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: '0'
 description: EveOnline API. XML and CREST.
 email:
 - igor.zubkov@gmail.com
@@ -144,7 +144,11 @@ files:
 - lib/eve_online/account/characters.rb
 - lib/eve_online/account/status.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/characters/account_balance.rb
 - lib/eve_online/characters/asset_list.rb
@@ -156,12 +160,12 @@ files:
 - lib/eve_online/characters/contact_notifications.rb
 - lib/eve_online/characters/skill_in_training.rb
 - lib/eve_online/characters/upcoming_calendar_events.rb
-- lib/eve_online/eve/skill_tree.rb
+- lib/eve_online/eve/character_id.rb
 - lib/eve_online/event.rb
 - lib/eve_online/event_response_object.rb
+- lib/eve_online/item.rb
 - lib/eve_online/server/status.rb
-- lib/eve_online/skill.rb
-- lib/eve_online/skill_group.rb
+- lib/eve_online/sovereignty/campaigns.rb
 - lib/eve_online/version.rb
 homepage: https://github.com/biow0lf/eve_online
 licenses:

data/lib/eve_online/eve/skill_tree.rb

@@ -1,12 +0,0 @@
-module EveOnline
-  module Eve
-    # http://wiki.eve-id.net/APIv2_Eve_SkillTree_XML
-    class SkillTree < Base
-      API_ENDPOINT = 'https://api.eveonline.com/eve/SkillTree.xml.aspx'
-
-      def url
-        API_ENDPOINT
-      end
-    end
-  end
-end

data/lib/eve_online/skill.rb

@@ -1,5 +0,0 @@
-module EveOnline
-  class Skill
-
-  end
-end

data/lib/eve_online/skill_group.rb

@@ -1,5 +0,0 @@
-module EveOnline
-  class SkillGroup
-
-  end
-end