late-sdk 0.0.93 → 0.0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d23b35d7dbf978a5d370f91f581010551c6c56cbd5daf4d974dec712d13be92
-  data.tar.gz: 0c28393acbfdbbf8220d3ae624de8a9d7fcea396c1e24222b6ccde5856f2be64
+  metadata.gz: df932c23e88e3e6675ca38fcaefff7052a4da59d3eb923526297e4d9a2c1e3a6
+  data.tar.gz: 4a7c1e5fb67076512e24cc667f13cbbe49e13872c615b0cb76ba63079d7ab1f7
 SHA512:
-  metadata.gz: 0cc37e3b98a08a8737973ff80ab89faf1f074546fd1a7c31e2a3e6fa22e8b78550b16deb26dcdf10736b564165c4a75670756f8c87108fc81f1a1175080b8dcc
-  data.tar.gz: 60576597ac554438a6b2f5d7fa599d7d40bc53eeecaa1b085cafdc34b8c3c79354bdea9cc888f402fa3b8d4507dc8032a579ce41032ee6c18e1c42ae5fb69316
+  metadata.gz: fdf054f2ab97d4977f16f783c266969c59ff7d9fdc182570760ff43d744bf950c4bc3b6b8b702a6f094452bd01ae0a9b2d93c1fc0a9aeb17a9b4d01fc789efa1
+  data.tar.gz: 6cae037881482b4b672c25c987e3cd271202787d32745fc9b17c7c1d7dd6191a609a278cbfb0e04fbe8cfd734c684ef8d12d922733e530fc232d16028308b902

data/docs/WhatsAppTemplateComponent.md

