eve_online 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0f57b29bc9c6d56a9df5c336044116b4bdb07d
-  data.tar.gz: 87deec1074a0c526c0e1a0516f882fe0df146d46
+  metadata.gz: 98c64387577199f7e1e4206c5dccd26b2ca8cf76
+  data.tar.gz: b754ef50b32369bd7eaea35405fc4b7aedd1c3b9
 SHA512:
-  metadata.gz: 2bffc8580c0780b0625ff0757842db30667a50d38b01edad2469dcee4aa39ff3c1c9dd910ef100f7ea552f9edd5e07d5a5931003f4c49caf8dac81ef3967ab01
-  data.tar.gz: 178fc0021e6838c2885d0b570238b5394d8e8d6d3c0a77e38cf64e75abbb00db8f629778076495197f167ba2b53e827df2f557b15f5d49106fc58d643351f6e0
+  metadata.gz: 2b54c122e27c7be950b76d2964594d248ff68c619091c99e3596fc6e1dc9ab379d445706eb99928b821209711d422517eb07cc86ef5496fb66176b3f3a336193
+  data.tar.gz: 3f6683afe931ca1ee9383cc526a20648b21cc9de4d5c59dd758770bc1ab361105611c368c19433c3a6128f7d90619c12ad57ced1bf7a607a56021ec117a56bd6

data/.travis.yml

@@ -2,8 +2,11 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
+  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - rbx
+  - jruby
 
 before_install: gem install bundler -v 1.10.6

data/README.md

@@ -27,9 +27,12 @@ Or install it yourself as:
 
 ## Supported ruby versions:
 
+ * MRI 1.9.3
  * MRI 2.0
  * MRI 2.1
  * MRI 2.2
+ * Rubinius (latest via RVM)
+ * JRuby (latest via RVM)
 
 ## Usage
 
