restiny 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64bba6028ea7ef4119e6019011b4d35cf1fb850903b446387b3aae0ba47c03e7
-  data.tar.gz: 629969c98d6d518c3cefb7f9c85d177a404408f6d88dd8d979be5e2be75c1027
+  metadata.gz: b1d08e2f02105ea2a6330679fe9cae0534bbb4a7d3c0fb7803d43fc70ae4ebdd
+  data.tar.gz: 80ab03d4fdbbf65ae276265f89e7c00d9a4f55870fdc0398893e45d429f44179
 SHA512:
-  metadata.gz: 65a76e2738de6da2e4e3dfaf6015f689d8c95d8fea9daa952d153fdf251feec6a145fa16b627bfd2baea1eb3c05cc7d83058e1670b1715d9ea21c18409f081c5
-  data.tar.gz: 70565f0ddc5c22d76f32cb1e4883261e3bbf181bd7e330a125a3c6982db1b95f6e14342aae7600379ded28697eef9f369ce4b50896b6388de984eea520aec971
+  metadata.gz: 4abf818ba76d6f6fefbf2070a1d56162462ac2d5a22dae7725383c34ae884d901be3539b78342510beaa93ddc9c3a554e90fcee473825bdcad144ab9a88af8c5
+  data.tar.gz: 78f09f843a2e5c00067b95e1e5aad5a938d181c56081b744e1ae0638605af65548de6d4b117d3667e326bc9ed2ef61aaa80b673990f15cc490045aa2aa9f95ca

data/lib/restiny/errors.rb

@@ -8,6 +8,9 @@ module Restiny
     end
   end
 
+  class NetworkError < Error
+  end
+
   class RequestError < Error
   end
 

data/lib/restiny/version.rb

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

data/lib/restiny.rb

@@ -23,7 +23,7 @@ module Restiny
   BUNGIE_URL = "https://www.bungie.net"
   API_BASE_URL = BUNGIE_URL + "/platform"
 
-  attr_accessor :api_key, :oauth_state, :oauth_client_id, :access_token
+  attr_accessor :api_key, :oauth_state, :oauth_client_id, :access_token, :user_agent
 
   # OAuth methods
 
@@ -55,7 +55,10 @@ module Restiny
 
     live_version = result.dig("version")
 
-    if force_download || @manifest.nil? || @manifest_version != live_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)
@@ -63,12 +66,12 @@ module Restiny
 
       Zip::File.open(zipped_file) { |file| file.first.extract(database_file_path) }
 
-      @manifest = Manifest.new(database_file_path, live_version)
-      @manifest_version = live_version
+      @manifests[locale] = Manifest.new(database_file_path, live_version)
+      @manifest_versions[locale] = live_version
     end
 
-    @manifest
-  rescue Down::Error => e
+    @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})")
@@ -113,6 +116,17 @@ module Restiny
     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?
@@ -153,7 +167,7 @@ module Restiny
   end
 
   def default_headers
-    { "User-Agent": "restiny v#{Restiny::VERSION}" }
+    { "User-Agent": @user_agent || "restiny v#{Restiny::VERSION}" }
   end
 
   def api_connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restiny
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday