Fixes ylecuyer#121. Bump faraday dep version from >= 0.9.2 to >= 2 an…

…d migrate custom middleware

lib/survey-gizmo-ruby.rb

@@ -10,7 +10,6 @@
 require 'awesome_print'
 require 'digest/md5'
 require 'faraday'
-require 'faraday_middleware'
 require 'logger'
 require 'net/http'
 require 'retriable'

lib/survey_gizmo/faraday_middleware/parse_survey_gizmo.rb

@@ -1,10 +1,10 @@
-require 'faraday_middleware/response_middleware'
+require 'faraday'
 
 module SurveyGizmo
   class RateLimitExceededError < RuntimeError; end
   class BadResponseError < RuntimeError; end
 
-  class ParseSurveyGizmo < FaradayMiddleware::ResponseMiddleware
+  class ParseSurveyGizmo < Faraday::Middleware
     Faraday::Response.register_middleware(parse_survey_gizmo_data: self)
 
     PAGINATION_FIELDS = [
@@ -22,20 +22,26 @@ class ParseSurveyGizmo < FaradayMiddleware::ResponseMiddleware
       'modified_on'
     ]
 
-    def call(environment)
-      @app.call(environment).on_complete do |response|
-        fail RateLimitExceededError if response.status == 429
-        fail BadResponseError, "Bad response code #{response.status} in #{response.inspect}" unless response.status == 200
-        fail BadResponseError, response.body['message'] unless response.body['result_ok'] && response.body['result_ok'].to_s =~ /^true$/i
+    def on_complete(env)
+      fail RateLimitExceededError if env.status == 429
+      fail BadResponseError, "Bad response code #{env.status} in #{environment.inspect}" unless env.status == 200
+      fail BadResponseError, env.body['message'] unless env.body['result_ok'] && env.body['result_ok'].to_s =~ /^true$/i
 
-        process_response(response)
-      end
+      process_response(env)
     end
 
-    define_parser do |body|
+    private
+
+    def process_response(env)
+      env[:body] = parse(env[:body])
+    rescue Faraday::ParsingError => e
+      raise Faraday::ParsingError.new(e.wrapped_exception, env[:response])
+    end
+
+    def parse(body)
       PAGINATION_FIELDS.each { |n| body[n] = body[n].to_i if body[n] }
 
-      next body unless body['data']
+      return body unless body['data']
 
       # Handle really crappy [] notation in SG API, so far just in SurveyResponse
       Array.wrap(body['data']).compact.each do |datum|
@@ -71,8 +77,6 @@ def call(environment)
       body
     end
 
-    private
-
     def self.cleanup_attribute_name(attr)
       attr.downcase.gsub(/[^[:alnum:]]+/, '_')
                    .gsub(/(url|variable|standard|shown)/, '')

survey-gizmo-ruby.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '>= 3.0'
   gem.add_dependency 'addressable', '>= 2'
   gem.add_dependency 'awesome_print', '>= 1'
-  gem.add_dependency 'faraday', '>= 0.9.1'
-  gem.add_dependency 'faraday_middleware'
+  gem.add_dependency 'faraday', '>= 2.0'
   gem.add_dependency 'retriable', '>= 2.0'
   gem.add_dependency 'i18n'
   gem.add_dependency 'virtus', '>= 1.0.0'