restiny 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 525f30b84be418f2709f43396452fe3fb5f1b7fc307f5096a6698da8a1a61d3b
-  data.tar.gz: 3e008a19f1766d4d0a89a840e7439acae17d714bd5ec22cfd637af8aa9790f46
+  metadata.gz: 741ac894abe43506371ddd982baddc4fc151742a1b60a7d7c0fdf702d69c5a46
+  data.tar.gz: 2bde117539309611f7bb2f7f859903195352cad1ba1158546238876496d3efa3
 SHA512:
-  metadata.gz: 4a741c23f022a5a9faa659aa26a8de4b39233caceaf1b11713209b605012d0cf721b2c2f06c4bbb865fe5f28f166d0b88a1446a06052aad88b35810ebc293a33
-  data.tar.gz: 530fd77d6b734bf749e9ce55b950dae7da4acc8f4719c95d57bf8f3dbb6403f0b804b7960b09cc434814b6f77e1c649ca651b86e649dd3b69081cea56d3e0359
+  metadata.gz: c301404d8149756a2cfab53a871fdbb8e1f68dd3cecd0a9d52698c54d421d6547588ea9dd8bc0f34584b9f9471d59a46df8af3f3d8c7603a13205fee619a9202
+  data.tar.gz: dae32ebf9a7646304782d6f3ccaca965d704bd0d62f0a8429abd1820877570deeb4054cc4ccbd9f77f58800d366cda30589e1e6d912b6d6576e3cae6f682f026

data/lib/restiny/constants.rb

@@ -6,7 +6,7 @@ PLATFORM_PSN = 2
 PLATFORM_STEAM = 3
 PLATFORM_EPIC = 6
 
-COMPONENT_TYPE_PROFILES = 'Profiles'.freeze
-COMPONENT_TYPE_PROFILE_INVENTORIES = 'ProfileInventories'.freeze
-COMPONENT_TYPE_CHARACTERS = 'Characters'.freeze
-COMPONENT_TYPE_CHARACTER_INVENTORIES = 'CharacterInventories'.freeze
+COMPONENT_TYPE_PROFILES = "Profiles"
+COMPONENT_TYPE_PROFILE_INVENTORIES = "ProfileInventories"
+COMPONENT_TYPE_CHARACTERS = "Characters"
+COMPONENT_TYPE_CHARACTER_INVENTORIES = "CharacterInventories"

data/lib/restiny/errors.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
 module Restiny
-  class Error < StandardError; end
-  class RequestError < Error; end
-    class InvalidParamsError < RequestError; end
-    class RateLimitedError < RequestError
-    end
-
-  class ResponseError < Error; end
-  class NetworkError < Error
-    attr_accessor :status_code
-
-    def initialize(message, status_code = nil)
-      @status_code = status_code
+  class Error < StandardError
+    def initialize(message, details = nil)
+      @details = details
       super(message)
     end
   end
+
+  class RequestError < Error; end
+
+  class InvalidParamsError < RequestError; end
+
+  class RateLimitedError < RequestError; end
+
+  class ResponseError < Error; end
 end

data/lib/restiny/manifest.rb

@@ -1,94 +1,94 @@
 # frozen_string/literal: true
