restiny 3.1.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d08e2f02105ea2a6330679fe9cae0534bbb4a7d3c0fb7803d43fc70ae4ebdd
-  data.tar.gz: 80ab03d4fdbbf65ae276265f89e7c00d9a4f55870fdc0398893e45d429f44179
+  metadata.gz: 19b9e9cb2183fde785169d457628f4f7517c74feed228aacee4d45cdfe901fff
+  data.tar.gz: bebc650be6668d5a46a284a2aeb6912f2309cce7a7100ec4de57d3a95b11805e
 SHA512:
-  metadata.gz: 4abf818ba76d6f6fefbf2070a1d56162462ac2d5a22dae7725383c34ae884d901be3539b78342510beaa93ddc9c3a554e90fcee473825bdcad144ab9a88af8c5
-  data.tar.gz: 78f09f843a2e5c00067b95e1e5aad5a938d181c56081b744e1ae0638605af65548de6d4b117d3667e326bc9ed2ef61aaa80b673990f15cc490045aa2aa9f95ca
+  metadata.gz: c4fbe785ad70936712f351e1f3453f1915220af599ea9d89a09dc3c67713b208c6232e12d52d20fb25153c6a9b04b706b4bf1b367a2c8ded96a79da10f9764af
+  data.tar.gz: ed736dce127c0c76cebec7051b89ba02505452a4f9d2aa6bce6beb836b8fc6169586a6970fea1db3387db7700e3cee2b032edcb9952abd7ba9f85940e1a320e4

data/lib/faraday/destiny/api.rb

@@ -1,21 +1,23 @@
-require "faraday"
-require "restiny/errors"
+# frozen_string_literal: true
+
+require 'faraday'
+require 'restiny/errors'
 
 module Faraday
   module Restiny
-    Faraday::Response.register_middleware(destiny_api: "Faraday::Restiny::Api")
+    Faraday::Response.register_middleware(destiny_api: 'Faraday::Restiny::Api')
 
     class Api < Middleware
       def on_complete(env)
-        return if env["response_body"].empty? || !env["response_body"].dig("ErrorCode")
+        return if env['response_body'].empty? || !env['response_body']['ErrorCode']
 
-        if env["response_body"]["ErrorCode"] == 1
-          env[:body] = env["response_body"].dig("Response")
+        if env['response_body']['ErrorCode'] == 1
+          env[:body] = env['response_body']['Response']
           return
         end
 
         klass =
-          case env["status"]
+          case env['status']
           when 400..499
             ::Restiny::RequestError
           when 500..599
@@ -24,7 +26,7 @@ module Faraday
             ::Restiny::Error
           end
 
-        raise klass.new(env["response_body"]["Message"], env["response_body"]["ErrorStatus"])
+        raise klass.new(env['response_body']['Message'], env['response_body']['ErrorStatus'])
       end
     end
   end

data/lib/faraday/destiny/auth.rb

@@ -1,20 +1,22 @@
-require "faraday"
-require "restiny/errors"
+# frozen_string_literal: true
+
+require 'faraday'
+require 'restiny/errors'
 
 module Faraday
   module Restiny
-    Faraday::Response.register_middleware(destiny_auth: "Faraday::Restiny::Auth")
+    Faraday::Response.register_middleware(destiny_auth: 'Faraday::Restiny::Auth')
 
     class Auth < Middleware
       def on_complete(env)
-        return if env["response_body"].empty? || env["url"].to_s !~ /oauth/
+        return if env['response_body'].empty? || env['url'].to_s !~ /oauth/
+
+        return unless env['response_body']['error']
 
-        if env["response_body"]["error"]
-          raise ::Restiny::AuthenticationError.new(
-                  env["response_body"]["error_description"],
-                  env["response_body"]["error"]
-                )
-        end
+        raise ::Restiny::AuthenticationError.new(
+          env['response_body']['error_description'],
+          env['response_body']['error']
+        )
       end
     end
   end

