Skip to content

Commit 284696b

Browse files
committed
Use Rackup::Server instead of the defunct Rack::Server. Still no good testing strategy.
Fixes #51.
1 parent 3e26b44 commit 284696b

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

bin/sparql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $:.unshift("../../lib", __FILE__)
44
require 'logger'
55
require 'sparql'
66
require 'rack'
7+
require 'rackup'
78
begin
89
require 'linkeddata'
910
rescue LoadError
@@ -67,9 +68,9 @@ end
6768

6869
def server(options)
6970
app = SPARQL::Server.application(**options)
70-
Rack::Server.start(app: app, Port: options.fetch(:port, 9292))
71+
Rackup::Server.start(app: app, Port: options.fetch(:port, 9292))
7172
rescue LoadError
72-
$stderr.puts "Running SPARQL server requires Rack and Sinatra to be in environment: #{$!.message}"
73+
$stderr.puts "Running SPARQL server requires Rack, Rackup, and Sinatra to be in environment: #{$!.message}"
7374
end
7475

7576
cmd, input = ARGV.shift, nil

sparql.gemspec

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,27 @@ Gem::Specification.new do |gem|
2929

3030
gem.required_ruby_version = '>= 3.0'
3131
gem.requirements = []
32-
gem.add_runtime_dependency 'rdf', '~> 3.3'
33-
gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.3'
34-
gem.add_runtime_dependency 'ebnf', '~> 2.5'
3532
gem.add_runtime_dependency 'builder', '~> 3.2', '>= 3.2.4'
33+
gem.add_runtime_dependency 'ebnf', '~> 2.5'
3634
gem.add_runtime_dependency 'logger', '~> 1.5'
35+
gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.3'
36+
gem.add_runtime_dependency 'rdf-xsd', '~> 3.3'
37+
gem.add_runtime_dependency 'rdf', '~> 3.3'
3738
gem.add_runtime_dependency 'readline', '~> 0.0'
38-
gem.add_runtime_dependency 'sxp', '~> 2.0'
3939
gem.add_runtime_dependency 'sparql-client', '~> 3.3'
40-
gem.add_runtime_dependency 'rdf-xsd', '~> 3.3'
40+
gem.add_runtime_dependency 'sxp', '~> 2.0'
4141

4242
gem.add_development_dependency 'getoptlong', '~> 0.2'
43+
gem.add_development_dependency 'linkeddata'
4344
gem.add_development_dependency 'ostruct', '~> 0.6'
44-
gem.add_development_dependency 'sinatra', '~> 4.1'
45-
gem.add_development_dependency 'rack', '~> 3.1'
4645
gem.add_development_dependency 'rack-test', '~> 2.2'
46+
gem.add_development_dependency 'rack', '~> 3.1'
47+
gem.add_development_dependency 'rackup', '~> 2.2'
4748
gem.add_development_dependency 'rdf-spec', '~> 3.3'
48-
gem.add_development_dependency 'linkeddata'
49-
gem.add_development_dependency 'rspec', '~> 3.13'
5049
gem.add_development_dependency 'rspec-its', '~> 1.3'
50+
gem.add_development_dependency 'rspec', '~> 3.13'
51+
gem.add_development_dependency 'sinatra', '~> 4.1'
52+
gem.add_development_dependency 'webrick', '~> 1.9'
5153
gem.add_development_dependency 'yard' , '~> 0.9'
5254

5355
gem.post_install_message = nil

spec/readme_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def self.read_examples
3232
gsub('etc', File.join(File.dirname(__FILE__), '..', 'etc'))
3333
eval(cmd)
3434
elsif example[:sh] =~ /sparql server/m
35-
skip "running server"
35+
skip "running server until there is a strategy for testing a Rackup::Server"
3636
else
3737
cmd = example[:sh].
3838
sub('sparql', File.join(File.dirname(__FILE__), '..', 'bin', 'sparql')).

0 commit comments

Comments
 (0)