togglr-sdk 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 542035bde9fcea69f8665c1fff0487e77d49c0961e5d51abf5c93f653217f997
-  data.tar.gz: e0ee9e0f7f72759fab507139d0b94e6468aceb439ea1dd38e45a624dcdf4aa06
+  metadata.gz: e1bb46f30a582926c8f1944f977def1d77b7bb31fb5de9ea6e6bdb6f6ef56ef4
+  data.tar.gz: 85babd1c686f8ebebcd2204fb7e90ae74a4e14f46a5766a3506fabded0e1a055
 SHA512:
-  metadata.gz: 8ac966a7faf9911269391ce637ecf880eaf28b348279ef1cb18a915be482c4ca338a7971e8603af1521f951cbadb72cf760b2d38c113f8d7f7c51eaa0fdd7bdd
-  data.tar.gz: 1bf501fa269bc33ca8a60fb8d1599a14083ef55e271377814616c8d55377daab54f387a1588a48347b3950dacddb029db4c985f56e76262b79e28cb771b65083
+  metadata.gz: 6703102fa6b7613b4a0c969f4b2ae83130147371ec0632cca607a68307008ee44019b686e33dd8898bd7a9094c6db1f5975b08b2d41a997844499c1351d8d6bf
+  data.tar.gz: 291d3df7395d3a16702a82bce7856b14207c685413a4432e410769fb246d0671960fa6fe76a9036cbc391fd0edb915e8d17442976099cd6f88302a7f2ffe9807

data/lib/togglr/cache.rb

@@ -42,4 +42,3 @@ module Togglr
     end
   end
 end
-

data/lib/togglr/client.rb

@@ -9,7 +9,6 @@ require_relative '../togglr-client/version'
 require_relative '../togglr-client/configuration'
 require_relative '../togglr-client/models/feature_error_report'
 require_relative '../togglr-client/models/feature_health'
-require_relative '../togglr-client/models/evaluate_request'
 require_relative '../togglr-client/api/default_api'
 
 module Togglr
@@ -17,10 +16,9 @@ module Togglr
     def initialize(config)
       @config = config
       @cache = config.cache_enabled ? Cache.new(config.cache_size, config.cache_ttl) : nil
-      
+
       # Initialize generated API client
       api_config = TogglrClient::Configuration.new
-      api_config.base_path = config.base_url
       api_config.api_key['Authorization'] = config.api_key
       api_config.ssl_verify = !config.insecure
       @api_client = TogglrClient::DefaultApi.new(TogglrClient::ApiClient.new(api_config))
@@ -28,12 +26,12 @@ module Togglr
 
     def self.new_with_defaults(api_key, *options)
       config = Config.default(api_key)
-      
+
       # Apply options
       options.each do |option|
         option.call(config) if option.respond_to?(:call)
       end
-      
+
       yield(config) if block_given?
       new(config)
     end
@@ -95,17 +93,16 @@ module Togglr
     end
 
     def health_check
-      begin
-        @api_client.health_check
-      rescue TogglrClient::ApiError => e
-        raise "Health check failed with status #{e.code}: #{e.message}"
-      end
+      @api_client.sdk_v1_health_get
+    rescue TogglrClient::ApiError => e
+      raise "Health check failed with status #{e.code}: #{e.message}"
     end
 
     # Report an error for a feature
     def report_error(feature_key, error_type, error_message, context = {})
       error = report_error_with_retries(feature_key, error_type, error_message, context)
       raise error if error
+
       nil # Success - error queued for processing
     end
 
@@ -113,6 +110,7 @@ module Togglr
     def get_feature_health(feature_key)
       health, error = get_feature_health_with_retries(feature_key)
       raise error if error
+
       health
     end
 
@@ -134,25 +132,22 @@ module Togglr
     end
 
     def evaluate_single(feature_key, context, project_api_key)
