Skip to content

Commit 570aaf5

Browse files
gkellogggkellogg
committed
Finish 3.2.5
2 parents 0786a2e + c34c461 commit 570aaf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+10658
-31210
lines changed

‎.rubocop.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
require:
3+
- rubocop-performance
4+
- rubocop-rspec
5+
6+
AllCops:
7+
DisplayCopNames: true
8+
NewCops: enable
9+
TargetRubyVersion: 2.6
10+
11+
Layout/ArgumentAlignment:
12+
# https://www.rubydoc.info/github/bbatsov/RuboCop/RuboCop/Cop/Layout/ArgumentAlignment
13+
EnforcedStyle: with_fixed_indentation
14+
Layout/CaseIndentation:
15+
EnforcedStyle: end
16+
Layout/EndAlignment:
17+
# https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Layout/EndAlignment
18+
EnforcedStyleAlignWith: variable
19+
Layout/FirstArgumentIndentation:
20+
# https://www.rubydoc.info/github/bbatsov/RuboCop/RuboCop/Cop/Layout/FirstArgumentIndentation
21+
Enabled: false
22+
Layout/HashAlignment:
23+
EnforcedLastArgumentHashStyle: ignore_implicit
24+
Layout/LineLength:
25+
Max: 120
26+
Layout/MultilineMethodCallIndentation:
27+
# https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Layout/MultilineMethodCallIndentation
28+
EnforcedStyle: indented
29+
Lint/AmbiguousBlockAssociation:
30+
AllowedMethods: ['change']
31+
32+
Metrics/MethodLength:
33+
CountComments: false # count full line comments?
34+
Max: 20
35+
36+
Style/Documentation:
37+
Enabled: false
38+
Style/DoubleNegation:
39+
Enabled: false
40+
Style/FormatStringToken:
41+
Enabled: false
42+
Style/HashSyntax:
43+
Enabled: false
44+
Style/MutableConstant:
45+
Enabled: false
46+
Style/StringLiterals:
47+
Enabled: false
48+
Style/StringConcatenation:
49+
Enabled: false
50+

‎Gemfile

+39-34
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,53 @@
1+
# frozen_string_literal: true
2+
13
source "https://rubygems.org"
2-
gem "nokogiri", '~> 1.13', '>= 1.13.4'
4+
gem "nokogiri", '~> 1.13', '>= 1.13.4'
35

46
gemspec
5-
gem 'rdf', git: "https://github.com/ruby-rdf/rdf", branch: "develop"
6-
gem 'json-canonicalization',git: "https://github.com/dryruby/json-canonicalization",branch: "develop"
7+
gem 'json-canonicalization', git: "https://github.com/dryruby/json-canonicalization", branch: "develop"
8+
gem 'rdf', git: "https://github.com/ruby-rdf/rdf", branch: "develop"
79

810
group :development do
9-
gem 'ebnf', git: "https://github.com/dryruby/ebnf", branch: "develop"
10-
gem 'json-ld-preloaded', github: "ruby-rdf/json-ld-preloaded", branch: "develop"
11-
gem 'ld-patch', github: "ruby-rdf/ld-patch", branch: "develop"
12-
gem 'linkeddata', git: "https://github.com/ruby-rdf/linkeddata", branch: "develop"
13-
gem 'rack-linkeddata', git: "https://github.com/ruby-rdf/rack-linkeddata", branch: "develop"
14-
gem 'rdf-aggregate-repo', git: "https://github.com/ruby-rdf/rdf-aggregate-repo", branch: "develop"
15-
gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic", branch: "develop"
16-
gem 'rdf-json', github: "ruby-rdf/rdf-json", branch: "develop"
17-
gem 'rdf-microdata', git: "https://github.com/ruby-rdf/rdf-microdata", branch: "develop"
18-
gem 'rdf-n3', github: "ruby-rdf/rdf-n3", branch: "develop"
19-
gem 'rdf-normalize', github: "ruby-rdf/rdf-normalize", branch: "develop"
20-
gem 'rdf-rdfa', git: "https://github.com/ruby-rdf/rdf-rdfa", branch: "develop"
21-
gem 'rdf-rdfxml', git: "https://github.com/ruby-rdf/rdf-rdfxml", branch: "develop"
22-
gem 'rdf-reasoner', github: "ruby-rdf/rdf-reasoner", branch: "develop"
23-
gem 'rdf-spec', git: "https://github.com/ruby-rdf/rdf-spec", branch: "develop"
24-
gem 'rdf-tabular', github: "ruby-rdf/rdf-tabular", branch: "develop"
25-
gem 'rdf-trig', git: "https://github.com/ruby-rdf/rdf-trig", branch: "develop"
26-
gem 'rdf-trix', github: "ruby-rdf/rdf-trix", branch: "develop"
27-
gem 'rdf-turtle', git: "https://github.com/ruby-rdf/rdf-turtle", branch: "develop"
28-
gem 'rdf-vocab', git: "https://github.com/ruby-rdf/rdf-vocab", branch: "develop"
29-
gem 'rdf-xsd', git: "https://github.com/ruby-rdf/rdf-xsd", branch: "develop"
30-
gem 'sinatra-linkeddata', git: "https://github.com/ruby-rdf/sinatra-linkeddata", branch: "develop"
31-
gem 'shex', github: "ruby-rdf/shex", branch: "develop"
32-
gem 'sparql', git: "https://github.com/ruby-rdf/sparql", branch: "develop"
33-
gem 'sparql-client', git: "https://github.com/ruby-rdf/sparql-client", branch: "develop"
34-
gem 'sxp', git: "https://github.com/dryruby/sxp.rb", branch: "develop"
35-
gem 'fasterer'
3611
gem 'earl-report'
37-
gem 'ruby-prof', platforms: :mri
12+
gem 'ebnf', git: "https://github.com/dryruby/ebnf", branch: "develop"
13+
gem 'fasterer'
14+
gem 'json-ld-preloaded', github: "ruby-rdf/json-ld-preloaded", branch: "develop"
15+
gem 'ld-patch', github: "ruby-rdf/ld-patch", branch: "develop"
16+
gem 'linkeddata', git: "https://github.com/ruby-rdf/linkeddata", branch: "develop"
17+
gem 'rack-linkeddata', git: "https://github.com/ruby-rdf/rack-linkeddata", branch: "develop"
18+
gem 'rdf-aggregate-repo', git: "https://github.com/ruby-rdf/rdf-aggregate-repo", branch: "develop"
19+
gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic", branch: "develop"
20+
gem 'rdf-json', github: "ruby-rdf/rdf-json", branch: "develop"
21+
gem 'rdf-microdata', git: "https://github.com/ruby-rdf/rdf-microdata", branch: "develop"
22+
gem 'rdf-n3', github: "ruby-rdf/rdf-n3", branch: "develop"
23+
gem 'rdf-normalize', github: "ruby-rdf/rdf-normalize", branch: "develop"
24+
gem 'rdf-rdfa', git: "https://github.com/ruby-rdf/rdf-rdfa", branch: "develop"
25+
gem 'rdf-rdfxml', git: "https://github.com/ruby-rdf/rdf-rdfxml", branch: "develop"
26+
gem 'rdf-reasoner', github: "ruby-rdf/rdf-reasoner", branch: "develop"
27+
gem 'rdf-spec', git: "https://github.com/ruby-rdf/rdf-spec", branch: "develop"
28+
gem 'rdf-tabular', github: "ruby-rdf/rdf-tabular", branch: "develop"
29+
gem 'rdf-trig', git: "https://github.com/ruby-rdf/rdf-trig", branch: "develop"
30+
gem 'rdf-trix', github: "ruby-rdf/rdf-trix", branch: "develop"
31+
gem 'rdf-turtle', git: "https://github.com/ruby-rdf/rdf-turtle", branch: "develop"
32+
gem 'rdf-vocab', git: "https://github.com/ruby-rdf/rdf-vocab", branch: "develop"
33+
gem 'rdf-xsd', git: "https://github.com/ruby-rdf/rdf-xsd", branch: "develop"
34+
gem 'ruby-prof', platforms: :mri
35+
gem 'shex', github: "ruby-rdf/shex", branch: "develop"
36+
gem 'sinatra-linkeddata', git: "https://github.com/ruby-rdf/sinatra-linkeddata", branch: "develop"
37+
gem 'sparql', git: "https://github.com/ruby-rdf/sparql", branch: "develop"
38+
gem 'sparql-client', git: "https://github.com/ruby-rdf/sparql-client", branch: "develop"
39+
gem 'sxp', git: "https://github.com/dryruby/sxp.rb", branch: "develop"
3840
end
3941

