eve_online 0.8.0 → 0.9.0

data/eve_online.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '>= 3.0.0'
   spec.add_runtime_dependency 'nori', '~> 2.6'
   spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'memoist'
 end

data/lib/eve_online.rb

@@ -14,14 +14,21 @@ require 'eve_online/item'
 require 'eve_online/implant'
 require 'eve_online/skill'
 require 'eve_online/jump_clone'
+require 'eve_online/jump_clone_implant'
 require 'eve_online/character_skills'
 require 'eve_online/character_implants'
 require 'eve_online/character_jump_clones'
+require 'eve_online/character_jump_clone_implants'
 require 'eve_online/standing'
+require 'eve_online/skill_queue_entry'
+require 'eve_online/contact_notification'
+require 'eve_online/wallet_journal_entry'
+require 'eve_online/market_order'
 
 require 'eve_online/account/api_key_info'
 require 'eve_online/account/characters'
 require 'eve_online/account/status'
+
 require 'eve_online/characters/account_balance'
 require 'eve_online/characters/asset_list'
 require 'eve_online/characters/blueprints'
@@ -34,6 +41,32 @@ require 'eve_online/characters/character_sheet'
 require 'eve_online/characters/upcoming_calendar_events'
 require 'eve_online/characters/skill_in_training'
 require 'eve_online/characters/standings'
+require 'eve_online/characters/contracts'
+require 'eve_online/characters/chat_channels'
+require 'eve_online/characters/contract_bids'
+require 'eve_online/characters/contract_items'
+require 'eve_online/characters/fac_war_stats'
+require 'eve_online/characters/industry_jobs'
+require 'eve_online/characters/industry_jobs_history'
+require 'eve_online/characters/kill_mails'
+require 'eve_online/characters/locations'
+require 'eve_online/characters/mail_bodies'
+require 'eve_online/characters/mailing_lists'
+require 'eve_online/characters/mail_messages'
+require 'eve_online/characters/market_orders'
+require 'eve_online/characters/notifications'
+require 'eve_online/characters/notification_texts'
+require 'eve_online/characters/planetary_colonies'
+require 'eve_online/characters/planetary_links'
+require 'eve_online/characters/planetary_pins'
+require 'eve_online/characters/planetary_routes'
+require 'eve_online/characters/research'
+require 'eve_online/characters/skill_queue'
+require 'eve_online/characters/wallet_journal'
+require 'eve_online/characters/wallet_transactions'
+
+require 'eve_online/corporations/market_orders'
+
 require 'eve_online/eve/character_id'
 require 'eve_online/server/status'
 

data/lib/eve_online/account/api_key_info.rb

@@ -26,34 +26,39 @@ module EveOnline
           raise ArgumentError
         end
       end
-
-      def row
-        @row ||= rowset.fetch('row')
-      end
-
-      def rowset
-        @rowset ||= key.fetch('rowset')
-      end
+      memoize :characters
 
       def expires
-        @expires ||= parse_datetime_with_timezone(key.fetch('@expires'))
+        parse_datetime_with_timezone(key.fetch('@expires'))
       end
 
       def type
-        @type ||= key.fetch('@type')
+        key.fetch('@type')
       end
 
       def access_mask
-        @access_mask ||= key.fetch('@accessMask').to_i
+        key.fetch('@accessMask').to_i
       end
 
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
+      end
+
+      private
+
       def key
-        @key ||= result.fetch('key')
+        result.fetch('key')
       end
 
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }"
+      def rowset
+        key.fetch('rowset')
+      end
+      memoize :rowset
+
+      def row
+        rowset.fetch('row')
       end
+      memoize :row
     end
   end
 end

data/lib/eve_online/account/characters.rb

@@ -26,18 +26,23 @@ module EveOnline
           raise ArgumentError
         end
       end
+      memoize :characters
 
-      def row
-        @row ||= rowset.fetch('row')
+      def url
+        "#{ API_ENDPOINT}?keyID=#{ key_id }&vCode=#{ v_code }"
       end
 
+      private
+
       def rowset
-        @rowset ||= result.fetch('rowset')
+        result.fetch('rowset')
       end
+      memoize :rowset
 
-      def url
-        "#{ API_ENDPOINT}?keyID=#{ key_id }&vCode=#{ v_code }"
+      def row
+        rowset.fetch('row')
       end
