Chores/upgrade gem dependencies

.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

kickbox.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
 
   gem.files = Dir["lib/**/*"]
 
-  gem.add_dependency "faraday", "~> 1.0"
-  gem.add_dependency "json", ">= 1.8"
+  gem.add_dependency "faraday", "~> 2.0"
+  gem.add_dependency "json", "~> 2.0"
 end

lib/kickbox/api/kickbox.rb

@@ -15,7 +15,7 @@ def initialize(client)
       #
       # email - Email address to verify
       def verify(email, options = {})
-        body    = options.fetch("query", {})
+        body = options.fetch("query", {})
         timeout = options.fetch("timeout", 6000)
 
         email = CGI::escape(email)

lib/kickbox/client.rb

@@ -12,7 +12,7 @@ def initialize(auth = {}, options = {})
     end
 
     # 
-    def kickbox()
+    def kickbox
       Kickbox::Api::Kickbox.new(@http_client)
     end
 

lib/kickbox/http_client/auth_handler.rb

@@ -15,40 +15,29 @@ def initialize(app, auth = {}, options = {})
       end
 
       def call(env)
-        if [email protected]?
-          auth = get_auth_type
-          flag = false
-
-          if auth == HTTP_HEADER
-            env = http_header(env)
-            flag = true
-          end
-
-          if !flag
-            raise StandardError.new "Unable to calculate authorization method. Please check"
-          end
-        else
-          raise StandardError.new "Server requires authentication to proceed further. Please check"
+        raise StandardError.new("Server requires authentication to proceed further. Please check") if @auth.empty?
+
+        if get_auth_type == HTTP_HEADER
+          env = http_header(env)
         end
 
         @app.call(env)
       end
 
       # Calculating the Authentication Type
-      def get_auth_type()
-
+      def get_auth_type
         if @auth.has_key?(:http_header)
-          return HTTP_HEADER
+          HTTP_HEADER
+        else
+          raise StandardError.new("Unable to calculate authorization method. Please check")
         end
-
-        return -1
       end
 
       # Authorization with HTTP header
       def http_header(env)
         env[:request_headers]["Authorization"] = "token #{@auth[:http_header]}"
 
-        return env
+        env
       end
 
       def query_params(url)
@@ -60,11 +49,11 @@ def query_params(url)
       end
 
       def merge_query(env, query)
-        query = query.update query_params(env[:url])
+        query = query.update(query_params(env[:url]))
 
         env[:url].query = Faraday::Utils.build_query(query)
 
-        return env
+        env
       end
     end
 

lib/kickbox/http_client/error_handler.rb

@@ -2,7 +2,7 @@ module Kickbox
 
   module HttpClient
 
-    # ErrorHanlder takes care of selecting the error message from response body
+    # ErrorHandler takes care of selecting the error message from response body
     class ErrorHandler < Faraday::Middleware
 
       def initialize(app)

lib/kickbox/http_client/response_handler.rb

@@ -7,14 +7,12 @@ class ResponseHandler
 
       def self.get_body(env)
         type = env.response_headers["content-type"] || ''
-        body = env.body
 
         # Response body is in JSON
-        if type.include?("json")
-          body = JSON.parse body
-        end
+        type.include?("json") ?
+          return JSON.parse(body) :
+          return env.body
 
-        return body
       end
 
     end