SematextCloud 0.3.1 → 0.4.0

data/lib/SematextCloud/api_client.rb

@@ -6,8 +6,7 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.12
-
+Swagger Codegen version: 3.0.30
 =end
 
 require 'date'
@@ -44,7 +43,7 @@ module SematextCloud
 
     # Call an API with given options.
     #
-    # @return [Array<(Object, Fixnum, Hash)>] an array of 3 elements:
+    # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
@@ -128,6 +127,34 @@ module SematextCloud
       request
     end
 
+    # Builds the HTTP request body
+    #
+    # @param [Hash] header_params Header parameters
+    # @param [Hash] form_params Query parameters
+    # @param [Object] body HTTP body (JSON/XML)
+    # @return [String] HTTP body data in the form of string
+    def build_request_body(header_params, form_params, body)
+      # http form
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
+          header_params['Content-Type'] == 'multipart/form-data'
+        data = {}
+        form_params.each do |key, value|
+          case value
+          when ::File, ::Array, nil
+            # let typhoeus handle File, Array and nil parameters
+            data[key] = value
+          else
+            data[key] = value.to_s
+          end
+        end
+      elsif body
+        data = body.is_a?(String) ? body : body.to_json
+      else
+        data = nil
+      end
+      data
+    end
+
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -143,7 +170,7 @@ module SematextCloud
     # Deserialize the response to the given return type.
     #
     # @param [Response] response HTTP response
-    # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
+    # @param [String] return_type some examples: "User", "Array<User>", "Hash<String, Integer>"
     def deserialize(response, return_type)
       body = response.body
 
@@ -187,7 +214,7 @@ module SematextCloud
         data.to_i
       when 'Float'
         data.to_f
-      when 'BOOLEAN'
+      when 'Boolean'
         data == true
       when 'DateTime'
         # parse date time (expecting ISO 8601 format)
@@ -210,9 +237,7 @@ module SematextCloud
         end
       else
         # models, e.g. Pet
-        SematextCloud.const_get(return_type).new.tap do |model|
-          model.build_from_hash data
-        end
+        SematextCloud.const_get(return_type).build_from_hash(data)
       end
     end
 
@@ -244,11 +269,13 @@ module SematextCloud
         tempfile.write(chunk)
       end
       request.on_complete do |response|
-        tempfile.close
-        @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 "\
-                            "explicitly with `tempfile.delete`"
+        if tempfile
+          tempfile.close
+          @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 "\
+                              "explicitly with `tempfile.delete`"
+        end
       end
     end
 
@@ -264,35 +291,7 @@ module SematextCloud
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
-    end
-
-    # Builds the HTTP request body
-    #
-    # @param [Hash] header_params Header parameters
-    # @param [Hash] form_params Query parameters
-    # @param [Object] body HTTP body (JSON/XML)
-    # @return [String] HTTP body data in the form of string
-    def build_request_body(header_params, form_params, body)
-      # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
-          header_params['Content-Type'] == 'multipart/form-data'
-        data = {}
-        form_params.each do |key, value|
-          case value
-          when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
-      end
-      data
+      @config.base_url + path
     end
 
     # Update hearder and query params based on authentication settings.

data/lib/SematextCloud/api_error.rb

@@ -6,8 +6,7 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.12
-
+Swagger Codegen version: 3.0.30
 =end
 
 module SematextCloud
@@ -34,5 +33,25 @@ module SematextCloud
         super arg
       end
     end
+
+    # Override to_s to display a friendly error message
+    def to_s
+      message
+    end
+
+    def message
+      if @message.nil?
+        msg = "Error message: the server returns an error"
+      else
+        msg = @message
+      end
+
+      msg += "\nHTTP status code: #{code}" if code
+      msg += "\nResponse headers: #{response_headers}" if response_headers
+      msg += "\nResponse body: #{response_body}" if response_body
+
+      msg
+    end
+
   end
 end

data/lib/SematextCloud/configuration.rb

@@ -6,12 +6,9 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.12
-
+Swagger Codegen version: 3.0.30
 =end
 
-require 'uri'
-
 module SematextCloud
   class Configuration
     # Defines url scheme
@@ -128,9 +125,9 @@ module SematextCloud
     attr_accessor :force_ending_format
 
     def initialize
-      @scheme = 'https'
-      @host = ''
-      @base_path = ''
+      @scheme = 'http'
+      @host = 'apps.sematext.com'
+      @base_path = '/'
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0
@@ -174,8 +171,7 @@ module SematextCloud
     end
 
     def base_url
-      url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
     end
 
     # Gets API key (with prefix if set).

data/lib/{stcloud → SematextCloud}/models/alert_notification.rb

@@ -6,12 +6,12 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.25
+Swagger Codegen version: 3.0.30
 =end
 
 require 'date'
 
-module stcloud
+module SematextCloud
   class AlertNotification
     attr_accessor :app_name
 
@@ -63,13 +63,13 @@ module stcloud
     # @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 `stcloud::AlertNotification` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SematextCloud::AlertNotification` 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 `stcloud::AlertNotification`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `SematextCloud::AlertNotification`. 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
       }
@@ -208,7 +208,7 @@ module stcloud
           end
         end
       else # model
-        stcloud.const_get(type).build_from_hash(value)
+        SematextCloud.const_get(type).build_from_hash(value)
       end
     end
 

data/lib/SematextCloud/models/alert_notification_request.rb

@@ -6,8 +6,7 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.12
-
+Swagger Codegen version: 3.0.30
 =end
 
 require 'date'
@@ -35,36 +34,49 @@ module SematextCloud
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'default_interval' => :'Integer',
-        :'_end' => :'String',
-        :'interval' => :'String',
-        :'start' => :'String'
+        :'default_interval' => :'Object',
+        :'_end' => :'Object',
+        :'interval' => :'Object',
+        :'start' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    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 `SematextCloud::AlertNotificationRequest` 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 `SematextCloud::AlertNotificationRequest`. 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?(:'defaultInterval')
-        self.default_interval = attributes[:'defaultInterval']
+      if attributes.key?(:'default_interval')
+        self.default_interval = attributes[:'default_interval']
       end
 
-      if attributes.has_key?(:'end')
-        self._end = attributes[:'end']
+      if attributes.key?(:'_end')
+        self._end = attributes[:'_end']
       end
 
-      if attributes.has_key?(:'interval')
+      if attributes.key?(:'interval')
         self.interval = attributes[:'interval']
       end
 
-      if attributes.has_key?(:'start')
+      if attributes.key?(:'start')
         self.start = attributes[:'start']
       end
     end
@@ -100,26 +112,35 @@ module SematextCloud
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [default_interval, _end, interval, start].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.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
+          # 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) })
           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[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -141,7 +162,7 @@ module SematextCloud
         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
@@ -162,8 +183,7 @@ module SematextCloud
           end
         end
       else # model
-        temp_model = SematextCloud.const_get(type).new
-        temp_model.build_from_hash(value)
+        SematextCloud.const_get(type).build_from_hash(value)
       end
     end
 
@@ -185,7 +205,11 @@ module SematextCloud
       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
@@ -207,6 +231,5 @@ module SematextCloud
       else
         value
       end
-    end
-  end
+    end  end
 end