Skip to content

Commit a6e62af

Browse files
committed
Finish 3.1.0
2 parents fbf63f0 + c25ba20 commit a6e62af

File tree

16 files changed

+110
-123
lines changed

16 files changed

+110
-123
lines changed

.travis.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
language: ruby
2-
bundler_args: --without debug
32
script: "bundle exec rspec spec"
43
env:
5-
- CI=true
4+
global:
5+
- CI=true
6+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
7+
gemfile:
8+
- Gemfile
9+
- Gemfile-pure
610
rvm:
7-
- 2.2
8-
- 2.3
911
- 2.4
10-
- jruby-9
11-
- rbx-3
12+
- 2.5
13+
- 2.6
14+
- 2.7
15+
- jruby
1216
cache: bundler
1317
sudo: false
1418
matrix:
1519
allow_failures:
16-
- rvm: jruby-9
17-
- rvm: rbx-3
20+
- rvm: jruby
1821
dist: trusty

Gemfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa", branch: "develop"
77
gem "nokogiri"
88

99
group :development do
10-
gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
10+
gem 'ebnf', github: "dryruby/ebnf", branch: "develop"
1111
gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
1212
gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop"
1313
gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
@@ -24,9 +24,3 @@ group :debug do
2424
gem "ruby-debug", platforms: :jruby
2525
gem "byebug", platform: :mri
2626
end
27-
28-
platforms :rbx do
29-
gem 'rubysl', '~> 2.0'
30-
gem 'rubinius', '~> 2.0'
31-
gem 'json'
32-
end

Gemfile-pure

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rdf', github: "ruby-rdf/rdf", branch: "develop"
77
gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa", branch: "develop"
88

99
group :development do
10-
gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
10+
gem 'ebnf', github: "dryruby/ebnf", branch: "develop"
1111
gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
1212
gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop"
1313
gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
@@ -24,9 +24,3 @@ group :debug do
2424
gem "ruby-debug", platforms: :jruby
2525
gem "byebug", platform: :mri
2626
end
27-
28-
platforms :rbx do
29-
gem 'rubysl', '~> 2.0'
30-
gem 'rubinius', '~> 2.0'
31-
gem 'json'
32-
end

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Install with `gem install rdf-rdfxml`
1818

1919
* 100% free and unencumbered [public domain](http://unlicense.org/) software.
2020
* Implements a complete parser for [RDF/XML][].
21-
* Compatible with Ruby >= 2.2.2.
21+
* Compatible with Ruby >= 2.4.
2222

2323
## Usage:
2424
Instantiate a parser and parse source, specifying type and base-URL
@@ -40,8 +40,8 @@ Write a graph to a file:
4040
end
4141

4242
## Dependencies
43-
* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
44-
* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
43+
* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
44+
* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.10)
4545

4646
## Documentation
4747
Full documentation available on [Rubydoc.info][RDF/XML doc])

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.1
1+
3.1.0

lib/rdf/rdfxml/reader.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def initialize(base, element, graph, &cb)
4141
end
4242

4343
# Clone existing evaluation context adding information from element
44-
def clone(element, options = {}, &cb)
44+
def clone(element, **options, &cb)
4545
new_ec = EvaluationContext.new(@base, nil, @graph)
4646
new_ec.uri_mappings = self.uri_mappings.clone
4747
new_ec.language = self.language
@@ -136,7 +136,7 @@ def inspect
136136
# @yieldparam [RDF::Reader] reader
137137
# @yieldreturn [void] ignored
138138
# @raise [Error] Raises RDF::ReaderError if _validate_
139-
def initialize(input = $stdin, options = {}, &block)
139+
def initialize(input = $stdin, **options, &block)
140140
super do
141141
@library = case options[:library]
142142
when nil
@@ -156,7 +156,7 @@ def initialize(input = $stdin, options = {}, &block)
156156
self.extend(@implementation)
157157

158158
input.rewind if input.respond_to?(:rewind)
159-
initialize_xml(input, options) rescue log_fatal($!.message)
159+
initialize_xml(input, **options) rescue log_fatal($!.message)
160160

161161
log_error("Empty document") if root.nil?
162162
log_error("Synax errors") {doc_errors} if !doc_errors.empty?
@@ -427,7 +427,7 @@ def nodeElement(el, ec)
427427
else
428428
literal_opts[:language] = child_ec.language
429429
end
430-
literal = RDF::Literal.new(child.inner_text, literal_opts)
430+
literal = RDF::Literal.new(child.inner_text, **literal_opts)
431431
add_triple(child, subject, predicate, literal)
432432
reify(id, child, subject, predicate, literal, ec) if id
433433
elsif parseType == "Resource"

