blizzard_api 0.3.8 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b8829ee15345cbac3a2874955718a288bc75893fd8c7d282f30e3a176fd926
-  data.tar.gz: eeba67d5fd5fbd5a14e380ffc78ae35bc28f88668ca73601572a6441f95eaee1
+  metadata.gz: 242a293ba7b8ca3247dc92e4d4499049f4e81fc5ee425035148ad45d45717076
+  data.tar.gz: 0b4035e8c611f321a516182ec8f95ec88da575a408b43624ffa8ce4d7e1c7a37
 SHA512:
-  metadata.gz: 45e0f9eb2c89426546dc2d29a8462ee1a471e2463c9d1ac0cbd4b4e5a8066894bfed65b720fcaa176954f2548dcdd0624ae7e022ff03ac9f86acd78929e65b47
-  data.tar.gz: f14afd42c690d863732156f588a87ae1977fcb68221e41b7289324aaa18ab21bcce84306469f2d37a9fab418db2e40b5a9eca6a32c2be8d7fadb42fcc5bf6a1b
+  metadata.gz: f8ffab41d1106b9ae14cab5ca48bd369cd301ad7c833d878d841f96ab5c30fdb6944ed1e52b757e52cb519361e3c1317c798202d8e6333c215013d2b35304a57
+  data.tar.gz: 3a06b3833836360e72578224e53cc1b1cccb8c70bc310958b0ffe3f02a0cbbbf6ad6e545ad6413a5f7b067edf0f70f783b252b97bcfbf71a19eaec1a66ebbaa9

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 Please view this file on the master branch, otherwise it may be outdated
 
+**Version 0.4.1**
+
+Added new retail and classic endpoints described here: https://us.forums.blizzard.com/en/blizzard/t/world-of-warcraft-api-patch-notes-20200609/8902
+
+**Version 0.4.0**
+
+Added support to searchable endpoints
+
+https://develop.battle.net/documentation/world-of-warcraft/guides/search
+
+**Version 0.3.11**
+
+Fixed D3 item URL.
+
+**Version 0.3.10**
+
+Really fixed D3 profile URLs this time.
+
+**Version 0.3.9**
+
+Fix D3 profile URLs.
+
 **Version 0.3.8**
