fix lint errors reported by Rubocup and set new gem versions as dependency

Author: jvmvik

.rubocop.yml

@@ -1,19 +1,20 @@
+# human should be able to read 200 chars per line
 Layout/LineLength:
-  Max: 100
+  Max: 200
 
+# relax branch condition size, code can be too verbose
 Metrics/AbcSize:
-  Max: 21
+  Max: 40
 
+# short clear method name 
 Metrics/MethodLength:
   Max: 25
 
-Style/FrozenStringLiteralComment:
+# no performance implication
+Style/OptionalBooleanParameter:
   Enabled: false
 
-Style/RescueStandardError:
-  Enabled: false
-
-# %i is not supported by older languages
+# %i(array) is not common in Ruby
 Style/SymbolArray:
   Enabled: false
 

Gemfile

@@ -12,13 +12,13 @@ group :test, :development do
   # code coloring for yard
   gem 'redcarpet'
   # documentation generation
-  gem 'yard'
+  gem 'yard', '~>0.9.28'
   # linter for ruby
-  gem 'rubocop'
+  gem 'rubocop', '~>1.30.1'
   # test for ruby
-  gem 'rspec'
+  gem 'rspec', '~>3.11'
   # code coverage to monitor rspec tests
-  gem 'simplecov'
+  gem 'simplecov', 
 
   platforms :mri do
     gem "byebug"

Rakefile

@@ -69,3 +69,8 @@ task oobt: %i[readme doc check build install demo]
 
 desc "execute all the steps"
 task default: %i[dependency version readme doc build test oobt]
+
+desc "format ruby code using rubocop"
+task :format do
+  sh('rubocop --auto-correct')
+end

lib/serpapi/client.rb

@@ -1,7 +1,6 @@
 # Client implementation for SerpApi.com
 #
 module SerpApi
-
   # Client for SerpApi.com
   #
   class Client
@@ -10,7 +9,7 @@ class Client
     # Backend service URL
     BACKEND = 'serpapi.com'.freeze
 
-                # HTTP timeout requests
+    # HTTP timeout requests
     attr_reader :timeout,
                 # Query parameters
                 :params
@@ -31,7 +30,7 @@ class Client
     # key can be either a symbol or a string.
     #
     # @param [Hash] params default for the search
-    def initialize(params = {}, adapter = :net_http)
+    def initialize(params = {}, _adapter = :net_http)
       # set default read timeout
       @timeout = params[:timeout] || params['timeout'] || 120
       @timeout.freeze
@@ -128,30 +127,24 @@ def query(params)
     # @param [Boolean] symbolize_names if true, convert JSON keys to symbols
     # @return decoded payload as JSON / Hash or String
     def get(endpoint, decoder = :json, params = {}, symbolize_names = true)
-      begin
-        payload = @socket.get(endpoint) do |req|
-          req.params = query(params)
-          req.options.timeout = timeout
-        end
-        # read http response
-        data = payload.body
-        # decode payload using JSON native parser
-        if decoder == :json
-          data = JSON.parse(data, symbolize_names: symbolize_names)
-          if data.class == Hash && data.key?('error')
-            raise SerpApiException, "get failed with error: #{data['error']} from url: #{endpoint}, params: #{params}, decoder: #{decoder}, http status: #{payload.status} "
-          end
-          if payload.status != 200
-            raise SerpApiException, "get failed with response status: #{payload.status} reponse: #{data} on get url: #{endpoint}, params: #{params}, decoder: #{decoder}"
-          end
+      payload = @socket.get(endpoint) do |req|
+        req.params = query(params)
+        req.options.timeout = timeout
+      end
+      # read http response
+      data = payload.body
+      # decode payload using JSON native parser
+      if decoder == :json
+        data = JSON.parse(data, symbolize_names: symbolize_names)
+        if data.instance_of?(Hash) && data.key?('error')
+          raise SerpApiException, "get failed with error: #{data['error']} from url: #{endpoint}, params: #{params}, decoder: #{decoder}, http status: #{payload.status} "
         end
-        # return raw HTML
-        return data
-      rescue Faraday::Error => err
-        raise SerpApiException, "fail: get url: #{endpoint} caused by #{err.class} : #{err.message} (params: #{params}, decoder: #{decoder})"
+        raise SerpApiException, "get failed with response status: #{payload.status} reponse: #{data} on get url: #{endpoint}, params: #{params}, decoder: #{decoder}" if payload.status != 200
       end
+      # return raw HTML
+      data
+    rescue Faraday::Error => e
+      raise SerpApiException, "fail: get url: #{endpoint} caused by #{e.class} : #{e.message} (params: #{params}, decoder: #{decoder})"
     end
-
   end
-
 end

lib/serpapi/version.rb

@@ -1,6 +1,4 @@
 module SerpApi
-
   # Current version of the gem
   VERSION = '1.0.0'.freeze
-
 end