Add direct dependency on rest-client, and rest-client-components.

Author: gkellogg

Gemfile

@@ -28,9 +28,6 @@ group :development, :test do
   gem 'rake'
 end
 
-# Becuase rest-client-commonents doesn't seem like it's going to be updated:
-gem 'rest-client-components', git: "https://github.com/amatriain/rest-client-components", branch: "rest-client-2-compatibility"
-
 gem 'jsonlint',           git: "https://github.com/dougbarth/jsonlint"
 
 group :debug do

Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/amatriain/rest-client-components
-  revision: 236ac31ed1a061d479332ff179bf78fcb11edb74
-  branch: rest-client-2-compatibility
-  specs:
-    rest-client-components (1.4.0)
-      rack (>= 1.0.1)
-      rest-client (>= 1.6.0)
-
 GIT
   remote: https://github.com/dougbarth/jsonlint
   revision: 7bbfa062b9d06b4a1ad491c9dad60db0e088f10b
@@ -17,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/dryruby/ebnf
-  revision: cb84726cc68ca1e3225d8f90ea9e1c397b811a84
+  revision: 425d81b33fa4a47050a9120270f8e38928f4c741
   branch: develop
   specs:
-    ebnf (2.3.4)
+    ebnf (2.3.5)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
       scanf (~> 1.0)
@@ -29,7 +20,7 @@ GIT
 
 GIT
   remote: https://github.com/ruby-rdf/json-ld
-  revision: d7c54afa47406b5a9d1c11e1acde713fd2da9f84
+  revision: 4a13da952b2fcd713bce4d0eb5123ca6c7fd3bbe
   branch: develop
   specs:
     json-ld (3.2.5)
@@ -102,7 +93,7 @@ GIT
 
 GIT
   remote: https://github.com/ruby-rdf/rdf-rdfxml
-  revision: 8c579c668af4c8ea9fb8232d1fb7eb429ace5f84
+  revision: a48659d92dac957ef8b375cb4afd7284948ac070
   branch: develop
   specs:
     rdf-rdfxml (3.2.1)
@@ -136,7 +127,7 @@ GIT
 
 GIT
   remote: https://github.com/ruby-rdf/rdf-turtle
-  revision: ce802788195845d207c4c86209de7f48147bb3be
+  revision: b005c590dc7a74314f304b19277f4e1be3b6d412
   branch: develop
   specs:
     rdf-turtle (3.2.1)
@@ -153,7 +144,7 @@ GIT
 
 GIT
   remote: https://github.com/ruby-rdf/rdf-xsd
-  revision: e71d9c3063fd4aad2b9174396e86b84df2266e27
+  revision: 5d5bea8070a3345b945713d2d41899b87a6d977c
   branch: develop
   specs:
     rdf-xsd (3.2.1)
@@ -190,6 +181,8 @@ PATH
       rdf-turtle (~> 3.2)
       rdf-vocab (~> 3.2)
       rdf-xsd (~> 3.2)
+      rest-client (~> 2.1)
+      rest-client-components (~> 1.5)
       sass (~> 3.7)
       sinatra (~> 3.0)
       sinatra-rdf (~> 3.2)
@@ -266,7 +259,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.7)
-    rack-cache (1.13.0)
+    rack-cache (1.14.0)
       rack (>= 0.4)
     rack-protection (3.0.6)
       rack
@@ -285,6 +278,9 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rest-client-components (1.5.0)
+      rack (>= 1.0.1)
+      rest-client (>= 1.6.0)
     rexml (3.2.5)
     rouge (4.1.2)
     rspec (3.12.0)
@@ -371,7 +367,6 @@ DEPENDENCIES
   rdf-turtle!
   rdf-vocab!
   rdf-xsd!
-  rest-client-components!
   rspec (~> 3.12)
   rspec-its (~> 1.3)
   shotgun (>= 0.9.2)

Rakefile

@@ -10,6 +10,13 @@ namespace :doc do
   end
 end
 
+namespace :cache do
+  desc 'Clear document cache'
+  task :clear do
+    FileUtils.rm_rf File.expand_path("../cache", __FILE__)
+  end
+end
+
 # https://raw.githubusercontent.com/schemaorg/schemaorg/sdo-callisto/data/releases/3.3/all-layers.nq
 schema_base = ENV.fetch("schema_base", "https://raw.githubusercontent.com/schemaorg/schemaorg/main/data")
 schema_version = ENV.fetch("schema_version", "22.0")

config.ru

@@ -3,6 +3,7 @@ require 'rubygems' || Gem.clear_paths
 require 'bundler'
 Bundler.setup(:default)
 
+require 'restclient/components'
 require 'rack/cache'
 require 'sinatra'
 require 'sinatra/base'

linter.gemspec

@@ -45,6 +45,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency      'haml',               '~> 5.2'
   gem.add_runtime_dependency      'json-ld-preloaded',  '~> 3.2'
   gem.add_runtime_dependency      "rack",               '~> 2.2'
+  gem.add_runtime_dependency      'rest-client',        '~> 2.1'
+  gem.add_runtime_dependency      'rest-client-components', '~> 1.5'
   gem.add_runtime_dependency      'rack-cache',         '~> 1.13'
   gem.add_runtime_dependency      'nokogiri',           '~> 1.14'
 

spec/spec_helper.rb

@@ -5,6 +5,7 @@
 require 'rubygems'
 require 'rspec'
 require 'rspec/its'
+require 'restclient/components'
 require 'rack/cache'
 require 'sinatra'
 require 'matchers'