lib/sonar/client.rb in sonar-client-0.1.6 vs lib/sonar/client.rb in sonar-client-0.2.0

@@ -1,22 +1,21 @@
 # encoding: utf-8
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/follow_redirects'
+require 'faraday/rashify'
 require 'forwardable'
 require 'sonar/request'
-require 'sonar/certificate'
 require 'sonar/search'
 require 'sonar/user'
 require 'sonar/cli/cli'
 require 'sonar/registration'
 
 module Sonar
   class Client
     extend Forwardable
 
     include Request
-    include Certificate
     include Search
     include User
     include Registration
 
     attr_accessor :api_url, :api_version, :access_token, :email
@@ -37,12 +36,14 @@
     #
     # @return [Faraday::Connection]
     def connection
       params = {}
       @conn = Faraday.new(url: api_url, params: params, headers: default_headers, ssl: { verify: true }) do |faraday|
-        faraday.use FaradayMiddleware::Mashify
-        faraday.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
-        faraday.use FaradayMiddleware::FollowRedirects
+        faraday.use Faraday::FollowRedirects::Middleware
+        faraday.use Faraday::Rashify::Middleware
+        faraday.request :json
+
+        faraday.response :json
         faraday.adapter Faraday.default_adapter
       end
       @conn.headers['X-Sonar-Token'] = access_token
       @conn.headers['X-Sonar-Email'] = email
       @conn