@@ -37,29 +40,107 @@ Server status:
 
 ```ruby
 status = EveOnline::Server::Status.new
-status.as_json # => {:current_time=>"2015-11-20 22:18:59", :cached_until=>"2015-11-20 22:20:50", :server_open=>true, :online_players=>25192}
+status.as_json # => {:current_time=>Mon, 23 Nov 2015 18:18:29 UTC +00:00, :cached_until=>Mon, 23 Nov 2015 18:19:44 UTC +00:00, :server_open=>true, :online_players=>25611}
 
-status.current_time # => "2015-11-20 22:18:59"
-status.cached_until # => "2015-11-20 22:20:50"
+status.current_time # => Mon, 23 Nov 2015 18:18:29 UTC +00:00
+status.cached_until # => Mon, 23 Nov 2015 18:19:44 UTC +00:00
 status.server_open? # => true
-status.online_players # => 25192
+status.online_players # => 25611
+status.version # => 2
 ```
 
 Account status:
 
 ```ruby
-key_id = '1234567'
+key_id = 1234567
 v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
+
 account_status = EveOnline::Account::Status.new(key_id, v_code)
 account_status.as_json
-# => {:current_time=>"2015-11-20 23:02:48", :paid_until=>"2015-11-28 18:12:56", :create_date=>"2010-01-15 15:11:00", :logon_count=>388, :logon_minutes=>15598, :cached_until=>"2015-11-20 23:59:48"}
+# => {:current_time=>Mon, 23 Nov 2015 18:53:46 UTC +00:00, :paid_until=>Mon, 28 Dec 2015 18:12:56 UTC +00:00, :create_date=>Fri, 15 Jan 2010 15:11:00 UTC +00:00, :logon_count=>388, :logon_minutes=>15598, :cached_until=>Mon, 23 Nov 2015 19:28:38 UTC +00:00}
 
-account_status.current_time # => "2015-11-20 23:02:48"
-account_status.paid_until # => "2015-11-28 18:12:56"
-account_status.create_date # => "2010-01-15 15:11:00"
+account_status.current_time # => Mon, 23 Nov 2015 18:53:46 UTC +00:00
+account_status.paid_until # => Mon, 28 Dec 2015 18:12:56 UTC +00:00
+account_status.create_date # => Fri, 15 Jan 2010 15:11:00 UTC +00:00
 account_status.logon_count # => 388
 account_status.logon_minutes # => 15598
-account_status.cached_until # => "2015-11-20 23:59:48"
+account_status.cached_until # => Mon, 23 Nov 2015 19:28:38 UTC +00:00
+account_status.version # => 2
+```
+
+Characters:
+```ruby
+key_id = 1234567
+v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
+
+characters = EveOnline::Account::Characters.new(key_id, v_code)
+characters.version # => 2
+characters.current_time # => Mon, 30 Nov 2015 23:31:31 UTC +00:00
+characters.cached_until # => Tue, 01 Dec 2015 00:28:31 UTC +00:00
+
+characters.characters.size # => 2
+
+character = characters.characters.first
+
+character.as_json
+# => {:character_id=>90729314, :character_name=>"Green Black", :corporation_id=>1000168, :corporation_name=>"Federal Navy Academy", :alliance_id=>0, :alliance_name=>"", :faction_id=>0, :faction_name=>""}
+
+character.character_id # => 90729314
+character.character_name # => "Green Black"
+character.corporation_id # => 1000168
+character.corporation_name # => "Federal Navy Academy"
+character.alliance_id # => 0
+character.alliance_name # => ""
+character.faction_id # => 0
+character.faction_name # => ""
+```
+
+Api Key Info:
+```ruby
+key_id = 1234567
+v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
+
+api_key_info = EveOnline::Account::ApiKeyInfo.new(key_id, v_code)
+
+api_key_info.expires # => ""
+api_key_info.type # => "Account"
+api_key_info.access_mask # => 1073741823
+api_key_info.version # => 2
+api_key_info.current_time # => Mon, 30 Nov 2015 23:00:38 UTC +00:00
+api_key_info.cached_until # => Mon, 30 Nov 2015 23:05:38 UTC +00:00
+
+api_key_info.characters.size # => 2
+
+character = api_key_info.characters.first
+character.as_json
+# => {:character_id=>90729314, :character_name=>"Green Black", :corporation_id=>1000168, :corporation_name=>"Federal Navy Academy", :alliance_id=>0, :alliance_name=>"", :faction_id=>0, :faction_name=>""}
+
+character.character_id # => 90729314
+character.character_name # => "Green Black"
+character.corporation_id # => 1000168
+character.corporation_name # => "Federal Navy Academy"
+character.alliance_id # => 0
+character.alliance_name # => ""
+character.faction_id # => 0
+character.faction_name # => ""
+```
+
+Accounts Balance:
+```ruby
+key_id = 1234567
+v_code = '9ce9970b18d07586ead3d052e5b83bc8db303171a28a6f754cf35d9e6b66af17'
+character_id = 90729314
+
+account_balance = EveOnline::Characters::AccountBalance.new(key_id, v_code, character_id)
+account_balance.as_json
+# => {:account_id=>42763123, :account_key=>1000, :balance=>"5000.00", :current_time=>Wed, 02 Dec 2015 20:29:32 UTC +00:00, :cached_until=>Wed, 02 Dec 2015 20:40:42 UTC +00:00}
+
+account_balance.account_id # => 42763123
+account_balance.account_key # => 1000
+account_balance.balance # => "5000.00"
+account_balance.current_time # => Wed, 02 Dec 2015 20:29:32 UTC +00:00
+account_balance.cached_until # => Wed, 02 Dec 2015 20:40:42 UTC +00:00
+account_balance.version # => 2
 ```
 
 ## Development
@@ -74,7 +155,11 @@ Issue reports and pull requests are welcome on GitHub at https://github.com/biow
 
 ## Changelog
 
