hubspot-api-client 15.0.2 → 16.0.1

data/lib/hubspot/codegen/marketing/forms/models/error.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Marketing
@@ -50,6 +51,11 @@ module Hubspot
           }
         end
 
+        # Returns all the JSON keys this model knows about
+        def self.acceptable_attributes
+          attribute_map.values
+        end
+
         # Attribute type mapping.
         def self.openapi_types
           {
@@ -185,8 +191,11 @@ module Hubspot
         # @return [Object] Returns the model itself
         def build_from_hash(attributes)
           return nil unless attributes.is_a?(Hash)
+          attributes = attributes.transform_keys(&:to_sym)
           self.class.openapi_types.each_pair do |key, type|
-            if type =~ /\AArray<(.*)>/i
+            if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+              self.send("#{key}=", nil)
+            elsif type =~ /\AArray<(.*)>/i
               # check to ensure the input is an array given that the attribute
               # is documented as an array but the input is not
               if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -194,7 +203,7 @@ module Hubspot
               end
             elsif !attributes[self.class.attribute_map[key]].nil?
               self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-            end # or else data not found in attributes(hash), not an issue as the data can be optional
+            end
           end
 
           self
@@ -206,8 +215,8 @@ module Hubspot
         # @return [Object] Deserialized data
         def _deserialize(type, value)
           case type.to_sym
-          when :DateTime
-            DateTime.parse(value)
+          when :Time
+            Time.parse(value)
           when :Date
             Date.parse(value)
           when :String
@@ -237,7 +246,9 @@ module Hubspot
               end
             end
           else # model
-            Hubspot::Marketing::Forms.const_get(type).build_from_hash(value)
+            # models (e.g. Pet) or oneOf
+            klass = Hubspot::Marketing::Forms.const_get(type)
+            klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
           end
         end
 
@@ -263,7 +274,7 @@ module Hubspot
               is_nullable = self.class.openapi_nullable.include?(attr)
               next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
             end
-            
+
             hash[param] = _to_hash(value)
           end
           hash
@@ -286,7 +297,9 @@ module Hubspot
             value
           end
         end
+
       end
+
     end
   end
 end

data/lib/hubspot/codegen/marketing/forms/models/error_detail.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Marketing
@@ -42,6 +43,11 @@ module Hubspot
           }
         end
 
+        # Returns all the JSON keys this model knows about
+        def self.acceptable_attributes
+          attribute_map.values
+        end
+
         # Attribute type mapping.
         def self.openapi_types
           {
@@ -151,8 +157,11 @@ module Hubspot
         # @return [Object] Returns the model itself
         def build_from_hash(attributes)
           return nil unless attributes.is_a?(Hash)
+          attributes = attributes.transform_keys(&:to_sym)
           self.class.openapi_types.each_pair do |key, type|
-            if type =~ /\AArray<(.*)>/i
+            if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+              self.send("#{key}=", nil)
+            elsif type =~ /\AArray<(.*)>/i
               # check to ensure the input is an array given that the attribute
               # is documented as an array but the input is not
               if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -160,7 +169,7 @@ module Hubspot
               end
             elsif !attributes[self.class.attribute_map[key]].nil?
               self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-            end # or else data not found in attributes(hash), not an issue as the data can be optional
+            end
           end
 
           self
@@ -172,8 +181,8 @@ module Hubspot
         # @return [Object] Deserialized data
         def _deserialize(type, value)
           case type.to_sym
-          when :DateTime
-            DateTime.parse(value)
+          when :Time
+            Time.parse(value)
           when :Date
             Date.parse(value)
           when :String
@@ -203,7 +212,9 @@ module Hubspot
               end
             end
           else # model
-            Hubspot::Marketing::Forms.const_get(type).build_from_hash(value)
+            # models (e.g. Pet) or oneOf
+            klass = Hubspot::Marketing::Forms.const_get(type)
+            klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
           end
         end
 
@@ -229,7 +240,7 @@ module Hubspot
               is_nullable = self.class.openapi_nullable.include?(attr)
               next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
             end
-            
+
             hash[param] = _to_hash(value)
           end
           hash
@@ -252,7 +263,9 @@ module Hubspot
             value
           end
         end
+
       end
+
     end
   end
 end

data/lib/hubspot/codegen/marketing/forms/models/field_group.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Marketing
@@ -59,13 +60,18 @@ module Hubspot
           }
         end
 