data/lib/restiny/api/authentication.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+require 'securerandom'
+
+module Restiny
+  module Api
+    module Authentication
+      include Base
+
+      def get_authorise_url(redirect_url: nil, state: nil)
+        check_oauth_client_id
+
+        @oauth_state = state || SecureRandom.hex(15)
+
+        params = { response_type: 'code', client_id: @oauth_client_id, state: @oauth_state }
+        params['redirect_url'] = redirect_url unless redirect_url.nil?
+
+        auth_connection.build_url("#{BUNGIE_URL}/en/oauth/authorize/", params).to_s
+      end
+
+      def request_access_token(code:, redirect_url: nil)
+        check_oauth_client_id
+
+        params = { code: code, grant_type: 'authorization_code', client_id: @oauth_client_id }
+        params['redirect_url'] = redirect_url unless redirect_url.nil?
+
+        auth_connection.post('app/oauth/token/', params).body
+      end
+    end
+  end
+end

data/lib/restiny/api/base.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'restiny/constants'
+require 'restiny/errors'
+require 'faraday'
+require 'faraday/follow_redirects'
+require 'faraday/destiny/api'
+require 'faraday/destiny/auth'
+
+module Restiny
+  BUNGIE_URL = 'https://www.bungie.net'
+  API_BASE_URL = "#{BUNGIE_URL}/platform".freeze
+
+  attr_accessor :api_key, :oauth_state, :oauth_client_id, :access_token, :user_agent
+
+  module Api
+    module Base
+      def api_get(endpoint:, params: {})
+        api_connection.get(endpoint, params, token_header).body
+      end
+
+      def api_post(endpoint:, params: {})
+        api_connection.post(endpoint, params, token_header).body
+      end
+
+      private
+
+      def check_oauth_client_id
+        raise Restiny::RequestError, 'You need to set an OAuth client ID' unless @oauth_client_id
+      end
+
+      def default_headers
+        { 'User-Agent': @user_agent || "restiny v#{Restiny::VERSION}" }
+      end
+
+      def api_connection
+        raise Restiny::InvalidParamsError, 'You need to set an API key' unless @api_key
+
+        @api_connection ||=
+          Faraday.new(
+            url: API_BASE_URL,
+            headers: default_headers.merge('X-API-KEY': @api_key)
+          ) do |faraday|
+            faraday.request :json
+            faraday.response :follow_redirects
+            faraday.response :destiny_api
+            faraday.response :json
+          end
+      end
+
+      def auth_connection
+        @auth_connection ||=
+          Faraday.new(url: API_BASE_URL, headers: default_headers) do |faraday|
+            faraday.request :url_encoded
+            faraday.response :follow_redirects
+            faraday.response :destiny_auth
+            faraday.response :json
+          end
+      end
+
+      def token_header
+        {}.tap { |headers| headers['authorization'] = "Bearer #{@access_token}" if @access_token }
+      end
+    end
+  end
+end

data/lib/restiny/api/manifest.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+require 'restiny/manifest'
+
+require 'down'
+require 'tmpdir'
+require 'zip'
+
+module Restiny
+  module Api
+    module Manifest
+      include Base
+
+      def download_manifest(locale: 'en', force_download: false)
+        result = api_get(endpoint: 'Destiny2/Manifest/')
+        raise Restiny::ResponseError, 'Unable to determine manifest details' if result.nil?
+
+        return manifests[locale] if !force_download && manifest_version?(locale, result['version'])
+
+        manifests[locale] = download_manifest_by_url(result.dig('mobileWorldContentPaths', locale), result['version'])
+      end
+
+      def download_manifest_by_url(url, version)
+        raise Restiny::RequestError, 'Unknown locale' if url.nil?
+
+        database_file_path = extract_manifest_from_zip_file(Down.download(BUNGIE_URL + url), version)
+
+        Restiny::Manifest.new(database_file_path, version)
+      rescue Down::Error => e
+        raise Restiny::NetworkError.new('Unable to download the manifest file', e.response.code)
+      end
+
+      def extract_manifest_from_zip_file(source_path, version)
+        Zip::File.open(source_path) do |zip_file|
+          File.join(Dir.tmpdir, "#{version}.en.content.db").tap do |path|
+            zip_file.first.extract(path) unless File.exist?(path)
+          end
+        end
+      rescue Zip::Error => e
+        raise Restiny::Error, "Unable to unzip the manifest file (#{e})"
+      end
+
+      def manifests
+        @manifests ||= {}
+      end
+
+      def manifest_version?(locale, version)
+        manifests[locale] && manifests[locale].version == version
+      end
+    end
+  end
+end