lib/rdf/rdfxml/reader/nokogiri.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def method_missing(method, *args)
227227
#
228228
# @param [Hash{Symbol => Object}] options
229229
# @return [void]
230-
def initialize_xml(input, options = {})
230+
def initialize_xml(input, **options)
231231
require 'nokogiri' unless defined?(::Nokogiri)
232232
@doc = case input
233233
when ::Nokogiri::XML::Document

lib/rdf/rdfxml/reader/rexml.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def method_missing(method, *args)
245245
#
246246
# @param [Hash{Symbol => Object}] options
247247
# @return [void]
248-
def initialize_xml(input, options = {})
248+
def initialize_xml(input, **options)
249249
require 'rexml/document' unless defined?(::REXML)
250250
@doc = case input
251251
when ::REXML::Document

lib/rdf/rdfxml/writer.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def self.options
113113
# URI to use as @href for output stylesheet processing instruction.
114114
# @yield [writer]
115115
# @yieldparam [RDF::Writer] writer
116-
def initialize(output = $stdout, options = {}, &block)
116+
def initialize(output = $stdout, **options, &block)
117117
super
118118
end
119119

@@ -170,7 +170,7 @@ def write_epilogue
170170
# @return String
171171
# The rendered document is returned as a string
172172
# Return Haml template for document from `haml_template[:subject]`
173-
def render_subject(subject, predicates, options = {}, &block)
173+
def render_subject(subject, predicates, **options, &block)
174174
# extract those properties that can be rendered as attributes
175175
attr_props = if [:untyped, :typed].include?(@attributes)
176176
options[:property_values].inject({}) do |memo, (prop, values)|
@@ -189,7 +189,7 @@ def render_subject(subject, predicates, options = {}, &block)
189189
end
190190

191191
predicates -= attr_props.keys.map {|k| expand_curie(k).to_s}
192-
super(subject, predicates, options.merge(attr_props: attr_props), &block)
192+
super(subject, predicates, **options.merge(attr_props: attr_props), &block)
193193
end
194194
# See if we can serialize as attribute.
195195
# * untyped attributes that aren't duplicated where xml:lang == @lang
@@ -228,8 +228,8 @@ def predicate_as_attribute?(prop, object)
228228
# @yieldreturn [:ignored]
229229
# @return String
230230
# The rendered document is returned as a string
231-
def render_document(subjects, options = {}, &block)
232-
super(subjects, options.merge(stylesheet: @options[:stylesheet]), &block)
231+
def render_document(subjects, **options, &block)
232+
super(subjects, **options.merge(stylesheet: @options[:stylesheet]), &block)
233233
end
234234

235235
# Render a single- or multi-valued predicate using `haml_template[:property_value]` or `haml_template[:property_values]`. Yields each object for optional rendering. The block should only render for recursive subject definitions (i.e., where the object is also a subject and is rendered underneath the first referencing subject).
@@ -256,7 +256,7 @@ def render_document(subjects, options = {}, &block)
256256
# The block should only return a string for recursive object definitions.
257257
# @return String
258258
# The rendered document is returned as a string
259-
def render_property(predicate, objects, options = {}, &block)
259+
def render_property(predicate, objects, **options, &block)
260260
log_debug {"render_property(#{predicate}): #{objects.inspect}, #{options.inspect}"}
261261
# If there are multiple objects, and no :property_values is defined, call recursively with
262262
# each object
@@ -280,7 +280,7 @@ def render_property(predicate, objects, options = {}, &block)
280280

281281
log_debug {"list: #{list.inspect} #{list.to_a}"}
282282
log_depth do
283-
render_collection(predicate, list, options) do |object|
283+
render_collection(predicate, list, **options) do |object|
284284
yield(object, true) if block_given?
285285
end
286286
end
@@ -290,7 +290,7 @@ def render_property(predicate, objects, options = {}, &block)
290290
if objects.length > 1
291291
# Render each property using property_value template
292292
objects.map do |object|
293-
log_depth {render_property(predicate, [object], options, &block)}
293+
log_depth {render_property(predicate, [object], **options, &block)}
294294
end.join(" ")
295295
else
296296
log_fatal("Missing property template", exception: RDF::WriterError) if template.nil?
@@ -301,7 +301,7 @@ def render_property(predicate, objects, options = {}, &block)
301301
property: get_qname(predicate),
302302
recurse: log_depth <= @max_depth
303303
}.merge(options)
304-
hamlify(template, options, &block)
304+
hamlify(template, **options, &block)
305305
end
306306
end
307307

