From 3c37390c635d232e791a8eafa41b9a4a1c47d950 Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <grzuy0@gmail.com>
Date: Tue, 26 Jun 2018 11:15:13 -0300
Subject: [PATCH 1/3] Run with latest activesupport/actionpack when developing

---
 Appraisals                | 5 +++++
 gemfiles/rack_1_6.gemfile | 2 ++
 rack-attack.gemspec       | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Appraisals b/Appraisals
index e9d2e21..c800d68 100644
--- a/Appraisals
+++ b/Appraisals
@@ -5,6 +5,11 @@ end
 appraise "rack_1_6" do
   gem "rack", "~> 1.6.9"
 
+  # Override activesupport and actionpack version constraints by making
+  # it more loose so it's compatible with rack 1.6.x
+  gem "activesupport", ">= 4.2"
+  gem "actionpack", ">= 4.2"
+
   # Override rack-test version constraint by making it more loose
   # so it's compatible with actionpack 4.2.x
   gem "rack-test", ">= 0.6"
diff --git a/gemfiles/rack_1_6.gemfile b/gemfiles/rack_1_6.gemfile
index 8b636ed..1c10335 100644
--- a/gemfiles/rack_1_6.gemfile
+++ b/gemfiles/rack_1_6.gemfile
@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "rack", "~> 1.6.9"
+gem "activesupport", ">= 4.2"
+gem "actionpack", ">= 4.2"
 gem "rack-test", ">= 0.6"
 
 gemspec path: "../"
diff --git a/rack-attack.gemspec b/rack-attack.gemspec
index c1180c7..f2e6d9c 100644
--- a/rack-attack.gemspec
+++ b/rack-attack.gemspec
@@ -46,6 +46,6 @@ Gem::Specification.new do |s|
 
   # The following are potential runtime dependencies users may have,
   # which rack-attack uses only for testing compatibility in test suite.
-  s.add_development_dependency 'actionpack', '>= 3.0.0'
-  s.add_development_dependency 'activesupport', '>= 3.0.0'
+  s.add_development_dependency 'actionpack', '~> 5.2'
+  s.add_development_dependency 'activesupport', '~> 5.2'
 end

From 9e2fef7abe1bc149ef5f5c4772fbca66c743f37f Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <grzuy0@gmail.com>
Date: Tue, 26 Jun 2018 11:20:57 -0300
Subject: [PATCH 2/3] Make clear that bundler is a development depdendency

---
 rack-attack.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rack-attack.gemspec b/rack-attack.gemspec
index f2e6d9c..ca39cf0 100644
--- a/rack-attack.gemspec
+++ b/rack-attack.gemspec
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack'
 
   s.add_development_dependency 'appraisal', '~> 2.2'
+  s.add_development_dependency "bundler", "~> 1.16"
   s.add_development_dependency 'minitest', "~> 5.11"
   s.add_development_dependency "minitest-stub-const", "~> 0.6"
   s.add_development_dependency 'rack-test', "~> 1.0"

From 596ddabb0f36984309a682eb3aca6361153373dd Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <grzuy0@gmail.com>
Date: Tue, 26 Jun 2018 13:38:16 -0300
Subject: [PATCH 3/3] Fix rubocop Bundler/OrderedGems offenses

---
 Appraisals                | 6 +++---
 gemfiles/rack_1_6.gemfile | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Appraisals b/Appraisals
index c800d68..00b4bca 100644
--- a/Appraisals
+++ b/Appraisals
@@ -3,12 +3,12 @@ appraise "rack_2_0" do
 end
 
 appraise "rack_1_6" do
-  gem "rack", "~> 1.6.9"
-
   # Override activesupport and actionpack version constraints by making
   # it more loose so it's compatible with rack 1.6.x
-  gem "activesupport", ">= 4.2"
   gem "actionpack", ">= 4.2"
+  gem "activesupport", ">= 4.2"
+
+  gem "rack", "~> 1.6.9"
 
   # Override rack-test version constraint by making it more loose
   # so it's compatible with actionpack 4.2.x
diff --git a/gemfiles/rack_1_6.gemfile b/gemfiles/rack_1_6.gemfile
index 1c10335..0cc0050 100644
--- a/gemfiles/rack_1_6.gemfile
+++ b/gemfiles/rack_1_6.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rack", "~> 1.6.9"
-gem "activesupport", ">= 4.2"
 gem "actionpack", ">= 4.2"
+gem "activesupport", ">= 4.2"
+gem "rack", "~> 1.6.9"
 gem "rack-test", ">= 0.6"
 
 gemspec path: "../"