+
 Added new profession endpoints.
 
 https://us.forums.blizzard.com/en/blizzard/t/world-of-warcraft-api-patch-notes-20200414/5680

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    blizzard_api (0.3.7)
+    blizzard_api (0.4.0)
       redis (~> 4.1, >= 4.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    dotenv (2.7.5)
     jaro_winkler (1.5.3)
     minitest (5.11.3)
     parallel (1.17.0)
@@ -15,7 +16,7 @@ GEM
       ast (~> 2.4.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (4.1.3)
+    redis (4.1.4)
     rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -25,15 +26,18 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.6.0)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   blizzard_api!
+  dotenv
   minitest (~> 5.0)
   rake (~> 13.0)
   rubocop (~> 0.61)
+  yard
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -73,6 +73,46 @@ Most **data** endpoints will have always 3 methods available `index`, `get` and
 * `get` is used to get all information about a entry of the index returned data. It receives an id or slug as the first parameter, that depends on the endpoint.
 * `complete` is a complete information of all items listed in index. **This may perform various calls to the blizzard api** only use if you really need all information.
 
+### 3.1 Searchable endpoints
+
+Some endpoints support search filters. To perform a search you can use the following formats:
+
+
+To use the **or** operator you may pass an array of values as argument to `where` or `where_not` methods.
+```ruby
+realm = BlizzardApi::Wow.realm
+realm_data = realm.search(1, 100) do |options|
+  options.where 'name.en_US', %w[Azralon Nemesis]
+end
+```
+ 
+To use the **and** operator you may call `where` or `where_not` multiple times methods.
+```ruby
+realm = BlizzardApi::Wow.realm
+realm_data = realm.search(1, 100) do |options|
+  options.where 'name.en_US', 'Azralon'
+  options.where 'id', 3209
+end
+```
+
+To use the **range** operator you may pass a hash to `where` or `where_not`.
+```ruby
+realm = BlizzardApi::Wow.realm
+realm_data = realm.search(1, 100) do |options|
+  options.where 'id', min: 3209, max: 4000, mode: :exclusive
+end
+```
+*Note*: If you don't pass the `mode` key as `:exclusive` it will be `:inclusive` by default.
+
+To **sort** fields you may call the `order_by` method multiple times:
+```ruby
+realm = BlizzardApi::Wow.realm
+realm_data = realm.search(1, 100) do |options|
+  options.where 'id', min: 3209, max: 4000, mode: :exclusive
+  options.order_by 'id', :desc
+end
+```
+
 ## 4. Available endpoints
 
 **Hint**: All methods support an additional optional hash parameter that allows you to override the following configurations for a single call:

data/blizzard_api.gemspec

@@ -34,7 +34,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'redis', '~> 4.1', '>= 4.1.0'
 
+  spec.add_development_dependency 'dotenv'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.61'
+  spec.add_development_dependency 'yard'
 end

data/lib/blizzard_api/diablo/community/item.rb

@@ -13,13 +13,12 @@ module BlizzardApi
       ##
       # Return information about an item
       #
-      # @param item_slug [String] Item slug
-      # @param item_id [Integer] Item id
+      # @param item_slug_and_id [String] Item slug
       # @!macro request_options
       #
       # @!macro response
-      def get(item_slug, item_id, options = {})
-        api_request "#{base_url(:community)}/data/item/#{item_slug}-#{item_id}", { ttl: CACHE_TRIMESTER }.merge(options)
+      def get(item_slug_and_id, options = {})
+        api_request "#{base_url(:community)}/data/item/#{item_slug_and_id}", { ttl: CACHE_TRIMESTER }.merge(options)
       end
     end
   end

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

@@ -22,7 +22,7 @@ module BlizzardApi
       # @see https://develop.battle.net/documentation/guides/using-oauth/authorization-code-flow
       def index(battletag, oauth_token, options = {})
         opts = { access_token: oauth_token, ttl: CACHE_TRIMESTER }.merge(options)
-        api_request "#{base_url(:community)}/data/profile/#{parse_battle_tag(battletag)}", opts
+        api_request "#{base_url(:community)}/profile/#{parse_battle_tag(battletag)}/", opts
       end
 
       ##
@@ -38,7 +38,7 @@ module BlizzardApi
       # @see https://develop.battle.net/documentation/guides/using-oauth/authorization-code-flow
       def hero(battletag, oauth_token, hero_id, options = {})
         opts = { access_token: oauth_token, ttl: CACHE_TRIMESTER }.merge(options)
-        api_request "#{base_url(:community)}/data/profile/#{parse_battle_tag(battletag)}/hero/#{hero_id}", opts
+        api_request "#{base_url(:community)}/profile/#{parse_battle_tag(battletag)}/hero/#{hero_id}", opts
       end
 
       ##
@@ -54,7 +54,7 @@ module BlizzardApi
       # @see https://develop.battle.net/documentation/guides/using-oauth/authorization-code-flow
       def hero_items(battletag, oauth_token, hero_id, options = {})
         opts = { access_token: oauth_token, ttl: CACHE_TRIMESTER }.merge(options)
-        api_request "#{base_url(:community)}/data/profile/#{parse_battle_tag(battletag)}/hero/#{hero_id}/items", opts
+        api_request "#{base_url(:community)}/profile/#{parse_battle_tag(battletag)}/hero/#{hero_id}/items", opts
       end
 
       ##
@@ -70,7 +70,7 @@ module BlizzardApi
       # @see https://develop.battle.net/documentation/guides/using-oauth/authorization-code-flow
       def hero_follower_items(battletag, oauth_token, hero_id, options = {})
         opts = { access_token: oauth_token, ttl: CACHE_TRIMESTER }.merge(options)
-        api_request "#{base_url(:community)}/data/profile/#{parse_battle_tag(battletag)}/hero/#{hero_id}/follower-items", opts
+        api_request "#{base_url(:community)}/profile/#{parse_battle_tag(battletag)}/hero/#{hero_id}/follower-items", opts
       end
 
       private

data/lib/blizzard_api/request.rb

@@ -50,7 +50,8 @@ module BlizzardApi
       community: 'https://%s.api.blizzard.com/%s',
       profile: 'https://%s.api.blizzard.com/profile/%s',
       media: 'https://%s.api.blizzard.com/data/%s/media',
-      user_profile: 'https://%s.api.blizzard.com/profile/user/%s'
+      user_profile: 'https://%s.api.blizzard.com/profile/user/%s',
+      search: 'https://%s.api.blizzard.com/data/%s/search'
     }.freeze
 
     ##