@@ -319,7 +319,7 @@ def render_property(predicate, objects, options = {}, &block)
319319
# The block should only return a string for recursive object definitions.
320320
# @return String
321321
# The rendered collection is returned as a string
322-
def render_collection(predicate, list, options = {}, &block)
322+
def render_collection(predicate, list, **options, &block)
323323
template = options[:haml] || haml_template[:collection]
324324

325325
options = {
@@ -328,7 +328,7 @@ def render_collection(predicate, list, options = {}, &block)
328328
property: get_qname(predicate),
329329
recurse: log_depth <= @max_depth,
330330
}.merge(options)
331-
hamlify(template, options) do |object|
331+
hamlify(template, **options) do |object|
332332
yield object
333333
end
334334
end

rdf-rdfxml.gemspec

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,26 @@ Gem::Specification.new do |gem|
1717
gem.platform = Gem::Platform::RUBY
1818
gem.files = %w(README.md History.md AUTHORS CONTRIBUTORS VERSION UNLICENSE) + Dir.glob('lib/**/*.rb')
1919
gem.require_paths = %w(lib)
20-
gem.has_rdoc = false
2120

22-
gem.required_ruby_version = '>= 2.2.2'
21+
gem.required_ruby_version = '>= 2.4'
2322
gem.requirements = []
2423

25-
#gem.add_runtime_dependency 'rdf', '~> 3.0'
26-
#gem.add_runtime_dependency 'rdf-rdfa', '~> 3.0'
27-
#gem.add_runtime_dependency 'rdf-xsd', '~> 3.0'
28-
gem.add_runtime_dependency 'rdf', '>= 2.2', '< 4.0'
29-
gem.add_runtime_dependency 'rdf-rdfa', '>= 2.2', '< 4.0'
30-
gem.add_runtime_dependency 'rdf-xsd', '>= 2.2', '< 4.0'
24+
gem.add_runtime_dependency 'rdf', '~> 3.1'
25+
gem.add_runtime_dependency 'rdf-xsd', '~> 3.1'
26+
gem.add_runtime_dependency 'rdf-rdfa', '~> 3.1'
3127
gem.add_runtime_dependency 'htmlentities', '~> 4.3'
3228

33-
#gem.add_development_dependency 'nokogiri' , '>= 1.6.1' # conditionally done in Gemfile
34-
#gem.add_development_dependency 'equivalent-xml' , '~> 0.2' # conditionally done in Gemfile
29+
#gem.add_development_dependency 'nokogiri' , '~> 1.10'
30+
#gem.add_development_dependency 'equivalent-xml' , '~> 0.6' # conditionally done in Gemfile
3531
gem.add_development_dependency 'open-uri-cached', '~> 0.0', '>= 0.0.5'
36-
gem.add_development_dependency 'spira', '= 0.0.12'
37-
#gem.add_development_dependency 'json-ld', '~> 3.0'
38-
gem.add_development_dependency 'json-ld', '>= 2.1', '< 4.0'
39-
gem.add_development_dependency 'rspec', '~> 3.4'
40-
gem.add_development_dependency 'rspec-its', '~> 1.2'
41-
#gem.add_development_dependency 'rdf-isomorphic', '~> 3.0'
42-
#gem.add_development_dependency 'rdf-turtle', '~> 3.0'
43-
#gem.add_development_dependency 'rdf-spec', '~> 3.0'
44-
#gem.add_development_dependency 'rdf-vocab', '~> 3.0'
45-
gem.add_development_dependency 'rdf-isomorphic', '>= 2.2', '< 4.0'
46-
gem.add_development_dependency 'rdf-turtle', '>= 2.2', '< 4.0'
47-
gem.add_development_dependency 'rdf-spec', '>= 2.2', '< 4.0'
48-
gem.add_development_dependency 'rdf-vocab', '>= 2.2', '< 4.0'
49-
gem.add_development_dependency 'yard' , '~> 0.8'
50-
51-
# Rubinius has it's own dependencies
52-
if RUBY_ENGINE == "rbx" && RUBY_VERSION >= "2.1.0"
53-
gem.add_runtime_dependency "racc"
54-
end
32+
gem.add_development_dependency 'json-ld', '>= 3.1'
33+
gem.add_development_dependency 'rspec', '~> 3.9'
34+
gem.add_development_dependency 'rspec-its', '~> 1.3'
35+
gem.add_development_dependency 'rdf-isomorphic', '~> 3.1'
36+
gem.add_development_dependency 'rdf-turtle', '~> 3.1'
37+
gem.add_development_dependency 'rdf-spec', '~> 3.1'
38+
gem.add_development_dependency 'rdf-vocab', '~> 3.1'
39+
gem.add_development_dependency 'yard' , '~> 0.9.20'
5540

5641
gem.post_install_message = nil
5742
end

0 commit comments

Comments
 (0)