From d7c54afa47406b5a9d1c11e1acde713fd2da9f84 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 3 May 2023 14:17:24 -0700 Subject: [PATCH 1/7] Update badges. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cef60d9..d5dd0d8 100755 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [JSON-LD][] reader/writer for [RDF.rb][RDF.rb] and fully conforming [JSON-LD API][] processor. Additionally this gem implements [JSON-LD Framing][]. -[![Gem Version](https://badge.fury.io/rb/json-ld.png)](https://rubygems.org/gems/json-ld) -[![Build Status](https://secure.travis-ci.org/ruby-rdf/json-ld.png?branch=develop)](https://github.com/ruby-rdf/json-ld/actions?query=workflow%3ACI) +[![Gem Version](https://badge.fury.io/rb/json-ld.svg)](https://rubygems.org/gems/json-ld) +[![Build Status](https://github.com/ruby-rdf/json-ld/actions/workflows/ci.yml/badge.svg)](https://github.com/ruby-rdf/json-ld/actions?query=workflow%3ACI) [![Coverage Status](https://coveralls.io/repos/ruby-rdf/json-ld/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/json-ld?branch=develop) [![Gitter chat](https://badges.gitter.im/ruby-rdf.png)](https://gitter.im/gitterHQ/gitter) From 4a13da952b2fcd713bce4d0eb5123ca6c7fd3bbe Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 17 Jul 2023 13:50:50 -0700 Subject: [PATCH 2/7] Don't check `simple` when comparing term definitions. Relates to w3c/json-ld-api#570. --- .github/workflows/ci.yml | 4 ++-- lib/json/ld/context.rb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5767f0..8b90266 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: Run tests run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - name: Coveralls GitHub Action - uses: coverallsapp/github-action@v1.1.2 + uses: coverallsapp/github-action@v2 if: "matrix.ruby == '3.0'" with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -59,7 +59,7 @@ jobs: - name: Run tests run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - name: Coveralls GitHub Action - uses: coverallsapp/github-action@v1.1.2 + uses: coverallsapp/github-action@v2 if: "matrix.ruby == '3.0'" with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/lib/json/ld/context.rb b/lib/json/ld/context.rb index db3329b..3334974 100644 --- a/lib/json/ld/context.rb +++ b/lib/json/ld/context.rb @@ -2322,7 +2322,6 @@ def ==(other) language_mapping == other.language_mapping && direction_mapping == other.direction_mapping && reverse_property == other.reverse_property && - simple == other.simple && index == other.index && context == other.context && prefix? == other.prefix? && From b24b09758a760fd5c538843f064f06acd2af982a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 26 Aug 2023 11:39:47 -0700 Subject: [PATCH 3/7] Updates for version 3.3 with minumum Ruby version 3.0. --- .github/workflows/ci.yml | 9 ++------- README.md | 4 ++-- VERSION | 2 +- json-ld.gemspec | 8 ++++---- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b90266..00731b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, jruby] + ruby: ['3.0', 3.1, 3.2, ruby-head, jruby] steps: - name: Clone repository uses: actions/checkout@v3 @@ -33,7 +33,7 @@ jobs: run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2 - if: "matrix.ruby == '3.0'" + if: "matrix.ruby == '3.2'" with: github-token: ${{ secrets.GITHUB_TOKEN }} wintests: @@ -58,8 +58,3 @@ jobs: run: bundle install --jobs 4 --retry 3 - name: Run tests run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - - name: Coveralls GitHub Action - uses: coverallsapp/github-action@v2 - if: "matrix.ruby == '3.0'" - with: - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index d5dd0d8..839b65a 100755 --- a/README.md +++ b/README.md @@ -588,8 +588,8 @@ Note, the API method signatures differed in versions before 1.0, in that they al * {JSON::LD::Writer} ## Dependencies -* [Ruby](https://ruby-lang.org/) (>= 2.6) -* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2) +* [Ruby](https://ruby-lang.org/) (>= 3.0) +* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3) * [JSON](https://rubygems.org/gems/json) (>= 2.6) ## Installation diff --git a/VERSION b/VERSION index 5ae69bd..15a2799 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.5 +3.3.0 diff --git a/json-ld.gemspec b/json-ld.gemspec index cf6f869..c202084 100755 --- a/json-ld.gemspec +++ b/json-ld.gemspec @@ -29,17 +29,17 @@ Gem::Specification.new do |gem| gem.executables = %w[jsonld] gem.require_paths = %w[lib] - gem.required_ruby_version = '>= 2.6' + gem.required_ruby_version = '>= 3.0' gem.requirements = [] gem.add_runtime_dependency 'htmlentities', '~> 4.3' gem.add_runtime_dependency 'json-canonicalization', '~> 0.3', '>= 0.3.2' gem.add_runtime_dependency 'link_header', '~> 0.0', '>= 0.0.8' gem.add_runtime_dependency 'multi_json', '~> 1.15' gem.add_runtime_dependency "rack", '>= 2.2', '< 4' - gem.add_runtime_dependency 'rdf', '~> 3.2', '>= 3.2.10' + gem.add_runtime_dependency 'rdf', '~> 3.3' gem.add_development_dependency 'jsonlint', '~> 0.4' unless is_java - gem.add_development_dependency 'oj', '~> 3.14' unless is_java - gem.add_development_dependency 'rack-test', '>= 1.1', '< 3' + gem.add_development_dependency 'oj', '~> 3.15' unless is_java + gem.add_development_dependency 'rack-test', '~> 2.1' gem.add_development_dependency 'rdf-isomorphic', '~> 3.2' gem.add_development_dependency 'rdf-spec', '~> 3.2' gem.add_development_dependency 'rdf-trig', '~> 3.2' From ac7a1203517740e19e7a7cac941397c5436778dc Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 27 Aug 2023 13:26:16 -0700 Subject: [PATCH 4/7] Update dependencies. --- json-ld.gemspec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/json-ld.gemspec b/json-ld.gemspec index c202084..3ae1df9 100755 --- a/json-ld.gemspec +++ b/json-ld.gemspec @@ -40,12 +40,12 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'jsonlint', '~> 0.4' unless is_java gem.add_development_dependency 'oj', '~> 3.15' unless is_java gem.add_development_dependency 'rack-test', '~> 2.1' - gem.add_development_dependency 'rdf-isomorphic', '~> 3.2' - gem.add_development_dependency 'rdf-spec', '~> 3.2' - gem.add_development_dependency 'rdf-trig', '~> 3.2' - gem.add_development_dependency 'rdf-turtle', '~> 3.2' - gem.add_development_dependency 'rdf-vocab', '~> 3.2' - gem.add_development_dependency 'rdf-xsd', '~> 3.2' + gem.add_development_dependency 'rdf-isomorphic', '~> 3.3' + gem.add_development_dependency 'rdf-spec', '~> 3.3' + gem.add_development_dependency 'rdf-trig', '~> 3.3' + gem.add_development_dependency 'rdf-turtle', '~> 3.3' + gem.add_development_dependency 'rdf-vocab', '~> 3.3' + gem.add_development_dependency 'rdf-xsd', '~> 3.3' gem.add_development_dependency 'rspec', '~> 3.12' gem.add_development_dependency 'rspec-its', '~> 1.3' gem.add_development_dependency 'sinatra-linkeddata', '~> 3.2' From cb5ef847d963feca0a1bc161298314e18e98b818 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 27 Aug 2023 14:08:39 -0700 Subject: [PATCH 5/7] Remove earl-report from Gemfile. --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6ff46ef..8cc25d1 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,6 @@ gem 'json-canonicalization', git: "https://github.com/dryruby/json-canonicalizat gem 'rdf', git: "https://github.com/ruby-rdf/rdf", branch: "develop" group :development do - gem 'earl-report' gem 'ebnf', git: "https://github.com/dryruby/ebnf", branch: "develop" gem 'fasterer' gem 'json-ld-preloaded', github: "ruby-rdf/json-ld-preloaded", branch: "develop" From e119ff01146bc3af450f167df17e1b88a8671cdb Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 28 Aug 2023 10:31:13 -0700 Subject: [PATCH 6/7] Remove dependency on schema.org for conneg tests. --- spec/conneg_spec.rb | 191 +++++----------------------------------- spec/spec_helper.rb | 4 +- spec/suite_http_spec.rb | 8 +- 3 files changed, 25 insertions(+), 178 deletions(-) diff --git a/spec/conneg_spec.rb b/spec/conneg_spec.rb index aecefce..3fc1034 100644 --- a/spec/conneg_spec.rb +++ b/spec/conneg_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require_relative 'spec_helper' -require 'rack/linkeddata' +require 'rack/rdf' require 'rack/test' describe JSON::LD::ContentNegotiation do @@ -12,6 +12,25 @@ described_class.new(double("Target Rack Application", :call => [200, {}, @results || "A String"])) end + let(:example_context) do + JSON::LD::API::RemoteDocument.new('{ + "@context": { + "@vocab": "http://example.com/", + "id": "@id", + "type": "@type" + } + }', documentUrl: "http://example.com") + end + + before do + JSON::LD::Writer.default_context = 'http://example.com/context' + allow(JSON::LD::API).to receive(:documentLoader).with('http://example.com/context', any_args).and_yield(example_context) + end + + after do + JSON::LD::Writer.default_context = nil + end + describe "#parse_accept_header" do { "application/n-triples, application/ld+json;q=0.5" => %w[application/ld+json], @@ -40,15 +59,6 @@ end describe "#call" do - let(:schema_context) do - JSON::LD::API::RemoteDocument.new('{ - "@context": { - "@vocab": "http://schema.org/", - "id": "@id", - "type": "@type" - } - }', documentUrl: "http://schema.org") - end let(:frame) do JSON::LD::API::RemoteDocument.new('{ "@context": { @@ -74,7 +84,6 @@ end before do - allow(JSON::LD::API).to receive(:documentLoader).with("http://schema.org", any_args).and_yield(schema_context) allow(JSON::LD::API).to receive(:documentLoader).with("http://conneg.example.com/context", any_args).and_yield(context) allow(JSON::LD::API).to receive(:documentLoader).with("http://conneg.example.com/frame", @@ -216,163 +225,3 @@ end end end - -describe Rack::LinkedData::ContentNegotiation do - include Rack::Test::Methods - let(:logger) { RDF::Spec.logger } - - let(:app) do - graph = RDF::NTriples::Reader.new(%( - . - . - . - "The Republic" . - "Plato" . - . - . - "The Introduction" . - "An introductory chapter on The Republic." . - )) - described_class.new(double("Target Rack Application", :call => [200, {}, graph]), {}) - end - - describe "#call" do - let(:schema_context) do - JSON::LD::API::RemoteDocument.new('{ - "@context": { - "@vocab": "http://schema.org/", - "id": "@id", - "type": "@type" - } - }', documentUrl: "http://schema.org") - end - let(:frame) do - JSON::LD::API::RemoteDocument.new('{ - "@context": { - "dc": "http://purl.org/dc/elements/1.1/", - "ex": "http://example.org/vocab#" - }, - "@type": "ex:Library", - "ex:contains": { - "@type": "ex:Book", - "ex:contains": { - "@type": "ex:Chapter" - } - } - }', documentUrl: "http://conneg.example.com/frame") - end - let(:context) do - JSON::LD::API::RemoteDocument.new('{ - "@context": { - "dc": "http://purl.org/dc/elements/1.1/", - "ex": "http://example.org/vocab#" - } - }', documentUrl: "http://conneg.example.com/context") - end - - before do - allow(JSON::LD::API).to receive(:documentLoader).with("http://schema.org", any_args).and_yield(schema_context) - allow(JSON::LD::API).to receive(:documentLoader).with("http://conneg.example.com/context", - any_args).and_yield(context) - allow(JSON::LD::API).to receive(:documentLoader).with("http://conneg.example.com/frame", - any_args).and_yield(frame) - end - - { - "application/json" => LIBRARY_FLATTENED_EXPANDED, - "application/ld+json" => LIBRARY_FLATTENED_EXPANDED, - %(application/ld+json;profile=http://www.w3.org/ns/json-ld#expanded) => - LIBRARY_FLATTENED_EXPANDED, - - %(application/ld+json;profile=http://www.w3.org/ns/json-ld#compacted) => - LIBRARY_FLATTENED_COMPACTED_DEFAULT, - - %(application/ld+json;profile=http://www.w3.org/ns/json-ld#flattened) => - LIBRARY_FLATTENED_EXPANDED, - %(application/ld+json;profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#expanded") => - LIBRARY_FLATTENED_EXPANDED, - %(application/ld+json;profile="http://www.w3.org/ns/json-ld#expanded http://www.w3.org/ns/json-ld#flattened") => - LIBRARY_FLATTENED_EXPANDED, - - %(application/ld+json;profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted") => - LIBRARY_FLATTENED_COMPACTED_DEFAULT, - %(application/ld+json;profile="http://www.w3.org/ns/json-ld#compacted http://www.w3.org/ns/json-ld#flattened") => - LIBRARY_FLATTENED_COMPACTED_DEFAULT - - }.each do |accepts, result| - context accepts do - before do - get '/', {}, { "HTTP_ACCEPT" => accepts } - end - - it "status" do - expect(last_response.status).to satisfy("200 or 406") { |x| [200, 406].include?(x) } - end - - it "sets content type" do - expect(last_response.content_type).to eq(last_response.status == 406 ? 'text/plain' : 'application/ld+json') - end - - it "returns serialization" do - if last_response.status == 406 - expect(last_response.body).to eq result - else - expect(JSON.parse(last_response.body)).to produce_jsonld(result, logger) - end - end - end - end - - context "with Link" do - { - "with context" => { - accept: %(application/ld+json), - link: %( rel="http://www.w3.org/ns/json-ld#context"), - result: LIBRARY_FLATTENED_COMPACTED - }, - "compacted with context" => { - accept: %(application/ld+json;profile=http://www.w3.org/ns/json-ld#compacted), - link: %( rel="http://www.w3.org/ns/json-ld#context"), - result: LIBRARY_FLATTENED_COMPACTED - }, - "flattened and compacted with context" => { - accept: %(application/ld+json;profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted"), - link: %( rel="http://www.w3.org/ns/json-ld#context"), - result: LIBRARY_FLATTENED_COMPACTED - }, - "compacted and flattened with context" => { - accept: %(application/ld+json;profile="http://www.w3.org/ns/json-ld#compacted http://www.w3.org/ns/json-ld#flattened"), - link: %( rel="http://www.w3.org/ns/json-ld#context"), - result: LIBRARY_FLATTENED_COMPACTED - }, - "framed with frame" => { - accept: %(application/ld+json;profile=http://www.w3.org/ns/json-ld#framed), - link: %( rel="http://www.w3.org/ns/json-ld#frame"), - result: LIBRARY_FRAMED - } - }.each do |name, params| - context name do - before do - get '/', {}, { "HTTP_ACCEPT" => params[:accept], "HTTP_LINK" => params[:link] } - end - - it "status" do - expect(last_response.status).to satisfy("be 200 or 406") { |x| [200, 406].include?(x) } - end - - it "sets content type" do - expect(last_response.content_type).to eq(last_response.status == 406 ? 'text/plain' : 'application/ld+json') - end - - it "returns serialization" do - if last_response.status == 406 - expect(last_response.body).to eq params[:result] - else - expect(JSON.parse(last_response.body)).to produce_jsonld(params[:result], logger) - end - end - end - end - end - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b81e71b..ea10028 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -145,7 +145,7 @@ def replace_nodes(object, bijection) ])) LIBRARY_COMPACTED_DEFAULT = JSON.parse(%({ - "@context": "http://schema.org", + "@context": "http://example.com/context", "@graph": [ { "id": "http://example.org/library", @@ -213,7 +213,7 @@ def replace_nodes(object, bijection) ])) LIBRARY_FLATTENED_COMPACTED_DEFAULT = JSON.parse(%({ - "@context": "http://schema.org", + "@context": "http://example.com/context", "@graph": [ { "id": "http://example.org/library", diff --git a/spec/suite_http_spec.rb b/spec/suite_http_spec.rb index 14a6a04..cc623ea 100644 --- a/spec/suite_http_spec.rb +++ b/spec/suite_http_spec.rb @@ -1,5 +1,5 @@ require_relative 'spec_helper' -require 'rack/linkeddata' +require 'rack/rdf' require 'rack/test' begin @@ -15,10 +15,8 @@ let(:app) do JSON::LD::ContentNegotiation.new( - Rack::LinkedData::ContentNegotiation.new( - double("Target Rack Application", :call => [200, {}, @results]), - {} - ) + double("Target Rack Application", :call => [200, {}, @results]), + {} ) end From 9906ab7aea40695d50e2940601102ce30f1319de Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 28 Aug 2023 10:33:52 -0700 Subject: [PATCH 7/7] Simplify dependencies. --- Gemfile | 53 +++++++++++++---------------------------- json-ld.gemspec | 1 - script/tc | 2 +- spec/conneg_spec.rb | 1 - spec/suite_http_spec.rb | 1 - 5 files changed, 18 insertions(+), 40 deletions(-) diff --git a/Gemfile b/Gemfile index 8cc25d1..d30127d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,54 +1,35 @@ -# frozen_string_literal: true - -source "https://rubygems.org" -gem "nokogiri", '~> 1.13', '>= 1.13.4' +source 'https://rubygems.org' gemspec -gem 'json-canonicalization', git: "https://github.com/dryruby/json-canonicalization", branch: "develop" -gem 'rdf', git: "https://github.com/ruby-rdf/rdf", branch: "develop" +gem 'json-canonicalization', git: 'https://github.com/dryruby/json-canonicalization', branch: 'develop' +gem 'rdf', git: 'https://github.com/ruby-rdf/rdf', branch: 'develop' +gem 'nokogiri', '~> 1.15', '>= 1.15.4' group :development do - gem 'ebnf', git: "https://github.com/dryruby/ebnf", branch: "develop" - gem 'fasterer' - gem 'json-ld-preloaded', github: "ruby-rdf/json-ld-preloaded", branch: "develop" - gem 'ld-patch', github: "ruby-rdf/ld-patch", branch: "develop" - gem 'linkeddata', git: "https://github.com/ruby-rdf/linkeddata", branch: "develop" - gem 'rack-linkeddata', git: "https://github.com/ruby-rdf/rack-linkeddata", branch: "develop" - gem 'rdf-aggregate-repo', git: "https://github.com/ruby-rdf/rdf-aggregate-repo", branch: "develop" - gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic", branch: "develop" - gem 'rdf-json', github: "ruby-rdf/rdf-json", branch: "develop" - gem 'rdf-microdata', git: "https://github.com/ruby-rdf/rdf-microdata", branch: "develop" - gem 'rdf-n3', github: "ruby-rdf/rdf-n3", branch: "develop" - gem 'rdf-normalize', github: "ruby-rdf/rdf-normalize", branch: "develop" - gem 'rdf-rdfa', git: "https://github.com/ruby-rdf/rdf-rdfa", branch: "develop" - gem 'rdf-rdfxml', git: "https://github.com/ruby-rdf/rdf-rdfxml", branch: "develop" - gem 'rdf-reasoner', github: "ruby-rdf/rdf-reasoner", branch: "develop" - gem 'rdf-spec', git: "https://github.com/ruby-rdf/rdf-spec", branch: "develop" - gem 'rdf-tabular', github: "ruby-rdf/rdf-tabular", branch: "develop" - gem 'rdf-trig', git: "https://github.com/ruby-rdf/rdf-trig", branch: "develop" - gem 'rdf-trix', github: "ruby-rdf/rdf-trix", branch: "develop" - gem 'rdf-turtle', git: "https://github.com/ruby-rdf/rdf-turtle", branch: "develop" - gem 'rdf-vocab', git: "https://github.com/ruby-rdf/rdf-vocab", branch: "develop" - gem 'rdf-xsd', git: "https://github.com/ruby-rdf/rdf-xsd", branch: "develop" - gem 'ruby-prof', platforms: :mri - gem 'shex', github: "ruby-rdf/shex", branch: "develop" - gem 'sinatra-linkeddata', git: "https://github.com/ruby-rdf/sinatra-linkeddata", branch: "develop" - gem 'sparql', git: "https://github.com/ruby-rdf/sparql", branch: "develop" - gem 'sparql-client', git: "https://github.com/ruby-rdf/sparql-client", branch: "develop" - gem 'sxp', git: "https://github.com/dryruby/sxp.rb", branch: "develop" + gem 'ebnf', git: 'https://github.com/dryruby/ebnf', branch: 'develop' + gem 'json-ld-preloaded', git: 'https://github.com/ruby-rdf/json-ld-preloaded', branch: 'develop' + gem 'rdf-isomorphic', git: 'https://github.com/ruby-rdf/rdf-isomorphic', branch: 'develop' + gem 'rdf-spec', git: 'https://github.com/ruby-rdf/rdf-spec', branch: 'develop' + gem 'rdf-trig', git: 'https://github.com/ruby-rdf/rdf-trig', branch: 'develop' + gem 'rdf-turtle', git: 'https://github.com/ruby-rdf/rdf-turtle', branch: 'develop' + gem 'rdf-vocab', git: 'https://github.com/ruby-rdf/rdf-vocab', branch: 'develop' + gem 'rdf-xsd', git: 'https://github.com/ruby-rdf/rdf-xsd', branch: 'develop' + gem 'sxp', git: 'https://github.com/dryruby/sxp.rb', branch: 'develop' end group :development, :test do gem 'benchmark-ips' + gem 'fasterer' gem 'psych', platforms: %i[mri rbx] gem 'rake' gem 'rubocop' gem 'rubocop-performance' gem 'rubocop-rspec' - gem 'simplecov', '~> 0.21', platforms: :mri + gem 'ruby-prof', platforms: :mri + gem 'simplecov', '~> 0.22', platforms: :mri gem 'simplecov-lcov', '~> 0.8', platforms: :mri end group :debug do - gem "byebug", platforms: :mri + gem 'byebug', platforms: :mri end diff --git a/json-ld.gemspec b/json-ld.gemspec index 3ae1df9..ee95814 100755 --- a/json-ld.gemspec +++ b/json-ld.gemspec @@ -48,7 +48,6 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rdf-xsd', '~> 3.3' gem.add_development_dependency 'rspec', '~> 3.12' gem.add_development_dependency 'rspec-its', '~> 1.3' - gem.add_development_dependency 'sinatra-linkeddata', '~> 3.2' gem.add_development_dependency 'yajl-ruby', '~> 1.4' unless is_java gem.add_development_dependency 'yard', '~> 0.9' diff --git a/script/tc b/script/tc index baf8f80..ff3ec34 100755 --- a/script/tc +++ b/script/tc @@ -4,7 +4,7 @@ $:.unshift(File.expand_path("../../lib", __FILE__)) require "bundler/setup" require 'logger' require 'json/ld' -require 'linkeddata' +#require 'linkeddata' require 'rdf/isomorphic' require File.expand_path("../../spec/spec_helper", __FILE__) require File.expand_path("../../spec/suite_helper", __FILE__) diff --git a/spec/conneg_spec.rb b/spec/conneg_spec.rb index 3fc1034..c6b3473 100644 --- a/spec/conneg_spec.rb +++ b/spec/conneg_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require_relative 'spec_helper' -require 'rack/rdf' require 'rack/test' describe JSON::LD::ContentNegotiation do diff --git a/spec/suite_http_spec.rb b/spec/suite_http_spec.rb index cc623ea..0d2c891 100644 --- a/spec/suite_http_spec.rb +++ b/spec/suite_http_spec.rb @@ -1,5 +1,4 @@ require_relative 'spec_helper' -require 'rack/rdf' require 'rack/test' begin