faraday_middleware 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c352d19f8d4edebdb7729a98d7c3b1fee0efff81
-  data.tar.gz: 2d9cdcbd18177a69b876046438263c4d212919e7
+  metadata.gz: 98b62a188512ffc22a73d58652fdd1b812f0a481
+  data.tar.gz: 458cc66e01374dfc59e58b9231a061bfed6b8788
 SHA512:
-  metadata.gz: 3f40ec0ae3ef9fdbd6f3b365c5cff9d936e11dfd720e9a3f363f8dddd93f22e60f4916ae4afba72ccdfc0e0eeb462db5910390cca48e9e7e86550f4165ef2f84
-  data.tar.gz: e539f6866668031b76c7dfc9a8b6dca7f641ebdf86f518e2673b0bfe7f31facebaafa4c09aefa1109368a6416a2908b710845b9b519304b8ff1dfd80e8815434
+  metadata.gz: cb8e817ff09109ef7d47ddf01f7483b792e7696cf6cb39cacd378c0305f8b6b09776f38e411cb0fdb9201165412692bac5c3446f5dbb99b06af6f4208ad2edaa
+  data.tar.gz: 7c349cf036245554e4c94d125e64359c9269b518fc13c9b12b3dc887e5f037bf6e9d60f2bf7025c0554dedabe37eab80ce1da3c11ac92276ca311f562c9b38c5

data/lib/faraday_middleware/response/parse_json.rb

@@ -8,7 +8,7 @@ module FaradayMiddleware
     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"

data/lib/faraday_middleware/response/parse_marshal.rb

@@ -4,7 +4,7 @@ module FaradayMiddleware
   # Public: Restore marshalled Ruby objects in response bodies.
   class ParseMarshal < ResponseMiddleware
     define_parser do |body|
-      ::Marshal.load body unless body.empty?
+      ::Marshal.load(body) unless body.empty?
     end
   end
 end

data/lib/faraday_middleware/response/parse_xml.rb

@@ -5,8 +5,8 @@ module FaradayMiddleware
   class ParseXml < ResponseMiddleware
     dependency 'multi_xml'
 
-    define_parser do |body|
-      ::MultiXml.parse(body)
+    define_parser do |body, parser_options|
+      ::MultiXml.parse(body, parser_options || {})
     end
   end
 end

data/lib/faraday_middleware/response/parse_yaml.rb

@@ -26,8 +26,12 @@ module FaradayMiddleware
   class ParseYaml < ResponseMiddleware
     dependency 'safe_yaml/load'
 
-    define_parser do |body|
-      SafeYAML.load body
+    define_parser do |body, parser_options|
+      if SafeYAML::YAML_ENGINE == 'psych'
+        SafeYAML.load(body, nil, parser_options || {})
+      else
+        SafeYAML.load(body, parser_options || {})
+      end
     end
   end
 end

data/lib/faraday_middleware/response_middleware.rb

@@ -48,11 +48,7 @@ module FaradayMiddleware
     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

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.12.0" unless defined?(FaradayMiddleware::VERSION)
+  VERSION = '0.12.1' unless defined?(FaradayMiddleware::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday