rdf-rdfa 3.1.3 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +10 -12
  3. data/VERSION +1 -1
  4. data/lib/rdf/rdfa/reader/nokogiri.rb +1 -4
  5. data/lib/rdf/rdfa/reader.rb +1 -13
  6. metadata +26 -38
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e9c6b489278c19f99cef64319f39dce207428cd69caf45706ca9d6296c96fd1c
4
- data.tar.gz: 06ab651b6c459d328615887f1df74b187f9dc6e65d562a9d0aaf69760755b99c
3
+ metadata.gz: 1607516f63a1cce40c7ddc6b5a17ad311673f8b8d621bb371f01919e2a138f44
4
+ data.tar.gz: e7768c0968243e1cdb2054ff13107d52cff292889213f7103d2c8e0098f92c75
5
5
  SHA512:
6
- metadata.gz: 342891ea02851fe5edb917362f22fe5ea48170f38aeca5a7625b42cba303ae47f31cf48bc9c974bb8d8352aaad5ae260561823a82bff422c0326c20cdfcd2b3e
7
- data.tar.gz: 9f2d89aceaa50862b9ea334e50d78bc0581311aa41fe0fa9f0662455c05fd28aee7d0cfe20645f9210699af343b132c918451fd875cb65e1ad7d55ab15456133
6
+ metadata.gz: d019f203248eff7ab6d138291b715cf8b803059cc7f1619dea2fb677d0001d4f4804e2b1d39e718cd6c5d05ec7cb43aabf16e08520ba5cdccf95f208ff900875
7
+ data.tar.gz: c735757bbf56431c7a3add53a5b05de4f75bd86c95d2ea4f170ea6be5b8a14d62a2f42f5888940b2d27d133e7dc4ce8814da44c4c63d80ca2e5ad3753367f1f2
data/README.md CHANGED
@@ -16,15 +16,15 @@ RDF::RDFa parses [RDFa][RDFa 1.1 Core] into statements or triples.
16
16
  * Fully compliant RDFa 1.1 parser.
17
17
  * Template-based Writer to generate XHTML+RDFa.
18
18
  * Writer uses user-replaceable [Haml][Haml] -based templates to generate RDFa.
19
- * If available, uses [Nokogiri][] for parsing HTML/SVG, falls back to REXML otherwise. For HTML5, include the [Nokogumbo][] gem for a pure-HTML5 parser with better error detection.
19
+ * If available, uses [Nokogiri][] for parsing HTML/SVG, falls back to REXML otherwise.
20
20
 
21
21
  Install with `gem install rdf-rdfa`
22
22
 
23
23
  ### Pure Ruby
24
- In order to run as pure ruby (not requiring any C modules), this gem does not directly depend on [Nokogiri][] or [Nokogumbo][]
25
- and falls back to using REXML. [Nokogumbo][] uses the [Gumbo pure-C HTML5 parser](https://github.com/google/gumbo-parser#readme).
24
+ In order to run as pure ruby (not requiring any C modules), this gem does not directly depend on [Nokogiri][]
25
+ and falls back to using REXML.
26
26
  As REXML is not really an HTML parsing library, the results will only be useful if the HTML is well-formed.
27
- For best performance, install the [Nokogiri][] and [Nokogumbo][] gems as well.
27
+ For best performance, install the [Nokogiri][] gem as well.
28
28
 
29
29
  ### Important changes from previous versions
30
30
  RDFa is an evolving standard, undergoing some substantial recent changes partly due to perceived competition
@@ -191,7 +191,7 @@ generates the following turtle:
191
191
  dc:description "A yellow rectangle with sharp corners." .
192
192
 
193
193
  ### Support for embedded N-Triples or Turtle
194
- If the document includes a `<script>` element having an `@type` attribute whose value matches that of a loaded RDF reader (text/ntriples and text/turtle are loaded if they are availble), the data will be extracted and added to the default graph. For example:
194
+ If the document includes a `<script>` element having an `@type` attribute whose value matches that of a loaded RDF reader (text/ntriples and text/turtle are loaded if they are available), the data will be extracted and added to the default graph. For example:
195
195
 
196
196
  <html>
197
197
  <body>
@@ -397,12 +397,11 @@ The template hash defines four Haml templates:
397
397
  }
