faraday_middleware 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 67f099d83d2c464e52923be602b2fd0679e25540
-  data.tar.gz: cd5251554042cc0446e5d7a6261880c6a08d1f04
+SHA256:
+  metadata.gz: b3276b16e454e801286b52a8ba62f765b7517d63c2e224b336371e8a53facc41
+  data.tar.gz: 1d7c8d737d91c247bc4bd3ae1326d5e1ce1096126eb7ed8c7bde8bf0b47f4260
 SHA512:
-  metadata.gz: fe301bc8e38984c256bc6a757d3830e76b19bc7835ea469f4cde040ac8167abf84b5ab1fcfc9c195e0bfbe15b557d9788f002ea422801fec3672a158907fffa8
-  data.tar.gz: 00aebfd22482f2d38aa55dbd85ea8097d2d676c01747301a39492ea47415a2a8b4fb8b61a70d0a117fc3cd6d569974457ed4bf4f189da2be77c4ac3e6b0aa2bd
+  metadata.gz: 2d1b3441e3e62a474f6cc91d6b3b4d44214773b4036049b7b4f12bcdc827f0b8b8b7d5b0b0ed37fb8dda99271c8228eb4ffaeb82ee51ceb05a0e27c783d43a1e
+  data.tar.gz: '08da04c8e67e334409a7df32374afb45576cf5bf960e007fcca684c384674e54eabcbd32a3849a3b57b6a6ff04604fa352baabb5beb619417830a1719c9b128b'

data/README.md

@@ -10,13 +10,14 @@ Dependencies
 
 Some dependent libraries are needed only when using specific middleware:
 
