blizzard_api 0.5.6 → 0.6.3

data/lib/blizzard_api/starcraft.rb

@@ -41,7 +41,7 @@ module BlizzardApi
     def self.account(region = BlizzardApi.region)
       BlizzardApi::Starcraft::Account.new(region)
     end
-    
+
     ##
     # @return {Legacy}
     def self.legacy(region = BlizzardApi.region)

data/lib/blizzard_api/starcraft/community/account.rb

@@ -16,7 +16,7 @@ module BlizzardApi
       # @param [Integer] account_id Account ID
       # @!macro request_options
       def player(account_id, **options)
-        api_request "#{base_url(:community)}/player/#{account_id}", { ttl: CACHE_DAY }.merge(options)
+        api_request "#{base_url(:community)}/player/#{account_id}", **{ ttl: CACHE_DAY }.merge(options)
       end
     end
   end

data/lib/blizzard_api/starcraft/community/ladder.rb

@@ -17,7 +17,7 @@ module BlizzardApi
       # @!macro request_options
       def grandmaster(region_id, **options)
         reg = resolve_region(region_id)
-        api_request "#{base_url(:community)}/ladder/grandmaster/#{reg}", { ttl: CACHE_DAY }.merge(options)
+        api_request "#{base_url(:community)}/ladder/grandmaster/#{reg}", **{ ttl: CACHE_DAY }.merge(options)
       end
 
       ##
@@ -27,7 +27,7 @@ module BlizzardApi
       # @!macro request_options
       def season(region_id, **options)
         reg = resolve_region(region_id)
-        api_request "#{base_url(:community)}/ladder/season/#{reg}", { ttl: CACHE_DAY }.merge(options)
+        api_request "#{base_url(:community)}/ladder/season/#{reg}", **{ ttl: CACHE_DAY }.merge(options)
       end
     end
   end

data/lib/blizzard_api/starcraft/community/legacy.rb

@@ -10,7 +10,6 @@ module BlizzardApi
     # You can get an instance of this class using the default region as follows:
     #   api_instance = BlizzardApi::Starcraft.legacy
     class Legacy < Starcraft::Request
-      
       ##
       # Profile data
       #
@@ -49,7 +48,7 @@ module BlizzardApi
         opts = { ttl: CACHE_DAY }.merge(options)
         api_request "#{base_url(:community)}/legacy/profile/#{reg}/#{realm_id}/#{profile_id}/matches", opts
       end
-      
+
       ##
       # Ladder
       #
@@ -61,7 +60,7 @@ module BlizzardApi
         opts = { ttl: CACHE_DAY }.merge(options)
         api_request "#{base_url(:community)}/legacy/ladder/#{reg}/#{ladder_id}", opts
       end
-      
+
       ##
       # Achievement data
       #
@@ -72,7 +71,7 @@ module BlizzardApi
         opts = { ttl: CACHE_DAY }.merge(options)
         api_request "#{base_url(:community)}/legacy/data/achievements/#{reg}", opts
       end
-      
+
       ##
       # Rewards data
       #

data/lib/blizzard_api/starcraft/community/profile.rb

@@ -17,7 +17,7 @@ module BlizzardApi
       # @!macro request_options
       def static(region_id, **options)
         reg = resolve_region(region_id)
-        api_request "#{base_url(:community)}/static/profile/#{reg}", { ttl: CACHE_DAY }.merge(options)
+        api_request "#{base_url(:community)}/static/profile/#{reg}", **{ ttl: CACHE_DAY }.merge(options)
       end
 
       ##
@@ -30,7 +30,7 @@ module BlizzardApi
       def metadata(region_id, realm_id, profile_id, **options)
         reg = resolve_region(region_id)
         opts = { ttl: CACHE_DAY }.merge(options)
-        api_request "#{base_url(:community)}/metadata/profile/#{reg}/#{realm_id}/#{profile_id}", opts
+        api_request "#{base_url(:community)}/metadata/profile/#{reg}/#{realm_id}/#{profile_id}", **opts
       end
 
       ##
@@ -43,7 +43,7 @@ module BlizzardApi
       def profile(region_id, realm_id, profile_id, **options)
         reg = resolve_region(region_id)
         opts = { ttl: CACHE_DAY }.merge(options)
-        api_request "#{base_url(:community)}/profile/#{reg}/#{realm_id}/#{profile_id}", opts
+        api_request "#{base_url(:community)}/profile/#{reg}/#{realm_id}/#{profile_id}", **opts
       end
 
       ##
@@ -56,7 +56,7 @@ module BlizzardApi
       def ladder_summary(region_id, realm_id, profile_id, **options)
         reg = resolve_region(region_id)
         opts = { ttl: CACHE_DAY }.merge(options)
-        api_request "#{base_url(:community)}profile/#{reg}/#{realm_id}/#{profile_id}/ladder/summary ", opts
+        api_request "#{base_url(:community)}profile/#{reg}/#{realm_id}/#{profile_id}/ladder/summary ", **opts
       end
 
       ##