data/lib/restiny/api/membership.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module Restiny
+  module Api
+    module Membership
+      include Base
+
+      def get_user_memberships_by_id(membership_id:, membership_type: Platform::ALL)
+        raise Restiny::InvalidParamsError, 'Please provide a membership ID' if membership_id.nil?
+
+        api_get(endpoint: "User/GetMembershipsById/#{membership_id}/#{membership_type}/")
+      end
+
+      def get_primary_user_membership(membership_id:, use_fallback: true)
+        result = get_user_memberships_by_id(membership_id: membership_id)
+        return nil if result.nil? || result['primaryMembershipId'].nil?
+
+        result['destinyMemberships'].each do |membership|
+          return membership if membership['membershipID'] == result['primaryMembershipId']
+        end
+
+        result['destinyMemberships'][0] if use_fallback
+      end
+    end
+  end
+end

data/lib/restiny/api/profile.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module Restiny
+  module Api
+    module Profile
+      include Base
+
+      def get_profile(membership_id:, membership_type:, components:, type_url: nil)
+        if !components.is_a?(Array) || components.empty?
+          raise Restiny::InvalidParamsError, 'Please provide at least one component'
+        end
+
+        url = "Destiny2/#{membership_type}/Profile/#{membership_id}/"
+        url += type_url if type_url
+        url += "?components=#{components.join(',')}"
+
+        api_get(endpoint: url)
+      end
+
+      def get_character_profile(character_id:, membership_id:, membership_type:, components:)
+        get_profile(
+          membership_id: membership_id,
+          membership_type: membership_type,
+          components: components,
+          type_url: "Character/#{character_id}/"
+        )
+      end
+
+      def get_instanced_item_profile(item_id:, membership_id:, membership_type:, components:)
+        get_profile(
+          membership_id: membership_id,
+          membership_type: membership_type,
+          components: components,
+          type_url: "Item/#{item_id}/"
+        )
+      end
+    end
+  end
+end

data/lib/restiny/api/search.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module Restiny
+  module Api
+    module Search
+      include Base
+
+      def search_player_by_bungie_name(name:, membership_type: Platform::ALL)
+        display_name, display_name_code = name.split('#')
+        if display_name.nil? || display_name_code.nil?
+          raise Restiny::InvalidParamsError,
+                'You must provide a valid Bungie name'
+        end
+
+        api_post(
+          endpoint: "Destiny2/SearchDestinyPlayerByBungieName/#{membership_type}/",
+          params: {
+            displayName: display_name,
+            displayNameCode: display_name_code
+          }
+        )
+      end
+
+      def search_users_by_global_name(name:, page: 0)
+        api_post(endpoint: "User/Search/GlobalName/#{page}/", params: { displayNamePrefix: name })
+      end
+    end
+  end
+end

data/lib/restiny/api/stats.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module Restiny
+  module Api
+    module Stats
+      include Base
+
+      def get_post_game_carnage_report(activity_id:)
+        raise Restiny::InvalidParamsError, 'Please provide an activity ID' if activity_id.nil?
+
+        api_get(endpoint: "Destiny2/Stats/PostGameCarnageReport/#{activity_id}/")
+      end 
+      
+      alias get_pgcr get_post_game_carnage_report
+    end
+  end
+end

data/lib/restiny/constants.rb

@@ -1,22 +1,45 @@
 # frozen_string_literal: true
 
 module Restiny
+  # Definitions for the gaming platforms supported by Destiny 2.
   module Platform
     ALL = -1
     XBOX = 1
     PSN = 2
     STEAM = 3
     EPIC = 6
+
+    def self.names
+      {
+        ALL => 'All',
+        XBOX => 'Xbox',
+        PSN => 'PSN',
+        STEAM => 'Steam',
+        EPIC => 'Epic'
+      }
+    end
   end
 
   module ItemLocation
+    # Definitions for the possible locations an item can be related to a character.
     UNKNOWN = 0
     INVENTORY = 1
     VAULT = 2
     VENDOR = 3
     POSTMASTER = 4
+
+    def self.names
+      {
+        UNKNOWN => 'Unknown',
+        INVENTORY => 'Inventory',
+        VAULT => 'Vault',
+        VENDOR => 'Vendor',
+        POSTMASTER => 'Postmaster'
+      }
+    end
   end
 
+  # Definitions for the tier/rarity of a particular item.
   module TierType
     UNKNOWN = 0
     CURRENCY = 1
@@ -25,47 +48,100 @@ module Restiny
     RARE = 4
     SUPERIOR = 5
     EXOTIC = 6
+
+    def self.names
+      {
+        UNKNOWN => 'Unknown',
+        CURRENCY => 'Currency',
+        BASIC => 'Basic',
+        COMMON => 'Common',
+        RARE => 'Rare',
+        SUPERIOR => 'Superior',
+        EXOTIC => 'Exotic'
+      }
+    end
   end
 
+  # Definitions for a Guardian's class.
   module GuardianClass
     TITAN = 0
     HUNTER = 1
     WARLOCK = 2
     UNKNOWN = 3
+
+    def self.names
+      {
+        TITAN => 'Titan',
+        HUNTER => 'Hunter',
+        WARLOCK => 'Warlock',
+        UNKNOWN => 'Unknown'
+      }
+    end
   end
 
+  # Definitions for a Guardian's race.
   module Race
     HUMAN = 0
     AWOKEN = 1
     EXO = 2
     UNKNOWN = 3
+
+    def self.names
+      {
+        HUMAN => 'Human',
+        AWOKEN => 'Awoken',
+        EXO => 'Exo',
+        UNKNOWN => 'Unknown'
+      }
+    end
   end
 
+  # Definitions for a Guardian's gender.
   module Gender
     MASCULINE = 0
     FEMININE = 1
     UNKNOWN = 2
+
+    def self.names
+      {
+        MASCULINE => 'Masculine',
+        FEMININE => 'Feminine',
+        UNKNOWN => 'Unknown'
+      }
+    end
   end
 
+  # Definitions for the various typos of ammunition in the game.
   module Ammunition
     NONE = 0
     PRIMARY = 1
     SPECIAL = 2
     HEAVY = 3
     UNKNOWN = 4
+
+    def self.names
+      {
+        NONE => 'None',
+        PRIMARY => 'Primary',
+        SPECIAL => 'Special',
+        HEAVY => 'Heavy',
+        UNKNOWN => 'Unknown'
+      }
+    end
   end
 
+  # Definitions for the various component types used when requesting a profile entry.
   module ComponentType
-    CHARACTERS = "Characters"
-    CHARACTER_EQUIPMENT = "CharacterEquipment"
-    CHARACTER_INVENTORIES = "CharacterInventories"
-    CHARACTER_LOADOUTS = "CharacterLoadouts"
-    PROFILES = "Profiles"
-    PROFILE_INVENTORIES = "ProfileInventories"
-    ITEM_INSTANCES = "ItemInstances"
-    ITEM_SOCKETS = "ItemSockets"
-    ITEM_COMMON_DATA = "ItemCommonData"
-    ITEM_PLUG_STATES = "ItemPlugStates"
-    ITEM_REUSABLE_PLUGS = "ItemReusablePlugs"
+    CHARACTERS = 'Characters'
+    CHARACTER_EQUIPMENT = 'CharacterEquipment'
+    CHARACTER_INVENTORIES = 'CharacterInventories'
+    CHARACTER_LOADOUTS = 'CharacterLoadouts'
+    PROFILES = 'Profiles'
+    PROFILE_INVENTORIES = 'ProfileInventories'
+    ITEM_INSTANCES = 'ItemInstances'
+    ITEM_SOCKETS = 'ItemSockets'
+    ITEM_COMMON_DATA = 'ItemCommonData'
+    ITEM_PLUG_STATES = 'ItemPlugStates'
+    ITEM_REUSABLE_PLUGS = 'ItemReusablePlugs'
   end
 end