@@ -87,7 +88,7 @@ module BlizzardApi
     def endpoint_namespace(options)
       case options[:namespace]
       when :dynamic
-        "dynamic-#{region}"
+        options.include?(:classic) ? "dynamic-classic-#{region}" : "dynamic-#{region}"
       when :static
         options.include?(:classic) ? "static-classic-#{region}" : "static-#{region}"
       when :profile

data/lib/blizzard_api/version.rb

@@ -2,5 +2,5 @@
 
 module BlizzardApi
   # Gem version
-  VERSION = '0.3.8'
+  VERSION = '0.4.1'
 end

data/lib/blizzard_api/wow.rb

@@ -5,6 +5,8 @@ module BlizzardApi
   module Wow
     require_relative 'wow/request'
     require_relative 'wow/game_data/generic_data_endpoint'
+    require_relative 'wow/search/search_composer'
+    require_relative 'wow/search/search_request'
 
     # WoW data api
     require_relative 'wow/game_data/achievement'

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

@@ -10,6 +10,8 @@ module BlizzardApi
     # You can get an instance of this class using the default region as follows:
     #   api_instance = BlizzardApi::Wow.connected_realm
     class ConnectedRealm < Wow::GenericDataEndpoint
+      include BlizzardApi::Wow::Searchable
+
       protected
 
       def endpoint_setup

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

@@ -48,9 +48,9 @@ module BlizzardApi
 
       protected
 
-      def endpoint_uri(variant = nil)
+      def endpoint_uri(variant = nil, scope = :game_data)
         endpoint = variant ? "#{@endpoint}-#{variant}" : @endpoint
-        "#{base_url(:game_data)}/#{endpoint}"
+        "#{base_url(scope)}/#{endpoint}"
       end
 
       def endpoint_setup

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

@@ -10,6 +10,52 @@ module BlizzardApi
     # You can get an instance of this class using the default region as follows:
     #   api_instance = BlizzardApi::Wow.pet
     class Pet < Wow::GenericDataEndpoint
+      ##
+      # Fetch media for one of the pets listed by the {#index} using its *id*
+      #
+      # @param id [Integer] Pet id
+      #
+      # @!macro request_options
+      #
+      # @!macro response
+      def media(id, options = {})
+        api_request "#{base_url(:media)}/pet/#{id}", default_options.merge(options)
+      end
+
+      ##
+      # Fetch all pet abilities
+      #
+      # @!macro request_options
+      #
+      # @!macro response
+      def abilities(options = {})
+        api_request "#{endpoint_uri('ability')}/index", default_options.merge(options)
+      end
+
+      ##
+      # Fetch a pet ability
+      #
+      # @param id [Integer] Pet id
+      #
+      # @!macro request_options
+      #
+      # @!macro response
+      def ability(id, options = {})
+        api_request "#{endpoint_uri('ability')}/#{id}", default_options.merge(options)
+      end
+
+      ##
+      # Fetch media for one of the pet abilities listed by the {#abilities} using its *id*
+      #
+      # @param id [Integer] Pet ability id
+      #
+      # @!macro request_options
+      #
+      # @!macro response
+      def ability_media(id, options = {})
+        api_request "#{base_url(:media)}/pet-ability/#{id}", default_options.merge(options)
+      end
+
       protected
 
       def endpoint_setup

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

@@ -10,6 +10,8 @@ module BlizzardApi
     # You can get an instance of this class using the default region as follows:
     #   api_instance = BlizzardApi::Wow.realm
     class Realm < Wow::GenericDataEndpoint
