Merge pull request #85 from ruby-rdf/rack-2.0

Update for Rack 2.0 and Sinatra 2.0 support

Author: Thomas Johnson

.travis.yml

@@ -2,15 +2,18 @@ language: ruby
 bundler_args: --without debug
 script: "bundle exec rspec spec"
 env:
-  - CI=true
+  - CI=true RACK_VERSION=1.6
+  - CI=true RACK_VERSION=2.0
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-9.1.6.0
-  - rbx
+  - 2.2
+  - 2.3
+  - 2.4
+  - jruby-9
+  - rbx-3
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: rbx
+    - rvm: jruby-9
+    - rvm: rbx-3
+dist: trusty

Gemfile

@@ -26,3 +26,10 @@ platforms :rbx do
   gem 'rubinius', '~> 2.0'
   gem 'rubysl', '~> 2.0'
 end
+
+case ENV['RACK_VERSION']
+when /^1.6/
+  gem 'rack', '~> 1.6'
+when /^2.0/
+  gem 'rack', '~> 2.0'
+end

rdf-ldp.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version      = '>= 2.2.2'
   gem.requirements               = []
 
-  gem.add_runtime_dependency     'rack',            '~> 1.6'
+  gem.add_runtime_dependency     'rack',            '>= 1.6', '< 3.0'
   gem.add_runtime_dependency     'rdf',             '~> 2.0'
   gem.add_runtime_dependency     'rdf-turtle',      '~> 2.0'
   gem.add_runtime_dependency     'ld-patch',        '~> 0.3'
@@ -38,7 +38,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency     'json-ld', '~> 2.0'
 
-  gem.add_runtime_dependency     'sinatra', '~> 1.4'
+  gem.add_runtime_dependency     'sinatra', '>= 1.4', '< 3.0'
 
   gem.add_runtime_dependency     'link_header', '~> 0.0', '>= 0.0.8'