data/lib/restiny/manifest.rb

@@ -1,6 +1,6 @@
-# frozen_string/literal: true
+# frozen_string_literal: true
 
-require "sqlite3"
+require 'sqlite3'
 
 module Restiny
   class Manifest
@@ -68,49 +68,36 @@ module Restiny
       Unlock: %w[unlock unlocks],
       Vendor: %w[vendor vendors],
       VendorGroup: %w[vendor_group vendor_groups]
-    }
+    }.freeze
 
-    attr_reader :file_path, :version
+    attr_reader :version
 
     ENTITIES.each do |entity, method_names|
       full_table_name = "Destiny#{entity}Definition"
       single_method_name, plural_method_name = method_names
 
-      define_method single_method_name do |id|
-        fetch_item(table_name: full_table_name, id: id)
-      end
-
-      define_method plural_method_name do |limit: nil|
-        fetch_items(table_name: full_table_name, limit: limit)
-      end
+      define_method(single_method_name) { |id| fetch_item(table_name: full_table_name, id: id) }
+      define_method(plural_method_name) { |limit: nil| fetch_items(table_name: full_table_name, limit: limit) }
     end
 
     def initialize(file_path, version)
       if file_path.empty? || !File.exist?(file_path) || !File.file?(file_path)
-        raise Restiny::InvalidParamsError.new("You must provide a valid path for the manifest file")
+        raise Restiny::InvalidParamsError, 'You must provide a valid path for the manifest file'
       end
 
       @database = SQLite3::Database.new(file_path, results_as_hash: true)
-      @file_path = file_path
       @version = version
     end
 
     private
 
-    def get_entity_names
-      query = "SELECT name from sqlite_schema WHERE name LIKE 'Destiny%'"
-      @database.execute(query).map { |row| row["name"].gsub(/(Destiny|Definition)/, "") }
-    end
-
     def fetch_item(table_name:, id:)
       query = "SELECT json FROM #{table_name} WHERE json_extract(json, '$.hash')=?"
       result = @database.execute(query, id)
 
-      return nil if result.nil? || result.count < 1 || !result[0].include?("json")
-
-      JSON.parse(result[0]["json"])
+      JSON.parse(result[0]['json']) unless result.nil? || result.count < 1 || !result[0].include?('json')
     rescue SQLite3::Exception => e
-      raise Restiny::RequestError.new("Error while fetching item (#{e})")
+      raise Restiny::RequestError, "Error while fetching item (#{e})"
     end
 
     def fetch_items(table_name:, limit: nil)
@@ -119,14 +106,14 @@ module Restiny
       query = "SELECT json FROM #{table_name} ORDER BY json_extract(json, '$.index')"
 
       if limit
-        query << " LIMIT ?"
+        query << ' LIMIT ?'
         bindings << limit
       end
 
       items = []
 
       @database.execute(query, bindings) do |row|
-        item = JSON.parse(row["json"])
+        item = JSON.parse(row['json'])
         yield item if block_given?
 
         items << item
@@ -134,7 +121,7 @@ module Restiny
 
       items unless block_given?
     rescue SQLite3::Exception => e
-      raise Restiny::RequestError.new("Error while fetching items (#{e})")
+      raise Restiny::RequestError, "Error while fetching items (#{e})"
     end
   end
 end

data/lib/restiny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Restiny
-  VERSION = "3.1.0"
+  VERSION = '5.0.1'
 end

data/lib/restiny.rb

@@ -2,202 +2,22 @@
 
 $LOAD_PATH.unshift(__dir__)
 
