docspring 1.4.1 → 2.0.0

data/lib/docspring/models/combined_submission.rb

@@ -3,36 +3,41 @@
 
 #DocSpring is a service that helps you fill out and sign PDF templates.
 
-OpenAPI spec version: v1
+The version of the OpenAPI document: v1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.0
+Generator version: 7.11.0
 
 =end
 
 require 'date'
+require 'time'
 
 module DocSpring
   class CombinedSubmission
-    attr_accessor :metadata
-
-    attr_accessor :password
+    attr_accessor :id
 
     attr_accessor :expired
 
+    attr_accessor :expires_in
+
     attr_accessor :expires_at
 
-    attr_accessor :source_pdfs
+    attr_accessor :state
 
-    attr_accessor :pdf_hash
+    attr_accessor :error_message
 
-    attr_accessor :download_url
+    attr_accessor :metadata
+
+    attr_accessor :password
 
     attr_accessor :submission_ids
 
-    attr_accessor :id
+    attr_accessor :source_pdfs
 
-    attr_accessor :state
+    attr_accessor :download_url
+
+    attr_accessor :pdf_hash
 
     attr_accessor :actions
 
@@ -61,90 +66,136 @@ module DocSpring
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'metadata' => :'metadata',
-        :'password' => :'password',
+        :'id' => :'id',
         :'expired' => :'expired',
+        :'expires_in' => :'expires_in',
         :'expires_at' => :'expires_at',
+        :'state' => :'state',
+        :'error_message' => :'error_message',
+        :'metadata' => :'metadata',
+        :'password' => :'password',
+        :'submission_ids' => :'submission_ids',
         :'source_pdfs' => :'source_pdfs',
-        :'pdf_hash' => :'pdf_hash',
         :'download_url' => :'download_url',