+        # Returns all the JSON keys this model knows about
+        def self.acceptable_attributes
+          attribute_map.values
+        end
+
         # Attribute type mapping.
         def self.openapi_types
           {
             :'group_type' => :'String',
             :'rich_text_type' => :'String',
             :'rich_text' => :'String',
-            :'fields' => :'Array<OneOfEmailFieldPhoneFieldMobilePhoneFieldSingleLineTextFieldMultiLineTextFieldNumberFieldSingleCheckboxFieldMultipleCheckboxesFieldDropdownFieldRadioFieldDatepickerFieldFileField>'
+            :'fields' => :'Array<DependentFieldDependentField>'
           }
         end
 
@@ -186,8 +192,11 @@ module Hubspot
         # @return [Object] Returns the model itself
         def build_from_hash(attributes)
           return nil unless attributes.is_a?(Hash)
+          attributes = attributes.transform_keys(&:to_sym)
           self.class.openapi_types.each_pair do |key, type|
-            if type =~ /\AArray<(.*)>/i
+            if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+              self.send("#{key}=", nil)
+            elsif type =~ /\AArray<(.*)>/i
               # check to ensure the input is an array given that the attribute
               # is documented as an array but the input is not
               if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -195,7 +204,7 @@ module Hubspot
               end
             elsif !attributes[self.class.attribute_map[key]].nil?
               self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-            end # or else data not found in attributes(hash), not an issue as the data can be optional
+            end
           end
 
           self
@@ -207,8 +216,8 @@ module Hubspot
         # @return [Object] Deserialized data
         def _deserialize(type, value)
           case type.to_sym
-          when :DateTime
-            DateTime.parse(value)
+          when :Time
+            Time.parse(value)
           when :Date
             Date.parse(value)
           when :String
@@ -238,7 +247,9 @@ module Hubspot
               end
             end
           else # model
-            Hubspot::Marketing::Forms.const_get(type).build_from_hash(value)
+            # models (e.g. Pet) or oneOf
+            klass = Hubspot::Marketing::Forms.const_get(type)
+            klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
           end
         end
 
@@ -264,7 +275,7 @@ module Hubspot
               is_nullable = self.class.openapi_nullable.include?(attr)
               next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
             end
-            
+
             hash[param] = _to_hash(value)
           end
           hash
@@ -287,7 +298,9 @@ module Hubspot
             value
           end
         end
+
       end
+
     end
   end
 end

data/lib/hubspot/codegen/marketing/forms/models/file_field.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Marketing
@@ -88,6 +89,11 @@ module Hubspot
           }
         end
 
+        # Returns all the JSON keys this model knows about
+        def self.acceptable_attributes
+          attribute_map.values
+        end
+
         # Attribute type mapping.
         def self.openapi_types
           {
@@ -247,8 +253,11 @@ module Hubspot
         # @return [Object] Returns the model itself
         def build_from_hash(attributes)
           return nil unless attributes.is_a?(Hash)
+          attributes = attributes.transform_keys(&:to_sym)
           self.class.openapi_types.each_pair do |key, type|
-            if type =~ /\AArray<(.*)>/i
+            if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+              self.send("#{key}=", nil)
+            elsif type =~ /\AArray<(.*)>/i
               # check to ensure the input is an array given that the attribute
               # is documented as an array but the input is not
               if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -256,7 +265,7 @@ module Hubspot
               end
             elsif !attributes[self.class.attribute_map[key]].nil?
               self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-            end # or else data not found in attributes(hash), not an issue as the data can be optional
+            end
           end
 
           self
@@ -268,8 +277,8 @@ module Hubspot
         # @return [Object] Deserialized data
         def _deserialize(type, value)
           case type.to_sym
-          when :DateTime
-            DateTime.parse(value)
+          when :Time
+            Time.parse(value)
           when :Date
             Date.parse(value)
           when :String
@@ -299,7 +308,9 @@ module Hubspot
               end
             end
           else # model
-            Hubspot::Marketing::Forms.const_get(type).build_from_hash(value)
+            # models (e.g. Pet) or oneOf
+            klass = Hubspot::Marketing::Forms.const_get(type)
+            klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
           end
         end
 
@@ -325,7 +336,7 @@ module Hubspot
               is_nullable = self.class.openapi_nullable.include?(attr)
               next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
             end
-            
+
             hash[param] = _to_hash(value)
           end
           hash
@@ -348,7 +359,9 @@ module Hubspot
             value
           end
         end
+
       end
+
     end
   end
 end

data/lib/hubspot/codegen/marketing/forms/models/form_definition_base.rb

@@ -6,241 +6,102 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Marketing
     module Forms
-      class FormDefinitionBase
-        class EnumAttributeValidator
-          attr_reader :datatype
-          attr_reader :allowable_values
-
-          def initialize(datatype, allowable_values)
-            @allowable_values = allowable_values.map do |value|
-              case datatype.to_s
-              when /Integer/i
-                value.to_i
-              when /Float/i
-                value.to_f
-              else
-                value
-              end
-            end
+        class << self
+          # List of class defined in oneOf (OpenAPI v3)
+          def openapi_one_of
+            [
+              :'HubSpotFormDefinition'
+            ]
           end
 
-          def valid?(value)
-            !value || allowable_values.include?(value)
-          end
-        end
-
-        # Attribute mapping from ruby-style variable name to JSON key.
-        def self.attribute_map
-          {
-          }
-        end
-
-        # Attribute type mapping.
-        def self.openapi_types
-          {
-          }
-        end
-
-        # List of attributes with nullable: true
-        def self.openapi_nullable
-          Set.new([
-          ])
-        end
-
-        # List of class defined in oneOf (OpenAPI v3)
-        def self.openapi_one_of
-          [
-          :'HubSpotFormDefinition'
-          ]
-        end
-
-        # Initializes the object
-        # @param [Hash] attributes Model attributes in the form of hash
-        def initialize(attributes = {})
-          if (!attributes.is_a?(Hash))
-            fail ArgumentError, "The input argument (attributes) must be a hash in `Hubspot::Marketing::Forms::FormDefinitionBase` initialize method"
-          end
-
-          # check to see if the attribute exists and convert string to symbol for hash key
-          attributes = attributes.each_with_object({}) { |(k, v), h|
-            if (!self.class.attribute_map.key?(k.to_sym))
-              fail ArgumentError, "`#{k}` is not a valid attribute in `Hubspot::Marketing::Forms::FormDefinitionBase`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-            end
-            h[k.to_sym] = v
-          }
-        end
-
-        # Show invalid properties with the reasons. Usually used together with valid?
-        # @return Array for valid properties with the reasons
-        def list_invalid_properties
-          invalid_properties = Array.new
-          invalid_properties
-        end
-
-        # Check to see if the all the properties in the model are valid
-        # @return true if the model is valid
-        def valid?
-          _one_of_found = false
-          self.class.openapi_one_of.each do |_class|
-            _one_of = Hubspot::Marketing::Forms.const_get(_class).build_from_hash(self.to_hash)
-            if _one_of.valid?
-              if _one_of_found
-                return false
-              else
-                _one_of_found = true
+          # 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)
+            # 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"
+                typed_data = find_and_cast_into_type(klass, data)
+                return typed_data if typed_data
+              rescue # rescue all errors so we keep iterating even if the current item lookup raises
               end
             end
-          end
 
-          if !_one_of_found
-            return false
+            openapi_one_of.include?(:AnyType) ? data : nil
           end
 
-          true
-        end
-
-        # Checks equality by comparing each attribute.
-        # @param [Object] Object to be compared
-        def ==(o)
-          return true if self.equal?(o)
-          self.class == o.class
-        end
-
-        # @see the `==` method
-        # @param [Object] Object to be compared
-        def eql?(o)
-          self == o
-        end
-
-        # Calculates hash code according to all attributes.
-        # @return [Integer] Hash code
-        def hash
-          [].hash
-        end
-
-        # Builds the object from hash
-        # @param [Hash] attributes Model attributes in the form of hash
-        # @return [Object] Returns the model itself
-        def self.build_from_hash(attributes)
-          new.build_from_hash(attributes)
-        end
-
-        # Builds the object from hash
-        # @param [Hash] attributes Model attributes in the form of hash
-        # @return [Object] Returns the model itself
-        def build_from_hash(attributes)
-          return nil unless attributes.is_a?(Hash)
-          self.class.openapi_types.each_pair do |key, type|
-            if type =~ /\AArray<(.*)>/i
-              # check to ensure the input is an array given that the attribute
-              # is documented as an array but the input is not
-              if attributes[self.class.attribute_map[key]].is_a?(Array)
-                self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          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?
+
+            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.parse(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
-            elsif !attributes[self.class.attribute_map[key]].nil?
-              self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-            end # or else data not found in attributes(hash), not an issue as the data can be optional
-          end
-
-          self
-        end
-
-        # Deserializes the data based on type
-        # @param string type Data type
-        # @param string value Value to be deserialized
-        # @return [Object] Deserialized data
-        def _deserialize(type, value)
-          case type.to_sym
-          when :DateTime
-            DateTime.parse(value)
-          when :Date
-            Date.parse(value)
-          when :String
-            value.to_s
-          when :Integer
-            value.to_i
-          when :Float
-            value.to_f
-          when :Boolean
-            if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-              true
-            else
-              false
-            end
-          when :Object
-            # generic object (usually a Hash), return directly
-            value
-          when /\AArray<(?<inner_type>.+)>\z/
-            inner_type = Regexp.last_match[:inner_type]
-            value.map { |v| _deserialize(inner_type, v) }
-          when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-            k_type = Regexp.last_match[:k_type]
-            v_type = Regexp.last_match[:v_type]
-            {}.tap do |hash|
-              value.each do |k, v|
-                hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+            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 = Hubspot::Marketing::Forms.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 unless (data.keys - const.acceptable_attributes).empty?
+                  model = const.build_from_hash(data)
+                  return model if model && model.valid?
+                end
               end
             end
-          else # model
-            Hubspot::Marketing::Forms.const_get(type).build_from_hash(value)
-          end
-        end
-
-        # Returns the string representation of the object
-        # @return [String] String presentation of the object
-        def to_s
-          to_hash.to_s
-        end
-
-        # to_body is an alias to to_hash (backward compatibility)
-        # @return [Hash] Returns the object in the form of hash
-        def to_body
-          to_hash
-        end
-
-        # Returns the object in the form of hash
-        # @return [Hash] Returns the object in the form of hash
-        def to_hash
-          hash = {}
-          self.class.attribute_map.each_pair do |attr, param|
-            value = self.send(attr)
-            if value.nil?
-              is_nullable = self.class.openapi_nullable.include?(attr)
-              next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-            end
-            
-            hash[param] = _to_hash(value)
-          end
-          hash
-        end
 
-        # Outputs non-array value in the form of hash
-        # For object, use to_hash. Otherwise, just return the value
-        # @param [Object] value Any valid value
-        # @return [Hash] Returns the value in the form of hash
-        def _to_hash(value)
-          if value.is_a?(Array)
-            value.compact.map { |v| _to_hash(v) }
-          elsif value.is_a?(Hash)
-            {}.tap do |hash|
-              value.each { |k, v| hash[k] = _to_hash(v) }
-            end
-          elsif value.respond_to? :to_hash
-            value.to_hash
-          else
-            value
+            raise # if no match by now, raise
+          rescue
+            raise SchemaMismatchError, "#{data} doesn't match the #{klass} type"
           end
         end
       end
+
     end
   end
 end