@@ -21,38 +21,6 @@ Late::WhatsAppTemplateComponent.openapi_one_of
 # ]
 ```
 
-### `openapi_discriminator_name`
-
-Returns the discriminator's property name.
-
-#### Example
-
-```ruby
-require 'late-sdk'
-
-Late::WhatsAppTemplateComponent.openapi_discriminator_name
-# => :'type'
-```
-
-### `openapi_discriminator_name`
-
-Returns the discriminator's mapping.
-
-#### Example
-
-```ruby
-require 'late-sdk'
-
-Late::WhatsAppTemplateComponent.openapi_discriminator_mapping
-# =>
-# {
-#   :'BODY' => :'WhatsAppBodyComponent',
-#   :'BUTTONS' => :'WhatsAppButtonsComponent',
-#   :'FOOTER' => :'WhatsAppFooterComponent',
-#   :'HEADER' => :'WhatsAppHeaderComponent'
-# }
-```
-
 ### build
 
 Find the appropriate object from the `openapi_one_of` list and casts the data into it.

data/lib/late-sdk/models/whats_app_template_button.rb

@@ -125,11 +125,6 @@ module Late
       ])
     end
 
-    # discriminator's property name in OpenAPI v3
-    def self.openapi_discriminator_name
-      :'type'
-    end
-
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})

data/lib/late-sdk/models/whats_app_template_component.rb

@@ -26,32 +26,79 @@ module Late
         ]
       end
 
-      # Discriminator's property name (OpenAPI v3)
-      def openapi_discriminator_name
-        :'type'
-      end
-
-      # Discriminator's mapping (OpenAPI v3)
-      def openapi_discriminator_mapping
-        {
-          :'BODY' => :'WhatsAppBodyComponent',
-          :'BUTTONS' => :'WhatsAppButtonsComponent',
-          :'FOOTER' => :'WhatsAppFooterComponent',
-          :'HEADER' => :'WhatsAppHeaderComponent'
-        }
-      end
-
       # Builds the object
       # @param [Mixed] Data to be matched against the list of oneOf items
       # @return [Object] Returns the model or the data itself
       def build(data)
-        discriminator_value = data[openapi_discriminator_name]
-        return nil if discriminator_value.nil?
+        # Go through the list of oneOf items and attempt to identify the appropriate one.
+        # Note:
+        # - We do not attempt to check whether exactly one item matches.
+        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
+        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
+        # - TODO: scalar values are de facto behaving as if they were nullable.
+        # - TODO: logging when debugging is set.
+        openapi_one_of.each do |klass|
+          begin
+            next if klass == :AnyType # "nullable: true"
+            return find_and_cast_into_type(klass, data)
+          rescue # rescue all errors so we keep iterating even if the current item lookup raises
+          end
+        end
+
+        openapi_one_of.include?(:AnyType) ? data : nil
+      end
+
+      private
+
+      SchemaMismatchError = Class.new(StandardError)
+
+      # Note: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
+      def find_and_cast_into_type(klass, data)
+        return if data.nil?
 
-        klass = openapi_discriminator_mapping[discriminator_value.to_s.to_sym]
-        return nil unless klass
+        case klass.to_s
+        when 'Boolean'
+          return data if data.instance_of?(TrueClass) || data.instance_of?(FalseClass)
+        when 'Float'
+          return data if data.instance_of?(Float)
+        when 'Integer'
+          return data if data.instance_of?(Integer)
+        when 'Time'
+          return Time.parse(data)
+        when 'Date'
+          return Date.iso8601(data)
+        when 'String'
+          return data if data.instance_of?(String)
+        when 'Object' # "type: object"
+          return data if data.instance_of?(Hash)
+        when /\AArray<(?<sub_type>.+)>\z/ # "type: array"
+          if data.instance_of?(Array)
+            sub_type = Regexp.last_match[:sub_type]
+            return data.map { |item| find_and_cast_into_type(sub_type, item) }
+          end
+        when /\AHash<String, (?<sub_type>.+)>\z/ # "type: object" with "additionalProperties: { ... }"
+          if data.instance_of?(Hash) && data.keys.all? { |k| k.instance_of?(Symbol) || k.instance_of?(String) }
+            sub_type = Regexp.last_match[:sub_type]
+            return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
+          end
+        else # model
+          const = Late.const_get(klass)
+          if const
+            if const.respond_to?(:openapi_one_of) # nested oneOf model
+              model = const.build(data)
+              return model if model
+            else
+              # raise if data contains keys that are not known to the model
+              raise if const.respond_to?(:acceptable_attributes) && !(data.keys - const.acceptable_attributes).empty?
+              model = const.build_from_hash(data)
+              return model if model
+            end
+          end
+        end
 
-        Late.const_get(klass).build_from_hash(data)
+        raise # if no match by now, raise
+      rescue
+        raise SchemaMismatchError, "#{data} doesn't match the #{klass} type"
       end
     end
   end

data/lib/late-sdk/version.rb

@@ -11,5 +11,5 @@ Generator version: 7.19.0
 =end
 
 module Late
-  VERSION = '0.0.93'
+  VERSION = '0.0.94'
 end

data/openapi.yaml

@@ -349,21 +349,12 @@ components:
           type: string
         navigate_screen:
           type: string
-      discriminator:
-        propertyName: type
     WhatsAppTemplateComponent:
       oneOf:
         - $ref: '#/components/schemas/WhatsAppHeaderComponent'
         - $ref: '#/components/schemas/WhatsAppBodyComponent'
         - $ref: '#/components/schemas/WhatsAppFooterComponent'
         - $ref: '#/components/schemas/WhatsAppButtonsComponent'
-      discriminator:
-        propertyName: type
-        mapping:
-          HEADER: '#/components/schemas/WhatsAppHeaderComponent'
-          BODY: '#/components/schemas/WhatsAppBodyComponent'
-          FOOTER: '#/components/schemas/WhatsAppFooterComponent'
-          BUTTONS: '#/components/schemas/WhatsAppButtonsComponent'
     WhatsAppHeaderComponent:
       type: object
       required: [type, format]

data/spec/models/whats_app_template_component_spec.rb

@@ -24,18 +24,6 @@ describe Late::WhatsAppTemplateComponent do
     end
   end
 
-  describe '.openapi_discriminator_name' do
-    it 'returns the value of the "discriminator" property' do
-      expect(described_class.openapi_discriminator_name).to_not be_empty
-    end
-  end
-
-  describe '.openapi_discriminator_mapping' do
-    it 'returns the key/values of the "mapping" property' do
-      expect(described_class.openapi_discriminator_mapping.values.sort).to eq(described_class.openapi_one_of.sort)
-    end
-  end
-
   describe '.build' do
     it 'returns the correct model' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: late-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.93
+  version: 0.0.94
 platform: ruby
 authors:
 - OpenAPI-Generator
@@ -2247,7 +2247,7 @@ files:
 - spec/models/you_tube_scope_missing_response_scope_status_spec.rb
 - spec/models/you_tube_scope_missing_response_spec.rb
 - spec/spec_helper.rb
-- zernio-sdk-0.0.93.gem
+- zernio-sdk-0.0.94.gem
 homepage: https://openapi-generator.tech
 licenses:
 - Unlicense