lib/tijuana_client/client.rb in tijuana_client-0.2.4 vs lib/tijuana_client/client.rb in tijuana_client-0.3.0

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module TijuanaClient
   class Client < Vertebrae::API
     def user
       @user ||= TijuanaClient::User.new(client: self)
     end
@@ -17,37 +19,35 @@
         content_type: 'application/x-www-form-urlencoded'
       }
     end
 
     def request(method, path, params, options) # :nodoc:
-      if !::Vertebrae::Request::METHODS.include?(method)
-        raise ArgumentError, "unknown http method: #{method}"
-      end
+      raise ArgumentError, "unknown http method: #{method}" unless ::Vertebrae::Request::METHODS.include?(method)
 
-      path =  connection.configuration.prefix + '/' + path
+      path = "#{connection.configuration.prefix}/#{path}"
 
       ::Vertebrae::Base.logger.debug "EXECUTED: #{method} - #{path} with #{params} and #{options}"
 
       connection.connection.send(method) do |request|
-
         case method.to_sym
-          when *(::Vertebrae::Request::METHODS - ::Vertebrae::Request::METHODS_WITH_BODIES)
-            request.body = params.delete('data') if params.has_key?('data')
-            request.url(path, params)
-          when *::Vertebrae::Request::METHODS_WITH_BODIES
-            request.path = path
-            request.body = extract_data_from_params(params) unless params.empty?
+        when *(::Vertebrae::Request::METHODS - ::Vertebrae::Request::METHODS_WITH_BODIES)
+          request.body = params.delete('data') if params.key?('data')
+          request.url(path, params)
+        when *::Vertebrae::Request::METHODS_WITH_BODIES
+          request.path = path
+          request.body = extract_data_from_params(params) unless params.empty?
         end
       end
     end
 
     def setup
       connection.stack do |builder|
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
         if connection.configuration.authenticated?
-          builder.use Faraday::Request::BasicAuthentication, connection.configuration.username, connection.configuration.password
+          builder.use Faraday::Request::BasicAuthentication, connection.configuration.username,
+                      connection.configuration.password
         end
 
         builder.use Faraday::Response::Logger if ENV['DEBUG']
 
         builder.use TijuanaClient::ErrorMiddleware
@@ -56,13 +56,13 @@
     end
 
     private
 
     def extract_data_from_params(params)
-      if params.has_key?('data') && params['data'].present?
-        return  {'data'=> params['data']}
+      if params.key?('data') && params['data'].present?
+        { 'data' => params['data'] }
       else
-        return params
+        params
       end
     end
   end
 end