398
398
 
399
399
  ## Dependencies
400
- * [Ruby](https://ruby-lang.org/) (>= 2.4)
401
- * [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
402
- * [Haml](https://rubygems.org/gems/haml) (~> 5.1)
403
- * [HTMLEntities](https://rubygems.org/gems/htmlentities) (>= 4.3)
404
- * Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.10)
405
- * Soft dependency on [Nokogumbo](https://github.com/rubys/nokogumbo) (>= 2.0)
400
+ * [Ruby](https://ruby-lang.org/) (>= 2.6)
401
+ * [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
402
+ * [Haml](https://rubygems.org/gems/haml) (~> 5.2)
403
+ * [HTMLEntities](https://rubygems.org/gems/htmlentities) (~> 4.3)
404
+ * Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.12)
406
405
 
407
406
  ## Documentation
408
407
  Full documentation available on [Rubydoc.info][RDFa doc]
@@ -478,4 +477,3 @@ see <https://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
478
477
  [Haml]: https://haml-lang.com/
479
478
  [Turtle]: https://www.w3.org/TR/2011/WD-turtle-20110809/
480
479
  [Nokogiri]: https://www.nokogiri.org
481
- [Nokogumbo]: https://github.com/rubys/nokogumbo/#readme
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.3
1
+ 3.2.0
data/lib/rdf/rdfa/reader/nokogiri.rb CHANGED
@@ -176,10 +176,9 @@ module RDF::RDFa
176
176
  ::Nokogiri::HTML.parse(input, base_uri.to_s, options[:encoding])
177
177
  when :html5
178
178
  begin
179
- require 'nokogumbo' unless defined?(::Nokogumbo)
180
179
  input = input.read if input.respond_to?(:read)
181
180
  ::Nokogiri::HTML5(input.force_encoding(options[:encoding]), max_parse_errors: 1000)
182
- rescue LoadError
181
+ rescue LoadError, NoMethodError
183
182
  ::Nokogiri::HTML.parse(input, base_uri.to_s, options[:encoding])
184
183
  end
185
184
  else
@@ -283,8 +282,6 @@ module RDF::RDFa
283
282
  ##
284
283
  # Document errors
285
284
  def doc_errors
286
- # FIXME: Nokogiri version 1.5 thinks many HTML5 elements are invalid, so just ignore all Tag errors.
287
- # Nokogumbo might make this simpler
288
285
  if @host_language == :html5
289
286
  @doc.errors.reject do |e|
290
287
  e.to_s =~ %r{(The doctype must be the first token in the document)|(Expected a doctype token)|(Unexpected '\?' where start tag name is expected)}
data/lib/rdf/rdfa/reader.rb CHANGED
@@ -329,19 +329,7 @@ module RDF::RDFa
329
329
 
330
330
  detect_host_language_version(input, **options)
331
331
 
332
- parse_lib = if @library == :nokogiri && @host_language == :html5
333
- begin
334
- require 'nokogumbo' unless defined?(::Nokogumbo)
335
- :nokobumbo
336
- rescue LoadError
337
- :nokogiri
338
- end
339
- else
340
- @library
341
- end
342
-
343
- parse_lib = @library == :nokogiri && defined?(::Nokogumbo) ? :nokogumbo : @library
344
- add_info(@doc, "version = #{@version}, host_language = #{@host_language}, library = #{parse_lib}, rdfagraph = #{@options[:rdfagraph].inspect}, expand = #{@options[:vocab_expansion]}")
332
+ add_info(@doc, "version = #{@version}, host_language = #{@host_language}, library = #{@library}, rdfagraph = #{@options[:rdfagraph].inspect}, expand = #{@options[:vocab_expansion]}")
345
333
 
346
334
  begin
347
335
  initialize_xml(input, **options)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rdf-rdfa
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.3
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gregg
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-03-06 00:00:00.000000000 Z
12
+ date: 2021-12-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rdf
@@ -17,40 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '3.1'
21
- - - ">="
22
- - !ruby/object:Gem::Version
23
- version: 3.1.13
20
+ version: '3.2'
24
21
  type: :runtime
25
22
  prerelease: false
26
23
  version_requirements: !ruby/object:Gem::Requirement
27
24
  requirements:
28
25
  - - "~>"
29
26
  - !ruby/object:Gem::Version
30
- version: '3.1'
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: 3.1.13
27
+ version: '3.2'
34
28
  - !ruby/object:Gem::Dependency
35
29
  name: rdf-vocab
36
30
  requirement: !ruby/object:Gem::Requirement
37
31
  requirements:
38
32
  - - "~>"
39
33
  - !ruby/object:Gem::Version
40
- version: '3.1'
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- version: 3.1.11
34
+ version: '3.2'
44
35
  type: :runtime
45
36
  prerelease: false
46
37
  version_requirements: !ruby/object:Gem::Requirement
47
38
  requirements:
48
39
  - - "~>"
49
40
  - !ruby/object:Gem::Version
50
- version: '3.1'
51
- - - ">="
52
- - !ruby/object:Gem::Version
53
- version: 3.1.11
41
+ version: '3.2'
54
42
  - !ruby/object:Gem::Dependency
55
43
  name: haml
56
44
  requirement: !ruby/object:Gem::Requirement
@@ -71,28 +59,28 @@ dependencies:
71
59
  requirements:
72
60
  - - "~>"
73
61
  - !ruby/object:Gem::Version
74
- version: '3.1'
62
+ version: '3.2'
75
63
  type: :runtime
76
64
  prerelease: false
77
65
  version_requirements: !ruby/object:Gem::Requirement
78
66
  requirements:
79
67
  - - "~>"
80
68
  - !ruby/object:Gem::Version
81
- version: '3.1'
69
+ version: '3.2'
82
70
  - !ruby/object:Gem::Dependency
83
71
  name: rdf-aggregate-repo
84
72
  requirement: !ruby/object:Gem::Requirement
85
73
  requirements:
86
74
  - - "~>"
87
75
  - !ruby/object:Gem::Version
88
- version: '3.1'
76
+ version: '3.2'
89
77
  type: :runtime
90
78
  prerelease: false
91
79
  version_requirements: !ruby/object:Gem::Requirement
92
80
  requirements:
93
81
  - - "~>"
94
82
  - !ruby/object:Gem::Version
95
- version: '3.1'
83
+ version: '3.2'
96
84
  - !ruby/object:Gem::Dependency
97
85
  name: htmlentities
98
86
  requirement: !ruby/object:Gem::Requirement
@@ -113,14 +101,14 @@ dependencies:
113
101
  requirements:
114
102
  - - "~>"
115
103
  - !ruby/object:Gem::Version
116
- version: '3.1'
104
+ version: '3.2'
117
105
  type: :development
118
106
  prerelease: false
119
107
  version_requirements: !ruby/object:Gem::Requirement
120
108
  requirements:
121
109
  - - "~>"
122
110
  - !ruby/object:Gem::Version
123
- version: '3.1'
111
+ version: '3.2'
124
112
  - !ruby/object:Gem::Dependency
125
113
  name: rspec
126
114
  requirement: !ruby/object:Gem::Requirement
@@ -155,84 +143,84 @@ dependencies:
155
143
  requirements:
156
144
  - - "~>"
157
145
  - !ruby/object:Gem::Version
158
- version: '3.1'
146
+ version: '3.2'
159
147
  type: :development
160
148
  prerelease: false
161
149
  version_requirements: !ruby/object:Gem::Requirement
162
150
  requirements:
163
151
  - - "~>"
164
152
  - !ruby/object:Gem::Version
165
- version: '3.1'
153
+ version: '3.2'
166
154
  - !ruby/object:Gem::Dependency
167
155
  name: rdf-turtle
168
156
  requirement: !ruby/object:Gem::Requirement
169
157
  requirements:
170
158
  - - "~>"
171
159
  - !ruby/object:Gem::Version
172
- version: '3.1'
160
+ version: '3.2'
173
161
  type: :development
174
162
  prerelease: false
175
163
  version_requirements: !ruby/object:Gem::Requirement
176
164
  requirements:
177
165
  - - "~>"
178
166
  - !ruby/object:Gem::Version
179
- version: '3.1'
167
+ version: '3.2'
180
168
  - !ruby/object:Gem::Dependency
181
169
  name: rdf-isomorphic
182
170
  requirement: !ruby/object:Gem::Requirement
183
171
  requirements:
184
172
  - - "~>"
185
173
  - !ruby/object:Gem::Version
186
- version: '3.1'
174
+ version: '3.2'
187
175
  type: :development
188
176
  prerelease: false
189
177
  version_requirements: !ruby/object:Gem::Requirement
190
178
  requirements:
191
179
  - - "~>"
192
180
  - !ruby/object:Gem::Version
193
- version: '3.1'
181
+ version: '3.2'
194
182
  - !ruby/object:Gem::Dependency
195
183
  name: rdf-tabular
196
184
  requirement: !ruby/object:Gem::Requirement
197
185
  requirements:
198
186
  - - "~>"
199
187
  - !ruby/object:Gem::Version
200
- version: '3.1'
188
+ version: '3.2'
201
189
  type: :development
202
190
  prerelease: false
203
191
  version_requirements: !ruby/object:Gem::Requirement
204
192
  requirements:
205
193
  - - "~>"
206
194
  - !ruby/object:Gem::Version
207
- version: '3.1'
195
+ version: '3.2'
208
196
  - !ruby/object:Gem::Dependency
209
197
  name: rdf-rdfxml
210
198
  requirement: !ruby/object:Gem::Requirement
211
199
  requirements:
212
200
  - - "~>"
213
201
  - !ruby/object:Gem::Version
214
- version: '3.1'
202
+ version: '3.2'
215
203
  type: :development
216
204
  prerelease: false
217
205
  version_requirements: !ruby/object:Gem::Requirement
218
206
  requirements:
219
207
  - - "~>"
220
208
  - !ruby/object:Gem::Version
221
- version: '3.1'
209
+ version: '3.2'
222
210
  - !ruby/object:Gem::Dependency
223
211
  name: sparql
224
212
  requirement: !ruby/object:Gem::Requirement
225
213
  requirements:
226
214
  - - "~>"
227
215
  - !ruby/object:Gem::Version
228
- version: '3.1'
216
+ version: '3.2'
229
217
  type: :development
230
218
  prerelease: false
231
219
  version_requirements: !ruby/object:Gem::Requirement
232
220
  requirements:
233
221
  - - "~>"
234
222
  - !ruby/object:Gem::Version
235
- version: '3.1'
223
+ version: '3.2'
236
224
  - !ruby/object:Gem::Dependency
237
225
  name: yard
238
226
  requirement: !ruby/object:Gem::Requirement
@@ -285,14 +273,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
285
273
  requirements:
286
274
  - - ">="
287
275
  - !ruby/object:Gem::Version
288
- version: '2.4'
276
+ version: '2.6'
289
277
  required_rubygems_version: !ruby/object:Gem::Requirement
290
278
  requirements:
291
279
  - - ">="
292
280
  - !ruby/object:Gem::Version
293
281
  version: '0'
294
282
  requirements: []
295
- rubygems_version: 3.2.3
283
+ rubygems_version: 3.3.3
296
284
  signing_key:
297
285
  specification_version: 4
298
286
  summary: RDFa reader/writer for RDF.rb.