faraday_middleware 0.11.0.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923f7b7b81b0df3d1bcabaf65cab02f10a65ca7e
-  data.tar.gz: bd043e78e2f16facabd62d2e7003baef37600217
+  metadata.gz: c352d19f8d4edebdb7729a98d7c3b1fee0efff81
+  data.tar.gz: 2d9cdcbd18177a69b876046438263c4d212919e7
 SHA512:
-  metadata.gz: f6c3d53ae343b3d54cf981faf855d89d6aa7b204f37db9b34d66f1e00d0cf656f7919ec003d4ea096da1cfa0a8e1c8f3646ff0a8135f64e7ff24fa9803e40517
-  data.tar.gz: 413366d67bf0d97e4e2a1645ca6e02a8c4eb9453049bdb27c4f8d8a951697e612571098b53963dc78c841e25d9acfc69f887f2ae10b25ed8cd56fab3f017e24c
+  metadata.gz: 3f40ec0ae3ef9fdbd6f3b365c5cff9d936e11dfd720e9a3f363f8dddd93f22e60f4916ae4afba72ccdfc0e0eeb462db5910390cca48e9e7e86550f4165ef2f84
+  data.tar.gz: e539f6866668031b76c7dfc9a8b6dca7f641ebdf86f518e2673b0bfe7f31facebaafa4c09aefa1109368a6416a2908b710845b9b519304b8ff1dfd80e8815434

data/README.md

@@ -15,7 +15,7 @@ Some dependent libraries are needed only when using specific middleware:
 * FaradayMiddleware::ParseXml: "multi_xml"
 * FaradayMiddleware::OAuth: "simple_oauth"
 * FaradayMiddleware::Mashify: "hashie"
-* FaradayMiddleware::Rashify: "rash"
+* FaradayMiddleware::Rashify: "rash_alt" (Make sure to uninstall original rash gem to avoid conflict)
 * FaradayMiddleware::Instrumentation: "activesupport"
 
 Examples

data/lib/faraday_middleware/response/caching.rb

@@ -27,6 +27,9 @@ module FaradayMiddleware
     #           :ignore_params - String name or Array names of query params
     #                            that should be ignored when forming the cache
     #                            key (default: []).
+    #           :write_options - Hash of settings that should be passed as the third
+    #                            options parameter to the cache's #write method. If not
+    #                            specified, no options parameter will be passed.
     #
     # Yields if no cache is given. The block should return a cache object.
     def initialize(app, cache = nil, options = {})
@@ -46,10 +49,7 @@ module FaradayMiddleware
           key = cache_key(env)
           unless response = cache.read(key) and response
             response = @app.call(env)
-
-            if CACHEABLE_STATUS_CODES.include?(response.status)
-              cache.write(key, response)
-            end
+            store_response_in_cache(key, response)
           end
           finalize_response(response, env)
         end
@@ -80,14 +80,22 @@ module FaradayMiddleware
       else
         # response.status is nil at this point, any checks need to be done inside on_complete block
         @app.call(env).on_complete do |response_env|
-          if CACHEABLE_STATUS_CODES.include?(response_env.status)
-            cache.write(key, response_env.response)
-          end
+          store_response_in_cache(key, response_env.response)
           response_env
         end
       end
     end
 
+    def store_response_in_cache(key, response)
+      return unless CACHEABLE_STATUS_CODES.include?(response.status)
+
+      if @options[:write_options]
+        cache.write(key, response, @options[:write_options])
+      else
+        cache.write(key, response)
+      end
+    end
+
     def finalize_response(response, env)
       response = response.dup if response.frozen?
       env[:response] = response

data/lib/faraday_middleware/response/follow_redirects.rb

@@ -89,7 +89,7 @@ module FaradayMiddleware
     end
 
     def update_env(env, request_body, response)
-      env[:url] += safe_escape(response['location'])
+      env[:url] += safe_escape(response['location'] || '')
 
       if convert_to_get?(response)
         env[:method] = :get

data/lib/faraday_middleware/response/parse_json.rb

@@ -7,8 +7,8 @@ module FaradayMiddleware
       require 'json' unless defined?(::JSON)
     end
 
-    define_parser do |body|
-      ::JSON.parse body unless body.strip.empty?
+    define_parser do |body, parser_options|
+      ::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_yaml.rb

@@ -3,27 +3,31 @@ require 'faraday_middleware/response_middleware'
 module FaradayMiddleware
   # Public: Parse response bodies as YAML.
   #
-  # Warning: this uses `YAML.load()` by default and as such is not safe against
-  # code injection or DoS attacks. If you're loading resources from an
-  # untrusted host or over HTTP, you should subclass this middleware and
-  # redefine it to use `safe_load()` if you're using a Psych version that
-  # supports it:
+  # Warning: This is not backwards compatible with versions of this middleware prior to
+  # faraday_middleware v0.12 - prior to this version, we used YAML.load rather than
+  # YAMl.safe_load, which exposes serious remote code execution risks - see
+  # https://github.com/ruby/psych/issues/119 for details. If you're sure you can trust
+  # YAML you're passing, you can set up an unsafe version of this middleware as follows:
+  #
+  #     class UnsafelyParseYaml < FaradayMiddleware::ResponseMiddleware
+  #       dependency do
+  #         require 'yaml'
+  #       end
   #
-  #     class SafeYaml < FaradayMiddleware::ParseYaml
   #       define_parser do |body|
-  #         YAML.safe_load(body)
+  #         YAML.load body
   #       end
   #     end
   #
   #     Faraday.new(..) do |config|
-  #       config.use SafeYaml
+  #       config.use UnsafelyParseYaml
   #       ...
   #     end
   class ParseYaml < ResponseMiddleware
-    dependency 'yaml'
+    dependency 'safe_yaml/load'
 
     define_parser do |body|
-      ::YAML.load body
+      SafeYAML.load body
     end
   end
 end

data/lib/faraday_middleware/response/rashify.rb

@@ -6,7 +6,7 @@ module FaradayMiddleware
   class Rashify < Mashify
     dependency do
       require 'rash'
-      self.mash_class = ::Hashie::Rash
+      self.mash_class = ::Hashie::Mash::Rash
     end
   end
 end

data/lib/faraday_middleware/response_middleware.rb

@@ -23,6 +23,7 @@ module FaradayMiddleware
     def initialize(app = nil, options = {})
       super(app)
       @options = options
+      @parser_options = options[:parser_options]
       @content_types = Array(options[:content_type])
     end
 
@@ -47,7 +48,11 @@ module FaradayMiddleware
     def parse(body)
       if self.class.parser
         begin
-          self.class.parser.call(body)
+          if @parser_options
+            self.class.parser.call(body, @parser_options)
+          else
+            self.class.parser.call(body)
+          end
         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.11.0.1" unless defined?(FaradayMiddleware::VERSION)
+  VERSION = "0.12.0" unless defined?(FaradayMiddleware::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.11.0.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Various middleware for Faraday