esi-sdk 1.1.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96bfde25cec60466f068690e618f8eb448f287686652529627d83e61bff6a27e
-  data.tar.gz: 30a10c563775c08ce91e003fa97a34b72dc48db1b754b39a34d7b7b7398fc3d0
+  metadata.gz: 8602a9c524badb41010f8762e394df4bc923307acece2d53b64e91cdc7f934ae
+  data.tar.gz: 268036494ca33085700e903a266e4ca69f280637f6e53b46ebd33476b4c3db5a
 SHA512:
-  metadata.gz: 4e3e48c1b7e9b03605e0a58a1b9cc7f7d47ae4180efbf0872aef6aec9b187c84febf354f86267694478802f001d2ab0dc5094091ba7789e3be00e16d2217a957
-  data.tar.gz: 7f241d000d376edd19b72e743e5f7f5176ce75c32df0468f1544fac413eaa659e651113c4b1332dfecd19f626f8412d9615cd326e85a4d92410cbe5f6ed1682a
+  metadata.gz: 7f0c8d1c2052b7670cefa35bc0b98250bdac06e5cb1fa1c04be6c752f42beb2b859660ec9dd3450c10f018ff8015e0e896ff9fefb058996b6161bdee59b03fc2
+  data.tar.gz: 135710a1b828b631fcc0169e4c590c4a0ed968c818a0d93aaf397a399e14ad1d85b1a468c18922d9937eb5ea237df5aecd07b5311ca2e38336efd991015f9d8b

data/.github/workflows/cicd.yml

@@ -168,6 +168,22 @@ jobs:
         with:
           node-version: '16'
 
+      - name: Find yarn cache location
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Yarn package cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install yarn packages
+        run: |
+          yarn install --pure-lockfile
+
       - name: Release
         env:
           GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
@@ -177,5 +193,4 @@ jobs:
           GIT_COMMITTER_EMAIL: "shahni@bokobo.space"
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
-          npm install -g @semantic-release/changelog @semantic-release/exec @semantic-release/git conventional-changelog-angular
-          npx semantic-release ${{ github.event_name == 'pull_request' && '--dry-run' || ' ' }}
+          yarn release ${{ github.event_name == 'pull_request' && '--dry-run' || ' ' }}

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+vendor/bundle
+node_modules/

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # ESI SDK Changelog
 
