blizzard_api 0.5.6 → 0.6.0

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

@@ -18,7 +18,7 @@ module BlizzardApi
       #
       # @!macro response
       def talent_slots(id, **options)
-        api_request "#{endpoint_uri}/#{id}/pvp-talent-slots", default_options.merge(options)
+        api_request "#{endpoint_uri}/#{id}/pvp-talent-slots", **default_options.merge(options)
       end
 
       ##
@@ -26,11 +26,11 @@ module BlizzardApi
       #
       # @option options [Boolean] :classic If set to true, this method will call the classic version
       def complete(**options)
-        index_data = index options
+        index_data = index(**options)
         [].tap do |classes|
           index_data[:classes].each do |pclass|
             class_id = %r{playable-class/([0-9]+)}.match(pclass[:key].to_s)[1]
-            class_data = get class_id, options
+            class_data = get class_id, **options
             classes.push class_data
           end
         end
@@ -46,8 +46,8 @@ module BlizzardApi
       #
       # @!macro response
       def get(id, **options)
-        data = api_request "#{endpoint_uri}/#{id}", default_options.merge(options)
-        data[:icon] = get_class_icon data[:media], options
+        data = api_request "#{endpoint_uri}/#{id}", **default_options.merge(options)
+        data[:icon] = get_class_icon data[:media], **options
         data
       end
 
@@ -60,7 +60,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/playable-class/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/playable-class/#{id}", **default_options.merge(options)
       end
 
       protected
@@ -72,10 +72,10 @@ module BlizzardApi
         @ttl = CACHE_TRIMESTER
       end
 
-      def get_class_icon(media_url, options)
+      def get_class_icon(media_url, **options)
         return if options.include? :classic
 
-        media_data = request media_url[:key][:href], options
+        media_data = request media_url[:key][:href], **options
         %r{56/([a-z_]+).jpg}.match(media_data[:assets][0][:value].to_s)[1]
       end
     end

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

@@ -13,11 +13,11 @@ module BlizzardApi
       ##
       # @!macro complete
       def complete(**options)
-        index_data = index options
-        response_data = OpenStruct.new
-        response_data.character_specializations = character_data(index_data, options)
-        response_data.pet_specializations = pet_data(index_data, options)
-        response_data
+        index_data = index(**options)
+        {}.tap do |response_data|
+          response_data[:character_specializations] = character_data(index_data, options)
+          response_data[:pet_specializations] = pet_data(index_data, options)
+        end
       end
 
       ##
@@ -29,7 +29,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/playable-specialization/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/playable-specialization/#{id}", **default_options.merge(options)
       end
 
       protected
@@ -47,7 +47,7 @@ module BlizzardApi
         [].tap do |specs|
           index_data[:character_specializations].each do |spec|
             spec_id = %r{playable-specialization/([0-9]+)}.match(spec[:key].to_s)[1]
-            spec_data = get spec_id, options
+            spec_data = get spec_id, **options
             spec_data[:icon] = resolve_icon(spec_data[:media][:key][:href])
             cleanup spec_data
             specs.push spec_data
@@ -59,7 +59,7 @@ module BlizzardApi
         [].tap do |specs|
           index_data[:pet_specializations].each do |spec|
             spec_id = %r{playable-specialization/([0-9]+)}.match(spec[:key].to_s)[1]
-            spec_data = get spec_id, options
+            spec_data = get spec_id, **options
             spec_data[:icon] = resolve_icon(spec_data[:media][:key][:href])
             cleanup spec_data
             specs.push spec_data

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

@@ -19,7 +19,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/profession/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/profession/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -32,7 +32,7 @@ module BlizzardApi
       #
       # @!macro response
       def skill_tier(id, tier_id, **options)
-        api_request "#{base_url(:game_data)}/profession/#{id}/skill-tier/#{tier_id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/profession/#{id}/skill-tier/#{tier_id}", **default_options.merge(options)
       end
 
       ##
@@ -44,7 +44,7 @@ module BlizzardApi
       #
       # @!macro response
       def recipe(id, **options)
-        api_request "#{base_url(:game_data)}/recipe/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/recipe/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -56,7 +56,7 @@ module BlizzardApi
       #
       # @!macro response
       def recipe_media(id, **options)
-        api_request "#{base_url(:media)}/recipe/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/recipe/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -17,7 +17,7 @@ module BlizzardApi
       #
       # @!macro response
       def leaderboards(season_id, **options)
-        api_request "#{endpoint_uri}/#{season_id}/pvp-leaderboard/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/#{season_id}/pvp-leaderboard/index", **default_options.merge(options)
       end
 
       ##
@@ -27,7 +27,7 @@ module BlizzardApi
       #
       # @!macro response
       def leaderboard(season_id, brackets, **options)
-        api_request "#{endpoint_uri}/#{season_id}/pvp-leaderboard/#{brackets}", default_options.merge(options)
+        api_request "#{endpoint_uri}/#{season_id}/pvp-leaderboard/#{brackets}", **default_options.merge(options)
       end
 
       ##
@@ -37,7 +37,7 @@ module BlizzardApi
       #
       # @!macro response
       def rewards(season_id, **options)