-        :'submission_ids' => :'submission_ids',
-        :'id' => :'id',
-        :'state' => :'state',
+        :'pdf_hash' => :'pdf_hash',
         :'actions' => :'actions'
       }
     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
       {
+        :'id' => :'String',
+        :'expired' => :'Boolean',
+        :'expires_in' => :'Integer',
+        :'expires_at' => :'String',
+        :'state' => :'String',
+        :'error_message' => :'String',
         :'metadata' => :'Object',
         :'password' => :'String',
-        :'expired' => :'BOOLEAN',
-        :'expires_at' => :'String',
+        :'submission_ids' => :'Array<String>',
         :'source_pdfs' => :'Array<Object>',
-        :'pdf_hash' => :'String',
         :'download_url' => :'String',
-        :'submission_ids' => :'Array<String>',
-        :'id' => :'String',
-        :'state' => :'String',
+        :'pdf_hash' => :'String',
         :'actions' => :'Array<CombinedSubmissionAction>'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'expires_in',
+        :'expires_at',
+        :'error_message',
+        :'password',
+        :'download_url',
+        :'pdf_hash',
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DocSpring::CombinedSubmission` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # 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 `DocSpring::CombinedSubmission`. 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
+      }
 
-      if attributes.has_key?(:'metadata')
-        self.metadata = attributes[:'metadata']
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
+      else
+        self.id = nil
       end
 
-      if attributes.has_key?(:'password')
-        self.password = attributes[:'password']
+      if attributes.key?(:'expired')
+        self.expired = attributes[:'expired']
+      else
+        self.expired = nil
       end
 
-      if attributes.has_key?(:'expired')
-        self.expired = attributes[:'expired']
+      if attributes.key?(:'expires_in')
+        self.expires_in = attributes[:'expires_in']
       end
 
-      if attributes.has_key?(:'expires_at')
+      if attributes.key?(:'expires_at')
         self.expires_at = attributes[:'expires_at']
       end
 
-      if attributes.has_key?(:'source_pdfs')
-        if (value = attributes[:'source_pdfs']).is_a?(Array)
-          self.source_pdfs = value
-        end
+      if attributes.key?(:'state')
+        self.state = attributes[:'state']
+      else
+        self.state = nil
       end
 
-      if attributes.has_key?(:'pdf_hash')
-        self.pdf_hash = attributes[:'pdf_hash']
+      if attributes.key?(:'error_message')
+        self.error_message = attributes[:'error_message']
       end
 
-      if attributes.has_key?(:'download_url')
-        self.download_url = attributes[:'download_url']
+      if attributes.key?(:'metadata')
+        self.metadata = attributes[:'metadata']
+      end
+
+      if attributes.key?(:'password')
+        self.password = attributes[:'password']
       end
 
-      if attributes.has_key?(:'submission_ids')
+      if attributes.key?(:'submission_ids')
         if (value = attributes[:'submission_ids']).is_a?(Array)
           self.submission_ids = value
         end
+      else
+        self.submission_ids = nil
       end
 
-      if attributes.has_key?(:'id')
-        self.id = attributes[:'id']
+      if attributes.key?(:'source_pdfs')
+        if (value = attributes[:'source_pdfs']).is_a?(Array)
+          self.source_pdfs = value
+        end
+      else
+        self.source_pdfs = nil
       end
 
-      if attributes.has_key?(:'state')
-        self.state = attributes[:'state']
+      if attributes.key?(:'download_url')
+        self.download_url = attributes[:'download_url']
+      end
+
+      if attributes.key?(:'pdf_hash')
+        self.pdf_hash = attributes[:'pdf_hash']
       end
 
-      if attributes.has_key?(:'actions')
+      if attributes.key?(:'actions')
         if (value = attributes[:'actions']).is_a?(Array)
           self.actions = value
         end
@@ -154,24 +205,51 @@ module DocSpring
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
+      if @id.nil?
+        invalid_properties.push('invalid value for "id", id cannot be nil.')
+      end
+
+      if @expired.nil?
+        invalid_properties.push('invalid value for "expired", expired cannot be nil.')
+      end
+
+      if @state.nil?
+        invalid_properties.push('invalid value for "state", state cannot be nil.')
+      end
+
+      if @submission_ids.nil?
+        invalid_properties.push('invalid value for "submission_ids", submission_ids cannot be nil.')
+      end
+
+      if @source_pdfs.nil?
+        invalid_properties.push('invalid value for "source_pdfs", source_pdfs cannot be nil.')
+      end
+
       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?
-      state_validator = EnumAttributeValidator.new('String', ['pending', 'processed', 'error'])
+      warn '[DEPRECATED] the `valid?` method is obsolete'
+      return false if @id.nil?
+      return false if @expired.nil?
+      return false if @state.nil?
+      state_validator = EnumAttributeValidator.new('String', ["pending", "processed", "error"])
       return false unless state_validator.valid?(@state)
+      return false if @submission_ids.nil?
+      return false if @source_pdfs.nil?
       true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ['pending', 'processed', 'error'])
+      validator = EnumAttributeValidator.new('String', ["pending", "processed", "error"])
       unless validator.valid?(state)
-        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"state\", must be one of #{validator.allowable_values}."
       end
       @state = state
     end
@@ -181,16 +259,18 @@ module DocSpring
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          metadata == o.metadata &&
-          password == o.password &&
+          id == o.id &&
           expired == o.expired &&
+          expires_in == o.expires_in &&
           expires_at == o.expires_at &&
+          state == o.state &&
+          error_message == o.error_message &&
+          metadata == o.metadata &&
+          password == o.password &&
+          submission_ids == o.submission_ids &&
           source_pdfs == o.source_pdfs &&
-          pdf_hash == o.pdf_hash &&
           download_url == o.download_url &&
-          submission_ids == o.submission_ids &&
-          id == o.id &&
-          state == o.state &&
+          pdf_hash == o.pdf_hash &&
           actions == o.actions
     end
 
@@ -201,39 +281,42 @@ module DocSpring
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
-      [metadata, password, expired, expires_at, source_pdfs, pdf_hash, download_url, submission_ids, id, state, actions].hash
+      [id, expired, expires_in, expires_at, state, error_message, metadata, password, submission_ids, source_pdfs, download_url, pdf_hash, actions].hash
     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)
+    def self.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 the attribute
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           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
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      new(transformed_hash)
     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)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -242,7 +325,7 @@ module DocSpring
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -263,8 +346,9 @@ module DocSpring
           end
         end
       else # model
-        temp_model = DocSpring.const_get(type).new
-        temp_model.build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = DocSpring.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -286,7 +370,11 @@ module DocSpring
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        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
@@ -309,5 +397,7 @@ module DocSpring
         value
       end
     end
+
   end
+
 end

data/lib/docspring/models/combined_submission_action.rb

@@ -3,14 +3,15 @@
 
 #DocSpring is a service that helps you fill out and sign PDF templates.
 
-OpenAPI spec version: v1
+The version of the OpenAPI document: v1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.0
+Generator version: 7.11.0
 
 =end
 
 require 'date'
+require 'time'
 
 module DocSpring
   class CombinedSubmissionAction
@@ -60,6 +61,11 @@ module DocSpring
       }
     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
       {
@@ -72,42 +78,69 @@ module DocSpring
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'integration_id',
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DocSpring::CombinedSubmissionAction` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # 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 `DocSpring::CombinedSubmissionAction`. 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
+      }
 