+      memoize :row
     end
   end
 end

data/lib/eve_online/account/status.rb

@@ -24,19 +24,19 @@ module EveOnline
       end
 
       def paid_until
-        @paid_until ||= parse_datetime_with_timezone(result.fetch('paidUntil'))
+        parse_datetime_with_timezone(result.fetch('paidUntil'))
       end
 
       def create_date
-        @create_date ||= parse_datetime_with_timezone(result.fetch('createDate'))
+        parse_datetime_with_timezone(result.fetch('createDate'))
       end
 
       def logon_count
-        @logon_count ||= result.fetch('logonCount').to_i
+        result.fetch('logonCount').to_i
       end
 
       def logon_minutes
-        @logon_minutes ||= result.fetch('logonMinutes').to_i
+        result.fetch('logonMinutes').to_i
       end
 
       def url

data/lib/eve_online/base.rb

@@ -1,22 +1,27 @@
 require 'open-uri'
+require 'memoist'
 
 module EveOnline
   class Base
+    extend Memoist
+
     def url
       raise NotImplementedError
     end
 
     def user_agent
-      @user_agent ||= "EveOnline API (https://github.com/biow0lf/eve_online) v#{ VERSION }"
+      "EveOnline API (https://github.com/biow0lf/eve_online) v#{ VERSION }"
     end
 
     def content
-      @content ||= open(url, open_timeout: 60, read_timeout: 60,
-                             'User-Agent' => user_agent).read
+      open(url, open_timeout: 60, read_timeout: 60,
+                'User-Agent' => user_agent).read
     end
+    memoize :content
 
     def response
-      @response ||= parser.parse(content)
+      parser.parse(content)
     end
+    memoize :response
   end
 end

data/lib/eve_online/base_xml.rb

@@ -10,24 +10,29 @@ module EveOnline
     end
 
     def result
-      @result ||= eveapi.fetch('result')
+      eveapi.fetch('result')
     end
+    memoize :result
 
     def cached_until
-      @cached_until ||= parse_datetime_with_timezone(eveapi.fetch('cachedUntil'))
+      parse_datetime_with_timezone(eveapi.fetch('cachedUntil'))
     end
+    memoize :cached_until
 
     def current_time
-      @current_time ||= parse_datetime_with_timezone(eveapi.fetch('currentTime'))
+      parse_datetime_with_timezone(eveapi.fetch('currentTime'))
     end
+    memoize :current_time
 
     def version
       eveapi.fetch('@version').to_i
     end
+    memoize :version
 
     def eveapi
-      @eveapi ||= response.fetch('eveapi')
+      response.fetch('eveapi')
     end
+    memoize :eveapi
 
     private
 

data/lib/eve_online/blueprint.rb

@@ -21,40 +21,40 @@ module EveOnline
     end
 
     def item_id
-      @item_id ||= options.fetch('@itemID').to_i
+      options.fetch('@itemID').to_i
     end
 
     def location_id
-      @location_id ||= options.fetch('@locationID').to_i
+      options.fetch('@locationID').to_i
     end
 
     def type_id
-      @type_id ||= options.fetch('@typeID').to_i
+      options.fetch('@typeID').to_i
     end
 
     def type_name
-      @type_name ||= options.fetch('@typeName')
+      options.fetch('@typeName')
     end
 
     def flag_id
-      @flag_id ||= options.fetch('@flagID').to_i
+      options.fetch('@flagID').to_i
     end
 
     # TODO: return EveOnline::Blueprint::Quantity
     def quantity
-      @quantity ||= options.fetch('@quantity').to_i
+      options.fetch('@quantity').to_i
     end
 
     def time_efficiency
-      @time_efficiency ||= options.fetch('@timeEfficiency').to_i
+      options.fetch('@timeEfficiency').to_i
     end
 
     def material_efficiency
-      @material_efficiency ||= options.fetch('@materialEfficiency').to_i
+      options.fetch('@materialEfficiency').to_i
     end
 
     def runs
-      @runs ||= options.fetch('@runs').to_i
+      options.fetch('@runs').to_i
     end
   end
 end

data/lib/eve_online/bookmark.rb

@@ -1,3 +1,5 @@
+require 'active_support/time'
+
 module EveOnline
   class Bookmark
     attr_reader :options
