eve_online 0.18.0 → 0.19.0

data/lib/eve_online/esi/character_blueprints.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :blueprints
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-characters.read_blueprints.v1'
       end

data/lib/eve_online/esi/character_bookmark_folders.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :bookmark_folders
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-bookmarks.read_character_bookmarks.v1'
       end

data/lib/eve_online/esi/character_bookmarks.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :bookmarks
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-bookmarks.read_character_bookmarks.v1'
       end

data/lib/eve_online/esi/character_implants.rb

@@ -13,7 +13,7 @@ module EveOnline
         @character_id = options.fetch(:character_id)
       end
 
-      def implants
+      def implant_ids
         response
       end
 

data/lib/eve_online/esi/character_killmails_recent.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :killmails
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-killmails.read_killmails.v1'
       end

data/lib/eve_online/esi/character_wallet_journal.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :wallet_journal_entries
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-wallet.read_character_wallet.v1'
       end

data/lib/eve_online/esi/corporation_blueprints.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :blueprints
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-corporations.read_blueprints.v1'
       end

data/lib/eve_online/esi/corporation_industry_jobs.rb

@@ -24,10 +24,6 @@ module EveOnline
       end
       memoize :jobs
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-industry.read_corporation_jobs.v1'
       end

data/lib/eve_online/esi/corporation_killmails_recent.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :killmails
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-killmails.read_corporation_killmails.v1'
       end

data/lib/eve_online/esi/corporation_orders.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :orders
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-markets.read_corporation_orders.v1'
       end

data/lib/eve_online/esi/dogma_attributes.rb

@@ -5,7 +5,7 @@ module EveOnline
     class DogmaAttributes < Base
       API_ENDPOINT = 'https://esi.evetech.net/v1/dogma/attributes/?datasource=%<datasource>s'
 
-      def attributes
+      def attribute_ids
         response
       end
 

data/lib/eve_online/esi/dogma_effect.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module EveOnline
+  module ESI
+    class DogmaEffect < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://esi.evetech.net/v2/dogma/effects/%<effect_id>s/?datasource=%<datasource>s'
+
+      attr_reader :id
+
+      def initialize(options)
+        super
+
+        @id = options.fetch(:id)
+      end
+
+      def_delegators :model, :as_json, :description, :disallow_auto_repeat,
+                     :discharge_attribute_id, :display_name,
+                     :duration_attribute_id, :effect_category, :effect_id,
+                     :electronic_chance, :falloff_attribute_id, :icon_id,
+                     :is_assistance, :is_offensive, :is_warp_safe,
+                     :name, :post_expression, :pre_expression, :published,
+                     :range_attribute_id, :range_chance,
+                     :tracking_speed_attribute_id, :modifiers
+
+      def model
+        Models::DogmaEffect.new(response)
+      end
+      memoize :model
+
+      def scope; end
+
+      def url
+        format(API_ENDPOINT, effect_id: id, datasource: datasource)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/dogma_effects.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class DogmaEffects < Base
+      API_ENDPOINT = 'https://esi.evetech.net/v1/dogma/effects/?datasource=%<datasource>s'
+
+      def effect_ids
+        response
+      end
+
+      def scope; end
+
+      def url
+        format(API_ENDPOINT, datasource: datasource)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/factions.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Factions < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v2/universe/factions/?datasource=%<datasource>s&language=en-us'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/universe/factions/?datasource=%<datasource>s'
 
       def factions
         output = []

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class AssetLocation < Base
+        def as_json
+          {
+            item_id: item_id
+          }
+        end
+
+        def item_id
+          options['item_id']
+        end
+
+        def position
+          @position ||= Position.new(options['position'])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class AssetName < Base
+        def as_json
+          {
+            item_id: item_id,
+            name: name
+          }
+        end
+
+        def item_id
+          options['item_id']
+        end
+
+        def name
+          options['name']
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,6 @@ module EveOnline
           {
             constellation_id: constellation_id,
             name: name,
-            position_x: position_x,
-            position_y: position_y,
-            position_z: position_z,
             region_id: region_id,
             systems: systems
           }
@@ -24,18 +21,6 @@ module EveOnline
           options['name']
         end
 
-        def position_x
-          options['position']['x'] if options['position']
-        end
-
-        def position_y
-          options['position']['y'] if options['position']
-        end
-
-        def position_z
-          options['position']['z'] if options['position']
-        end
-
         def region_id
           options['region_id']
         end
@@ -43,6 +28,10 @@ module EveOnline
         def systems
           options['systems']
         end
+
+        def position
+          @position ||= Position.new(options['position'])
+        end
       end
     end
   end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class DogmaAttributeShort < Base
+        def as_json
+          {
+            attribute_id: attribute_id,
+            value: value
+          }
+        end
+
+        def attribute_id
+          options['attribute_id']
+        end
+
+        def value
+          options['value']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class DogmaAttributes < Base
+        def dogma_attributes
+          output = []
+
+          return output if !options.is_a?(Array)
+
+          options.each do |dogma_attribute_short|
+            output << DogmaAttributeShort.new(dogma_attribute_short)
+          end
+
+          output
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class DogmaEffect < Base
+        def as_json
+          {
+            description: description,
+            disallow_auto_repeat: disallow_auto_repeat,
+            discharge_attribute_id: discharge_attribute_id,
+            display_name: display_name,
+            duration_attribute_id: duration_attribute_id,
+            effect_category: effect_category,
+            effect_id: effect_id,
+            electronic_chance: electronic_chance,
+            falloff_attribute_id: falloff_attribute_id,
+            icon_id: icon_id,
+            is_assistance: is_assistance,
+            is_offensive: is_offensive,
+            is_warp_safe: is_warp_safe,
+            name: name,
+            post_expression: post_expression,
+            pre_expression: pre_expression,
+            published: published,
+            range_attribute_id: range_attribute_id,
+            range_chance: range_chance,
+            tracking_speed_attribute_id: tracking_speed_attribute_id
+          }
+        end
+
+        def description
+          options['description']
+        end
+
+        def disallow_auto_repeat
+          options['disallow_auto_repeat']
+        end
+
+        def discharge_attribute_id
+          options['discharge_attribute_id']
+        end
+
+        def display_name
+          options['display_name']
+        end
+
+        def duration_attribute_id
+          options['duration_attribute_id']
+        end
+
+        def effect_category
+          options['effect_category']
+        end
+
+        def effect_id
+          options['effect_id']
+        end
+
+        def electronic_chance
+          options['electronic_chance']
+        end
+
+        def falloff_attribute_id
+          options['falloff_attribute_id']
+        end
+
+        def icon_id
+          options['icon_id']
+        end
+
+        def is_assistance
+          options['is_assistance']
+        end
+
+        def is_offensive
+          options['is_offensive']
+        end
+
+        def is_warp_safe
+          options['is_warp_safe']
+        end
+
+        def name
+          options['name']
+        end
+
+        def post_expression
+          options['post_expression']
+        end
+
+        def pre_expression
+          options['pre_expression']
+        end
+
+        def published
+          options['published']
+        end
+
+        def range_attribute_id
+          options['range_attribute_id']
+        end
+
+        def range_chance
+          options['range_chance']
+        end
+
+        def tracking_speed_attribute_id
+          options['tracking_speed_attribute_id']
+        end
+
+        def modifiers
+          @modifiers ||= DogmaEffectModifiers.new(options['modifiers']).modifiers
+        end
+      end
+    end
+  end
+end