From 1ff0f1f2b425786ea5226dc556290acf2eb03eaf Mon Sep 17 00:00:00 2001
From: sdogruyol <dogruyolserdar@gmail.com>
Date: Mon, 21 Jan 2019 17:09:41 +0300
Subject: [PATCH] Remove Addressable::URI query hack

---
 .travis.yml                                 |  2 +-
 lib/faraday_middleware/addressable_patch.rb | 20 --------------------
 lib/faraday_middleware/response/caching.rb  |  2 --
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 lib/faraday_middleware/addressable_patch.rb

diff --git a/.travis.yml b/.travis.yml
index 8dd99d5d..fd212084 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 bundler_args: --without development
 language: ruby
-before_install: gem install bundler
+before_install: gem install bundler -v '<2'
 rvm:
   - 1.9.3
   - 2.0
diff --git a/lib/faraday_middleware/addressable_patch.rb b/lib/faraday_middleware/addressable_patch.rb
deleted file mode 100644
index f4773487..00000000
--- a/lib/faraday_middleware/addressable_patch.rb
+++ /dev/null
@@ -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
diff --git a/lib/faraday_middleware/response/caching.rb b/lib/faraday_middleware/response/caching.rb
index 78be6f97..f91ef677 100644
--- a/lib/faraday_middleware/response/caching.rb
+++ b/lib/faraday_middleware/response/caching.rb
@@ -1,8 +1,6 @@
 require 'faraday'
 require 'forwardable'
 require 'digest/sha1'
-# fixes normalizing query strings:
-require 'faraday_middleware/addressable_patch' if defined? ::Addressable::URI
 
 module FaradayMiddleware
   # Public: Caches GET responses and pulls subsequent ones from the cache.