form_api 0.2.0 → 1.0.0

data/lib/form_api/api_client.rb

@@ -1,12 +1,12 @@
 =begin
 #API V1
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
 OpenAPI spec version: v1
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 3.3.0-SNAPSHOT
 
 =end
 
@@ -33,7 +33,7 @@ module FormAPI
       @config = config
       @user_agent = "ruby-swagger-#{VERSION}"
       @default_headers = {
-        'Content-Type' => "application/json",
+        'Content-Type' => 'application/json',
         'User-Agent' => @user_agent
       }
     end
@@ -137,7 +137,7 @@ module FormAPI
     # @param [String] mime MIME
     # @return [Boolean] True if the MIME is application/json
     def json_mime?(mime)
-       (mime == "*/*") || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
+      (mime == '*/*') || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
     end
 
     # Deserialize the response to the given return type.
@@ -201,12 +201,12 @@ module FormAPI
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
         sub_type = $1
-        data.map {|item| convert_to_type(item, sub_type) }
+        data.map { |item| convert_to_type(item, sub_type) }
       when /\AHash\<String, (.+)\>\z/
         # e.g. Hash<String, Integer>
         sub_type = $1
         {}.tap do |hash|
-          data.each {|k, v| hash[k] = convert_to_type(v, sub_type) }
+          data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
         end
       else
         # models, e.g. Pet
@@ -228,7 +228,7 @@ module FormAPI
       encoding = nil
       request.on_headers do |response|
         content_disposition = response.headers['Content-Disposition']
-        if content_disposition and content_disposition =~ /filename=/i
+        if content_disposition && content_disposition =~ /filename=/i
           filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
           prefix = sanitize_filename(filename)
         else
@@ -244,7 +244,7 @@ module FormAPI
         tempfile.write(chunk)
       end
       request.on_complete do |response|
-        tempfile.close
+        tempfile.close if tempfile
         @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
                             "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
                             "will be deleted automatically with GC. It's also recommended to delete the temp file "\
@@ -314,7 +314,7 @@ module FormAPI
 
     # Sets user agent in HTTP header
     #
-    # @param [String] user_agent User agent (e.g. swagger-codegen/ruby/1.0.0)
+    # @param [String] user_agent User agent (e.g. openapi-generator/ruby/1.0.0)
     def user_agent=(user_agent)
       @user_agent = user_agent
       @default_headers['User-Agent'] = @user_agent
@@ -327,7 +327,7 @@ module FormAPI
       return nil if accepts.nil? || accepts.empty?
       # use JSON when present, otherwise use all of the provided
       json_accept = accepts.find { |s| json_mime?(s) }
-      return json_accept || accepts.join(',')
+      json_accept || accepts.join(',')
     end
 
     # Return Content-Type header based on an array of content types provided.
@@ -338,7 +338,7 @@ module FormAPI
       return 'application/json' if content_types.nil? || content_types.empty?
       # use JSON when present, otherwise use the first one
       json_content_type = content_types.find { |s| json_mime?(s) }
-      return json_content_type || content_types.first
+      json_content_type || content_types.first
     end
 
     # Convert object (array, hash, object, etc) to JSON string.
@@ -348,7 +348,7 @@ module FormAPI
       return model if model.nil? || model.is_a?(String)
       local_body = nil
       if model.is_a?(Array)
-        local_body = model.map{|m| object_to_hash(m) }
+        local_body = model.map { |m| object_to_hash(m) }
       else
         local_body = object_to_hash(model)
       end

data/lib/form_api/api_error.rb

@@ -1,12 +1,12 @@
 =begin
 #API V1
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
 OpenAPI spec version: v1
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 3.3.0-SNAPSHOT
 
 =end
 

data/lib/form_api/configuration.rb

@@ -1,12 +1,12 @@
 =begin
 #API V1
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
 OpenAPI spec version: v1
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 3.3.0-SNAPSHOT
 
 =end
 
@@ -14,6 +14,8 @@ require 'uri'
 
 module FormAPI
   class Configuration
+    SCHEME_REGEX = /^(https?):\/\//
+
     # Defines url scheme
     attr_accessor :scheme
 
@@ -40,11 +42,13 @@ module FormAPI
     attr_accessor :api_key_prefix
 
     # Defines the username used with HTTP basic authentication.
+    # (FormAPI override: We also add a getter/setter for api_token_id)
     #
     # @return [String]
     attr_accessor :username
 
     # Defines the password used with HTTP basic authentication.
+    # (FormAPI override: We also add a getter/setter for api_token_secret)
     #
     # @return [String]
     attr_accessor :password
@@ -145,9 +149,24 @@ module FormAPI
       @force_ending_format = false
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
 
+      # Use ENV variables by default if they are provided.
+      @username = ENV['FORMAPI_TOKEN_ID']
+      @password = ENV['FORMAPI_TOKEN_SECRET']
+
       yield(self) if block_given?
     end
 
+    def api_token_id=(api_token_id)
+      @username = api_token_id
+    end
+    alias api_token_id username
+
+    def api_token_secret=(api_token_secret)
+      @password = api_token_secret
+    end
+    alias api_token_secret password
+
+
     # The default Configuration object.
     def self.default
       @@default ||= Configuration.new
