Fixes support for Oj < 3.3.3 (#163)

lostisland · Aug 2, 2017 · 52ca881 · 52ca881
1 parent 693ee0d
commit 52ca881
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/lib/faraday_middleware/response/parse_json.rb b/lib/faraday_middleware/response/parse_json.rb
@@ -8,7 +8,7 @@ class ParseJson < ResponseMiddleware
     end
 
     define_parser do |body, parser_options|
-      ::JSON.parse(body, parser_options) unless body.strip.empty?
+      ::JSON.parse(body, parser_options || {}) unless body.strip.empty?
     end
 
     # Public: Override the content-type of the response with "application/json"

diff --git a/lib/faraday_middleware/response_middleware.rb b/lib/faraday_middleware/response_middleware.rb
@@ -48,11 +48,7 @@ def process_response(env)
     def parse(body)
       if self.class.parser
         begin
-          if @parser_options
-            self.class.parser.call(body, @parser_options)
-          else
-            self.class.parser.call(body)
-          end
+          self.class.parser.call(body, @parser_options)
         rescue StandardError, SyntaxError => err
           raise err if err.is_a? SyntaxError and err.class.name != 'Psych::SyntaxError'
           raise Faraday::Error::ParsingError, err