-      if attributes.has_key?(:'id')
+      if attributes.key?(:'id')
         self.id = attributes[:'id']
+      else
+        self.id = nil
       end
 
-      if attributes.has_key?(:'integration_id')
+      if attributes.key?(:'integration_id')
         self.integration_id = attributes[:'integration_id']
+      else
+        self.integration_id = nil
       end
 
-      if attributes.has_key?(:'state')
+      if attributes.key?(:'state')
         self.state = attributes[:'state']
+      else
+        self.state = nil
       end
 
-      if attributes.has_key?(:'action_category')
+      if attributes.key?(:'action_category')
         self.action_category = attributes[:'action_category']
+      else
+        self.action_category = nil
       end
 
-      if attributes.has_key?(:'action_type')
+      if attributes.key?(:'action_type')
         self.action_type = attributes[:'action_type']
+      else
+        self.action_type = nil
       end
 
-      if attributes.has_key?(:'result_data')
+      if attributes.key?(:'result_data')
         self.result_data = attributes[:'result_data']
+      else
+        self.result_data = nil
       end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @id.nil?
         invalid_properties.push('invalid value for "id", id cannot be nil.')
@@ -135,15 +168,16 @@ module DocSpring
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @id.nil?
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('String', ['pending', 'processed', 'failed', 'error'])
+      state_validator = EnumAttributeValidator.new('String', ["pending", "processed", "failed", "error"])
       return false unless state_validator.valid?(@state)
       return false if @action_category.nil?
-      action_category_validator = EnumAttributeValidator.new('String', ['notification', 'file_upload'])
+      action_category_validator = EnumAttributeValidator.new('String', ["notification", "file_upload"])
       return false unless action_category_validator.valid?(@action_category)
       return false if @action_type.nil?
-      action_type_validator = EnumAttributeValidator.new('String', ['webhook', 'slack_webhook', 'email', 'aws_s3_upload'])
+      action_type_validator = EnumAttributeValidator.new('String', ["webhook", "slack_webhook", "email", "aws_s3_upload"])
       return false unless action_type_validator.valid?(@action_type)
       return false if @result_data.nil?
       true
@@ -152,9 +186,9 @@ module DocSpring
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ['pending', 'processed', 'failed', 'error'])
+      validator = EnumAttributeValidator.new('String', ["pending", "processed", "failed", "error"])
       unless validator.valid?(state)
-        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"state\", must be one of #{validator.allowable_values}."
       end
       @state = state
     end
@@ -162,9 +196,9 @@ module DocSpring
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] action_category Object to be assigned
     def action_category=(action_category)
-      validator = EnumAttributeValidator.new('String', ['notification', 'file_upload'])
+      validator = EnumAttributeValidator.new('String', ["notification", "file_upload"])
       unless validator.valid?(action_category)
-        fail ArgumentError, 'invalid value for "action_category", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"action_category\", must be one of #{validator.allowable_values}."
       end
       @action_category = action_category
     end
@@ -172,9 +206,9 @@ module DocSpring
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] action_type Object to be assigned
     def action_type=(action_type)
-      validator = EnumAttributeValidator.new('String', ['webhook', 'slack_webhook', 'email', 'aws_s3_upload'])
+      validator = EnumAttributeValidator.new('String', ["webhook", "slack_webhook", "email", "aws_s3_upload"])
       unless validator.valid?(action_type)
-        fail ArgumentError, 'invalid value for "action_type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"action_type\", must be one of #{validator.allowable_values}."
       end
       @action_type = action_type
     end
@@ -199,7 +233,7 @@ module DocSpring
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [id, integration_id, state, action_category, action_type, result_data].hash
     end
@@ -207,31 +241,34 @@ module DocSpring
     # 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)
+    def self.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 the attribute
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           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
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      new(transformed_hash)
     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)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -240,7 +277,7 @@ module DocSpring
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -261,8 +298,9 @@ module DocSpring
           end
         end
       else # model
-        temp_model = DocSpring.const_get(type).new
-        temp_model.build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = DocSpring.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -284,7 +322,11 @@ module DocSpring
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        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
@@ -307,5 +349,7 @@ module DocSpring
         value
       end
     end
+
   end
+
 end