-v0.3.0: [Account Characters XML](http://wiki.eve-id.net/APIv2_Account_Characters_XML). Refactoring and bugfixes.
+master: nothing yet.
+
+v0.4.0: Time zone fixes. Add EveOnline::Character class for handling each Character. EveOnline::Account::Characters and EveOnline::Account::ApiKeyInfo now supports multiple characters. Fix EveOnline::Characters::AccountBalance class. Fix EveOnline::Characters::AccountBalance#account_key. And #as_json methods.
+
+v0.3.0: [Account Characters XML](http://wiki.eve-id.net/APIv2_Account_Characters_XML). Refactoring and bug fixes.
 
 v0.2.0: [Character Account Balance XML](http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML), [Account APIKeyInfo XML](http://wiki.eve-id.net/APIv2_Account_APIKeyInfo_XML), [Account Status XML](http://wiki.eve-id.net/APIv2_Account_AccountStatus_XML).
 
@@ -206,3 +291,7 @@ v0.1.0: [Server Status XML](http://wiki.eve-id.net/APIv2_Server_ServerStatus_XML
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/biow0lf/eve_online/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/eve_online.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'webmock'
 
+  spec.add_runtime_dependency 'activesupport', '~> 4'
   spec.add_runtime_dependency 'nori', '~> 2.6'
   # https://github.com/sparklemotion/nokogiri/blob/v1.6.6.4/CHANGELOG.rdoc
   spec.add_runtime_dependency 'nokogiri', '>= 1.6.4.4'

data/lib/eve_online.rb

@@ -1,9 +1,12 @@
 require 'eve_online/version'
 require 'eve_online/base'
+require 'eve_online/character'
 require 'eve_online/account/status'
 require 'eve_online/account/api_key_info'
 require 'eve_online/account/characters'
-require 'eve_online/character/account_balance'
+require 'eve_online/characters/account_balance'
+require 'eve_online/characters/asset_list'
+require 'eve_online/characters/calendar_event_attendees'
 require 'eve_online/server/status'
 
 module EveOnline

data/lib/eve_online/account/api_key_info.rb

@@ -4,36 +4,27 @@ module EveOnline
     class ApiKeyInfo < Base
       API_ENDPOINT = 'https://api.eveonline.com/account/APIKeyInfo.xml.aspx'
 
-      def character_id
-        row.fetch('@characterID').to_i
-      end
-
-      def character_name
-        row.fetch('@characterName')
-      end
-
-      def corporation_id
-        row.fetch('@corporationID').to_i
-      end
-
-      def corporation_name
-        row.fetch('@corporationName')
-      end
-
-      def alliance_id
-        row.fetch('@allianceID').to_i
-      end
-
-      def alliance_name
-        row.fetch('@allianceName')
-      end
+      attr_reader :key_id, :v_code
 
-      def faction_id
-        row.fetch('@factionID').to_i
+      def initialize(key_id, v_code)
+        super()
+        @key_id = key_id
+        @v_code = v_code
       end
 
-      def faction_name
-        row.fetch('@factionName')
+      def characters
+        case row
+        when Hash
+          [EveOnline::Character.new(row)]
+        when Array
+          output = []
+          row.each do |character|
+            output << EveOnline::Character.new(character)
+          end
+          output
+        else
+          raise ArgumentError
+        end
       end
 
       def row
@@ -45,6 +36,7 @@ module EveOnline
       end
 
       def expires
+        # TODO: convert to Time
         key.fetch('@expires')
       end
 

data/lib/eve_online/account/characters.rb

@@ -4,40 +4,31 @@ module EveOnline
     class Characters < Base
       API_ENDPOINT = 'https://api.eveonline.com/account/Characters.xml.aspx'
 
-      def version
-        eveapi.fetch('@version').to_i
-      end
-
-      def name
-        row.fetch('@name')
-      end
-
-      def character_id
-        row.fetch('@characterID').to_i
-      end
+      attr_reader :key_id, :v_code
 
-      def corporation_name
-        row.fetch('@corporationName')
+      def initialize(key_id, v_code)
+        super()
+        @key_id = key_id
+        @v_code = v_code
       end
 
-      def corporation_id
-        row.fetch('@corporationID').to_i
-      end
-
-      def alliance_id
-        row.fetch('@allianceID').to_i
-      end
-
-      def alliance_name
-        row.fetch('@allianceName')
-      end
-
-      def faction_id
-        row.fetch('@factionID').to_i
+      def version
+        eveapi.fetch('@version').to_i
       end
 
-      def faction_name
-        row.fetch('@factionName')
+      def characters
+        case row
+        when Hash
+          [EveOnline::Character.new(row)]
+        when Array
+          output = []
+          row.each do |character|
+            output << EveOnline::Character.new(character)
+          end
+          output
+        else
+          raise ArgumentError
+        end
       end
 
       def row

data/lib/eve_online/account/status.rb

@@ -4,7 +4,15 @@ module EveOnline
     class Status < Base
       API_ENDPOINT = 'https://api.eveonline.com/account/AccountStatus.xml.aspx'
 
-      def as_json
+      attr_reader :key_id, :v_code
+
+      def initialize(key_id, v_code)
+        super()
+        @key_id = key_id
+        @v_code = v_code
+      end
+
+      def as_json(*args)
         {
           current_time: current_time,
           paid_until: paid_until,
@@ -16,25 +24,27 @@ module EveOnline
       end
 
       def paid_until
-        # TODO: time in "(GMT) Monrovia, Reykjavik".
-        result.fetch('paidUntil')
+        @paid_until ||= begin
+          ActiveSupport::TimeZone['UTC'].parse(result.fetch('paidUntil'))
+        end
       end
 
       def create_date
-        # TODO: time in "(GMT) Monrovia, Reykjavik".
-        result.fetch('createDate')
+        @create_date ||= begin
+          ActiveSupport::TimeZone['UTC'].parse(result.fetch('createDate'))
+        end
       end
 
       def logon_count
-        result.fetch('logonCount').to_i
+        @logon_count ||= result.fetch('logonCount').to_i
       end
 
       def logon_minutes
-        result.fetch('logonMinutes').to_i
+        @logon_minutes ||= result.fetch('logonMinutes').to_i
       end
 
       def version
-        eveapi.fetch('@version').to_i
+        @version ||= eveapi.fetch('@version').to_i
       end
 
       def url

data/lib/eve_online/base.rb

@@ -1,28 +1,29 @@
 require 'open-uri'
 require 'nori'
+require 'active_support/time'
 
 module EveOnline
   class Base
-    attr_reader :key_id, :v_code, :parser
+    attr_reader :parser
 
-    def initialize(key_id = nil, v_code = nil, parser = Nori.new)
-      @key_id = key_id
-      @v_code = v_code
-      @parser = parser
+    def initialize
+      @parser = Nori.new(advanced_typecasting: false)
     end
 
     def result
-      eveapi.fetch('result')
+      @result ||= eveapi.fetch('result')
     end
 
     def cached_until
-      # TODO: time in "(GMT) Monrovia, Reykjavik".
-      eveapi.fetch('cachedUntil')
+      @cached_until ||= begin
+        ActiveSupport::TimeZone['UTC'].parse(eveapi.fetch('cachedUntil'))
+      end
     end
 
     def current_time
-      # TODO: time in "(GMT) Monrovia, Reykjavik".
-      eveapi.fetch('currentTime')
+      @current_time ||= begin
+        ActiveSupport::TimeZone['UTC'].parse(eveapi.fetch('currentTime'))
+      end
     end
 
     def version
@@ -31,7 +32,7 @@ module EveOnline
     end
 
     def eveapi
-      response.fetch('eveapi')
+      @eveapi ||= response.fetch('eveapi')
     end
 
     def url
@@ -39,7 +40,7 @@ module EveOnline
     end
 
     def content
-      open(url, open_timeout: 60, read_timeout: 60).read
+      @content ||= open(url, open_timeout: 60, read_timeout: 60).read
     end
 
     def response

data/lib/eve_online/character.rb

@@ -0,0 +1,54 @@
+module EveOnline
+  class Character
+    attr_reader :options
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    def as_json(*args)
+      {
+        character_id: character_id,
+        character_name: character_name,
+        corporation_id: corporation_id,
+        corporation_name: corporation_name,
+        alliance_id: alliance_id,
+        alliance_name: alliance_name,
+        faction_id: faction_id,
+        faction_name: faction_name
+      }
+    end
+
+    def character_id
+      @character_id ||= options.fetch('@characterID').to_i
+    end
+
+    def character_name
+      @name = @name || options.fetch('@name', nil) || options.fetch('@characterName')
+    end
+
+    def corporation_id
+      @corporation_id ||= options.fetch('@corporationID').to_i
+    end
+
+    def corporation_name
+      @corporation_name ||= options.fetch('@corporationName')
+    end
+
+    def alliance_id
+      @alliance_id ||= options.fetch('@allianceID').to_i
+    end
+
+    def alliance_name
+      @alliance_name ||= options.fetch('@allianceName')
+    end
+
+    def faction_id
+      @faction_id ||= options.fetch('@factionID').to_i
+    end
+
+    def faction_name
+      @faction_name ||= options.fetch('@factionName')
+    end
+  end
+end

data/lib/eve_online/characters/account_balance.rb

@@ -0,0 +1,55 @@
+module EveOnline
+  module Characters
+    # http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML
+    class AccountBalance < Base
+      API_ENDPOINT = 'https://api.eveonline.com/char/AccountBalance.xml.aspx'
+
+      attr_reader :key_id, :v_code, :character_id
+
+      def initialize(key_id, v_code, character_id)
+        super()
+        @key_id = key_id
+        @v_code = v_code
+        @character_id = character_id
+      end
+
+      def as_json(*args)
+        {
+          account_id: account_id,
+          account_key: account_key,
+          balance: balance,
+          current_time: current_time,
+          cached_until: cached_until
+        }
+      end
+
+      def account_id
+        row.fetch('@accountID').to_i
+      end
+
+      def account_key
+        row.fetch('@accountKey').to_i
+      end
+
+      def balance
+        row.fetch('@balance')
+      end
+
+      def row
+        rowset.fetch('row')
+      end
+
+      def rowset
+        result.fetch('rowset')
+      end
+
+      def version
+        eveapi.fetch('@version').to_i
+      end
+
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
+      end
+    end
+  end
+end

data/lib/eve_online/characters/asset_list.rb

@@ -0,0 +1,9 @@
+# TODO: finish this
+module EveOnline
+  module Characters
+    # http://wiki.eve-id.net/APIv2_Char_AssetList_XML
+    class AssetList < Base
+      API_ENDPOINT = 'https://api.eveonline.com/char/AssetList.xml.aspx'
+    end
+  end
+end

data/lib/eve_online/characters/calendar_event_attendees.rb

@@ -0,0 +1,9 @@
+# TODO: finish this
+module EveOnline
+  module Characters
+    # http://wiki.eve-id.net/APIv2_Char_CalendarEventAttendees_XML
+    class CalendarEventAttendees < Base
+      API_ENDPOINT = 'https://api.eveonline.com/char/CalendarEventAttendees.xml.aspx'
+    end
+  end
+end

data/lib/eve_online/server/status.rb

@@ -4,25 +4,27 @@ module EveOnline
     class Status < Base
       API_ENDPOINT = 'https://api.eveonline.com/Server/ServerStatus.xml.aspx'
 
-      def as_json
+      def as_json(*args)
         {
           current_time: current_time,
           cached_until: cached_until,
-          server_open: server_open?,
+          server_open: server_open,
           online_players: online_players
         }
       end
 
-      def server_open?
-        result.fetch('serverOpen') == 'True'
+      def server_open
+        @server_open ||= result.fetch('serverOpen') == 'True'
       end
 
+      alias server_open? server_open
+
       def online_players
-        result.fetch('onlinePlayers').to_i
+        @online_players ||= result.fetch('onlinePlayers').to_i
       end
 
       def version
-        eveapi.fetch('@version').to_i
+        @version ||= eveapi.fetch('@version').to_i
       end
 
       def url

data/lib/eve_online/version.rb

@@ -1,3 +1,3 @@
 module EveOnline
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +144,10 @@ files:
 - lib/eve_online/account/characters.rb
 - lib/eve_online/account/status.rb
 - lib/eve_online/base.rb
-- lib/eve_online/character/account_balance.rb
+- lib/eve_online/character.rb
+- lib/eve_online/characters/account_balance.rb
+- lib/eve_online/characters/asset_list.rb
+- lib/eve_online/characters/calendar_event_attendees.rb
 - lib/eve_online/server/status.rb
 - lib/eve_online/version.rb
 homepage: https://github.com/biow0lf/eve_online

data/lib/eve_online/character/account_balance.rb

@@ -1,36 +0,0 @@
-module EveOnline
-  module Character
-    # http://wiki.eve-id.net/APIv2_Char_AccountBalance_XML
-    class AccountBalance < Base
-      API_ENDPOINT = 'https://api.eveonline.com/char/AccountBalance.xml.aspx'
-
-      def account_id
-        row.fetch('@accountID').to_i
-      end
-
-      def account_key
-        row.fetch('@accountKey')
-      end
-
-      def balance
-        row.fetch('@balance')
-      end
-
-      def row
-        rowset.fetch('row')
-      end
-
-      def rowset
-        result.fetch('rowset')
-      end
-
-      def version
-        eveapi.fetch('@version').to_i
-      end
-
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
-      end
-    end
-  end
-end