-
-require 'down'
-require 'json'
-require 'sqlite3'
-require 'zip'
+require "down"
+require "json"
+require "sqlite3"
+require "zip"
 
 module Restiny
   class Manifest
     TABLES = {
-      'DestinyAchievementDefinition': { item: 'achievement', items: 'achievements' },
-      'DestinyActivityDefinition': { item: 'activity', items: 'activities' },
-      'DestinyActivityGraphDefinition': { item: 'activity_graph', items: 'activity_graphs' },
-      'DestinyActivityModeDefinition': { item: 'activity_modes', items: 'activity_modes' },
-      'DestinyActivityModifierDefinition': { item: 'activity_modifier', items: 'activity_modifiers' },
-      'DestinyActivityTypeDefinition': { item: 'activity_type', items: 'activity_types' },
-      'DestinyArtifactDefinition': { item: 'artifact', items: 'artifacts' },
-      'DestinyBondDefinition': { item: 'bond', items: 'bonds' },
-      'DestinyBreakerTypeDefinition': { item: 'breaker_type', items: 'breaker_types' },
-      'DestinyChecklistDefinition': { item: 'checklist', items: 'checklists' },
-      'DestinyClassDefinition': { item: 'class', items: 'classes' },
-      'DestinyCollectibleDefinition': { item: 'collectible', items: 'collectibles' },
-      'DestinyDamageTypeDefinition': { item: 'damage_type', items: 'damage_types' },
-      'DestinyDestinationDefinition': { item: 'destination', items: 'destinations' },
-      'DestinyEnergyTypeDefinition': { item: 'energy_type', items: 'energy_types' },
-      'DestinyEquipmentSlotDefinition': { item: 'equipment_slot', items: 'equipment_slots' },
-      'DestinyEventCardDefinition': { item: 'event_card', items: 'event_cards' },
-      'DestinyFactionDefinition': { item: 'faction', items: 'factions' },
-      'DestinyGenderDefinition': { item: 'gender', items: 'genders' },
-      'DestinyHistoricalStatsDefinition': { item: 'historical_stat', items: 'historical_stats' },
-      'DestinyInventoryBucketDefinition': { item: 'inventory_bucket', items: 'inventory_buckets' },
-      'DestinyInventoryItemDefinition': { item: 'inventory_item', items: 'inventory_items' },
-      'DestinyItemCategoryDefinition': { item: 'item_category', items: 'item_categories' },
-      'DestinyItemTierTypeDefinition': { item: 'item_tier_type', items: 'item_tier_types' },
-      'DestinyLocationDefinition': { item: 'location', items: 'locations' },
-      'DestinyLoreDefinition': { item: 'lore', items: 'lore_entries' },
-      'DestinyMaterialRequirementSetDefinition': { item: 'material_requirement_set', items: 'material_requirement_sets' },
-      'DestinyMedalTierDefinition': { item: 'medal_tier', items: 'medal_tiers' },
-      'DestinyMetricDefinition': { item: 'metric', items: 'metrics' },
-      'DestinyMilestoneDefinition': { item: 'milestone', items: 'milestones' },
-      'DestinyObjectiveDefinition': { item: 'objective', items: 'objectives' },
-      'DestinyPlaceDefinition': { item: 'place', items: 'places' },
-      'DestinyPlugSetDefinition': { item: 'plug_set', items: 'plug_sets' },
-      'DestinyPowerCapDefinition': { item: 'power_cap', items: 'power_caps' },
-      'DestinyPresentationNodeDefinition': { item: 'presentation_node', items: 'presentation_nodes' },
-      'DestinyProgressionDefinition': { item: 'progression', items: 'progression_data' },
-      'DestinyProgressionLevelRequirementDefinition': { item: 'progression_level_requirement', items: 'progression_level_requirements' },
-      'DestinyRaceDefinition': { item: 'race', items: 'races' },
-      'DestinyRecordDefinition': { item: 'record', items: 'records' },
-      'DestinyReportReasonCategoryDefinition': { item: 'report_reason_category', items: 'report_reason_categories' },
-      'DestinyRewardSourceDefinition': { item: 'reward_source', items: 'reward_sources' },
-      'DestinySackRewardItemListDefinition': { item: 'sack_reward_item_list', items: 'sack_reward_item_lists' },
-      'DestinySandboxPatternDefinition': { item: 'sandbox_pattern', items: 'sandbox_patterns' },
-      'DestinySandboxPerkDefinition': { item: 'sandbox_perk', items: 'sandbox_perks' },
-      'DestinySeasonDefinition': { item: 'season', items: 'seasons' },
-      'DestinySeasonPassDefinition': { item: 'season_pass', items: 'season_passes' },
-      'DestinySocketCategoryDefinition': { item: 'socket_category', items: 'socket_categories' },
-      'DestinySocketTypeDefinition': { item: 'socket_type', items: 'socket_types' },
-      'DestinyStatDefinition': { item: 'stat', items: 'stats' },
-      'DestinyStatGroupDefinition': { item: 'stat_group', items: 'stat_groups' },
-      'DestinyTalentGridDefinition': { item: 'talent_grid', items: 'talent_grids' },
-      'DestinyTraitCategoryDefinition': { item: 'trait_category', items: 'trait_categories' },
-      'DestinyTraitDefinition': { item: 'trait', items: 'traits' },
-      'DestinyUnlockDefinition': { item: 'unlock', items: 'unlocks' },
-      'DestinyVendorDefinition': { item: 'vendor', items: 'vendors' },
-      'DestinyVendorGroupDefinition': { item: 'vendor_group', items: 'vendor_groups' }
+      Achievement: {item: "achievement", items: "achievements"},
+      Activity: {item: "activity", items: "activities"},
+      ActivityGraph: {item: "activity_graph", items: "activity_graphs"},
+      ActivityMode: {item: "activity_mode", items: "activity_modes"},
+      ActivityModifier: {item: "activity_modifier", items: "activity_modifiers"},
+      ActivityType: {item: "activity_type", items: "activity_types"},
+      Artifact: {item: "artifact", items: "artifacts"},
+      Bond: {item: "bond", items: "bonds"},
+      BreakerType: {item: "breaker_type", items: "breaker_types"},
+      Checklist: {item: "checklist", items: "checklists"},
+      Class: {item: "guardian_class", items: "guardian_classes"},
+      Collectible: {item: "collectible", items: "collectibles"},
+      DamageType: {item: "damage_type", items: "damage_types"},
+      Destination: {item: "destination", items: "destinations"},
+      EnergyType: {item: "energy_type", items: "energy_types"},
+      EquipmentSlot: {item: "equipment_slot", items: "equipment_slots"},
+      EventCard: {item: "event_card", items: "event_cards"},
+      Faction: {item: "faction", items: "factions"},
+      Gender: {item: "gender", items: "genders"},
+      HistoricalStats: {item: "historical_stat", items: "historical_stats"},
+      InventoryBucket: {item: "inventory_bucket", items: "inventory_buckets"},
+      InventoryItem: {item: "inventory_item", items: "inventory_items"},
+      ItemCategory: {item: "item_category", items: "item_categories"},
+      ItemTierType: {item: "item_tier_type", items: "item_tier_types"},
+      Location: {item: "location", items: "locations"},
+      Lore: {item: "lore", items: "lore_entries"},
+      MaterialRequirementSet: {item: "material_requirement_set", items: "material_requirement_sets"},
+      MedalTier: {item: "medal_tier", items: "medal_tiers"},
+      Metric: {item: "metric", items: "metrics"},
+      Milestone: {item: "milestone", items: "milestones"},
+      Objective: {item: "objective", items: "objectives"},
+      Place: {item: "place", items: "places"},
+      PlugSet: {item: "plug_set", items: "plug_sets"},
+      PowerCap: {item: "power_cap", items: "power_caps"},
+      PresentationNode: {item: "presentation_node", items: "presentation_nodes"},
+      Progression: {item: "progression", items: "progression_data"},
+      ProgressionLevelRequirement: {item: "progression_level_requirement", items: "progression_level_requirements"},
+      Race: {item: "race", items: "races"},
+      Record: {item: "record", items: "records"},
+      ReportReasonCategory: {item: "report_reason_category", items: "report_reason_categories"},
+      RewardSource: {item: "reward_source", items: "reward_sources"},
+      SackRewardItemList: {item: "sack_reward_item_list", items: "sack_reward_item_lists"},
+      SandboxPattern: {item: "sandbox_pattern", items: "sandbox_patterns"},
+      SandboxPerk: {item: "sandbox_perk", items: "sandbox_perks"},
+      Season: {item: "season", items: "seasons"},
+      SeasonPass: {item: "season_pass", items: "season_passes"},
+      SocketCategory: {item: "socket_category", items: "socket_categories"},
+      SocketType: {item: "socket_type", items: "socket_types"},
+      Stat: {item: "stat", items: "stats"},
+      StatGroup: {item: "stat_group", items: "stat_groups"},
+      TalentGrid: {item: "talent_grid", items: "talent_grids"},
+      Trait: {item: "trait", items: "traits"},
+      Unlock: {item: "unlock", items: "unlocks"},
+      Vendor: {item: "vendor", items: "vendors"},
+      VendorGroup: {item: "vendor_group", items: "vendor_groups"}
     }
 
     attr_reader :file_path
 
     TABLES.each do |table_name, method_names|