-      begin
-        # Create evaluate request using generated client
-        evaluate_request = TogglrClient::EvaluateRequest.new(context.to_h)
-        response = @api_client.evaluate_feature(feature_key, evaluate_request)
-        
-        [response.value, response.enabled, true, nil]
-      rescue TogglrClient::ApiError => e
-        case e.code
-        when 404
-          ['', false, false, nil] # Feature not found, not an error
-        when 401
-          [nil, nil, nil, UnauthorizedError.new('Authentication required')]
-        when 400
-          [nil, nil, nil, BadRequestError.new('Bad request')]
-        when 500
-          [nil, nil, nil, InternalServerError.new('Internal server error')]
-        else
-          [nil, nil, nil, APIError.new(e.code.to_s, e.message, e.code)]
-        end
+      # Use the correct API method with request body as hash
+      response = @api_client.sdk_v1_features_feature_key_evaluate_post(feature_key, context.to_h)
+
+      [response.value, response.enabled, true, nil]
+    rescue TogglrClient::ApiError => e
+      case e.code
+      when 404
+        ['', false, false, nil] # Feature not found, not an error
+      when 401
+        [nil, nil, nil, UnauthorizedError.new('Authentication required')]
+      when 400
+        [nil, nil, nil, BadRequestError.new('Bad request')]
+      when 500
+        [nil, nil, nil, InternalServerError.new('Internal server error')]
+      else
+        [nil, nil, nil, APIError.new(e.code.to_s, e.message, e.code)]
       end
     end
 
@@ -192,34 +187,33 @@ module Togglr
       with_retries(max_tries: @config.retries + 1) do
         error = report_error_single(feature_key, error_type, error_message, context)
         raise error if error
+
         nil # Success
       end
     end
 
     def report_error_single(feature_key, error_type, error_message, context)
-      begin
-        error_report = TogglrClient::FeatureErrorReport.new(
-          error_type: error_type,
-          error_message: error_message,
-          context: context
-        )
-        
-        @api_client.report_feature_error(feature_key, error_report)
-        # Success - error queued for processing
-        nil
-      rescue TogglrClient::ApiError => e
-        case e.code
-        when 401
-          UnauthorizedError.new('Authentication required')
-        when 400
-          BadRequestError.new('Bad request')
-        when 404
-          FeatureNotFoundError.new("Feature #{feature_key} not found")
-        when 500
-          InternalServerError.new('Internal server error')
-        else
-          APIError.new(e.code.to_s, e.message, e.code)
-        end
+      error_report = TogglrClient::FeatureErrorReport.new(
+        error_type: error_type,
+        error_message: error_message,
+        context: context
+      )
+
+      @api_client.report_feature_error(feature_key, error_report)
+      # Success - error queued for processing
+      nil
+    rescue TogglrClient::ApiError => e
+      case e.code
+      when 401
+        UnauthorizedError.new('Authentication required')
+      when 400
+        BadRequestError.new('Bad request')
+      when 404
+        FeatureNotFoundError.new("Feature #{feature_key} not found")
+      when 500
+        InternalServerError.new('Internal server error')
+      else
+        APIError.new(e.code.to_s, e.message, e.code)
       end
     end
 
@@ -230,23 +224,21 @@ module Togglr
     end
 
     def get_feature_health_single(feature_key)
-      begin
-        api_health = @api_client.get_feature_health(feature_key)
-        health = convert_feature_health(api_health)
-        [health, nil] # health, error
-      rescue TogglrClient::ApiError => e
-        case e.code
-        when 401
-          [nil, UnauthorizedError.new('Authentication required')]
-        when 400
-          [nil, BadRequestError.new('Bad request')]
-        when 404
-          [nil, FeatureNotFoundError.new("Feature #{feature_key} not found")]
-        when 500
-          [nil, InternalServerError.new('Internal server error')]
-        else
-          [nil, APIError.new(e.code.to_s, e.message, e.code)]
-        end
+      api_health = @api_client.get_feature_health(feature_key)
+      health = convert_feature_health(api_health)
+      [health, nil] # health, error
+    rescue TogglrClient::ApiError => e
+      case e.code
+      when 401
+        [nil, UnauthorizedError.new('Authentication required')]
+      when 400
+        [nil, BadRequestError.new('Bad request')]
+      when 404
+        [nil, FeatureNotFoundError.new("Feature #{feature_key} not found")]
+      when 500
+        [nil, InternalServerError.new('Internal server error')]
+      else
+        [nil, APIError.new(e.code.to_s, e.message, e.code)]
       end
     end
 