-* FaradayMiddleware::EncodeJson & FaradayMiddleware::ParseJson: "json"
-  for ruby older than 1.9
-* FaradayMiddleware::ParseXml: "multi_xml"
-* FaradayMiddleware::OAuth: "simple_oauth"
-* FaradayMiddleware::Mashify: "hashie"
-* FaradayMiddleware::Rashify: "rash_alt" (Make sure to uninstall original rash gem to avoid conflict)
-* FaradayMiddleware::Instrumentation: "activesupport"
+| Middleware                  | Library        | Notes |
+| --------------------------- | -------------- | ----- |
+| [FaradayMiddleware::Instrumentation](https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/instrumentation.rb) | [`activesupport`](https://rubygems.org/gems/activesupport) |       |
+| [FaradayMiddleware::OAuth](https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/request/oauth.rb)    | [`simple_oauth`](https://rubygems.org/gems/simple_oauth) |       |
+| [FaradayMiddleware::ParseXml](https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/response/parse_xml.rb) | [`multi_xml`](https://rubygems.org/gems/multi_xml)    |       |
+| [FaradayMiddleware::ParseYaml](https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/response/parse_yaml.rb)  | [`safe_yaml`](https://rubygems.org/gems/safe_yaml)     | Not backwards compatible with versions of this middleware prior to `faraday_middleware` v0.12. See code comments for alternatives. |
+| [FaradayMiddleware::Mashify](https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/response/mashify.rb)  | [`hashie`](https://rubygems.org/gems/hashie)       |       |
+| [FaradayMiddleware::Rashify](https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/response/rashify.rb)  | [`rash_alt`](https://rubygems.org/gems/rash_alt)     | Make sure to uninstall original `rash` gem to avoid conflict. |
 
 Examples
 --------

data/lib/faraday_middleware/backwards_compatibility.rb

@@ -1,15 +1,18 @@
 # deprecated constants
 
-Faraday::Request.class_eval do
-  autoload :OAuth,        'faraday_middleware/request/oauth'
-  autoload :OAuth2,       'faraday_middleware/request/oauth2'
-end
+module Faraday
+  class Request
+    autoload :OAuth,        'faraday_middleware/request/oauth'
+    autoload :OAuth2,       'faraday_middleware/request/oauth2'
+  end
 
-Faraday::Response.class_eval do
-  autoload :Mashify,      'faraday_middleware/response/mashify'
-  autoload :Rashify,      'faraday_middleware/response/rashify'
-  autoload :ParseJson,    'faraday_middleware/response/parse_json'
-  autoload :ParseXml,     'faraday_middleware/response/parse_xml'
-  autoload :ParseMarshal, 'faraday_middleware/response/parse_marshal'
-  autoload :ParseYaml,    'faraday_middleware/response/parse_yaml'
+  class Response
+    autoload :Mashify,      'faraday_middleware/response/mashify'
+    autoload :Rashify,      'faraday_middleware/response/rashify'
+    autoload :ParseJson,    'faraday_middleware/response/parse_json'
+    autoload :ParseXml,     'faraday_middleware/response/parse_xml'
+    autoload :ParseMarshal, 'faraday_middleware/response/parse_marshal'
+    autoload :ParseYaml,    'faraday_middleware/response/parse_yaml'
+  end
 end
+

data/lib/faraday_middleware/gzip.rb

@@ -16,7 +16,7 @@ module FaradayMiddleware
     ACCEPT_ENCODING = 'Accept-Encoding'.freeze
     CONTENT_ENCODING = 'Content-Encoding'.freeze
     CONTENT_LENGTH = 'Content-Length'.freeze
-    SUPPORTED_ENCODINGS = 'gzip,deflate'.freeze
+    SUPPORTED_ENCODINGS = 'gzip,deflate,br'.freeze
     RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
 
     def call(env)
@@ -27,6 +27,8 @@ module FaradayMiddleware
           reset_body(response_env, &method(:uncompress_gzip))
         when 'deflate'
           reset_body(response_env, &method(:inflate))
+        when 'br'
+          reset_body(response_env, &method(:brotli_inflate))
         end
       end
     end
@@ -60,5 +62,11 @@ module FaradayMiddleware
         inflate.close
       end
     end
+
+    def brotli_inflate(body)
+      self.class.dependency 'brotli'
+
+      Brotli.inflate(body)
+    end
   end
 end

data/lib/faraday_middleware/response/caching.rb

@@ -1,7 +1,6 @@
 require 'faraday'
 require 'forwardable'
-# fixes normalizing query strings:
-require 'faraday_middleware/addressable_patch' if defined? ::Addressable::URI
+require 'digest/sha1'
 
 module FaradayMiddleware
   # Public: Caches GET responses and pulls subsequent ones from the cache.
@@ -22,7 +21,7 @@ module FaradayMiddleware
 
     # Public: initialize the middleware.
     #
-    # cache   - An object that responds to read, write and fetch (default: nil).
+    # cache   - An object that responds to read and write (default: nil).
     # options - An options Hash (default: {}):
     #           :ignore_params - String name or Array names of query params
     #                            that should be ignored when forming the cache
@@ -66,7 +65,8 @@ module FaradayMiddleware
         url.query = params.any? ? build_query(params) : nil
       end
       url.normalize!
-      url.request_uri
+
+      Digest::SHA1.hexdigest(url.request_uri)
     end
 
     def params_to_ignore

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = '0.12.2' unless defined?(FaradayMiddleware::VERSION)
+  VERSION = '0.13.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.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,7 +42,6 @@ files:
 - LICENSE.md
 - README.md
 - lib/faraday_middleware.rb
-- lib/faraday_middleware/addressable_patch.rb
 - lib/faraday_middleware/backwards_compatibility.rb
 - lib/faraday_middleware/gzip.rb
 - lib/faraday_middleware/instrumentation.rb
@@ -82,8 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Various middleware for Faraday

data/lib/faraday_middleware/addressable_patch.rb

@@ -1,20 +0,0 @@
-require 'addressable/uri'
-
-# feature-detect the bug
-unless Addressable::URI.parse('/?a=1&b=2') === '/?b=2&a=1'
-  # fix `normalized_query` by sorting query key-value pairs
-  # (rejected: https://github.com/sporkmonger/addressable/issues/28)
-  class Addressable::URI
-    alias normalized_query_without_ordering_fix normalized_query
-
-    def normalized_query
-      fresh = @normalized_query.nil?
-      query = normalized_query_without_ordering_fix
-      if query && fresh
-        @normalized_query = query.split('&', -1).sort_by {|q| q[0..(q.index('=')||-1)] }.join('&')
-      else
-        query
-      end
-    end
-  end
-end