+      include BlizzardApi::Wow::Searchable
+
       protected
 
       def endpoint_setup

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

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module BlizzardApi
+  module Wow
+    ##
+    # Composer for search endpoint arguments
+    class SearchComposer
+      attr_accessor :fields, :order, :page, :page_size
+
+      def initialize(page, page_size)
+        self.page = page
+        self.page_size = page_size
+        self.fields = []
+        self.order = []
+      end
+
+      ##
+      # Add a search field
+      #
+      # The second argument takes a simple value, an array of values or a hash for range searches.
+      #
+      # @param field [String] Field name
+      # @param value [String|Integer|Hash|Array<Integer|String>]
+      # @option value [Integer] :min Range start
+      # @option value [Integer] :max Range end
+      # @option value [Integer] :mode Range mode (:inclusive|:exclusive)
+      #
+      # @return {SearchComposer}
+      def where(field, value)
+        fields.push "#{field}=#{resolve_value(value)}"
+        self
+      end
+
+      ##
+      # Add a search field
+      #
+      # The second argument takes a simple value, an array of values or a hash for range searches.
+      #
+      # @param field [String] Field name
+      # @param value [String|Integer|Hash|Array<Integer|String>]
+      # @option value [Integer] :min Range start
+      # @option value [Integer] :max Range end
+      # @option value [Integer] :mode Range mode (:inclusive|:exclusive)
+      #
+      # @return {SearchComposer}
+      def where_not(field, value)
+        fields.push "#{field}!=#{resolve_value(value)}"
+        self
+      end
+
+      ##
+      # Add a sort field
+      #
+      # @param field [String] Field name
+      # @param mode [Symbol] :asc or :desc
+      #
+      # @return {SearchComposer}
+      def order_by(field, mode = :asc)
+        raise ArgumentError, 'Invalid order mode.' unless %i[asc desc].include? mode
+
+        order.push "#{field}:#{mode}"
+        self
+      end
+
+      ##
+      # Returns a valid queryString based on the options
+      #
+      # @return {String}
+      def to_search_query
+        query_string = "_page=#{page}&_pageSize=#{page_size}"
+        query_string += '&' + fields.join('&') unless fields.size.zero?
+        query_string += "&orderby=#{order.join(',')}" unless order.size.zero?
+        query_string
+      end
+
+      protected
+
+      def resolve_value(value)
+        return value.join '||' if value.is_a? Array
+
+        return value.to_s unless value.is_a? Hash
+
+        resolve_hash value
+      end
+
+      def resolve_hash(value)
+        min = value.key?(:min) ? value[:min] : ''
+        max = value.key?(:max) ? value[:max] : ''
+        mode = value.key?(:mode) ? value[:mode] : :inclusive
+
+        return "[#{min},#{max}]" if mode.eql? :inclusive
+
+        "(#{min},#{max})"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module BlizzardApi
+  module Wow
+    ##
+    # Added search support to an endpoint
+    module Searchable
+      ##
+      # Fetch data base on search criteria
+      #
+      # @param page [Integer] Page o return
+      # @param page_size [Integer] Amount of items per page
+      #
+      # @!macro request_options
+      # @!macro response
+      def search(page = 1, page_size = 100, options = {})
+        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)
+      end
+    end
+  end
+end

metadata

@@ -1,35 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: blizzard_api
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.1
 platform: ruby
 authors:
 - Francis Schiavo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-    - - "~>"
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.61'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a simple interface to obtain data from Blizzard API
 email:
 - francis.schiavo@francisschiavo.com
@@ -157,6 +185,8 @@ files:
 - lib/blizzard_api/wow/profile/guild.rb
 - lib/blizzard_api/wow/profile/profile.rb
 - lib/blizzard_api/wow/request.rb
+- lib/blizzard_api/wow/search/search_composer.rb
+- lib/blizzard_api/wow/search/search_request.rb
 homepage: https://gitlab.com/francisschiavo/blizzard_api
 licenses:
 - MIT
@@ -179,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Unofficial Ruby client for Blizzard Entertainment API