data/lib/togglr/models.rb

@@ -24,7 +24,7 @@ module Togglr
 
   # Model for feature health information
   class FeatureHealth
-    attr_accessor :feature_key, :environment_key, :enabled, :auto_disabled, 
+    attr_accessor :feature_key, :environment_key, :enabled, :auto_disabled,
                   :error_rate, :threshold, :last_error_at
 
     def initialize(data = {})

data/lib/togglr/options.rb

@@ -23,7 +23,7 @@ module Togglr
 
     # Set backoff configuration
     def self.with_backoff(base_delay: nil, max_delay: nil, factor: nil)
-      ->(config) do
+      lambda do |config|
         config.backoff.base_delay = base_delay if base_delay
         config.backoff.max_delay = max_delay if max_delay
         config.backoff.factor = factor if factor
@@ -32,7 +32,7 @@ module Togglr
 
     # Enable caching
     def self.with_cache(size, ttl)
-      ->(config) do
+      lambda do |config|
         config.cache_enabled = true
         config.cache_size = size
         config.cache_ttl = ttl

data/lib/togglr/version.rb

@@ -1,3 +1,3 @@
 module Togglr
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/togglr-client/api/default_api.rb

@@ -1,14 +1,12 @@
-=begin
-#SDK API
-
-#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-Generator version: 7.15.0
-
-=end
+# #SDK API
+#
+# No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+#
+# The version of the OpenAPI document: 1.0.0
+#
+# Generated by: https://openapi-generator.tech
+# Generator version: 7.15.0
+#
 
 require 'cgi'
 
@@ -19,8 +17,9 @@ module TogglrClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
+
     # Get health status of feature (including auto-disable state)
-    # @param feature_key [String] 
+    # @param feature_key [String]
     # @param [Hash] opts the optional parameters
     # @return [FeatureHealth]
     def get_feature_health(feature_key, opts = {})
@@ -29,19 +28,19 @@ module TogglrClient
     end
 
     # Get health status of feature (including auto-disable state)