4042
group :development, :test do
41-
gem 'simplecov', '~> 0.21', platforms: :mri
42-
gem 'simplecov-lcov', '~> 0.8', platforms: :mri
43-
gem 'psych', platforms: [:mri, :rbx]
4443
gem 'benchmark-ips'
44+
gem 'psych', platforms: %i[mri rbx]
4545
gem 'rake'
46+
gem 'rubocop'
47+
gem 'rubocop-performance'
48+
gem 'rubocop-rspec'
49+
gem 'simplecov', '~> 0.21', platforms: :mri
50+
gem 'simplecov-lcov', '~> 0.8', platforms: :mri
4651
end
4752

4853
group :debug do

‎Rakefile

+39-32
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# frozen_string_literal: true
2+
13
require 'rubygems'
24

3-
task default: [ :spec ]
5+
task default: [:spec]
46

57
namespace :gem do
68
desc "Build the json-ld-#{File.read('VERSION').chomp}.gem file"
@@ -17,18 +19,18 @@ end
1719
require 'rspec/core/rake_task'
1820
desc 'Run specifications'
1921
RSpec::Core::RakeTask.new(:spec) do |spec|
20-
spec.rspec_opts = %w(--options spec/spec.opts) if File.exists?('spec/spec.opts')
22+
spec.rspec_opts = %w[--options spec/spec.opts] if File.exist?('spec/spec.opts')
2123
end
2224