@@ -69,7 +69,7 @@ module BlizzardApi
       def ladder(region_id, realm_id, profile_id, ladder_id, **options)
         reg = resolve_region(region_id)
         opts = { ttl: CACHE_DAY }.merge(options)
-        api_request "#{base_url(:community)}/profile/#{reg}/#{realm_id}/#{profile_id}/ladder/#{ladder_id}", opts
+        api_request "#{base_url(:community)}/profile/#{reg}/#{realm_id}/#{profile_id}/ladder/#{ladder_id}", **opts
       end
     end
   end

data/lib/blizzard_api/starcraft/game_data/league.rb

@@ -20,7 +20,7 @@ module BlizzardApi
       # @!macro request_options
       def get(season_id, queue_id, team_type, league_id, **options)
         opts = { ttl: CACHE_DAY }.merge(options)
-        api_request "#{base_url(:game_data)}/league/#{season_id}/#{queue_id}/#{team_type}/#{league_id}", opts
+        api_request "#{base_url(:game_data)}/league/#{season_id}/#{queue_id}/#{team_type}/#{league_id}", **opts
       end
     end
   end

data/lib/blizzard_api/version.rb

@@ -2,5 +2,5 @@
 
 module BlizzardApi
   # Gem version
-  VERSION = '0.5.6'
+  VERSION = '0.6.3'
 end

data/lib/blizzard_api/wow/game_data/achievement.rb

@@ -25,7 +25,7 @@ module BlizzardApi
       #
       # @!macro response
       def categories(**options)
-        api_request "#{endpoint_uri('category')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('category')}/index", **default_options.merge(options)
       end
 
       ##
@@ -35,7 +35,7 @@ module BlizzardApi
       #
       # @!macro response
       def category(id, **options)
-        api_request "#{endpoint_uri('category')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('category')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -45,7 +45,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/achievement/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/achievement/#{id}", **default_options.merge(options)
       end
 
       protected

data/lib/blizzard_api/wow/game_data/auction.rb

@@ -10,16 +10,34 @@ module BlizzardApi
     # You can get an instance of this class using the default region as follows:
     #   api_instance = BlizzardApi::Wow.auction
     class Auction < Wow::Request
+      ##
+      # Return all auction houses for the specified connected realm. Classic only.
+      #
+      # @param connected_realm_id [Integer] A valid connected realm id
+      # @!macro request_options
+      #
+      # @!macro response
+      def index(connected_realm_id, **options)
+        opts = { ttl: CACHE_HOUR, namespace: :dynamic }.merge(options)
+        api_request "#{base_url(:game_data)}/connected-realm/#{connected_realm_id}/auctions/index", **opts
+      end
+
       ##
       # Return all active auctions for the specified connected realm
       #
       # @param connected_realm_id [Integer] A valid connected realm id
       # @!macro request_options
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
-      def get(connected_realm_id, **options)
+      def get(connected_realm_id, auction_house_id = nil, **options)
         opts = { ttl: CACHE_HOUR, namespace: :dynamic }.merge(options)
-        api_request "#{base_url(:game_data)}/connected-realm/#{connected_realm_id}/auctions", opts
+
+        unless auction_house_id.nil?
+          return api_request "#{base_url(:game_data)}/connected-realm/#{connected_realm_id}/auctions/#{auction_house_id}", **opts
+        end
+
+        api_request "#{base_url(:game_data)}/connected-realm/#{connected_realm_id}/auctions", **opts
       end
     end
   end

data/lib/blizzard_api/wow/game_data/azerite_essence.rb

@@ -21,7 +21,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/azerite-essence/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/azerite-essence/#{id}", **default_options.merge(options)
       end
 
       protected

data/lib/blizzard_api/wow/game_data/covenant.rb

@@ -19,7 +19,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/covenant/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/covenant/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -29,7 +29,7 @@ module BlizzardApi
       #
       # @!macro response
       def soulbinds(**options)
-        api_request "#{base_url(:game_data)}/covenant/soulbind/index", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/covenant/soulbind/index", **default_options.merge(options)
       end
 
       ##
@@ -41,7 +41,7 @@ module BlizzardApi
       #
       # @!macro response
       def soulbind(id, **options)
-        api_request "#{base_url(:game_data)}/covenant/soulbind/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/covenant/soulbind/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -51,7 +51,7 @@ module BlizzardApi
       #
       # @!macro response
       def conduits(**options)
-        api_request "#{base_url(:game_data)}/covenant/conduit/index", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/covenant/conduit/index", **default_options.merge(options)
       end
 
       ##
@@ -63,7 +63,7 @@ module BlizzardApi
       #
       # @!macro response
       def conduit(id, **options)
-        api_request "#{base_url(:game_data)}/covenant/conduit/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/covenant/conduit/#{id}", **default_options.merge(options)
       end
 
       protected

