blizzard_api 0.5.2 → 0.6.0

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

@@ -15,9 +15,9 @@ module BlizzardApi
       #
       # @!macro sc2_regions
       # @!macro request_options
-      def static(region_id, 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
 
       ##
@@ -27,10 +27,10 @@ module BlizzardApi
       # @param [Integer] realm_id Realm ID
       # @param [Integer] profile_id Profile ID
       # @!macro request_options
-      def metadata(region_id, realm_id, profile_id, options = {})
+      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
 
       ##
@@ -40,10 +40,10 @@ module BlizzardApi
       # @param [Integer] realm_id Realm ID
       # @param [Integer] profile_id Profile ID
       # @!macro request_options
-      def profile(region_id, realm_id, profile_id, options = {})
+      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
 
       ##
@@ -53,10 +53,10 @@ module BlizzardApi
       # @param [Integer] realm_id Realm ID
       # @param [Integer] profile_id Profile ID
       # @!macro request_options
-      def ladder_summary(region_id, realm_id, profile_id, options = {})
+      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
 
       ##
@@ -66,10 +66,10 @@ module BlizzardApi
       # @param [Integer] realm_id Realm ID
       # @param [Integer] profile_id Profile ID
       # @!macro request_options
-      def ladder(region_id, realm_id, profile_id, ladder_id, options = {})
+      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

@@ -18,9 +18,9 @@ module BlizzardApi
       # @param [Integer] team_type Team type
       # @param [Integer] league_id League id
       # @!macro request_options
-      def get(season_id, queue_id, team_type, league_id, 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.2'
+  VERSION = '0.6.0'
 end

data/lib/blizzard_api/wow.rb

@@ -275,13 +275,6 @@ module BlizzardApi
       BlizzardApi::Wow::WowToken.new(region)
     end
 
-    ##
-    # @param region [String] API Region
-    # @return {Character}
-    def self.character(region = BlizzardApi.region)
-      BlizzardApi::Wow::Character.new(region)
-    end
-
     require_relative 'wow/profile/profile'
     require_relative 'wow/profile/guild'
     require_relative 'wow/profile/character_profile'

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

@@ -24,8 +24,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def categories(options = {})
-        api_request "#{endpoint_uri('category')}/index", default_options.merge(options)
+      def categories(**options)
+        api_request "#{endpoint_uri('category')}/index", **default_options.merge(options)
       end
 
       ##
@@ -34,8 +34,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def category(id, options = {})
-        api_request "#{endpoint_uri('category')}/#{id}", default_options.merge(options)
+      def category(id, **options)
+        api_request "#{endpoint_uri('category')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -44,8 +44,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def media(id, options = {})
-        api_request "#{base_url(:media)}/achievement/#{id}", default_options.merge(options)
+      def media(id, **options)
+        api_request "#{base_url(:media)}/achievement/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -17,9 +17,9 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def get(connected_realm_id, options = {})
+      def get(connected_realm_id, **options)
         opts = { ttl: CACHE_HOUR, namespace: :dynamic }.merge(options)
-        api_request "#{base_url(:game_data)}/connected-realm/#{connected_realm_id}/auctions", opts
+        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

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

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

@@ -18,8 +18,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def media(id, options = {})
-        api_request "#{base_url(:media)}/covenant/#{id}", default_options.merge(options)
+      def media(id, **options)
+        api_request "#{base_url(:media)}/covenant/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -28,8 +28,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def soulbinds(options = {})
-        api_request "#{base_url(:game_data)}/covenant/soulbind/index", default_options.merge(options)
+      def soulbinds(**options)
+        api_request "#{base_url(:game_data)}/covenant/soulbind/index", **default_options.merge(options)
       end
 
       ##
@@ -40,8 +40,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def soulbind(id, options = {})
-        api_request "#{base_url(:game_data)}/covenant/soulbind/#{id}", default_options.merge(options)
+      def soulbind(id, **options)
+        api_request "#{base_url(:game_data)}/covenant/soulbind/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -50,8 +50,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def conduits(options = {})
-        api_request "#{base_url(:game_data)}/covenant/conduit/index", default_options.merge(options)
+      def conduits(**options)
+        api_request "#{base_url(:game_data)}/covenant/conduit/index", **default_options.merge(options)
       end
 
       ##
@@ -62,8 +62,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def conduit(id, options = {})
-        api_request "#{base_url(:game_data)}/covenant/conduit/#{id}", default_options.merge(options)
+      def conduit(id, **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

@@ -27,8 +27,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def families(options = {})
-        api_request "#{endpoint_uri('family')}/index", default_options.merge(options)
+      def families(**options)
+        api_request "#{endpoint_uri('family')}/index", **default_options.merge(options)
       end
 
       ##
@@ -40,8 +40,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def family(id, options = {})
-        api_request "#{endpoint_uri('family')}/#{id}", default_options.merge(options)
+      def family(id, **options)
+        api_request "#{endpoint_uri('family')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -53,8 +53,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def family_media(id, options = {})
-        api_request "#{base_url(:media)}/creature-family/#{id}", default_options.merge(options)
+      def family_media(id, **options)
+        api_request "#{base_url(:media)}/creature-family/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -64,8 +64,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def types(options = {})
-        api_request "#{endpoint_uri('type')}/index", default_options.merge(options)
+      def types(**options)
+        api_request "#{endpoint_uri('type')}/index", **default_options.merge(options)
       end
 
       ##
@@ -77,8 +77,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def type(id, options = {})
-        api_request "#{endpoint_uri('type')}/#{id}", default_options.merge(options)
+      def type(id, **options)
+        api_request "#{endpoint_uri('type')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -90,8 +90,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def display_media(id, options = {})
-        api_request "#{base_url(:media)}/creature-display/#{id}", default_options.merge(options)
+      def display_media(id, **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
     ##
@@ -18,8 +20,8 @@ module BlizzardApi
       #
       # @!macro request_options
       # @!macro response
-      def index(options = {})
-        api_request "#{endpoint_uri}/index", default_options.merge(options)
+      def index(**options)
+        api_request "#{endpoint_uri}/index", **default_options.merge(options)
       end
 
       ##
@@ -29,21 +31,31 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def get(id, options = {})
-        api_request "#{endpoint_uri}/#{id}", default_options.merge(options)
+      def get(id, **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
+      def complete(**options)
+        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

@@ -23,8 +23,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def border_media(id, options = {})
-        api_request "#{base_url(:media)}/#{@endpoint}/border/#{id}", default_options.merge(options)
+      def border_media(id, **options)
+        api_request "#{base_url(:media)}/#{@endpoint}/border/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -36,8 +36,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def emblem_media(id, options = {})
-        api_request "#{base_url(:media)}/#{@endpoint}/emblem/#{id}", default_options.merge(options)
+      def emblem_media(id, **options)
+        api_request "#{base_url(:media)}/#{@endpoint}/emblem/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -35,8 +35,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def classes(options = {})
-        api_request "#{endpoint_uri('class')}/index", default_options.merge(options)
+      def classes(**options)
+        api_request "#{endpoint_uri('class')}/index", **default_options.merge(options)
       end
 
       ##
@@ -47,8 +47,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def class(id, options = {})
-        api_request "#{endpoint_uri('class')}/#{id}", default_options.merge(options)
+      def class(id, **options)
+        api_request "#{endpoint_uri('class')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -60,8 +60,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def subclass(id, subclass_id, options = {})
-        api_request "#{endpoint_uri('class')}/#{id}/item-subclass/#{subclass_id}", default_options.merge(options)
+      def subclass(id, subclass_id, **options)
+        api_request "#{endpoint_uri('class')}/#{id}/item-subclass/#{subclass_id}", **default_options.merge(options)
       end
 
       ##
@@ -73,8 +73,8 @@ module BlizzardApi
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       #
       # @!macro response
-      def media(id, options = {})
-        api_request "#{base_url(:media)}/item/#{id}", default_options.merge(options)
+      def media(id, **options)
+        api_request "#{base_url(:media)}/item/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -83,8 +83,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def sets(options = {})
-        api_request "#{endpoint_uri('set')}/index", default_options.merge(options)
+      def sets(**options)
+        api_request "#{endpoint_uri('set')}/index", **default_options.merge(options)
       end
 
       ##
@@ -94,8 +94,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def set(id, options = {})
-        api_request "#{endpoint_uri('set')}/#{id}", default_options.merge(options)
+      def set(id, **options)
+        api_request "#{endpoint_uri('set')}/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -30,7 +30,7 @@ module BlizzardApi
       # This method overrides the inherited default behavior to prevent high server load and fetch time
       #
       # @!macro response
-      def get(_id, _options = {})
+      def get(_id, **options)
         raise BlizzardApi::ApiException, 'This endpoint does not have a get method'
       end
 
@@ -40,8 +40,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def expansions(options = {})
-        api_request "#{endpoint_uri('expansion')}/index", default_options.merge(options)
+      def expansions(**options)
+        api_request "#{endpoint_uri('expansion')}/index", **default_options.merge(options)
       end
 
       ##
@@ -51,8 +51,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def expansion(id, options = {})
-        api_request "#{endpoint_uri('expansion')}/#{id}", default_options.merge(options)
+      def expansion(id, **options)
+        api_request "#{endpoint_uri('expansion')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -61,8 +61,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def instances(options = {})
-        api_request "#{endpoint_uri('instance')}/index", default_options.merge(options)
+      def instances(**options)
+        api_request "#{endpoint_uri('instance')}/index", **default_options.merge(options)
       end
 
       ##
@@ -72,8 +72,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def instance(id, options = {})
-        api_request "#{endpoint_uri('instance')}/#{id}", default_options.merge(options)
+      def instance(id, **options)
+        api_request "#{endpoint_uri('instance')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -82,8 +82,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def encounters(options = {})
-        api_request "#{endpoint_uri('encounter')}/index", default_options.merge(options)
+      def encounters(**options)
+        api_request "#{endpoint_uri('encounter')}/index", **default_options.merge(options)
       end
 
       ##
@@ -93,8 +93,8 @@ module BlizzardApi
       # @!macro request_options
       #
       # @!macro response
-      def encounter(id, options = {})
-        api_request "#{endpoint_uri('encounter')}/#{id}", default_options.merge(options)
+      def encounter(id, **options)
+        api_request "#{endpoint_uri('encounter')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -105,11 +105,11 @@ module BlizzardApi
       #
       # @!macro request_options
       # @!macro response
-      def encounter_search(page = 1, page_size = 100, options = {})
+      def encounter_search(page = 1, page_size = 100, **options)
         search_options = SearchComposer.new(page, page_size)
         yield search_options if block_given?
 
-        api_request "#{endpoint_uri('encounter', :search)}?#{search_options.to_search_query}", default_options.merge(options)
+        api_request "#{endpoint_uri('encounter', :search)}?#{search_options.to_search_query}", **default_options.merge(options)
       end
 
       protected