blizzard_api 0.5.6 → 0.6.3

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

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

@@ -21,7 +21,7 @@ module BlizzardApi
       #
       # @!macro response
       def get(realm, guild, **options)
-        guild_request(realm, guild, options)
+        guild_request(realm, guild, **options)
       end
 
       ##
@@ -34,7 +34,7 @@ module BlizzardApi
       #
       # @!macro response
       def roster(realm, guild, **options)
-        guild_request realm, guild, 'roster', options
+        guild_request realm, guild, 'roster', **options
       end
 
       ##
@@ -46,7 +46,7 @@ module BlizzardApi
       #
       # @!macro response
       def achievements(realm, guild, **options)
-        guild_request realm, guild, 'achievements', options
+        guild_request realm, guild, 'achievements', **options
       end
 
       ##
@@ -58,7 +58,7 @@ module BlizzardApi
       #
       # @!macro response
       def activity(realm, guild, **options)
-        guild_request realm, guild, 'activity', options
+        guild_request realm, guild, 'activity', **options
       end
 
       private
@@ -68,7 +68,7 @@ module BlizzardApi
         guild = string_to_slug(guild)
         url = "#{base_url(:game_data)}/guild/#{realm}/#{guild}"
         url += "/#{variant}" if variant
-        api_request url, { ttl: CACHE_DAY, namespace: :profile }.merge(options)
+        api_request url, **{ ttl: CACHE_DAY, namespace: :profile }.merge(options)
       end
     end
   end

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

@@ -19,7 +19,7 @@ module BlizzardApi
       #
       # @!macro response
       def get(**options)
-        api_request base_url(:user_profile).to_s, default_options.merge(options)
+        api_request base_url(:user_profile).to_s, **default_options.merge(options)
       end
 
       ##
@@ -29,7 +29,7 @@ module BlizzardApi
       #
       # @!macro response
       def protected_character(realm_id, character_id, **options)
-        api_request "#{base_url(:user_profile)}/protected-character/#{realm_id}-#{character_id}", default_options.merge(options)
+        api_request "#{base_url(:user_profile)}/protected-character/#{realm_id}-#{character_id}", **default_options.merge(options)
       end
 
       ##
@@ -39,7 +39,7 @@ module BlizzardApi
       #
       # @!macro response
       def collection(**options)
-        api_request "#{base_url(:user_profile)}/collections", default_options.merge(options)
+        api_request "#{base_url(:user_profile)}/collections", **default_options.merge(options)
       end
 
       ##
@@ -49,7 +49,7 @@ module BlizzardApi
       #
       # @!macro response
       def mounts(**options)
-        api_request "#{base_url(:user_profile)}/collections/mounts", default_options.merge(options)
+        api_request "#{base_url(:user_profile)}/collections/mounts", **default_options.merge(options)
       end
 
       ##
@@ -59,7 +59,7 @@ module BlizzardApi
       #
       # @!macro response
       def pets(**options)
-        api_request "#{base_url(:user_profile)}/collections/pets", default_options.merge(options)
+        api_request "#{base_url(:user_profile)}/collections/pets", **default_options.merge(options)
       end
 
       protected
@@ -68,7 +68,7 @@ module BlizzardApi
         { ttl: CACHE_HOUR, namespace: :profile }
       end
 
-      def api_request(_uri, query_string = {})
+      def api_request(_uri, **query_string)
         query_string.merge! access_token: @token
         super
       end

data/lib/blizzard_api/wow/search/search_composer.rb

@@ -27,7 +27,7 @@ module BlizzardApi
       #
       # @return {SearchComposer}
       def where(field, value)
-        fields.push "#{field}=#{resolve_value(value)}"
+        fields.push "#{field}=#{URI.encode_www_form_component(resolve_value(value))}"
         self
       end
 
@@ -44,7 +44,7 @@ module BlizzardApi
       #
       # @return {SearchComposer}
       def where_not(field, value)
-        fields.push "#{field}!=#{resolve_value(value)}"
+        fields.push "#{field}!=#{URI.encode_www_form_component(resolve_value(value))}"
         self
       end
 

data/lib/blizzard_api/wow/search/search_request.rb

@@ -17,7 +17,7 @@ module BlizzardApi
         search_options = SearchComposer.new(page, page_size)
         yield search_options if block_given?
 
-        api_request "#{endpoint_uri(nil, :search)}?#{search_options.to_search_query}", default_options.merge(options)
+        api_request "#{endpoint_uri(nil, :search)}?#{search_options.to_search_query}", **default_options.merge(options)
       end
     end
   end