data/lib/blizzard_api/wow/game_data/creature.rb

@@ -13,7 +13,7 @@ module BlizzardApi
       include BlizzardApi::Wow::Searchable
 
       def index
-        raise BlizzardApi::ApiException, 'Creatures endpoint doesn\'t have a index method'
+        raise BlizzardApi::ApiException, 'Creatures endpoint doesn\'t have an index method'
       end
 
       def complete
@@ -25,10 +25,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def families(**options)
-        api_request "#{endpoint_uri('family')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('family')}/index", **default_options.merge(options)
       end
 
       ##
@@ -38,10 +39,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def family(id, **options)
-        api_request "#{endpoint_uri('family')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('family')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -51,10 +53,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def family_media(id, **options)
-        api_request "#{base_url(:media)}/creature-family/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/creature-family/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -62,10 +65,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def types(**options)
-        api_request "#{endpoint_uri('type')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('type')}/index", **default_options.merge(options)
       end
 
       ##
@@ -75,10 +79,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def type(id, **options)
-        api_request "#{endpoint_uri('type')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('type')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -88,10 +93,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def display_media(id, **options)
-        api_request "#{base_url(:media)}/creature-display/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/creature-display/#{id}", **default_options.merge(options)
       end
 
       protected

data/lib/blizzard_api/wow/game_data/generic_data_endpoint.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'thwait'
+
 module BlizzardApi
   module Wow
     ##
@@ -19,7 +21,7 @@ module BlizzardApi
       # @!macro request_options
       # @!macro response
       def index(**options)
-        api_request "#{endpoint_uri}/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/index", **default_options.merge(options)
       end
 
       ##
@@ -30,20 +32,30 @@ module BlizzardApi
       #
       # @!macro response
       def get(id, **options)
-        api_request "#{endpoint_uri}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri}/#{id}", **default_options.merge(options)
       end
 
       ##
       # @!macro complete
       def complete(**options)
-        [].tap do |complete_data|
-          index_data = index options
-          index_data[@collection.to_sym].each do |item|
-            link = item.key?(:key) ? item[:key][:href] : item[:href]
-            item_data = request link
-            complete_data.push item_data
+        payload = [].tap do |complete_data|
+          index_data = index(**options)
+          threads = []
+
+          concurrency = options.key?(:concurrency) ? options[:concurrency].to_i : BlizzardApi.concurrency
+          concurrency.times do
+            threads << Thread.new do
+              while index_data[@collection.to_sym].size.positive?
+                item = index_data[@collection.to_sym].pop
+                link = item.key?(:key) ? item[:key][:href] : item[:href]
+                item_data = request link
+                complete_data.push item_data
+              end
+            end
           end
+          ThreadsWait.all_waits threads
         end
+        payload.sort { |a, b| a[:id] <=> b[:id] }
       end
 
       protected

data/lib/blizzard_api/wow/game_data/guild_crest.rb

@@ -21,10 +21,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def border_media(id, **options)
-        api_request "#{base_url(:media)}/#{@endpoint}/border/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/#{@endpoint}/border/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -32,12 +33,13 @@ module BlizzardApi
       #
       # @param id [Integer] Emblem id
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro request_options
       #
       # @!macro response
       def emblem_media(id, **options)
-        api_request "#{base_url(:media)}/#{@endpoint}/emblem/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/#{@endpoint}/emblem/#{id}", **default_options.merge(options)
       end
 
       protected

data/lib/blizzard_api/wow/game_data/item.rb

@@ -33,10 +33,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def classes(**options)
-        api_request "#{endpoint_uri('class')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('class')}/index", **default_options.merge(options)
       end
 
       ##
@@ -45,10 +46,11 @@ module BlizzardApi
       # @param id [Integer] Item class id
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def class(id, **options)
-        api_request "#{endpoint_uri('class')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('class')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -58,10 +60,11 @@ module BlizzardApi
       # @param subclass_id [Integer] Item subclass id
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def subclass(id, subclass_id, **options)
-        api_request "#{endpoint_uri('class')}/#{id}/item-subclass/#{subclass_id}", default_options.merge(options)
+        api_request "#{endpoint_uri('class')}/#{id}/item-subclass/#{subclass_id}", **default_options.merge(options)
       end
 
       ##
@@ -71,10 +74,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @option options [Boolean] :classic If set to true, this method will call the classic version
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/item/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/item/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -84,7 +88,7 @@ module BlizzardApi
       #
       # @!macro response
       def sets(**options)
-        api_request "#{endpoint_uri('set')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('set')}/index", **default_options.merge(options)
       end
 
       ##
@@ -95,7 +99,7 @@ module BlizzardApi
       #
       # @!macro response
       def set(id, **options)
-        api_request "#{endpoint_uri('set')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('set')}/#{id}", **default_options.merge(options)
       end
 
       protected