plex_ruby_sdk 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c826c6bba14335b50adff99ea7aeadace3961d533aeb638c984539c524ef57a
-  data.tar.gz: 1cbc5ab44c993b9a38dee33743a3c20829a38fd74e1d4cac39a89e20caab5147
+  metadata.gz: caf9cf3f01c061dad369aa2458abd0de7f5ccbdca7932c0ce38afd93a68523ce
+  data.tar.gz: 253e702742d48c33f4699c2a064c4aced5d8ddc5d07ff9c211d2e375f70454ce
 SHA512:
-  metadata.gz: 2a523986a25e9095fc461b49e55295d6b7db299ed012719f771cec9ece3eb409996b406f6147a07194ac336140e8939a53b95c4223e8867e39a2ffc70b2b681c
-  data.tar.gz: f340e7c3c73b071cf403b98eca04190df9b251999e9d54bdf62e562bd9cb5a39d2d95fa4c26dae6fbba4a22ec35e85791b353146dc6f57c71d50803b56755f60
+  metadata.gz: d189a8ac0478edd58606abd7c34e9ae26b339894c9596a56b6fdcb94d9bb685d0dd7ea54724d9b155960b6cb5ebd6a896b2b757f700ae225d096edae2087a028
+  data.tar.gz: 98924f266aaca5b8229908f2c955baf2bb5dfa306fc8cbc0779579a531a114d64aee5468436b4c6a7b43f27b5a97ac1a2871d3957a710cff3e1e54d6e3cdaf99

data/lib/crystalline/metadata_fields.rb

@@ -80,6 +80,10 @@ module Crystalline
           key = "#{field.name}="
           lookup = field.metadata.fetch(:format_json, {}).fetch(:letter_case, nil).call
           value = d[lookup]
+          
+          # If field is not nilable, and the value is not in the dict, raise a KeyError
+          raise KeyError, "key #{lookup} not found in hash" if value.nil? && !T.nilable?(field.type)
+          # If field is nilable, and the value is not in the dict, just move to the next field
           next if value.nil?
 
           if T.arr? field_type
@@ -93,12 +97,41 @@ module Crystalline
             unmarshalled_hash = value.map { |k, v| [k, unmarshal_single(val_type, v)] }.to_h
             # rubocop:enable Style/HashTransformValues
             to_build.send(key, unmarshalled_hash)
+          elsif T.union? field_type
+            discriminator = field.metadata.fetch(:discriminator, nil)
+            if !discriminator.nil?
+              type_to_deserialize = value.fetch(discriminator)
+              type_to_deserialize = T.get_union_types(field_type).find { |t| t.name.split('::').last == type_to_deserialize }              
+              unmarshalled_val = Crystalline.unmarshal_json(value, type_to_deserialize)
+              to_build.send(key, unmarshalled_val)
+            else
+              union_types = T.get_union_types(field_type)
+              union_types = union_types.sort_by { |klass| Crystalline.non_nilable_attr_count(klass) }
+
+              union_types.each do |union_type|
+                begin
+                  unmarshalled_val = Crystalline.unmarshal_json(value, union_type)
+                  to_build.send(key, unmarshalled_val)
+                rescue TypeError
+                  next
+                rescue NoMethodError
+                  next
+                rescue KeyError
+                  next
+                end
+                break
+              end
+            end
+          elsif field_type.instance_of?(Class) && field_type < ::Crystalline::FieldAugmented
+            unmarshalled = Crystalline.unmarshal_json(value, field_type)
+            to_build.send(key, unmarshalled)
           else
             decoder = field.metadata.fetch(:format_json, {}).fetch(:decoder, nil)
             final_value = unmarshal_single(field_type, value, decoder)
             to_build.send(key, final_value)
           end
         end
+
         to_build
       end
     end

data/lib/crystalline/t.rb

@@ -27,11 +27,17 @@ module T
   end
 
   def self.nilable?(t)
-    t.respond_to? :unwrap_nilable
+    # in sorbet all `T.any` types provide unwrap_nilable for some reason
+    # So, in order to make this check more robust, we check if the type responds to the `types` method, and if so, whether
+    # one of those types is NilClass.  For non-nilable unions, `types` will return a valid list that does not include NilClass
+    return false unless t.respond_to?(:unwrap_nilable)
+    return true unless t.respond_to?(:types)
+    t.types.map { |tt| simplify_type(tt) }.include?(NilClass)
   end
 
   def self.nilable_of(t)
-    if t.respond_to? :unwrap_nilable
+    
+    if nilable t
       return simplify_type t.unwrap_nilable
     end
     nil
@@ -48,6 +54,19 @@ module T
     t
   end
 
+    
+  def self.union?(t)
+    return false unless t.respond_to? :types
+    return false if t.types.any? { |tt| get_raw_type(tt) == TrueClass }
+    return false if t.types.length == 2 && t.types.any? { |tt| get_raw_type(tt) == NilClass }
+    t.types.length > 1
+  end
+
+  def self.get_union_types(t)
+    t.types.map { |tt| get_raw_type(tt) }
+  end
+
+
   def self.get_raw_type(t)
     if t.respond_to? :raw_type
       return t.raw_type

data/lib/crystalline/utils.rb

@@ -13,25 +13,20 @@ module Crystalline
   end
 
   sig { params(complex: Object).returns(Object) }
-  def self.marshal_dict_complex(complex)
+  def self.to_dict(complex)
     if complex.is_a? Array
-      complex.map { |v| Crystalline.marshal_dict_complex(v) }
+      complex.map { |v| Crystalline.to_dict(v) }
     elsif complex.is_a? Hash
-      complex.transform_values { |v| Crystalline.marshal_dict_complex(v) }
+      complex.transform_values { |v| Crystalline.to_dict(v) }
     elsif complex.is_a? Crystalline::FieldAugmented
       complex.to_dict
     else
-      complex
+      val_to_string complex, primitives: false
     end
   end
 
-  def self.marshal_json_complex(complex)
-    JSON.dump(marshal_dict_complex(complex))
-  end
-
-  sig { params(data: Object, type: Object).returns(Object) }
-  def self.unmarshal_complex(data, type)
-    unmarshal_json(data, type)
+  def self.to_json(complex)
+    JSON.dump(to_dict(complex))
   end
 
   sig { params(data: Object, type: Object).returns(Object) }
@@ -42,9 +37,9 @@ module Crystalline
     if type.instance_of?(Class) && type < ::Crystalline::FieldAugmented
       type.from_dict(data)
     elsif T.arr? type
-      data.map { |v| Crystalline.unmarshal_complex(v, T.arr_of(type)) }
+      data.map { |v| Crystalline.unmarshal_json(v, T.arr_of(type)) }
     elsif T.hash? type
-      data.transform_values { |v| Crystalline.unmarshal_complex(v, T.hash_of(type)) }
+      data.transform_values { |v| Crystalline.unmarshal_json(v, T.hash_of(type)) }
     else
       data
     end
@@ -62,4 +57,25 @@ module Crystalline
       val
     end
   end
+
+  sig { params(klass: T.any(Class, T::Types::TypedArray, T::Types::TypedHash)).returns(Integer) }
+  def self.non_nilable_attr_count(klass)
+    # somewhat sane sort ordering for Union deserialization.
+    # All Crystalline objects return the number of non-nilable fields
+    # All non-string primitives return 2
+    # All arrays and hashes return 1
+    # Strings return 0 (since any data can deserialize to a string, it should be our last attempt)
+    if klass.respond_to? :fields
+      return -1 * klass.fields.count do |field|
+        !T.nilable? field.type
+      end
+    else
+      if klass == String
+        return 0
+      elsif klass.is_a?(T::Types::TypedArray) || klass.is_a?(T::Types::TypedHash)
+        return 1
+      end
+      return 2
+    end
+  end
 end

data/lib/plex_ruby_sdk/activities.rb

@@ -49,7 +49,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getServerActivities',
         security_source: @sdk_configuration.security_source
       )
@@ -151,7 +151,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'cancelServerActivities',
         security_source: @sdk_configuration.security_source
       )

data/lib/plex_ruby_sdk/authentication.rb

@@ -60,7 +60,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getTransientToken',
         security_source: @sdk_configuration.security_source
       )
@@ -157,7 +157,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getSourceConnectionInformation',
         security_source: @sdk_configuration.security_source
       )
@@ -248,7 +248,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getTokenDetails',
         security_source: @sdk_configuration.security_source
       )
@@ -350,7 +350,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'post-users-sign-in-data',
         security_source: nil
       )

data/lib/plex_ruby_sdk/butler.rb

@@ -43,7 +43,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getButlerTasks',
         security_source: @sdk_configuration.security_source
       )
@@ -141,7 +141,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'startAllTasks',
         security_source: @sdk_configuration.security_source
       )
@@ -231,7 +231,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'stopAllTasks',
         security_source: @sdk_configuration.security_source
       )
@@ -334,7 +334,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'startTask',
         security_source: @sdk_configuration.security_source
       )
@@ -433,7 +433,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'stopTask',
         security_source: @sdk_configuration.security_source
       )

data/lib/plex_ruby_sdk/hubs.rb

@@ -49,7 +49,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getGlobalHubs',
         security_source: @sdk_configuration.security_source
       )
@@ -145,7 +145,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'get-recently-added',
         security_source: @sdk_configuration.security_source
       )
@@ -243,7 +243,7 @@ module PlexRubySDK
 
       hook_ctx = SDKHooks::HookContext.new(
         base_url: base_url,
-        oauth2_scopes: nil,
+        oauth2_scopes: [],
         operation_id: 'getLibraryHubs',
         security_source: @sdk_configuration.security_source
       )