teleswagger 0.1.0 → 0.2.0

data/lib/teleswagger/api/updates_api.rb

@@ -3,10 +3,21 @@
 
 #This is a swagger defenition for [Telegram bot API](https://core.telegram.org/bots/api). 
 
-OpenAPI spec version: 3.3
+OpenAPI spec version: 3.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 =end
 
@@ -38,17 +49,21 @@ module Teleswagger
         @api_client.config.logger.debug "Calling API: UpdatesApi.delete_webhook ..."
       end
       # resource path
-      local_var_path = "/bot{token}/deleteWebhook"
+      local_var_path = "/bot{token}/deleteWebhook".sub('{format}','json')
 
       # query parameters
       query_params = {}
 
       # header parameters
       header_params = {}
+
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      local_header_content_type = ['application/json']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
       form_params = {}
@@ -74,9 +89,7 @@ module Teleswagger
     # @param token bot's token to authorize the request
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :offset 
-    # @option opts [Integer] :limit 
-    # @option opts [Integer] :timeout 
-    # @option opts [Array<String>] :allowed_updates 
+    # @option opts [GetUpdatesBody] :body 
     # @return [ResponseUpdate]
     def get_updates(token, opts = {})
       data, _status_code, _headers = get_updates_with_http_info(token, opts)
@@ -88,45 +101,39 @@ module Teleswagger
     # @param token bot&#39;s token to authorize the request
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :offset 
-    # @option opts [Integer] :limit 
-    # @option opts [Integer] :timeout 
-    # @option opts [Array<String>] :allowed_updates 
+    # @option opts [GetUpdatesBody] :body 
     # @return [Array<(ResponseUpdate, Fixnum, Hash)>] ResponseUpdate data, response status code and response headers
     def get_updates_with_http_info(token, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UpdatesApi.get_updates ..."
       end
       # verify the required parameter 'token' is set
-      if @api_client.config.client_side_validation && token.nil?
-        fail ArgumentError, "Missing the required parameter 'token' when calling UpdatesApi.get_updates"
-      end
-      if @api_client.config.client_side_validation && opts[:'allowed_updates'] && !opts[:'allowed_updates'].all?{|item| ['message', 'edited_message', 'channel_post', 'edited_channel_post', 'inline_query', 'chosen_inline_result', 'callback_query'].include?(item)}
-        fail ArgumentError, 'invalid value for "allowed_updates", must include one of message, edited_message, channel_post, edited_channel_post, inline_query, chosen_inline_result, callback_query'
-      end
+      fail ArgumentError, "Missing the required parameter 'token' when calling UpdatesApi.get_updates" if token.nil?
       # resource path
-      local_var_path = "/bot{token}/getUpdates".sub('{' + 'token' + '}', token.to_s)
+      local_var_path = "/bot{token}/getUpdates".sub('{format}','json').sub('{' + 'token' + '}', token.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'offset'] = opts[:'offset'] if !opts[:'offset'].nil?
-      query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil?
-      query_params[:'timeout'] = opts[:'timeout'] if !opts[:'timeout'].nil?
-      query_params[:'allowed_updates'] = @api_client.build_collection_param(opts[:'allowed_updates'], :multi) if !opts[:'allowed_updates'].nil?
 
       # header parameters
       header_params = {}
+
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      local_header_content_type = ['application/json']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
       form_params = {}
 
       # http body (model)
-      post_body = nil
+      post_body = @api_client.object_to_http_body(opts[:'body'])
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -157,17 +164,21 @@ module Teleswagger
         @api_client.config.logger.debug "Calling API: UpdatesApi.get_webhook_info ..."
       end
       # resource path
-      local_var_path = "/bot{token}/getWebhookInfo"
+      local_var_path = "/bot{token}/getWebhookInfo".sub('{format}','json')
 
       # query parameters
       query_params = {}
 
       # header parameters
       header_params = {}
+
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      local_header_content_type = ['application/json']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
       form_params = {}
@@ -216,28 +227,28 @@ module Teleswagger
         @api_client.config.logger.debug "Calling API: UpdatesApi.set_webhook ..."
       end
       # verify the required parameter 'token' is set
-      if @api_client.config.client_side_validation && token.nil?
-        fail ArgumentError, "Missing the required parameter 'token' when calling UpdatesApi.set_webhook"
-      end
+      fail ArgumentError, "Missing the required parameter 'token' when calling UpdatesApi.set_webhook" if token.nil?
       # verify the required parameter 'url' is set
-      if @api_client.config.client_side_validation && url.nil?
-        fail ArgumentError, "Missing the required parameter 'url' when calling UpdatesApi.set_webhook"
-      end
-      if @api_client.config.client_side_validation && opts[:'allowed_updates'] && !opts[:'allowed_updates'].all?{|item| ['message', 'edited_message', 'channel_post', 'edited_channel_post', 'inline_query', 'chosen_inline_result', 'callback_query'].include?(item)}
-        fail ArgumentError, 'invalid value for "allowed_updates", must include one of message, edited_message, channel_post, edited_channel_post, inline_query, chosen_inline_result, callback_query'
+      fail ArgumentError, "Missing the required parameter 'url' when calling UpdatesApi.set_webhook" if url.nil?
+      if opts[:'allowed_updates'] && !['message', 'edited_message', 'channel_post', 'edited_channel_post', 'inline_query', 'chosen_inline_result', 'callback_query', 'shipping_query', 'pre_checkout_query'].include?(opts[:'allowed_updates'])
+        fail ArgumentError, 'invalid value for "allowed_updates", must be one of message, edited_message, channel_post, edited_channel_post, inline_query, chosen_inline_result, callback_query, shipping_query, pre_checkout_query'
       end
       # resource path
-      local_var_path = "/bot{token}/setWebhook".sub('{' + 'token' + '}', token.to_s)
+      local_var_path = "/bot{token}/setWebhook".sub('{format}','json').sub('{' + 'token' + '}', token.to_s)
 
       # query parameters
       query_params = {}
 
       # header parameters
       header_params = {}
+
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
+      local_header_content_type = ['multipart/form-data']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
       form_params = {}

data/lib/teleswagger/api/users_api.rb

@@ -3,10 +3,21 @@
 
 #This is a swagger defenition for [Telegram bot API](https://core.telegram.org/bots/api). 
 
-OpenAPI spec version: 3.3
+OpenAPI spec version: 3.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 =end
 
@@ -24,7 +35,7 @@ module Teleswagger
     # 
     # @param token bot's token to authorize the request
     # @param [Hash] opts the optional parameters
-    # @return [InlineResponse200]
+    # @return [InlineResponse2007]
     def get_me(token, opts = {})
       data, _status_code, _headers = get_me_with_http_info(token, opts)
       return data
@@ -34,27 +45,29 @@ module Teleswagger
     # 
     # @param token bot's token to authorize the request
     # @param [Hash] opts the optional parameters
-    # @return [Array<(InlineResponse200, Fixnum, Hash)>] InlineResponse200 data, response status code and response headers
+    # @return [Array<(InlineResponse2007, Fixnum, Hash)>] InlineResponse2007 data, response status code and response headers
     def get_me_with_http_info(token, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UsersApi.get_me ..."
       end
       # verify the required parameter 'token' is set
-      if @api_client.config.client_side_validation && token.nil?
-        fail ArgumentError, "Missing the required parameter 'token' when calling UsersApi.get_me"
-      end
+      fail ArgumentError, "Missing the required parameter 'token' when calling UsersApi.get_me" if token.nil?
       # resource path
-      local_var_path = "/bot{token}/getMe".sub('{' + 'token' + '}', token.to_s)
+      local_var_path = "/bot{token}/getMe".sub('{format}','json').sub('{' + 'token' + '}', token.to_s)
 
       # query parameters
       query_params = {}
 
       # header parameters
       header_params = {}
+
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      local_header_content_type = ['application/json']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
       form_params = {}
@@ -68,7 +81,7 @@ module Teleswagger
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'InlineResponse200')
+        :return_type => 'InlineResponse2007')
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UsersApi#get_me\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -82,7 +95,7 @@ module Teleswagger
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :offset 
     # @option opts [Integer] :limit 
