Merge branch 'stjhimy-ruby_version'

Gemfile

@@ -6,11 +6,7 @@ gem 'sinatra', github: 'sinatra/sinatra'
 
 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
@@ -30,8 +26,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
 

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
 

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

sinatra-contrib.gemspec

@@ -213,6 +213,8 @@ Gem::Specification.new do |s|
     "spec/params_spec.rb",
   ]
 
+  s.required_ruby_version = '>= 2.2.0'
+
   s.add_dependency "sinatra", "> 1", "< 3"
   s.add_dependency "mustermann",  "~> 0.4"
   s.add_dependency "backports", ">= 2.0"

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
 

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')