-      define_method method_names[:item] do |id|
-        query_table(table_name, id: id)[0]
+      full_table_name = "Destiny#{table_name}Definition"
+
+      define_method method_names[:item] do |hash|
+        fetch_item(full_table_name, hash)
       end
 
-      define_method method_names[:items] do |limit: nil|
-        query_table(table_name, limit: limit)
+      define_method method_names[:items] do |options = {}|
+        fetch_items(full_table_name, options)
       end
     end
 
     def self.download(url)
       zipped_file = Down.download(url)
-      manifest_path = zipped_file.path + ".db" 
+      manifest_path = zipped_file.path + ".db"
 
       Zip::File.open(zipped_file) { |file| file.first.extract(manifest_path) }
 
-      self.new(manifest_path)
+      new(manifest_path)
     rescue Down::ResponseError => 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 (#{e})")
+      raise Restiny::Error.new("Unable to unzip the manifest file (#{error})")
     end
 
     def initialize(file_path)
@@ -102,42 +102,44 @@ module Restiny
 
     private
 
-    def self.clean_row_keys(row_hash)
-      OpenStruct.new.tap do |output|
-        row_hash.each_pair do |key, value|
-          key = key.gsub(/(\B[A-Z])/, '_\1') if key =~ /\B[A-Z]/
-          output[key.downcase] = if value.is_a?(Hash)
-                                   clean_row_keys(value)
-                                 elsif value.is_a?(Array)
-                                   value.map { |item| item.is_a?(Hash) ? clean_row_keys(item) : value }
-                                 else
-                                   value
-                                 end
-        end
-      end
+    def fetch_item(table_name, hash)
+      query = "SELECT json FROM #{table_name} WHERE json_extract(json, '$.hash')=?"
+      result = @database.execute(query, hash)
+
+      return nil if result.nil? || result.count < 1 || !result[0].include?("json")
+
+      JSON.parse(result[0]["json"])
+    rescue SQLite3::Exception => e
+      raise Restiny::RequestError.new("Error while fetching item (#{e})")
     end
 
-    def query_table(table_name, id: nil, limit: nil)
-      query = "SELECT json FROM #{table_name}"
+    def fetch_items(table_name, options = {})
       bindings = []
 
-      if id
-        query << " WHERE id=?"
-        bindings << id
-      end
-
-      query << " ORDER BY json_extract(json, '$.index')" unless id
+      query = "SELECT json FROM #{table_name} "
+      query << "WHERE json_extract(json, '$.displayProperties.name') != '' " if options[:filter_empty]
+      query << "ORDER BY json_extract(json, '$.index')"
 
-      if limit
+      if options[:limit]
         query << " LIMIT ?"
-        bindings << limit
+        bindings << options[:limit]
       end
 
-      @database.execute(query, bindings).map do |row|
-        Manifest::clean_row_keys(JSON.parse(row['json'])) unless row['json'].nil?
+      result = []
+
+      @database.execute(query, bindings) do |row|
+        item = JSON.parse(row["json"])
+
+        if block_given?
+          yield item
+        else
+          result << item
+        end
       end
+
+      result unless block_given?
     rescue SQLite3::Exception => e
-      raise Restiny::Error.new("Error while querying the manifest (#{e})")
+      raise Restiny::RequestError.new("Error while fetching item (#{e})")
     end
   end
 end

data/lib/restiny/version.rb

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

data/lib/restiny.rb

@@ -2,17 +2,14 @@
 
 $LOAD_PATH.unshift(__dir__)
 
-require 'restiny/version'
-require 'restiny/constants'
-require 'restiny/errors'
-require 'restiny/manifest'
-require 'restiny/user'
-require 'restiny/membership'
-require 'restiny/character'
-
-require 'faraday'
-require 'faraday/follow_redirects'
-require 'securerandom'
+require "restiny/version"
+require "restiny/constants"
+require "restiny/errors"
+require "restiny/manifest"
+
+require "faraday"
+require "faraday/follow_redirects"
+require "securerandom"
 
 module Restiny
   extend self
@@ -30,7 +27,7 @@ module Restiny
     @oauth_state = state || SecureRandom.hex(15)
 
     params = {
-      response_type: 'code',
+      response_type: "code",
       client_id: @oauth_client_id,
       state: @oauth_state
     }
@@ -45,24 +42,21 @@ module Restiny
 
     params = {
       code: code,
-      grant_type: 'authorization_code',
+      grant_type: "authorization_code",
       client_id: @oauth_client_id
     }
 
     params[:redirect_url] = redirect_url unless redirect_url.nil?
 
-    post('/platform/app/oauth/token/', params, "Content-Type" => "application/x-www-form-urlencoded")
-  end
-
-  def request_refresh_token
+    post("/platform/app/oauth/token/", params, "Content-Type" => "application/x-www-form-urlencoded")
   end
 
   # Manifest methods
 
-  def download_manifest(locale = 'en')
+  def download_manifest(locale = "en")
     response = get("/platform/Destiny2/Manifest/")
 
-    manifest_path = response.dig('Response', 'mobileWorldContentPaths', locale)
+    manifest_path = response.dig("Response", "mobileWorldContentPaths", locale)
     raise Restiny::ResponseError.new("Unable to determine manifest URL") if manifest_path.nil?
 
     Manifest.download(BUNGIE_URL + manifest_path)
@@ -72,39 +66,18 @@ module Restiny
 
   def get_profile(membership_id, membership_type, components = [])
     raise Restiny::InvalidParamsError.new("You must provide at least one component") if components.empty?
-
-    component_query = components.join(",")
-    response = get("/platform/Destiny2/#{membership_type}/Profile/#{membership_id}?components=#{component_query}")
-
-    {}.tap do |output|
-      components.each do |component|
-        case component.downcase
-        when 'characters'
-          output[:characters] = parse_profile_characters_response(response)
-        end
-      end
-    end
+    get("/platform/Destiny2/#{membership_type}/Profile/#{membership_id}?components=#{components.join(",")}")
   end
 
   # Account methods
 
   def get_user_by_membership_id(membership_id, membership_type = PLATFORM_ALL)
     raise Restiny::InvalidParamsError.new("You must provide a valid membership ID") if membership_id.nil?
-
-    response = get("/platform/User/GetMembershipsById/#{membership_id}/#{membership_type}/")
-    results = response.dig('Response')
-
-    return nil if results.nil?
-
-    Restiny::User.new(
-      display_name: results['bungieNetUser']['cachedBungieGlobalDisplayName'],
-      display_name_code: results['bungieNetUser']['cachedBungieGlobalDisplayNameCode'],
-      memberships: results['destinyMemberships']
-    )
+    get("/platform/User/GetMembershipsById/#{membership_id}/#{membership_type}/")
   end
 
   def get_user_by_bungie_name(full_display_name, membership_type = PLATFORM_ALL)
-    display_name, display_name_code = full_display_name.split('#')
+    display_name, display_name_code = full_display_name.split("#")
     raise Restiny::InvalidParamsError.new("You must provide a valid Bungie name") if display_name.nil? || display_name_code.nil?
 
     params = {
@@ -112,30 +85,11 @@ module Restiny
       displayNameCode: display_name_code
     }
 
-    response = post("/platform/Destiny2/SearchDestinyPlayerByBungieName/#{membership_type}/", params)
-    result = response.dig('Response')
-
-    return nil if result.nil?
-
-    Restiny::User.new(
-      display_name: result[0]['bungieGlobalDisplayName'],
-      display_name_code: result[0]['bungieGlobalDisplayNameCode'],
-      memberships: result
-    )
+    post("/platform/Destiny2/SearchDestinyPlayerByBungieName/#{membership_type}/", params)
   end
 
   def search_users(name, page = 0)
-    response = post("/platform/User/Search/GlobalName/#{page}", displayNamePrefix: name)
-    search_results = response.dig('Response', 'searchResults')
-    return [] if search_results.nil?
-
-    search_results.map do |user|
-      Restiny::User.new(
-        display_name: user['bungieGlobalDisplayName'],
-        display_name_code: user['bungieGlobalDisplayNameCode'],
-        memberships: user['destinyMemberships']
-      )
-    end
+    post("/platform/User/Search/GlobalName/#{page}", displayNamePrefix: name)
   end
 
   private
@@ -154,45 +108,28 @@ module Restiny
     headers[:authorization] = "Bearer #{@oauth_token}" if @oauth_token
 
     response = case type
-               when :get
-                 connection.get(url, params, headers)
-               when :post
-                 connection.post(url, params, headers)
-               end
+    when :get
+      connection.get(url, params, headers)
+    when :post
+      connection.post(url, params, headers)
+    end
 
-    response.body
+    response.body&.dig("Response")
   rescue Faraday::Error => error
-    message = if error.response_body && error.response_headers['content-type'] =~ /application\/json;/i
-      JSON.parse(error.response_body)['Message']
+    message = if error.response_body && error.response_headers["content-type"] =~ /application\/json;/i
+      error_response = JSON.parse(error.response_body)
+      "#{error_response["error_description"]} (#{error_response["error"]})"
     else
       error.message
     end
 
     case error
-    when Faraday::ClientError, Faraday::ServerError, Faraday::ConnectionFailed
-      raise Restiny::NetworkError.new(message, error.response_status)
+    when Faraday::ClientError
+      raise Restiny::RequestError.new(message, error.response_status)
+    when Faraday::ServerError
+      raise Restiny::ResponseError.new(message, error.response_status)
     else
-    end
-  end
-
-  def parse_profile_characters_response(response)
-    characters = response.dig('Response', 'characters', 'data')
-    return [] if characters.nil?
-
-    result = []
-
-    [].tap do |result|
-      characters.each_value do |character|
-        result << Restiny::Character.new(
-          id: character['characterId'],
-          session_playtime: character['minutesPlayedThisSession'],
-          total_playtime: character['minutesPlayedTotal'],
-          light_level: character['light'],
-          stats: [],
-          emblem: [],
-          progression: character['progression']
-        )
-      end
+      raise Restiny::Error.new(message)
     end
   end
 
@@ -202,8 +139,8 @@ module Restiny
 
   def default_headers
     {
-      'User-Agent': "restiny v#{Restiny::VERSION}",
-      'X-API-KEY': @api_key
+      "User-Agent": "restiny v#{Restiny::VERSION}",
+      "X-API-KEY": @api_key
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restiny
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Bogan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,42 +86,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 description: A gem for interacting with Bungie's Destiny API.
 email:
 - d+restiny@waferbaby.com
@@ -130,18 +158,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/restiny.rb
-- lib/restiny/character.rb
 - lib/restiny/constants.rb
 - lib/restiny/errors.rb
 - lib/restiny/manifest.rb
 - lib/restiny/membership.rb
-- lib/restiny/user.rb
 - lib/restiny/version.rb
 homepage: http://github.com/waferbaby/restiny
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A Destiny API gem
 test_files: []

data/lib/restiny/character.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Restiny
-  class Character
-    attr_accessor :id, :playtime, :light_level, :stats, :emblem, :progression
-
-    def initialize(id:, session_playtime:, total_playtime:, light_level:, stats:, emblem:, progression:)
-      @id = id
-      @playtime = { session: session_playtime, total: total_playtime }
-      @light_level = light_level
-      @stats = stats
-      @emblem = emblem
-      @progression = progression
-    end
-  end
-end
-

data/lib/restiny/user.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Restiny
-  class User
-    attr_reader :display_name, :display_name_code, :memberships
-
-    def initialize(display_name:, display_name_code:, memberships:)
-      @display_name = display_name
-      @display_name_code = display_name_code
-      
-      self.memberships = memberships
-    end
-
-    def memberships=(raw_memberships)
-      @memberships = {}
-
-      raw_memberships.each do |ship|
-        platform = Restiny::Membership.platform(ship['membershipType'])
-
-        @memberships[platform] = Restiny::Membership.new(
-          id: ship['membershipId'],
-          type: ship['membershipType'],
-          cross_save_override: ship['crossSaveOverride'],
-          icon_path: ship['iconPath'],
-          is_public: ship['isPublic'],
-          types: ship['applicableMembershipTypes']
-        )
-      end
-    end
-  end
-end