stackone_client 0.39.2 → 0.39.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0d44dafbc5a84147642a132bf341bc6ad27f49706e2e1dddca7c5a98eb959b
-  data.tar.gz: 39c16679252707712d891873293548339a3c0c1fb5804f89b3f14b0b57403f88
+  metadata.gz: d9f1427ab570081dad1f69094a9553439df13b90888d6a34c3b0bef6498425ed
+  data.tar.gz: 83318b2a9a156f367e7673ca3967a024d265a0346e5cc810570356e50b7da7ea
 SHA512:
-  metadata.gz: acad7f3b17df26286cbf4f76d72a621082fc9af283c6b1b3a45ce2ffcfd7625f6e684d5ac11aa9639643760192d3896e401a9da72210ffb7ae389f17516a4201
-  data.tar.gz: 36079320005651bc01b4b115e1654f0a3d749b06c6a7d4a719e6af7c691a968b77260ba7145b3f22ea2000e24dff7c5683ea4d432b4d2a8a877abf1d07727bc9
+  metadata.gz: 6751c227d1f97f222612834c9096f104f3b33df0556cf53ce0191608f496618ed8ecb4cd474353b77fd8deb068938ab7d49d149a58901a8c748805701ab27e03
+  data.tar.gz: '024439ab4370c3e0e7722c8a4130ae1d6dd3b24ef20e34038d5465fa50c844d2f9396466b9d7f789df6183cdfd42e0c1b3200258b18e010896773c08ed9a80e8'

data/lib/crystalline/metadata_fields.rb

@@ -62,20 +62,6 @@ module Crystalline
         end
       end
 
-      def from_json(json_obj)
-        case json_obj
-        when String
-          begin
-            d = JSON.parse(json_obj)
-          rescue JSON::ParserError
-            d = json_obj
-          end
-        else
-          d = json_obj
-        end
-        from_json(d)
-      end
-
       def from_dict(d)
         to_build = {}
 
@@ -111,9 +97,16 @@ module Crystalline
             to_build[key] = unmarshalled_hash
           elsif Crystalline::Utils.union? field_type
             discriminator = field.metadata.fetch(:discriminator, nil)
+            discriminator_mapping = field.metadata.fetch(:discriminator_mapping, nil)
             if !discriminator.nil?
-              type_to_deserialize = value.fetch(discriminator)
-              type_to_deserialize = Crystalline::Utils.get_union_types(field_type).find { |t| t.name.split('::').last == type_to_deserialize }
+              discriminator_value = value.fetch(discriminator)
+              if !discriminator_mapping.nil?
+                # Use explicit mapping from discriminator value to type
+                type_to_deserialize = discriminator_mapping[discriminator_value]
+              else
+                # Fallback: try to match discriminator value against type name
+                type_to_deserialize = Crystalline::Utils.get_union_types(field_type).find { |t| t.name.split('::').last == discriminator_value }
+              end
               to_build[key] = Crystalline.unmarshal_json(value, type_to_deserialize)
             else
               union_types = Crystalline::Utils.get_union_types(field_type)

data/lib/crystalline/types.rb

@@ -41,38 +41,43 @@ module Crystalline
   end
 
   module Enum
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
     def initialize(val)
-      puts methods
-      if instance_methods(false).include?(:initialize)
+      if self.class.instance_methods(false).include?(:initialize)
         super(val)
       else
         @val = val
       end
     end
 
-    def self.enums(&blk)
-      @mapping = {}
+    module ClassMethods
+      def enums(&blk)
+        @mapping = {}
+
+        yield
+        constants(false).each do |const_name|
+          instance = const_get(const_name, false)
+          unless instance.is_a? self
+            raise 'Enum constants must be instances of the Enum class (e.g. `Foo = new`)'
+          end
+          @mapping[instance.serialize] = instance
+        end
+      end
 
-      yield
-      constants(false).each do |const_name|
-        instance = const_get(const_name, false)
-        unless instance.is_a? self
-          raise 'Enum constants must be instances of the Enum class (e.g. `Foo = new`)'
+      def deserialize(val)
+        if @mapping.include? val
+          @mapping[val]
+        else
+          raise "Invalid value for enum: #{val}"
         end
-        @mapping[instance.serialize] = instance
       end
     end
 
     def serialize
       @val
     end
-
-    def deserialize(val)
-      if @mapping.include? val
-        @mapping[val]
-      else
-        raise "Invalid value for enum: #{val}"
-      end
-    end
   end
 end