-        api_request "#{endpoint_uri}/#{season_id}/pvp-reward/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/#{season_id}/pvp-reward/index", **default_options.merge(options)
       end
 
       protected

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

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

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

@@ -17,7 +17,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
 
       ##
@@ -28,7 +28,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
 
       ##
@@ -38,7 +38,7 @@ module BlizzardApi
       #
       # @!macro response
       def areas(**options)
-        api_request "#{endpoint_uri}/area/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/area/index", **default_options.merge(options)
       end
 
       ##
@@ -49,7 +49,7 @@ module BlizzardApi
       #
       # @!macro response
       def area(id, **options)
-        api_request "#{endpoint_uri}/area/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri}/area/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -59,7 +59,7 @@ module BlizzardApi
       #
       # @!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
 
       ##
@@ -70,7 +70,7 @@ module BlizzardApi
       #
       # @!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
 
       protected

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

@@ -33,7 +33,7 @@ module BlizzardApi
       #
       # @!macro response
       def factions(**options)
-        api_request "#{endpoint_uri('faction')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('faction')}/index", **default_options.merge(options)
       end
 
       ##
@@ -44,7 +44,7 @@ module BlizzardApi
       #
       # @!macro response
       def faction(id, **options)
-        api_request "#{endpoint_uri('faction')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('faction')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -54,7 +54,7 @@ module BlizzardApi
       #
       # @!macro response
       def tiers(**options)
-        api_request "#{endpoint_uri('tiers')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('tiers')}/index", **default_options.merge(options)
       end
 
       ##
@@ -65,7 +65,7 @@ module BlizzardApi
       #
       # @!macro response
       def tier(id, **options)
-        api_request "#{endpoint_uri('tiers')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('tiers')}/#{id}", **default_options.merge(options)
       end
 
       protected

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

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

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

@@ -17,7 +17,7 @@ module BlizzardApi
       #
       # @!macro response
       def pvp_talents(**options)
-        api_request "#{base_url(:game_data)}/pvp-talent/index", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/pvp-talent/index", **default_options.merge(options)
       end
 
       ##
@@ -29,7 +29,7 @@ module BlizzardApi
       #
       # @!macro response
       def pvp_talent(id, **options)
-        api_request "#{base_url(:game_data)}/pvp-talent/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/pvp-talent/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -17,7 +17,7 @@ module BlizzardApi
       #
       # @!macro response
       def tech_talent_trees(**options)
-        api_request "#{base_url(:game_data)}/tech-talent-tree/index", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/tech-talent-tree/index", **default_options.merge(options)
       end
 
       ##
@@ -29,7 +29,7 @@ module BlizzardApi
       #
       # @!macro response
       def tech_talent_tree(id, **options)
-        api_request "#{base_url(:game_data)}/tech-talent-tree/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/tech-talent-tree/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -41,7 +41,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/tech-talent/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/tech-talent/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -18,7 +18,7 @@ module BlizzardApi
       # @!macro response
       def get(**options)
         opts = { namespace: :dynamic, ttl: CACHE_HOUR }.merge(options)
-        api_request "#{base_url(:game_data)}/token/index", opts
+        api_request "#{base_url(:game_data)}/token/index", **opts
       end
     end
   end

data/lib/blizzard_api/wow/profile/character_profile.rb

@@ -23,7 +23,7 @@ module BlizzardApi
       #
       # @!macro response
       def get(realm, character, **options)
-        character_request realm, character, options
+        character_request realm, character, **options
       end
 
       ##
@@ -37,7 +37,7 @@ module BlizzardApi
       #
       # @!macro response
       def achievements(realm, character, **options)
-        character_request realm, character, 'achievements', options
+        character_request realm, character, 'achievements', **options
       end
 
       ##
@@ -51,7 +51,7 @@ module BlizzardApi
       #
       # @!macro response
       def achievement_statistics(realm, character, **options)
-        character_request realm, character, 'achievements/statistics', options
+        character_request realm, character, 'achievements/statistics', **options
       end
 
       ##
@@ -65,7 +65,7 @@ module BlizzardApi
       #
       # @!macro response
       def appearance(realm, character, **options)
-        character_request realm, character, 'appearance', options
+        character_request realm, character, 'appearance', **options
       end
 
       ##
@@ -79,7 +79,7 @@ module BlizzardApi
       #
       # @!macro response
       def collections(realm, character, **options)
-        character_request realm, character, 'collections', options
+        character_request realm, character, 'collections', **options
       end
 
       ##
@@ -93,7 +93,7 @@ module BlizzardApi
       #
       # @!macro response
       def pets(realm, character, **options)
-        character_request realm, character, 'collections/pets', options
+        character_request realm, character, 'collections/pets', **options
       end
 
       ##
@@ -107,7 +107,7 @@ module BlizzardApi
       #
       # @!macro response
       def mounts(realm, character, **options)
-        character_request realm, character, 'collections/mounts', options
+        character_request realm, character, 'collections/mounts', **options
       end
 
       ##