-    # @return [InlineResponse2001]
+    # @return [InlineResponse2009]
     def get_user_profile_photos(token, user_id, opts = {})
       data, _status_code, _headers = get_user_profile_photos_with_http_info(token, user_id, opts)
       return data
@@ -95,21 +108,17 @@ module Teleswagger
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :offset 
     # @option opts [Integer] :limit 
-    # @return [Array<(InlineResponse2001, Fixnum, Hash)>] InlineResponse2001 data, response status code and response headers
+    # @return [Array<(InlineResponse2009, Fixnum, Hash)>] InlineResponse2009 data, response status code and response headers
     def get_user_profile_photos_with_http_info(token, user_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UsersApi.get_user_profile_photos ..."
       end
       # verify the required parameter 'token' is set
-      if @api_client.config.client_side_validation && token.nil?
-        fail ArgumentError, "Missing the required parameter 'token' when calling UsersApi.get_user_profile_photos"
-      end
+      fail ArgumentError, "Missing the required parameter 'token' when calling UsersApi.get_user_profile_photos" if token.nil?
       # verify the required parameter 'user_id' is set
-      if @api_client.config.client_side_validation && user_id.nil?
-        fail ArgumentError, "Missing the required parameter 'user_id' when calling UsersApi.get_user_profile_photos"
-      end
+      fail ArgumentError, "Missing the required parameter 'user_id' when calling UsersApi.get_user_profile_photos" if user_id.nil?
       # resource path
-      local_var_path = "/bot{token}/getUserProfilePhotos".sub('{' + 'token' + '}', token.to_s)
+      local_var_path = "/bot{token}/getUserProfilePhotos".sub('{format}','json').sub('{' + 'token' + '}', token.to_s)
 
       # query parameters
       query_params = {}
@@ -119,10 +128,14 @@ module Teleswagger
 
       # header parameters
       header_params = {}
+
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      local_header_content_type = ['application/json']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
       form_params = {}
@@ -136,7 +149,7 @@ module Teleswagger
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'InlineResponse2001')
+        :return_type => 'InlineResponse2009')
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UsersApi#get_user_profile_photos\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end