+## [2.1.1](https://github.com/bokoboshahni/esi-sdk-ruby/compare/v2.1.0...v2.1.1) (2021-10-09)
+
+# [2.1.0](https://github.com/bokoboshahni/esi-sdk-ruby/compare/v2.0.0...v2.1.0) (2021-10-09)
+
+
+### Features
+
+* add methods to return raw responses ([93dc308](https://github.com/bokoboshahni/esi-sdk-ruby/commit/93dc3082cf06b0b4e42e17e3de77c9e05e3345b5))
+
+# [2.0.0](https://github.com/bokoboshahni/esi-sdk-ruby/compare/v1.2.0...v2.0.0) (2021-10-08)
+
+
+### Bug Fixes
+
+* require name from esi/sdk to esi-sdk ([2e5e996](https://github.com/bokoboshahni/esi-sdk-ruby/commit/2e5e9966343baef91bd037579607bb562edce301))
+
+
+### Features
+
+* migrate to httpx ([fd6ec0d](https://github.com/bokoboshahni/esi-sdk-ruby/commit/fd6ec0d6910805215efceb80a5361dc4d72b9599))
+
+
+### BREAKING CHANGES
+
+* use httpx instead of faraday for http calls
+
+# [1.2.0](https://github.com/bokoboshahni/esi-sdk-ruby/compare/v1.1.3...v1.2.0) (2021-07-20)
+
+
+### Features
+
+* Client improvements ([bad70ae](https://github.com/bokoboshahni/esi-sdk-ruby/commit/bad70ae4d97b8b0f93019b5b4dac73f97aad7dc0))
+
 ## [1.1.3](https://github.com/bokoboshahni/esi-sdk-ruby/compare/v1.1.2...v1.1.3) (2021-07-19)
 
 

data/Gemfile

@@ -7,6 +7,7 @@ ruby "3.0.2"
 gemspec
 
 gem "activesupport", "~> 6.1"
+gem "awesome_print", "~> 1.9"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.10"
 gem "rubocop", "~> 1.18"

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    esi-sdk (1.1.3)
-      faraday (~> 1.5)
-      faraday-http-cache (~> 2.2)
-      faraday_middleware (~> 1.0)
+    esi-sdk (2.1.1)
+      httpx (~> 0.18)
+      retriable (~> 3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,33 +17,16 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
+    awesome_print (1.9.2)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
     docile (1.4.0)
-    faraday (1.5.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-http-cache (2.2.0)
-      faraday (>= 0.8)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
     hashdiff (1.0.1)
+    http-2-next (0.5.0)
+    httpx (0.18.0)
+      http-2-next (>= 0.4.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     kramdown (2.3.1)
@@ -52,16 +34,16 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     minitest (5.14.4)
-    multipart-post (2.1.1)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
+    retriable (3.1.2)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (3.26.1)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -75,27 +57,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rubocop (1.22.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.4)
+    rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -104,10 +84,10 @@ GEM
     simplecov_json_formatter (0.1.3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     vcr (6.0.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.26)
@@ -119,6 +99,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 6.1)
+  awesome_print (~> 1.9)
   esi-sdk!
   kramdown-parser-gfm (~> 1.1)
   rake (~> 13.0)

data/README.md

@@ -1,3 +1,5 @@
+![Build images](https://github.com/bokoboshahni/esi-sdk-ruby/workflows/CICD/badge.svg)
+
 # EVE Swagger Interface (ESI) SDK
 
 ESI SDK is a Ruby API client for the EVE Swagger Interface (ESI), the official API for the [EVE Online](https://eveonline.com) MMORPG.

data/Rakefile

@@ -120,6 +120,7 @@ task :generate do
     module_name = tag.gsub(/ /, "_").classify
     method_definitions = operations.sort_by { |(k, _v)| k }.each_with_object([]) do |(method_name, operation), a|
       signature_params = operation[:params].map { |p| "#{p["name"]}:" }
+      raw_call_params = operation[:params].map { |p| "#{p["name"]}: #{p["name"]}" }
 
       description = "# #{operation[:description]}"
       description = "#{description}." unless description.end_with?(".")
@@ -142,7 +143,7 @@ task :generate do
       end
 
       param_tags = operation[:params].map do |p|
-        "# @param #{p["name"]} [Integer,String] #{p["description"]}"
+        "# @param #{p["name"]} [#{p["type"].capitalize}] #{p["description"]}"
       end
 
       if operation[:body]
@@ -157,18 +158,35 @@ task :generate do
           end
 
         signature_params << "#{body_name}:"
+        raw_call_params << "#{body_name}: #{body_name}"
         param_tags += ["# @param #{body_name} [#{body_type}] #{body_param["description"]}"]
       end
 
       operation[:query]&.each do |p|
-        signature_params << "#{p["name"]}:"
-        param_tags << "# @param #{p["name"]} [#{p["type"].capitalize}] #{p["description"]}"
+        p_tag = "# @param #{p["name"]} [#{p["type"].capitalize}] "
+        p_tag += (p["description"]).to_s
+        p_tag += ". Must be one of: #{p["enum"].map { |e| "`#{e}`" }.join(", ")}" if p["enum"]
+        p_str = if p["default"] && p["type"] == "integer"
+                  "#{p["name"]}: #{p["default"]}"
+                elsif p["default"] && p["type"] == "string"
+                  "#{p["name"]}: \"#{p["default"]}\""
+                elsif !p["required"]
+                  "#{p["name"]}: nil"
+                else
+                  "#{p["name"]}:"
+                end
+        signature_params << p_str
+        raw_call_params << "#{p["name"]}: #{p["name"]}"
+        param_tags << p_tag
       end
 
-      if %w[delete get].include?(operation[:method])
-        signature_params << "params: {}"
-        param_tags << "# @param params [Hash] Additional query string parameters"
+      signature_params += %w[headers params].map do |p|
+        "#{p}: {}"
+      end
+      raw_call_params += %w[headers params].map do |p|
+        "#{p}: #{p}"
       end
+      param_tags << "# @param params [Hash] Additional query string parameters"
 
       param_tags += [
         "# @param headers [Hash] Additional headers"
@@ -188,10 +206,8 @@ task :generate do
       description += "# @see https://esi.evetech.net/ui/#/#{operation[:tag]}/#{operation[:name]}"
       description.gsub!(/^$\n/m, "")
 
-      signature_params += %w[headers].map do |p|
-        "#{p}: {}"
-      end
       signature = "(#{signature_params.join(", ")})"
+      raw_call = "(#{raw_call_params.join(", ")})"
       path_parts = operation[:path].split("/")
       path_parts.map! do |p|
         if p =~ /\{\w+\}/
@@ -202,19 +218,16 @@ task :generate do
       end
       path = "#{path_parts.join("/")}/"
 
-      http_call_params = %w[headers].map { |p| "#{p}: #{p}" }
-      http_call_params << if %w[delete get].include?(operation[:method])
-                            "params: params"
-                          elsif operation[:body]
-                            "payload: #{body_param["name"]}"
-                          end
+      http_call_params = %w[headers params].map { |p| "#{p}: #{p}" }
+      http_call_params << ("payload: #{body_param["name"]}" if operation[:body])
 
-      if operation[:query].any?
-        http_call = "query_string = URI.encode_www_form([#{operation[:query].map { |q| "['#{q["name"]}', #{q["name"]}]" }.join(", ")}])\n"
-        http_call += "#{operation[:method]}(\"#{path}?\#{query_string}\", #{http_call_params.join(", ")})"
-      else
-        http_call = "#{operation[:method]}(\"#{path}\", #{http_call_params.join(", ")})"
-      end
+      params_merge = if operation[:query].any?
+                       "params.merge!(#{operation[:query].map { |q| "'#{q["name"]}' => #{q["name"]}" }.join(", ")})"
+                     else
+                       ""
+                     end
+
+      http_call = "#{operation[:method]}(\"#{path}\", #{http_call_params.join(", ")})"
 
       alias_methods = if method_aliases[method_name]
                         Array(method_aliases[method_name]).sort.map do |alias_name|
@@ -226,13 +239,36 @@ task :generate do
       alias_methods << "alias_method :#{operation[:name]}, :#{method_name}" unless operation[:name] == method_name
       alias_methods = alias_methods.join("\n")
 
-      a << <<~METHOD_DEFINITION
-        #{description}
-        def #{method_name}#{signature}
-          #{http_call}
-        end
-        #{alias_methods}
-      METHOD_DEFINITION
+      if operation[:responses]["200"] && operation[:responses]["200"]["headers"] && operation[:responses]["200"]["headers"].key?("X-Pages")
+        a << <<~METHOD_DEFINITION
+          #{description}
+          def #{method_name}#{signature}
+            #{params_merge}
+            concat_responses(#{method_name}_raw#{raw_call})
+          end
+          #{alias_methods}
+
+          #{description}
+          def #{method_name}_raw#{signature}
+            #{params_merge}
+            #{http_call}
+          end
+        METHOD_DEFINITION
+      else
+        a << <<~METHOD_DEFINITION
+          #{description}
+          def #{method_name}#{signature}
+            #{method_name}_raw#{raw_call}.json
+          end
+          #{alias_methods}
+
+          #{description}
+          def #{method_name}_raw#{signature}
+            #{params_merge}
+            #{http_call}
+          end
+        METHOD_DEFINITION
+      end
     end
 
     lib_content = <<~MODULE_DEFINITION
@@ -269,11 +305,6 @@ task :generate do
       success_params = operation[:params].map { |p| "#{p["name"]}: \"1234567890\"" }
       success_params += operation[:query].map { |p| "#{p["name"]}: \"1234567890\"" }
 
-      if operation[:query].any?
-        query = URI.encode_www_form(operation[:query].map { |q| [q["name"], "1234567890"] })
-        success_path = "#{success_path}?#{query}"
-      end
-
       if operation[:body]
         body_param = operation[:body]
         body_name = body_param["name"]
@@ -287,12 +318,16 @@ task :generate do
         success_params << "#{body_name}: #{body_value}"
       end
 
+      with_query = operation[:query].any? ? ".with(query: { #{operation[:query].map { |p| "#{p["name"]}: \"1234567890\"" }.join(", ")} })" : ""
+
+      extra_headers = success_desc["headers"] && success_desc["headers"]["X-Pages"] ? ", 'X-Pages': '1'" : ""
+
       describe = "  describe \"##{method_name}\" do\n"
       describe += "    context \"when the response is #{success_code}\" do\n"
       describe += "      let(:response) { #{success_response_body} }\n"
       describe += "\n"
       describe += "      before do\n"
-      describe += "        stub_request(:#{operation[:method]}, \"https://esi.evetech.net/latest#{success_path}\").to_return(body: response.to_json)\n"
+      describe += "        stub_request(:#{operation[:method]}, \"https://esi.evetech.net/latest#{success_path}\")#{with_query}.to_return(body: response.to_json, headers: { 'Content-Type': 'application/json'#{extra_headers} })\n"
       describe += "      end\n"
       describe += "\n"
       describe += "      it \"returns the response\" do\n"
@@ -303,13 +338,15 @@ task :generate do
       describe += "\n"
 
       error_contexts = operation[:errors].map do |(code, error)|
+        next if %w[502 503 504].include?(code)
+
         error_response_body = error["examples"]["application/json"].inspect
 
         context = "    context \"when the response is #{code}\" do\n"
         context += "      let(:response) { #{error_response_body} }\n"
         context += "\n"
         context += "      before do\n"
-        context += "        stub_request(:#{operation[:method]}, \"https://esi.evetech.net/latest#{success_path}\").to_return(body: response.to_json, status: #{code})\n"
+        context += "        stub_request(:#{operation[:method]}, \"https://esi.evetech.net/latest#{success_path}\")#{with_query}.to_return(body: response.to_json, status: #{code}, headers: { 'Content-Type': 'application/json' })\n"
         context += "      end\n"
         context += "\n"
         context += "      it \"raises a #{error_mapping[code.to_i]} error\" do\n"
@@ -327,8 +364,8 @@ task :generate do
     spec_content = <<~SPEC_FILE
       # frozen_string_literal: true
 
-      RSpec.describe ESI::Client::#{module_name} do
-        subject(:client) { ESI::Client.new(user_agent: \"ESI SDK Tests/1.0; +(https://github.com/bokoboshahni/esi-sdk)\") }
+      RSpec.describe ESI::Client::#{module_name}, type: :stub do
+        subject(:client) { ESI::Client.new(user_agent: \"esi-sdk-ruby Tests/1.0; +(https://github.com/bokoboshahni/esi-sdk-ruby)\") }
 
       #{describe_blocks.join("\n\n")}
       end

data/bin/console

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "esi/sdk"
+require "esi-sdk"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/esi-sdk.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 1.5"
-  spec.add_dependency "faraday-http-cache", "~> 2.2"
-  spec.add_dependency "faraday_middleware", "~> 1.0"
+  spec.add_dependency "httpx", "~> 0.18"
+  spec.add_dependency "retriable", "~> 3.1"
 end

data/lib/esi/client/alliance.rb

@@ -13,7 +13,7 @@ module ESI
       # @esi_version v3
       # @esi_version v4
       #
-      # @param alliance_id [Integer,String] An EVE alliance ID
+      # @param alliance_id [Integer] An EVE alliance ID
       # @param params [Hash] Additional query string parameters
       # @param headers [Hash] Additional headers
       #
@@ -25,11 +25,36 @@ module ESI
       # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
       #
       # @see https://esi.evetech.net/ui/#/Alliance/get_alliances_alliance_id
-      def get_alliance(alliance_id:, params: {}, headers: {})
-        get("/alliances/#{alliance_id}/", headers: headers, params: params)
+      def get_alliance(alliance_id:, headers: {}, params: {})
+        get_alliance_raw(alliance_id: alliance_id, headers: headers, params: params).json
       end
       alias get_alliances_alliance_id get_alliance
 
+      # Public information about an alliance.
+      #
+      # This endpoint is cached for up to 3600 seconds.
+      #
+      # @esi_version dev
+      # @esi_version legacy
+      # @esi_version v3
+      # @esi_version v4
+      #
+      # @param alliance_id [Integer] An EVE alliance ID
+      # @param params [Hash] Additional query string parameters
+      # @param headers [Hash] Additional headers
+      #
+      # @raise [ESI::Errors::BadRequestError] Bad request
+      # @raise [ESI::Errors::NotFoundError] Alliance not found
+      # @raise [ESI::Errors::ErrorLimitedError] Error limited
+      # @raise [ESI::Errors::InternalServerError] Internal server error
+      # @raise [ESI::Errors::ServiceUnavailableError] Service unavailable
+      # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
+      #
+      # @see https://esi.evetech.net/ui/#/Alliance/get_alliances_alliance_id
+      def get_alliance_raw(alliance_id:, headers: {}, params: {})
+        get("/alliances/#{alliance_id}/", headers: headers, params: params)
+      end
+
       # List all current member corporations of an alliance.
       #
       # This endpoint is cached for up to 3600 seconds.
@@ -39,7 +64,7 @@ module ESI
       # @esi_version v1
       # @esi_version v2
       #
-      # @param alliance_id [Integer,String] An EVE alliance ID
+      # @param alliance_id [Integer] An EVE alliance ID
       # @param params [Hash] Additional query string parameters
       # @param headers [Hash] Additional headers
       #
@@ -50,17 +75,41 @@ module ESI
       # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
       #
       # @see https://esi.evetech.net/ui/#/Alliance/get_alliances_alliance_id_corporations
-      def get_alliance_corporations(alliance_id:, params: {}, headers: {})
-        get("/alliances/#{alliance_id}/corporations/", headers: headers, params: params)
+      def get_alliance_corporations(alliance_id:, headers: {}, params: {})
+        get_alliance_corporations_raw(alliance_id: alliance_id, headers: headers, params: params).json
       end
       alias get_alliances_alliance_id_corporations get_alliance_corporations
 
+      # List all current member corporations of an alliance.
+      #
+      # This endpoint is cached for up to 3600 seconds.
+      #
+      # @esi_version dev
+      # @esi_version legacy
+      # @esi_version v1
+      # @esi_version v2
+      #
+      # @param alliance_id [Integer] An EVE alliance ID
+      # @param params [Hash] Additional query string parameters
+      # @param headers [Hash] Additional headers
+      #
+      # @raise [ESI::Errors::BadRequestError] Bad request
+      # @raise [ESI::Errors::ErrorLimitedError] Error limited
+      # @raise [ESI::Errors::InternalServerError] Internal server error
+      # @raise [ESI::Errors::ServiceUnavailableError] Service unavailable
+      # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
+      #
+      # @see https://esi.evetech.net/ui/#/Alliance/get_alliances_alliance_id_corporations
+      def get_alliance_corporations_raw(alliance_id:, headers: {}, params: {})
+        get("/alliances/#{alliance_id}/corporations/", headers: headers, params: params)
+      end
+
       # Get the icon urls for a alliance.
       #
       # @esi_version legacy
       # @esi_version v1
       #
-      # @param alliance_id [Integer,String] An EVE alliance ID
+      # @param alliance_id [Integer] An EVE alliance ID
       # @param params [Hash] Additional query string parameters
       # @param headers [Hash] Additional headers
       #
@@ -72,11 +121,55 @@ module ESI
       # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
       #
       # @see https://esi.evetech.net/ui/#/Alliance/get_alliances_alliance_id_icons
-      def get_alliance_icons(alliance_id:, params: {}, headers: {})
-        get("/alliances/#{alliance_id}/icons/", headers: headers, params: params)
+      def get_alliance_icons(alliance_id:, headers: {}, params: {})
+        get_alliance_icons_raw(alliance_id: alliance_id, headers: headers, params: params).json
       end
       alias get_alliances_alliance_id_icons get_alliance_icons
 
+      # Get the icon urls for a alliance.
+      #
+      # @esi_version legacy
+      # @esi_version v1
+      #
+      # @param alliance_id [Integer] An EVE alliance ID
+      # @param params [Hash] Additional query string parameters
+      # @param headers [Hash] Additional headers
+      #
+      # @raise [ESI::Errors::BadRequestError] Bad request
+      # @raise [ESI::Errors::NotFoundError] No image server for this datasource
+      # @raise [ESI::Errors::ErrorLimitedError] Error limited
+      # @raise [ESI::Errors::InternalServerError] Internal server error
+      # @raise [ESI::Errors::ServiceUnavailableError] Service unavailable
+      # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
+      #
+      # @see https://esi.evetech.net/ui/#/Alliance/get_alliances_alliance_id_icons
+      def get_alliance_icons_raw(alliance_id:, headers: {}, params: {})
+        get("/alliances/#{alliance_id}/icons/", headers: headers, params: params)
+      end
+
+      # List all active player alliances.
+      #
+      # This endpoint is cached for up to 3600 seconds.
+      #
+      # @esi_version dev
+      # @esi_version legacy
+      # @esi_version v1
+      # @esi_version v2
+      #
+      # @param params [Hash] Additional query string parameters
+      # @param headers [Hash] Additional headers
+      #
+      # @raise [ESI::Errors::BadRequestError] Bad request
+      # @raise [ESI::Errors::ErrorLimitedError] Error limited
+      # @raise [ESI::Errors::InternalServerError] Internal server error
+      # @raise [ESI::Errors::ServiceUnavailableError] Service unavailable
+      # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
+      #
+      # @see https://esi.evetech.net/ui/#/Alliance/get_alliances
+      def get_alliances(headers: {}, params: {})
+        get_alliances_raw(headers: headers, params: params).json
+      end
+
       # List all active player alliances.
       #
       # This endpoint is cached for up to 3600 seconds.
@@ -96,7 +189,7 @@ module ESI
       # @raise [ESI::Errors::GatewayTimeoutError] Gateway timeout
       #
       # @see https://esi.evetech.net/ui/#/Alliance/get_alliances
-      def get_alliances(params: {}, headers: {})
+      def get_alliances_raw(headers: {}, params: {})
         get("/alliances/", headers: headers, params: params)
       end
     end