blizzard_api 0.5.6 → 0.6.3

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)
         raise BlizzardApi::ApiException, 'This endpoint does not have a get method'
       end
 
@@ -41,7 +41,7 @@ module BlizzardApi
       #
       # @!macro response
       def expansions(**options)
-        api_request "#{endpoint_uri('expansion')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('expansion')}/index", **default_options.merge(options)
       end
 
       ##
@@ -52,7 +52,7 @@ module BlizzardApi
       #
       # @!macro response
       def expansion(id, **options)
-        api_request "#{endpoint_uri('expansion')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('expansion')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -62,7 +62,7 @@ module BlizzardApi
       #
       # @!macro response
       def instances(**options)
-        api_request "#{endpoint_uri('instance')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('instance')}/index", **default_options.merge(options)
       end
 
       ##
@@ -73,7 +73,7 @@ module BlizzardApi
       #
       # @!macro response
       def instance(id, **options)
-        api_request "#{endpoint_uri('instance')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('instance')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -83,7 +83,7 @@ module BlizzardApi
       #
       # @!macro response
       def encounters(**options)
-        api_request "#{endpoint_uri('encounter')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('encounter')}/index", **default_options.merge(options)
       end
 
       ##
@@ -94,7 +94,7 @@ module BlizzardApi
       #
       # @!macro response
       def encounter(id, **options)
-        api_request "#{endpoint_uri('encounter')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('encounter')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -109,7 +109,7 @@ module BlizzardApi
         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

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

@@ -19,7 +19,7 @@ module BlizzardApi
       #
       # @!macro request_options
       def categories(**options)
-        api_request "#{base_url(:game_data)}/modified-crafting/category/index", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/modified-crafting/category/index", **default_options.merge(options)
       end
 
       ##
@@ -31,7 +31,7 @@ module BlizzardApi
       #
       # @!macro response
       def category(id, **options)
-        api_request "#{base_url(:game_data)}/modified-crafting/category/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/modified-crafting/category/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -39,7 +39,7 @@ module BlizzardApi
       #
       # @!macro request_options
       def slot_types(**options)
-        api_request "#{base_url(:game_data)}/modified-crafting/reagent-slot-type/index", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/modified-crafting/reagent-slot-type/index", **default_options.merge(options)
       end
 
       ##
@@ -51,7 +51,7 @@ module BlizzardApi
       #
       # @!macro response
       def slot_type(id, **options)
-        api_request "#{base_url(:game_data)}/modified-crafting/reagent-slot-type/#{id}", default_options.merge(options)
+        api_request "#{base_url(:game_data)}/modified-crafting/reagent-slot-type/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -25,7 +25,7 @@ module BlizzardApi
       #
       # @!macro response
       def dungeons(**options)
-        api_request "#{endpoint_uri}/dungeon/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/dungeon/index", **default_options.merge(options)
       end
 
       ##
@@ -37,7 +37,7 @@ module BlizzardApi
       #
       # @!macro response
       def dungeon(id, **options)
-        api_request "#{endpoint_uri}/dungeon/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri}/dungeon/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -47,7 +47,7 @@ module BlizzardApi
       #
       # @!macro response
       def periods(**options)
-        api_request "#{endpoint_uri}/period/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/period/index", **default_options.merge(options)
       end
 
       ##
@@ -59,7 +59,7 @@ module BlizzardApi
       #
       # @!macro response
       def period(id, **options)
-        api_request "#{endpoint_uri}/period/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri}/period/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -69,7 +69,7 @@ module BlizzardApi
       #
       # @!macro response
       def seasons(**options)
-        api_request "#{endpoint_uri}/season/index", default_options.merge(options)
+        api_request "#{endpoint_uri}/season/index", **default_options.merge(options)
       end
 
       ##
@@ -81,7 +81,7 @@ module BlizzardApi
       #
       # @!macro response
       def season(id, **options)
-        api_request "#{endpoint_uri}/season/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri}/season/#{id}", **default_options.merge(options)
       end
 
       protected

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

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

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

@@ -19,7 +19,7 @@ module BlizzardApi
       #
       # @!macro response
       def index(connected_realm_id, **options)
-        api_request "#{endpoint_uri(connected_realm_id)}/index", default_options(options)
+        api_request "#{endpoint_uri(connected_realm_id)}/index", **default_options(options)
       end
 
       ##
@@ -31,7 +31,7 @@ module BlizzardApi
       #
       # @!macro response
       def get(connected_realm_id, dungeon_id, period, **options)
-        api_request "#{endpoint_uri(connected_realm_id)}/#{dungeon_id}/period/#{period}", default_options(options)
+        api_request "#{endpoint_uri(connected_realm_id)}/#{dungeon_id}/period/#{period}", **default_options(options)
       end
 
       private

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

@@ -21,7 +21,7 @@ module BlizzardApi
       # @!macro response
       def get(raid, faction, **options)
         opts = options.merge(namespace: :dynamic, ttl: CACHE_DAY)
-        api_request "#{base_url(:game_data)}/leaderboard/hall-of-fame/#{raid}/#{faction}", opts
+        api_request "#{base_url(:game_data)}/leaderboard/hall-of-fame/#{raid}/#{faction}", **opts
       end
     end
   end

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

@@ -19,7 +19,7 @@ module BlizzardApi
       #
       # @!macro response
       def media(id, **options)
-        api_request "#{base_url(:media)}/pet/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/pet/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -29,7 +29,7 @@ module BlizzardApi
       #
       # @!macro response
       def abilities(**options)
-        api_request "#{endpoint_uri('ability')}/index", default_options.merge(options)
+        api_request "#{endpoint_uri('ability')}/index", **default_options.merge(options)
       end
 
       ##
@@ -41,7 +41,7 @@ module BlizzardApi
       #
       # @!macro response
       def ability(id, **options)
-        api_request "#{endpoint_uri('ability')}/#{id}", default_options.merge(options)
+        api_request "#{endpoint_uri('ability')}/#{id}", **default_options.merge(options)
       end
 
       ##
@@ -53,7 +53,7 @@ module BlizzardApi
       #
       # @!macro response
       def ability_media(id, **options)
-        api_request "#{base_url(:media)}/pet-ability/#{id}", default_options.merge(options)
+        api_request "#{base_url(:media)}/pet-ability/#{id}", **default_options.merge(options)
       end
 
       protected

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

@@ -18,19 +18,20 @@ 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
 
       ##
       # @!macro complete
       #
       # @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
       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
@@ -43,11 +44,12 @@ 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 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 +62,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 +74,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

@@ -14,20 +14,22 @@ module BlizzardApi
       # Returns a index of pvp leaderboard for a season
       #
       # @!macro request_options
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!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
 
       ##
       # Returns the leaderboard for a given season and bracket
       #
       # @!macro request_options
+      # @option options [Boolean] :classic1x If set to true, this method will call the classic era version
       #
       # @!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 +39,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