2325
desc "Generate schema.org context"
2426
task :schema_context do
25-
%x(
27+
`
2628
script/gen_context https://schema.org/docs/schema_org_rdfa.html \
2729
--vocab http://schema.org/ \
2830
--prefix 'schema http://schema.org/' \
2931
--body --hier \
3032
--o etc/schema.org.jsonld
31-
)
33+
`
3234
end
3335

3436
desc "Create concatenated test manifests"
@@ -37,68 +39,73 @@ file "etc/manifests.nt" do
3739
require 'json/ld'
3840
require 'rdf/ntriples'
3941
graph = RDF::Graph.new do |g|
40-
%w( https://w3c.github.io/json-ld-api/tests/compact-manifest.jsonld
42+
%w[ https://w3c.github.io/json-ld-api/tests/compact-manifest.jsonld
4143
https://w3c.github.io/json-ld-api/tests/expand-manifest.jsonld
4244
https://w3c.github.io/json-ld-api/tests/flatten-manifest.jsonld
4345
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest.jsonld
4446
https://w3c.github.io/json-ld-api/tests/html-manifest.jsonld
4547
https://w3c.github.io/json-ld-api/tests/remote-doc-manifest.jsonld
4648
https://w3c.github.io/json-ld-api/tests/toRdf-manifest.jsonld
47-
https://w3c.github.io/json-ld-framing/tests/frame-manifest.jsonld
48-
).each do |man|
49+
https://w3c.github.io/json-ld-framing/tests/frame-manifest.jsonld].each do |man|
4950
puts "load #{man}"
5051
g.load(man, unique_bnodes: true)
5152
end
5253
end
5354
puts "write"
54-
RDF::NTriples::Writer.open("etc/manifests.nt", unique_bnodes: true, validate: false) {|w| w << graph}
55+
RDF::NTriples::Writer.open("etc/manifests.nt", unique_bnodes: true, validate: false) { |w| w << graph }
5556
end
5657

5758
# Presentation building
5859
namespace :presentation do
5960
desc "Clean presentation files"
6061
task :clean do
61-
FileUtils.rm %w(compacted expanded framed).map {|f| "presentation/dbpedia/#{f}.jsonld"}
62+
FileUtils.rm %w[compacted expanded framed].map { |f| "presentation/dbpedia/#{f}.jsonld" }
6263
end
6364

6465
desc "Build presentation files"
65-
task build: %w(
66+
task build: %w[
6667
presentation/dbpedia/expanded.jsonld
6768
presentation/dbpedia/compacted.jsonld
6869
presentation/dbpedia/framed.jsonld
69-
)
70+
]
7071

7172
desc "Build expanded example"
72-
file "presentation/dbpedia/expanded.jsonld" => %w(
73+
file "presentation/dbpedia/expanded.jsonld" => %w[
7374
presentation/dbpedia/orig.jsonld
74-
presentation/dbpedia/expanded-context.jsonld) do
75-
system(%w(
76-
script/parse
77-
--expand presentation/dbpedia/orig.jsonld
78-
--context presentation/dbpedia/expanded-context.jsonld
79-
-o presentation/dbpedia/expanded.jsonld).join(" "))
75+
presentation/dbpedia/expanded-context.jsonld
76+
] do
77+
system(%w[
78+
script/parse
79+
--expand presentation/dbpedia/orig.jsonld
80+
--context presentation/dbpedia/expanded-context.jsonld
81+
-o presentation/dbpedia/expanded.jsonld
82+
].join(" "))
8083
end
8184

8285
desc "Build compacted example"
83-
file "presentation/dbpedia/compacted.jsonld" => %w(
86+
file "presentation/dbpedia/compacted.jsonld" => %w[
8487
presentation/dbpedia/expanded.jsonld
85-
presentation/dbpedia/compact-context.jsonld) do
86-
system(%w(
87-
script/parse
88-
--compact presentation/dbpedia/expanded.jsonld
89-
--context presentation/dbpedia/compact-context.jsonld
90-
-o presentation/dbpedia/compacted.jsonld).join(" "))
88+
presentation/dbpedia/compact-context.jsonld
89+
] do
90+
system(%w[
91+
script/parse
92+
--compact presentation/dbpedia/expanded.jsonld
93+
--context presentation/dbpedia/compact-context.jsonld
94+
-o presentation/dbpedia/compacted.jsonld
95+
].join(" "))
9196
end
9297

9398
desc "Build framed example"
94-
file "presentation/dbpedia/framed.jsonld" => %w(
99+
file "presentation/dbpedia/framed.jsonld" => %w[
95100
presentation/dbpedia/expanded.jsonld
96-
presentation/dbpedia/frame.jsonld) do
97-
system(%w(
98-
script/parse
99-
--frame presentation/dbpedia/frame.jsonld
100-
presentation/dbpedia/expanded.jsonld
101-
-o presentation/dbpedia/framed.jsonld).join(" "))
101+
presentation/dbpedia/frame.jsonld
102+
] do
103+
system(%w[
104+
script/parse
105+
--frame presentation/dbpedia/frame.jsonld
106+
presentation/dbpedia/expanded.jsonld
107+
-o presentation/dbpedia/framed.jsonld
108+
].join(" "))
102109
end
103110
end
104111

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.4
1+
3.2.5

0 commit comments

Comments
 (0)