@@ -121,7 +121,7 @@ module BlizzardApi
       #
       # @!macro response
       def encounters(realm, character, **options)
-        character_request realm, character, 'encounters', options
+        character_request realm, character, 'encounters', **options
       end
 
       ##
@@ -135,7 +135,7 @@ module BlizzardApi
       #
       # @!macro response
       def dungeons(realm, character, **options)
-        character_request realm, character, 'encounters/dungeons', options
+        character_request realm, character, 'encounters/dungeons', **options
       end
 
       ##
@@ -149,7 +149,7 @@ module BlizzardApi
       #
       # @!macro response
       def raids(realm, character, **options)
-        character_request realm, character, 'encounters/raids', options
+        character_request realm, character, 'encounters/raids', **options
       end
 
       ##
@@ -163,7 +163,7 @@ module BlizzardApi
       #
       # @!macro response
       def equipment(realm, character, **options)
-        character_request realm, character, 'equipment', options
+        character_request realm, character, 'equipment', **options
       end
 
       ##
@@ -177,7 +177,7 @@ module BlizzardApi
       #
       # @!macro response
       def hunter_pets(realm, character, **options)
-        character_request realm, character, 'hunter-pets', options
+        character_request realm, character, 'hunter-pets', **options
       end
 
       ##
@@ -191,7 +191,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(realm, character, **options)
-        character_request realm, character, 'character-media', options
+        character_request realm, character, 'character-media', **options
       end
 
       ##
@@ -205,7 +205,7 @@ module BlizzardApi
       #
       # @!macro response
       def mythic_keystone_profile(realm, character, **options)
-        character_request realm, character, 'mythic-keystone-profile', options
+        character_request realm, character, 'mythic-keystone-profile', **options
       end
 
       ##
@@ -220,7 +220,7 @@ module BlizzardApi
       #
       # @!macro response
       def mythic_keystone_seasons(realm, character, season = nil, **options)
-        character_request realm, character, "mythic-keystone-profile/season/#{season}", options
+        character_request realm, character, "mythic-keystone-profile/season/#{season}", **options
       end
 
       ##
@@ -234,7 +234,7 @@ module BlizzardApi
       #
       # @!macro response
       def professions(realm, character, **options)
-        character_request realm, character, 'professions', options
+        character_request realm, character, 'professions', **options
       end
 
       ##
@@ -249,7 +249,7 @@ module BlizzardApi
       #
       # @!macro response
       def status(realm, character, **options)
-        character_request realm, character, 'status', options
+        character_request realm, character, 'status', **options
       end
 
       ##
@@ -264,7 +264,7 @@ module BlizzardApi
       #
       # @!macro response
       def pvp_bracket(realm, character, bracket, **options)
-        character_request realm, character, "pvp-bracket/#{bracket}", options
+        character_request realm, character, "pvp-bracket/#{bracket}", **options
       end
 
       ##
@@ -278,7 +278,7 @@ module BlizzardApi
       #
       # @!macro response
       def pvp_summary(realm, character, **options)
-        character_request realm, character, 'pvp-summary', options
+        character_request realm, character, 'pvp-summary', **options
       end
 
       ##
@@ -294,9 +294,9 @@ module BlizzardApi
       # @!macro response
       def quests(realm, character, **options)
         completed = options.delete(:completed) || false
-        return character_request realm, character, 'quests/completed', options if completed
+        return character_request realm, character, 'quests/completed', **options if completed
 
-        character_request realm, character, 'quests', options
+        character_request realm, character, 'quests', **options
       end
 
       ##
@@ -310,7 +310,7 @@ module BlizzardApi
       #
       # @!macro response
       def reputation(realm, character, **options)
-        character_request realm, character, 'reputations', options
+        character_request realm, character, 'reputations', **options
       end
 
       ##
@@ -324,7 +324,7 @@ module BlizzardApi
       #
       # @!macro response
       def soulbinds(realm, character, **options)
-        character_request realm, character, 'soulbinds', options
+        character_request realm, character, 'soulbinds', **options
       end
 
       ##
@@ -338,7 +338,7 @@ module BlizzardApi
       #
       # @!macro response
       def specializations(realm, character, **options)
-        character_request realm, character, 'specializations', options
+        character_request realm, character, 'specializations', **options
       end
 
       ##
@@ -352,7 +352,7 @@ module BlizzardApi
       #
       # @!macro response
       def statistics(realm, character, **options)
-        character_request realm, character, 'statistics', options
+        character_request realm, character, 'statistics', **options
       end
 
       ##
@@ -366,7 +366,7 @@ module BlizzardApi
       #
       # @!macro response
       def titles(realm, character, **options)
-        character_request realm, character, 'titles', options
+        character_request realm, character, 'titles', **options
       end
 
       private
@@ -380,7 +380,7 @@ module BlizzardApi
       def character_request(realm, character, variant = nil, **options)
         uri = "#{base_url(:profile)}/character/#{string_to_slug(realm)}/#{string_to_slug(character)}"
         uri += "/#{variant}" if variant
-        api_request uri, default_options.merge(options)
+        api_request uri, **default_options.merge(options)
       end
     end
   end