-require "restiny/version"
-require "restiny/constants"
-require "restiny/errors"
-require "restiny/manifest"
-
-require "faraday"
-require "faraday/follow_redirects"
-require "faraday/destiny/api"
-require "faraday/destiny/auth"
-
-require "down"
-require "json"
-require "securerandom"
-require "zip"
-
+require 'restiny/version'
+require 'restiny/api/authentication'
+require 'restiny/api/manifest'
+require 'restiny/api/membership'
+require 'restiny/api/profile'
+require 'restiny/api/search'
+require 'restiny/api/stats'
+
+# The main Restiny module.
 module Restiny
   extend self
 
-  BUNGIE_URL = "https://www.bungie.net"
-  API_BASE_URL = BUNGIE_URL + "/platform"
-
-  attr_accessor :api_key, :oauth_state, :oauth_client_id, :access_token, :user_agent
-
-  # OAuth methods
-
-  def get_authorise_url(redirect_url: nil, state: nil)
-    check_oauth_client_id
-
-    @oauth_state = state || SecureRandom.hex(15)
-
-    params = { response_type: "code", client_id: @oauth_client_id, state: @oauth_state }
-    params["redirect_url"] = redirect_url unless redirect_url.nil?
-
-    auth_connection.build_url(BUNGIE_URL + "/en/oauth/authorize/", params).to_s
-  end
-
-  def request_access_token(code:, redirect_url: nil)
-    check_oauth_client_id
-
-    params = { code: code, grant_type: "authorization_code", client_id: @oauth_client_id }
-    params["redirect_url"] = redirect_url unless redirect_url.nil?
-
-    auth_post("app/oauth/token/", params)
-  end
-
-  # Manifest methods
-
-  def get_manifest(locale: "en", force_download: false)
-    result = api_get("Destiny2/Manifest/")
-    raise Restiny::ResponseError.new("Unable to determine manifest details") if result.nil?
-
-    live_version = result.dig("version")
-
-    @manifests ||= {}
-    @manifest_versions ||= {}
-
-    if force_download || @manifests[locale].nil? || @manifest_versions[locale] != live_version
-      url = BUNGIE_URL + result.dig("mobileWorldContentPaths", locale)
-
-      zipped_file = Down.download(url)
-      database_file_path = zipped_file.path + ".db"
-
-      Zip::File.open(zipped_file) { |file| file.first.extract(database_file_path) }
-
-      @manifests[locale] = Manifest.new(database_file_path, live_version)
-      @manifest_versions[locale] = live_version
-    end
-
-    @manifests[locale]
-  rescue Down::Error => error
-    raise Restiny::NetworkError.new("Unable to download the manifest file", error.response.code)
-  rescue Zip::Error => error
-    raise Restiny::Error.new("Unable to unzip the manifest file (#{error})")
-  end
-
-  # Profile and related methods
-
-  def get_profile(membership_id:, membership_type:, components:, type_url: nil)
-    if !components.is_a?(Array) || components.empty?
-      raise Restiny::InvalidParamsError.new("Please provide at least one component")
-    end
-
-    url = "Destiny2/#{membership_type}/Profile/#{membership_id}/"
-    url += type_url if type_url
-    url += "?components=#{components.join(",")}"
-
-    api_get(url)
-  end
-
-  def get_character_profile(character_id:, membership_id:, membership_type:, components:)
-    get_profile(
-      membership_id: membership_id,
-      membership_type: membership_type,
-      components: components,
-      type_url: "Character/#{character_id}/"
-    )
-  end
-
-  def get_instanced_item_profile(item_id:, membership_id:, membership_type:, components:)
-    get_profile(
-      membership_id: membership_id,
-      membership_type: membership_type,
-      components: components,
-      type_url: "Item/#{item_id}/"
-    )
-  end
-
-  # User methods.
-
-  def get_user_memberships_by_id(membership_id, membership_type: Platform::ALL)
-    raise Restiny::InvalidParamsError.new("Please provide a membership ID") if membership_id.nil?
-    api_get("User/GetMembershipsById/#{membership_id}/#{membership_type}/")
-  end
-
-  def get_primary_membership(parent_membership_id, use_fallback: true)
-    result = get_user_memberships_by_id(parent_membership_id)
-    return nil if result.nil? || result["primaryMembershipId"].nil?
-
-    result["destinyMemberships"].each do |membership|
-      return membership if membership["membershipID"] == result["primaryMembershipId"]
-    end
-
-    return result["destinyMemberships"][0] if use_fallback
-  end
-
-  def search_player_by_bungie_name(name, membership_type: Platform::ALL)
-    display_name, display_name_code = name.split("#")
-    if display_name.nil? || display_name_code.nil?
-      raise Restiny::InvalidParamsError.new("You must provide a valid Bungie name")
-    end
-
-    api_post(
-      "Destiny2/SearchDestinyPlayerByBungieName/#{membership_type}/",
-      params: {
-        displayName: display_name,
-        displayNameCode: display_name_code
-      }
-    )
-  end
-
-  def search_users_by_global_name(name:, page: 0)
-    api_post("User/Search/GlobalName/#{page}/", params: { displayNamePrefix: name })
-  end
-
-  # General request methods
-
-  def api_get(url, params: {})
-    api_connection.get(url, params, token_header).body
-  end
-
-  def api_post(url, params: {})
-    api_connection.post(url, params, token_header).body
-  end
-
-  def auth_post(url, params)
-    auth_connection.post(url, params, "Content-Type" => "application/x-www-form-urlencoded").body
-  end
-
-  private
-
-  def check_oauth_client_id
-    raise Restiny::RequestError.new("You need to set an OAuth client ID") unless @oauth_client_id
-  end
-
-  def default_headers
-    { "User-Agent": @user_agent || "restiny v#{Restiny::VERSION}" }
-  end
-
-  def api_connection
-    raise Restiny::InvalidParamsError.new("You need to set an API key") unless @api_key
-
-    @connection ||=
-      Faraday.new(
-        url: API_BASE_URL,
-        headers: default_headers.merge("X-API-KEY": @api_key)
-      ) do |faraday|
-        faraday.request :url_encoded
-        faraday.request :json
-        faraday.response :follow_redirects
-        faraday.response :destiny_api
-        faraday.response :json
-      end
-  end
-
-  def auth_connection
-    @auth_connection ||=
-      Faraday.new(url: API_BASE_URL, headers: default_headers) do |faraday|
-        faraday.request :url_encoded
-        faraday.request :json
-        faraday.response :follow_redirects
-        faraday.response :destiny_auth
-        faraday.response :json
-      end
-  end
-
-  def token_header
-    {}.tap { |headers| headers["authorization"] = "Bearer #{@oauth_token}" if @oauth_token }
-  end
+  include Api::Authentication
+  include Api::Manifest
+  include Api::Membership
+  include Api::Profile
+  include Api::Search
+  include Api::Stats
 end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: restiny
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Daniel Bogan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: faraday-follow_redirects
+  name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: down
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -81,75 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.22'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
-- !ruby/object:Gem::Dependency
-  name: vcr
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.3'
 description: A gem for interacting with Bungie's Destiny API.
 email:
 - d+restiny@waferbaby.com
@@ -160,6 +90,13 @@ files:
 - lib/faraday/destiny/api.rb
 - lib/faraday/destiny/auth.rb
 - lib/restiny.rb
+- lib/restiny/api/authentication.rb
+- lib/restiny/api/base.rb
+- lib/restiny/api/manifest.rb
+- lib/restiny/api/membership.rb
+- lib/restiny/api/profile.rb
+- lib/restiny/api/search.rb
+- lib/restiny/api/stats.rb
 - lib/restiny/constants.rb
 - lib/restiny/errors.rb
 - lib/restiny/manifest.rb
@@ -167,24 +104,25 @@ files:
 homepage: http://github.com/waferbaby/restiny
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.2.33
+signing_key: 
 specification_version: 4
 summary: A Destiny API gem
 test_files: []