@@ -23,47 +25,47 @@ module EveOnline
     end
 
     def bookmark_id
-      @bookmark_id ||= options.fetch('@bookmarkID').to_i
+      options.fetch('@bookmarkID').to_i
     end
 
     def creator_id
-      @creator_id ||= options.fetch('@creatorID').to_i
+      options.fetch('@creatorID').to_i
     end
 
     def created
-      @created ||= ActiveSupport::TimeZone['UTC'].parse(options.fetch('@created'))
+      ActiveSupport::TimeZone['UTC'].parse(options.fetch('@created'))
     end
 
     def item_id
-      @item_id ||= options.fetch('@itemID').to_i
+      options.fetch('@itemID').to_i
     end
 
     def type_id
-      @type_id ||= options.fetch('@typeID').to_i
+      options.fetch('@typeID').to_i
     end
 
     def location_id
-      @location_id ||= options.fetch('@locationID').to_i
+      options.fetch('@locationID').to_i
     end
 
     def x
-      @x ||= options.fetch('@x').to_f
+      options.fetch('@x').to_f
     end
 
     def y
-      @y ||= options.fetch('@y').to_f
+      options.fetch('@y').to_f
     end
 
     def z
-      @z ||= options.fetch('@z').to_f
+      options.fetch('@z').to_f
     end
 
     def memo
-      @memo ||= options.fetch('@memo')
+      options.fetch('@memo')
     end
 
     def note
-      @note ||= options.fetch('@note')
+      options.fetch('@note')
     end
   end
 end

data/lib/eve_online/bookmark_folder.rb

@@ -1,5 +1,9 @@
+require 'memoist'
+
 module EveOnline
   class BookmarkFolder
+    extend Memoist
+
     attr_reader :options
 
     def initialize(options)
@@ -14,38 +18,39 @@ module EveOnline
     end
 
     def folder_id
-      @folder_d ||= options.fetch('@folderID').to_i
+      options.fetch('@folderID').to_i
     end
 
     def folder_name
-      @folder_name ||= options.fetch('@folderName')
+      options.fetch('@folderName')
     end
 
     def bookmarks
-      @bookmarks ||= begin
-        case row
-        when Hash
-          [Bookmark.new(row)]
-        when Array
-          bookmarks = []
-          row.each do |bookmark|
-            bookmarks << Bookmark.new(bookmark)
-          end
-          bookmarks
-        else
-          raise ArgumentError
+      case row
+      when Hash
+        [Bookmark.new(row)]
+      when Array
+        bookmarks = []
+        row.each do |bookmark|
+          bookmarks << Bookmark.new(bookmark)
         end
+        bookmarks
+      else
+        raise ArgumentError
       end
     end
+    memoize :bookmarks
 
     private
 
     def rowset
-      @rowset ||= options.fetch('rowset')
+      options.fetch('rowset')
     end
+    memoize :rowset
 
     def row
-      @row ||= rowset.fetch('row')
+      rowset.fetch('row')
     end
+    memoize :row
   end
 end

data/lib/eve_online/character.rb

@@ -20,35 +20,35 @@ module EveOnline
     end
 
     def character_id
-      @character_id ||= options.fetch('@characterID').to_i
+      options.fetch('@characterID').to_i
     end
 
     def character_name
-      @character_name ||= options.fetch('@name', nil) || options.fetch('@characterName')
+      options.fetch('@name', nil) || options.fetch('@characterName')
     end
 
     def corporation_id
-      @corporation_id ||= options.fetch('@corporationID').to_i
+      options.fetch('@corporationID').to_i
     end
 
     def corporation_name
-      @corporation_name ||= options.fetch('@corporationName')
+      options.fetch('@corporationName')
     end
 
     def alliance_id
-      @alliance_id ||= options.fetch('@allianceID').to_i
+      options.fetch('@allianceID').to_i
     end
 
     def alliance_name
-      @alliance_name ||= options.fetch('@allianceName')
+      options.fetch('@allianceName')
     end
 
     def faction_id
-      @faction_id ||= options.fetch('@factionID').to_i
+      options.fetch('@factionID').to_i
     end
 
     def faction_name
-      @faction_name ||= options.fetch('@factionName')
+      options.fetch('@factionName')
     end
   end
 end