-    # @param feature_key [String] 
+    # @param feature_key [String]
     # @param [Hash] opts the optional parameters
     # @return [Array<(FeatureHealth, Integer, Hash)>] FeatureHealth data, response status code and response headers
     def get_feature_health_with_http_info(feature_key, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: DefaultApi.get_feature_health ...'
-      end
+      @api_client.config.logger.debug 'Calling API: DefaultApi.get_feature_health ...' if @api_client.config.debugging
       # verify the required parameter 'feature_key' is set
       if @api_client.config.client_side_validation && feature_key.nil?
-        fail ArgumentError, "Missing the required parameter 'feature_key' when calling DefaultApi.get_feature_health"
+        raise ArgumentError, "Missing the required parameter 'feature_key' when calling DefaultApi.get_feature_health"
       end
+
       # resource path
-      local_var_path = '/sdk/v1/features/{feature_key}/health'.sub('{' + 'feature_key' + '}', CGI.escape(feature_key.to_s))
+      local_var_path = '/sdk/v1/features/{feature_key}/health'.sub('{' + 'feature_key' + '}',
+                                                                   CGI.escape(feature_key.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -64,25 +63,25 @@ module TogglrClient
       auth_names = opts[:debug_auth_names] || ['ApiKeyAuth']
 
       new_options = opts.merge(
-        :operation => :"DefaultApi.get_feature_health",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
+        operation: :'DefaultApi.get_feature_health',
+        header_params: header_params,
+        query_params: query_params,
+        form_params: form_params,
+        body: post_body,
+        auth_names: auth_names,
+        return_type: return_type
       )
 
       data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: DefaultApi#get_feature_health\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
-      return data, status_code, headers
+      [data, status_code, headers]
     end
 
     # Report feature execution error (for auto-disable)
-    # @param feature_key [String] 
-    # @param feature_error_report [FeatureErrorReport] 
+    # @param feature_key [String]
+    # @param feature_error_report [FeatureErrorReport]
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def report_feature_error(feature_key, feature_error_report, opts = {})
@@ -91,24 +90,26 @@ module TogglrClient
     end
 
     # Report feature execution error (for auto-disable)
-    # @param feature_key [String] 
-    # @param feature_error_report [FeatureErrorReport] 
+    # @param feature_key [String]
+    # @param feature_error_report [FeatureErrorReport]
     # @param [Hash] opts the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def report_feature_error_with_http_info(feature_key, feature_error_report, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: DefaultApi.report_feature_error ...'
-      end
+      @api_client.config.logger.debug 'Calling API: DefaultApi.report_feature_error ...' if @api_client.config.debugging
       # verify the required parameter 'feature_key' is set
       if @api_client.config.client_side_validation && feature_key.nil?
-        fail ArgumentError, "Missing the required parameter 'feature_key' when calling DefaultApi.report_feature_error"
+        raise ArgumentError, "Missing the required parameter 'feature_key' when calling DefaultApi.report_feature_error"
       end
+
       # verify the required parameter 'feature_error_report' is set
       if @api_client.config.client_side_validation && feature_error_report.nil?
-        fail ArgumentError, "Missing the required parameter 'feature_error_report' when calling DefaultApi.report_feature_error"
+        raise ArgumentError,
+              "Missing the required parameter 'feature_error_report' when calling DefaultApi.report_feature_error"
       end
+
       # resource path
-      local_var_path = '/sdk/v1/features/{feature_key}/report-error'.sub('{' + 'feature_key' + '}', CGI.escape(feature_key.to_s))
+      local_var_path = '/sdk/v1/features/{feature_key}/report-error'.sub('{' + 'feature_key' + '}',
+                                                                         CGI.escape(feature_key.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -119,9 +120,7 @@ module TogglrClient
       header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
       content_type = @api_client.select_header_content_type(['application/json'])
-      if !content_type.nil?
-          header_params['Content-Type'] = content_type
-      end
+      header_params['Content-Type'] = content_type unless content_type.nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -136,37 +135,38 @@ module TogglrClient
       auth_names = opts[:debug_auth_names] || ['ApiKeyAuth']
 
       new_options = opts.merge(
-        :operation => :"DefaultApi.report_feature_error",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
+        operation: :'DefaultApi.report_feature_error',
+        header_params: header_params,
+        query_params: query_params,
+        form_params: form_params,
+        body: post_body,
+        auth_names: auth_names,
+        return_type: return_type
       )
 
       data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: DefaultApi#report_feature_error\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
-      return data, status_code, headers
+      [data, status_code, headers]
     end
 
     # Evaluate feature for given context
-    # Returns feature evaluation result for given project and context. The project is derived from the API key. 
-    # @param feature_key [String] 
-    # @param request_body [Hash<String, Object>] 
+    # Returns feature evaluation result for given project and context. The project is derived from the API key.
+    # @param feature_key [String]
+    # @param request_body [Hash<String, Object>]
     # @param [Hash] opts the optional parameters
     # @return [EvaluateResponse]
     def sdk_v1_features_feature_key_evaluate_post(feature_key, request_body, opts = {})
-      data, _status_code, _headers = sdk_v1_features_feature_key_evaluate_post_with_http_info(feature_key, request_body, opts)
+      data, _status_code, _headers = sdk_v1_features_feature_key_evaluate_post_with_http_info(feature_key,
+                                                                                              request_body, opts)
       data
     end
 
     # Evaluate feature for given context
-    # Returns feature evaluation result for given project and context. The project is derived from the API key. 
-    # @param feature_key [String] 
-    # @param request_body [Hash<String, Object>] 
+    # Returns feature evaluation result for given project and context. The project is derived from the API key.
+    # @param feature_key [String]
+    # @param request_body [Hash<String, Object>]
     # @param [Hash] opts the optional parameters
     # @return [Array<(EvaluateResponse, Integer, Hash)>] EvaluateResponse data, response status code and response headers
     def sdk_v1_features_feature_key_evaluate_post_with_http_info(feature_key, request_body, opts = {})
@@ -175,14 +175,18 @@ module TogglrClient
       end
       # verify the required parameter 'feature_key' is set
       if @api_client.config.client_side_validation && feature_key.nil?
-        fail ArgumentError, "Missing the required parameter 'feature_key' when calling DefaultApi.sdk_v1_features_feature_key_evaluate_post"
+        raise ArgumentError,
+              "Missing the required parameter 'feature_key' when calling DefaultApi.sdk_v1_features_feature_key_evaluate_post"
       end
       # verify the required parameter 'request_body' is set
       if @api_client.config.client_side_validation && request_body.nil?
-        fail ArgumentError, "Missing the required parameter 'request_body' when calling DefaultApi.sdk_v1_features_feature_key_evaluate_post"
+        raise ArgumentError,
+              "Missing the required parameter 'request_body' when calling DefaultApi.sdk_v1_features_feature_key_evaluate_post"
       end
+
       # resource path
-      local_var_path = '/sdk/v1/features/{feature_key}/evaluate'.sub('{' + 'feature_key' + '}', CGI.escape(feature_key.to_s))
+      local_var_path = '/sdk/v1/features/{feature_key}/evaluate'.sub('{' + 'feature_key' + '}',
+                                                                     CGI.escape(feature_key.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -193,9 +197,7 @@ module TogglrClient
       header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
       content_type = @api_client.select_header_content_type(['application/json'])
-      if !content_type.nil?
-          header_params['Content-Type'] = content_type
-      end
+      header_params['Content-Type'] = content_type unless content_type.nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -210,20 +212,20 @@ module TogglrClient
       auth_names = opts[:debug_auth_names] || ['ApiKeyAuth']
 
       new_options = opts.merge(
-        :operation => :"DefaultApi.sdk_v1_features_feature_key_evaluate_post",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
+        operation: :'DefaultApi.sdk_v1_features_feature_key_evaluate_post',
+        header_params: header_params,
+        query_params: query_params,
+        form_params: form_params,
+        body: post_body,
+        auth_names: auth_names,
+        return_type: return_type
       )
 
       data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: DefaultApi#sdk_v1_features_feature_key_evaluate_post\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
-      return data, status_code, headers
+      [data, status_code, headers]
     end
 
     # Health check for SDK server
@@ -238,9 +240,7 @@ module TogglrClient
     # @param [Hash] opts the optional parameters
     # @return [Array<(HealthResponse, Integer, Hash)>] HealthResponse data, response status code and response headers
     def sdk_v1_health_get_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: DefaultApi.sdk_v1_health_get ...'
-      end
+      @api_client.config.logger.debug 'Calling API: DefaultApi.sdk_v1_health_get ...' if @api_client.config.debugging
       # resource path
       local_var_path = '/sdk/v1/health'
 
@@ -265,20 +265,20 @@ module TogglrClient
       auth_names = opts[:debug_auth_names] || []
 
       new_options = opts.merge(
-        :operation => :"DefaultApi.sdk_v1_health_get",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
+        operation: :'DefaultApi.sdk_v1_health_get',
+        header_params: header_params,
+        query_params: query_params,
+        form_params: form_params,
+        body: post_body,
+        auth_names: auth_names,
+        return_type: return_type
       )
 
       data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: DefaultApi#sdk_v1_health_get\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
-      return data, status_code, headers
+      [data, status_code, headers]
     end
   end
 end

data/lib/togglr-client/api_client.rb

@@ -1,14 +1,12 @@
-=begin
-#SDK API
-
-#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-Generator version: 7.15.0
-
-=end
+# #SDK API
+#
+# No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+#
+# The version of the OpenAPI document: 1.0.0
+#
+# Generated by: https://openapi-generator.tech
+# Generator version: 7.15.0
+#
 
 require 'date'
 require 'json'
@@ -19,7 +17,6 @@ require 'faraday'
 require 'faraday/multipart' if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2.0')
 require 'marcel'
 
-
 module TogglrClient
   class ApiClient
     # The Configuration object holding settings to be used in the API client.
@@ -54,39 +51,37 @@ module TogglrClient
       begin
         response = connection(opts).public_send(http_method.to_sym.downcase) do |req|
           request = build_request(http_method, path, req, opts)
-          stream = download_file(request) if opts[:return_type] == 'File' || opts[:return_type] == 'Binary'
+          stream = download_file(request) if %w[File Binary].include?(opts[:return_type])
         end
 
-        if config.debugging
-          config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
-        end
+        config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n" if config.debugging
 
         unless response.success?
           if response.status == 0 && response.respond_to?(:return_message)
             # Errors from libcurl will be made visible here
-            fail ApiError.new(code: 0,
-                              message: response.return_message)
+            raise ApiError.new(code: 0,
+                               message: response.return_message)
           else
-            fail ApiError.new(code: response.status,
-                              response_headers: response.headers,
-                              response_body: response.body),
-                 response.reason_phrase
+            raise ApiError.new(code: response.status,
+                               response_headers: response.headers,
+                               response_body: response.body),
+                  response.reason_phrase
           end
         end
       rescue Faraday::TimeoutError
-        fail ApiError.new('Connection timed out')
+        raise ApiError.new('Connection timed out')
       rescue Faraday::ConnectionFailed
-        fail ApiError.new('Connection failed')
+        raise ApiError.new('Connection failed')
       end
 
-      if opts[:return_type] == 'File' || opts[:return_type] == 'Binary'
-        data = deserialize_file(response, stream)
-      elsif opts[:return_type]
-        data = deserialize(response, opts[:return_type])
-      else
-        data = nil
-      end
-      return data, response.status, response.headers
+      data = if %w[File Binary].include?(opts[:return_type])
+               deserialize_file(response, stream)
+             elsif opts[:return_type]
+               deserialize(response, opts[:return_type])
+             else
+               nil
+             end
+      [data, response.status, response.headers]
     end
 
     # Builds the HTTP request
@@ -108,11 +103,9 @@ module TogglrClient
 
       update_params_for_auth! header_params, query_params, opts[:auth_names]
 
-      if [:post, :patch, :put, :delete].include?(http_method)
+      if %i[post patch put delete].include?(http_method)
         req_body = build_request_body(header_params, form_params, opts[:body])
-        if config.debugging
-          config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n"
-        end
+        config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n" if config.debugging
       end
       request.headers = header_params
       request.body = req_body
@@ -139,15 +132,15 @@ module TogglrClient
       elsif header_params['Content-Type'] == 'multipart/form-data'
         data = {}
         form_params.each do |key, value|
-          case value
-          when ::File, ::Tempfile
-            data[key] = Faraday::FilePart.new(value.path, Marcel::MimeType.for(Pathname.new(value.path)))
-          when ::Array, nil
-            # let Faraday handle Array and nil parameters
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
+          data[key] = case value
+                      when ::File, ::Tempfile
+                        Faraday::FilePart.new(value.path, Marcel::MimeType.for(Pathname.new(value.path)))
+                      when ::Array, nil
+                        # let Faraday handle Array and nil parameters
+                        value
+                      else
+                        value.to_s
+                      end
         end
       elsif body
         data = body.is_a?(String) ? body : body.to_json
@@ -161,7 +154,7 @@ module TogglrClient
       stream = []
 
       # handle streaming Responses
-      request.options.on_data = Proc.new do |chunk, overall_received_bytes|
+      request.options.on_data = proc do |chunk, overall_received_bytes|
         stream << chunk
       end
 
@@ -188,16 +181,16 @@ module TogglrClient
       else
         prefix = 'download-'
       end
-      prefix = prefix + '-' unless prefix.end_with?('-')
+      prefix += '-' unless prefix.end_with?('-')
 
       tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
       tempfile.write(content)
       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`"
+      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
 
@@ -237,12 +230,12 @@ module TogglrClient
     end
 
     def basic_auth(conn)
-      if config.username && config.password
-        if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2.0')
-          conn.request(:authorization, :basic, config.username, config.password)
-        else
-          conn.request(:basic_auth, config.username, config.password)
-        end
+      return unless config.username && config.password
+
+      if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2.0')
+        conn.request(:authorization, :basic, config.username, config.password)
+      else
+        conn.request(:basic_auth, config.username, config.password)
       end
     end
 
@@ -255,7 +248,7 @@ module TogglrClient
     # @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 =~ %r{^Application/.*json(?!p)(;.*)?}i).nil?
     end
 
     # Deserialize the response to the given return type.
@@ -272,16 +265,14 @@ module TogglrClient
       # ensuring a default content type
       content_type = response.headers['Content-Type'] || 'application/json'
 
-      fail "Content-Type is not supported: #{content_type}" unless json_mime?(content_type)
+      raise "Content-Type is not supported: #{content_type}" unless json_mime?(content_type)
 
       begin
-        data = JSON.parse("[#{body}]", :symbolize_names => true)[0]
+        data = JSON.parse("[#{body}]", symbolize_names: true)[0]
       rescue JSON::ParserError => e
-        if %w(String Date Time).include?(return_type)
-          data = body
-        else
-          raise e
-        end
+        raise e unless %w[String Date Time].include?(return_type)
+
+        data = body
       end
 
       convert_to_type data, return_type
@@ -293,6 +284,7 @@ module TogglrClient
     # @return [Mixed] Data in a particular type
     def convert_to_type(data, return_type)
       return nil if data.nil?
+
       case return_type
       when 'String'
         data.to_s
@@ -313,11 +305,11 @@ module TogglrClient
         data
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
-        sub_type = $1
+        sub_type = ::Regexp.last_match(1)
         data.map { |item| convert_to_type(item, sub_type) }
-      when /\AHash\<String, (.+)\>\z/
+      when /\AHash<String, (.+)>\z/
         # e.g. Hash<String, Integer>
-        sub_type = $1
+        sub_type = ::Regexp.last_match(1)
         {}.tap do |hash|
           data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
         end
@@ -334,12 +326,12 @@ module TogglrClient
     # @param [String] filename the filename to be sanitized
     # @return [String] the sanitized filename
     def sanitize_filename(filename)
-      filename.split(/[\/\\]/).last
+      filename.split(%r{[/\\]}).last
     end
 
     def build_request_url(path, opts = {})
       # Add leading and trailing slashes to path
-      path = "/#{path}".gsub(/\/+/, '/')
+      path = "/#{path}".gsub(%r{/+}, '/')
       @config.base_url(opts[:operation]) + path
     end
 
@@ -352,10 +344,11 @@ module TogglrClient
       Array(auth_names).each do |auth_name|
         auth_setting = @config.auth_settings[auth_name]
         next unless auth_setting
+
         case auth_setting[:in]
         when 'header' then header_params[auth_setting[:key]] = auth_setting[:value]
         when 'query'  then query_params[auth_setting[:key]] = auth_setting[:value]
-        else fail ArgumentError, 'Authentication token must be in `query` or `header`'
+        else raise ArgumentError, 'Authentication token must be in `query` or `header`'
         end
       end
     end
@@ -373,6 +366,7 @@ module TogglrClient
     # @return [String] the Accept header (e.g. application/json)
     def select_header_accept(accepts)
       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) }
       json_accept || accepts.join(',')
@@ -384,6 +378,7 @@ module TogglrClient
     def select_header_content_type(content_types)
       # return nil by default
       return 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) }
       json_content_type || content_types.first
@@ -394,12 +389,13 @@ module TogglrClient
     # @return [String] JSON string representation of the object
     def object_to_http_body(model)
       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) }
-      else
-        local_body = object_to_hash(model)
-      end
+      local_body = if model.is_a?(Array)
+                     model.map { |m| object_to_hash(m) }
+                   else
+                     object_to_hash(model)
+                   end
       local_body.to_json
     end
 
@@ -430,7 +426,7 @@ module TogglrClient
         # return the array directly as typhoeus will handle it as expected
         param
       else
-        fail "unknown collection format: #{collection_format.inspect}"
+        raise "unknown collection format: #{collection_format.inspect}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: togglr-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Roman