Finish 3.3.0

ruby-rdf · Sep 1, 2023 · 088738d · 088738d
2 parents 570aaf5 + 9906ab7
commit 088738d
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 241 deletions.
diff --git 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
@@ -32,8 +32,8 @@ jobs:
       - name: Run tests
         run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
       - name: Coveralls GitHub Action
-        uses: coverallsapp/github-action@v1.1.2
-        if: "matrix.ruby == '3.0'"
+        uses: coverallsapp/github-action@v2
+        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@v1.1.2
-        if: "matrix.ruby == '3.0'"
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Gemfile b/Gemfile
@@ -1,55 +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 '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"
-  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/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)
 
@@ -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
@@ -1 +1 @@
-3.2.5
+3.3.0
diff --git a/json-ld.gemspec b/json-ld.gemspec
@@ -29,26 +29,25 @@ 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 '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 'oj',              '~> 3.15' unless is_java
+  gem.add_development_dependency 'rack-test',       '~> 2.1'
+  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'
   gem.add_development_dependency 'yajl-ruby',       '~> 1.4' unless is_java
   gem.add_development_dependency 'yard', '~> 0.9'
 

diff --git 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? &&

diff --git 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__)