From 6930718adc6b747e5cae1f4e6348976ab79ad27d Mon Sep 17 00:00:00 2001
From: stjhimy <stjhimy@gmail.com>
Date: Sat, 7 May 2016 06:57:06 -0300
Subject: [PATCH 1/3] Remove ruby 1.8/1.9 version check

---
 Gemfile                     |  9 ++-------
 lib/sinatra/cookies.rb      |  2 +-
 lib/sinatra/respond_with.rb |  2 --
 spec/capture_spec.rb        |  2 +-
 spec/cookies_spec.rb        | 18 +-----------------
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3180096..53cbce2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,11 +3,7 @@ gemspec
 
 group :development, :test do
 
-  platform :ruby_18 do
-    gem 'libv8', '3.16.14.7'
-  end
-
-  platform :ruby_18, :jruby do
+  platform :jruby do
     gem 'json'
     gem 'rdoc'
   end
@@ -27,8 +23,7 @@ group :development, :test do
     gem 'redcarpet', '2.3.0'
     gem 'yajl-ruby'
     # ref is a dependency of therubyracer
-    # version 2 drops support for Rubies earlier than 1.9.3
-    gem 'ref', '< 2.0'
+    gem 'ref'
     gem 'therubyracer'
   end
 
diff --git a/lib/sinatra/cookies.rb b/lib/sinatra/cookies.rb
index bd06315..1373aad 100644
--- a/lib/sinatra/cookies.rb
+++ b/lib/sinatra/cookies.rb
@@ -166,7 +166,7 @@ def hash
       alias member?  has_key?
 
       def index(value)
-        warn "Hash#index is deprecated; use Hash#key" if RUBY_VERSION > '1.9'
+        warn "Hash#index is deprecated; use Hash#key"
         key(value)
       end
 
diff --git a/lib/sinatra/respond_with.rb b/lib/sinatra/respond_with.rb
index 1ff8989..29c9a57 100644
--- a/lib/sinatra/respond_with.rb
+++ b/lib/sinatra/respond_with.rb
@@ -1,8 +1,6 @@
 require 'sinatra/json'
 require 'sinatra/base'
 
-$KCODE = "UTF-8" unless RUBY_VERSION > "1.9.0"
-
 module Sinatra
   #
   # = Sinatra::RespondWith
diff --git a/spec/capture_spec.rb b/spec/capture_spec.rb
index f21b6f0..3ca8a60 100644
--- a/spec/capture_spec.rb
+++ b/spec/capture_spec.rb
@@ -44,7 +44,7 @@ def render(engine, template)
 
     it "handles ISO-8859-1 encoding" do
       render(:erb, "iso_8859_1").should == "ISO-8859-1 -"
-    end if RUBY_VERSION >= '1.9'
+    end
   end
 end
 
diff --git a/spec/cookies_spec.rb b/spec/cookies_spec.rb
index 59e6512..bd38738 100644
--- a/spec/cookies_spec.rb
+++ b/spec/cookies_spec.rb
@@ -492,7 +492,7 @@ def cookies(*set_cookies)
       error = if defined? JRUBY_VERSION
         IndexError
       else
-        RUBY_VERSION >= '1.9' ? KeyError : IndexError
+        KeyError
       end
       expect { cookies.fetch('foo') }.to raise_exception(error)
     end
@@ -560,22 +560,6 @@ def cookies(*set_cookies)
     end
   end
 
-  describe :index do
-    it 'checks request cookies' do
-      cookies('foo=bar').index('bar').should be == 'foo'
-    end
-
-    it 'checks response cookies' do
-      jar = cookies
-      jar['foo'] = 'bar'
-      jar.index('bar').should be == 'foo'
-    end
-
-    it 'returns nil when missing' do
-      cookies('foo=bar').index('baz').should be_nil
-    end
-  end if RUBY_VERSION < '1.9'
-
   describe :keep_if do
     it 'removes entries' do
       jar = cookies('foo=bar', 'bar=baz')

From ddea3abbe9224bef872e86d7539997e2f50136c2 Mon Sep 17 00:00:00 2001
From: stjhimy <stjhimy@gmail.com>
Date: Mon, 9 May 2016 11:50:20 -0300
Subject: [PATCH 2/3] Lock sinatra ~> 1.4 on gemspec

---
 sinatra-contrib.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sinatra-contrib.gemspec b/sinatra-contrib.gemspec
index 1648bbd..fb6fdcc 100644
--- a/sinatra-contrib.gemspec
+++ b/sinatra-contrib.gemspec
@@ -215,7 +215,7 @@ Gem::Specification.new do |s|
     "spec/params_spec.rb",
   ]
 
-  s.add_dependency "sinatra"
+  s.add_dependency "sinatra", "~> 1.4"
   s.add_dependency "backports", ">= 2.0"
   s.add_dependency "tilt",      ">= 1.3", "< 3"
   s.add_dependency "rack-test"

From 04aa4e3267590f86959e477c912dc161c476165a Mon Sep 17 00:00:00 2001
From: stjhimy <stjhimy@gmail.com>
Date: Tue, 10 May 2016 10:02:11 -0300
Subject: [PATCH 3/3] Set required_ruby_version to >= 2.2.0

---
 sinatra-contrib.gemspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sinatra-contrib.gemspec b/sinatra-contrib.gemspec
index fb6fdcc..6cde1f2 100644
--- a/sinatra-contrib.gemspec
+++ b/sinatra-contrib.gemspec
@@ -215,6 +215,8 @@ Gem::Specification.new do |s|
     "spec/params_spec.rb",
   ]
 
+  s.required_ruby_version = '>= 2.2.0'
+
   s.add_dependency "sinatra", "~> 1.4"
   s.add_dependency "backports", ">= 2.0"
   s.add_dependency "tilt",      ">= 1.3", "< 3"