@@ -163,14 +182,16 @@ module FormAPI
     end
 
     def host=(host)
+      # Also set scheme when setting host.
+      @scheme = host[SCHEME_REGEX, 1] if host.match?(SCHEME_REGEX)
       # remove http(s):// and anything after a slash
-      @host = host.sub(/https?:\/\//, '').split('/').first
+      @host = host.sub(SCHEME_REGEX, '').split('/').first
     end
 
     def base_path=(base_path)
       # Add leading and trailing slashes to base_path
       @base_path = "/#{base_path}".gsub(/\/+/, '/')
-      @base_path = "" if @base_path == "/"
+      @base_path = '' if @base_path == '/'
     end
 
     def base_url

data/lib/form_api/models/{inline_response_201_1.rb → authentication_error.rb}

@@ -1,23 +1,22 @@
 =begin
 #API V1
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
 OpenAPI spec version: v1
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 3.3.0-SNAPSHOT
 
 =end
 
 require 'date'
 
 module FormAPI
-
-  class InlineResponse2011
+  class AuthenticationError
     attr_accessor :status
 
-    attr_accessor :submission
+    attr_accessor :error
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -45,15 +44,15 @@ module FormAPI
     def self.attribute_map
       {
         :'status' => :'status',
-        :'submission' => :'submission'
+        :'error' => :'error'
       }
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
         :'status' => :'String',
-        :'submission' => :'TemplatestemplateIdsubmissionsbatchSubmission'
+        :'error' => :'String'
       }
     end
 
@@ -63,44 +62,43 @@ module FormAPI
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'status')
         self.status = attributes[:'status']
       end
 
-      if attributes.has_key?(:'submission')
-        self.submission = attributes[:'submission']
+      if attributes.has_key?(:'error')
+        self.error = attributes[:'error']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @status.nil?
-        invalid_properties.push("invalid value for 'status', status cannot be nil.")
+      if @error.nil?
+        invalid_properties.push('invalid value for "error", error cannot be nil.')
       end
 
-      return invalid_properties
+      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?
-      return false if @status.nil?
-      status_validator = EnumAttributeValidator.new('String', ["success", "error"])
+      status_validator = EnumAttributeValidator.new('String', ['error'])
       return false unless status_validator.valid?(@status)
-      return true
+      return false if @error.nil?
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('String', ["success", "error"])
+      validator = EnumAttributeValidator.new('String', ['error'])
       unless validator.valid?(status)
-        fail ArgumentError, "invalid value for 'status', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "status", must be one of #{validator.allowable_values}.'
       end
       @status = status
     end
@@ -111,7 +109,7 @@ module FormAPI
       return true if self.equal?(o)
       self.class == o.class &&
           status == o.status &&
-          submission == o.submission
+          error == o.error
     end
 
     # @see the `==` method
@@ -123,7 +121,7 @@ module FormAPI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [status, submission].hash
+      [status, error].hash
     end
 
     # Builds the object from hash
@@ -131,12 +129,12 @@ module FormAPI
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.swagger_types.each_pair do |key, type|
+      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
           # 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) } )
+            self.send("#{key}=", attributes[self.class.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]]))
@@ -218,7 +216,7 @@ module FormAPI
     # @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) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -229,7 +227,5 @@ module FormAPI
         value
       end
     end
-
   end
-
 end

data/lib/form_api/models/{inline_response_200.rb → authentication_success_response.rb}

@@ -1,20 +1,19 @@
 =begin
 #API V1
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
 OpenAPI spec version: v1
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 3.3.0-SNAPSHOT
 
 =end
 
 require 'date'
 
 module FormAPI
-
-  class InlineResponse200
+  class AuthenticationSuccessResponse
     attr_accessor :status
 
     class EnumAttributeValidator
@@ -47,7 +46,7 @@ module FormAPI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
         :'status' => :'String'
       }
@@ -59,40 +58,34 @@ module FormAPI
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'status')
         self.status = attributes[:'status']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @status.nil?
-        invalid_properties.push("invalid value for 'status', status cannot be nil.")
-      end
-
-      return invalid_properties
+      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?
-      return false if @status.nil?
-      status_validator = EnumAttributeValidator.new('String', ["success"])
+      status_validator = EnumAttributeValidator.new('String', ['success'])
       return false unless status_validator.valid?(@status)
-      return true
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('String', ["success"])
+      validator = EnumAttributeValidator.new('String', ['success'])
       unless validator.valid?(status)
-        fail ArgumentError, "invalid value for 'status', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "status", must be one of #{validator.allowable_values}.'
       end
       @status = status
     end
@@ -122,12 +115,12 @@ module FormAPI
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.swagger_types.each_pair do |key, type|
+      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
           # 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) } )
+            self.send("#{key}=", attributes[self.class.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]]))
@@ -209,7 +202,7 @@ module FormAPI
     # @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) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -220,7 +213,5 @@ module FormAPI
         value
       end
     end
-
   end
-
 end