data/lib/teleswagger/api_client.rb

@@ -3,10 +3,21 @@
 
 #This is a swagger defenition for [Telegram bot API](https://core.telegram.org/bots/api). 
 
-OpenAPI spec version: 3.3
+OpenAPI spec version: 3.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 =end
 
@@ -55,18 +66,10 @@ module Teleswagger
       end
 
       unless response.success?
-        if response.timed_out?
-          fail ApiError.new('Connection timed out')
-        elsif response.code == 0
-          # Errors from libcurl will be made visible here
-          fail ApiError.new(:code => 0,
-                            :message => response.return_message)
-        else
-          fail ApiError.new(:code => response.code,
-                            :response_headers => response.headers,
-                            :response_body => response.body),
-               response.status_message
-        end
+        fail ApiError.new(:code => response.code,
+                          :response_headers => response.headers,
+                          :response_body => response.body),
+             response.status_message
       end
 
       if opts[:return_type]
@@ -122,9 +125,7 @@ module Teleswagger
         end
       end
 
-      request = Typhoeus::Request.new(url, req_opts)
-      download_file(request) if opts[:return_type] == 'File'
-      request
+      Typhoeus::Request.new(url, req_opts)
     end
 
     # Check if the given MIME is a JSON MIME.
@@ -132,11 +133,10 @@ module Teleswagger
     #   application/json
     #   application/json; charset=UTF8
     #   APPLICATION/JSON
-    #   */*
     # @param [String] mime MIME
-    # @return [Boolean] True if the MIME is application/json
+    # @return [Boolean] True if the MIME is applicaton/json
     def json_mime?(mime)
-       (mime == "*/*") || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
+       !(mime =~ /\Aapplication\/json(;.*)?\z/i).nil?
     end
 
     # Deserialize the response to the given return type.
@@ -145,16 +145,14 @@ module Teleswagger
     # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
     def deserialize(response, return_type)
       body = response.body
-
-      # handle file downloading - return the File instance processed in request callbacks
-      # note that response body is empty when the file is written in chunks in request on_body callback
-      return @tempfile if return_type == 'File'
-
       return nil if body.nil? || body.empty?
 
       # return response body directly for String return type
       return body if return_type == 'String'
 
+      # handle file downloading - save response body into a tmp file and return the File instance
+      return download_file(response) if return_type == 'File'
+
       # ensuring a default content type
       content_type = response.headers['Content-Type'] || 'application/json'
 
@@ -217,38 +215,30 @@ module Teleswagger
 
     # Save response body into a file in (the defined) temporary folder, using the filename
     # from the "Content-Disposition" header if provided, otherwise a random filename.
-    # The response body is written to the file in chunks in order to handle files which
-    # size is larger than maximum Ruby String or even larger than the maximum memory a Ruby
-    # process can use.
     #
     # @see Configuration#temp_folder_path
-    def download_file(request)
-      tempfile = nil
-      encoding = nil
-      request.on_headers do |response|
-        content_disposition = response.headers['Content-Disposition']
-        if content_disposition and content_disposition =~ /filename=/i
-          filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-          prefix = sanitize_filename(filename)
-        else
-          prefix = 'download-'
-        end
-        prefix = prefix + '-' unless prefix.end_with?('-')
-        encoding = response.body.encoding
-        tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
-        @tempfile = tempfile
-      end
-      request.on_body do |chunk|
-        chunk.force_encoding(encoding)
-        tempfile.write(chunk)
+    # @return [Tempfile] the file downloaded
+    def download_file(response)
+      content_disposition = response.headers['Content-Disposition']
+      if content_disposition and content_disposition =~ /filename=/i
+        filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+        prefix = sanitize_filename(filename)
+      else
+        prefix = 'download-'
       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`"
+      prefix = prefix + '-' unless prefix.end_with?('-')
+
+      tempfile = nil
+      encoding = response.body.encoding
+      Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding) do |file|
+        file.write(response.body)
+        tempfile = file
       end
+      @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`"
+      tempfile
     end
 
     # Sanitize filename by removing path.
@@ -279,7 +269,7 @@ module Teleswagger
         data = {}
         form_params.each do |key, value|
           case value
-          when ::File, ::Array, nil
+          when File, Array, nil
             # let typhoeus handle File, Array and nil parameters
             data[key] = value
           else
@@ -297,7 +287,7 @@ module Teleswagger
     # Update hearder and query params based on authentication settings.
     #
     # @param [Hash] header_params Header parameters
-    # @param [Hash] query_params Query parameters
+    # @param [Hash] form_params Query parameters
     # @param [String] auth_names Authentication scheme name
     def update_params_for_auth!(header_params, query_params, auth_names)
       Array(auth_names).each do |auth_name|