relaton-w3c 1.14.2 → 1.16.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/release.yml +2 -1
  3. data/.gitignore +1 -0
  4. data/.rubocop.yml +1 -1
  5. data/Gemfile +1 -0
  6. data/grammars/biblio.rng +1 -1
  7. data/lib/relaton_w3c/data_fetcher.rb +2 -2
  8. data/lib/relaton_w3c/version.rb +1 -1
  9. data/lib/relaton_w3c/w3c_bibliography.rb +3 -1
  10. data/relaton_w3c.gemspec +3 -5
  11. metadata +7 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3fa2cf3c72f102ca4939b69644daa84953456cf718e647043cd96821b60d76fc
4
- data.tar.gz: 712c67760c7810fe30a915e11c9e5c50c829db4ff9dac5421b233445d19d6c04
3
+ metadata.gz: 845e2b18fd329b3f50315eebb7cdf91bd467d53397c65cd2a9124b09d9683e61
4
+ data.tar.gz: ed906f6bd964ac5af614c1ff88b485d73af30eb4006c6fdea7372f130ebd54cc
5
5
  SHA512:
6
- metadata.gz: 9974031951fd2938d8d7fa272df81a77d9c6f35be90374442c51344f0996d7488d1ec4b1b22d1af09b4b0913da65f4392bfa72344f13a3cb2d0fb4522a8ec4dc
7
- data.tar.gz: 3f1bd4e90a671e3f3564fe80327096e7f26bc9371ffef46f2ed9e47be953e398c676ccac07d1083383fde2dce229af9fb0176b9b7d2c95e28ba4f2a520bdc69e
6
+ metadata.gz: debbdc5fb438e7290748f825859dd432d75d19b4937ef5d749f66c0e899c0e6d9ba3e5287239898b1c773ec9c3832fed89050abacb913fee7171446211d015ea
7
+ data.tar.gz: 7e007f96fe6a1d712f9cb8766df8b844d1bcd61965e038fb28a3954b50b9d5d485bd7d6849627edc4a13902a94f2de9a0136f98adb4eaffabc194c701f8757fc
data/.github/workflows/release.yml CHANGED
@@ -7,7 +7,8 @@ on:
7
7
  inputs:
8
8
  next_version:
9
9
  description: |
10
- Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
10
+ Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
11
+ Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
11
12
  required: true
12
13
  default: 'skip'
13
14
  repository_dispatch:
data/.gitignore CHANGED
@@ -6,6 +6,7 @@
6
6
  /pkg/
7
7
  /spec/reports/
8
8
  /tmp/
9
+ /vendor/
9
10
 
10
11
  # rspec failure tracking
11
12
  .rspec_status
data/.rubocop.yml CHANGED
@@ -7,6 +7,6 @@ require: rubocop-rails
7
7
  inherit_from:
8
8
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
9
9
  AllCops:
10
- TargetRubyVersion: 2.6
10
+ TargetRubyVersion: 2.7
11
11
  Rails:
12
12
  Enabled: false
data/Gemfile CHANGED
@@ -6,6 +6,7 @@ gemspec
6
6
  gem "rake", "~> 13.0"
7
7
  gem "rspec", "~> 3.0"
8
8
 
9
+ gem "equivalent-xml"
9
10
  gem "ruby-jing"
10
11
  gem "simplecov"
11
12
  gem "vcr"
data/grammars/biblio.rng CHANGED
@@ -1283,7 +1283,7 @@
1283
1283
  <value>mergedInto</value>
1284
1284
  <value>splits</value>
1285
1285
  <value>splitInto</value>
1286
- <value>instance</value>
1286
+ <value>instanceOf</value>
1287
1287
  <value>hasInstance</value>
1288
1288
  <value>exemplarOf</value>
1289
1289
  <value>hasExemplar</value>
data/lib/relaton_w3c/data_fetcher.rb CHANGED
@@ -74,13 +74,13 @@ module RelatonW3c
74
74
  if File.exist? file
75
75
  item = send "read_#{@format}", file
76
76
  item.relation.each do |r1|
77
- r1.type = "hasEdition" if r1.type == "instance"
77
+ r1.type = "hasEdition" if r1.type == "instanceOf"
78
78
  same_edition = bib.relation.detect { |r2| same_edition?(r1, r2) }
79
79
  bib.relation << r1 unless same_edition
80
80
  end
81
81
  end
82
82
  bib.relation.select { |r| r.type == "hasEdition" }
83
- .max_by { |r| r.bibitem.id.match(/(?<=-)\d{8}$/).to_s }&.type = "instance"
83
+ .max_by { |r| r.bibitem.id.match(/(?<=-)\d{8}$/).to_s }&.type = "instanceOf"
84
84
  end
85
85
 
86
86
  #
data/lib/relaton_w3c/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RelatonW3c
2
- VERSION = "1.14.2".freeze
2
+ VERSION = "1.16.0".freeze
3
3
  end
data/lib/relaton_w3c/w3c_bibliography.rb CHANGED
@@ -13,7 +13,9 @@ module RelatonW3c
13
13
  # @return [RelatonW3c::W3cBibliographicItem]
14
14
  def search(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
15
15
  pubid = PubId.parse text.sub(/^W3C\s/, "")
16
- index = Relaton::Index.find_or_create :W3C, url: "#{SOURCE}#{INDEX}.zip", file: "#{INDEX}.yaml"
16
+ index = Relaton::Index.find_or_create(
17
+ :W3C, url: "#{SOURCE}#{INDEX}.zip", file: "#{INDEX}.yaml", id_keys: PubId::PARTS
18
+ )
17
19
  row = index.search { |r| pubid == r[:id] }.first
18
20
  return unless row
19
21
 
data/relaton_w3c.gemspec CHANGED
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
14
14
  "using the IsoBibliographicItem model"
15
15
  spec.homepage = "https://github.com/relaton/relaton-wc3"
16
16
  spec.license = "BSD-2-Clause"
17
- spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
17
+ spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
18
18
 
19
19
  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
20
20
 
@@ -31,14 +31,12 @@ Gem::Specification.new do |spec|
31
31
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
32
32
  spec.require_paths = ["lib"]
33
33
 
34
- spec.add_development_dependency "equivalent-xml", "~> 0.6"
35
-
36
34
  spec.add_dependency "linkeddata", "~> 3.2.0"
37
35
  spec.add_dependency "mechanize", "~> 2.8.0"
38
36
  spec.add_dependency "rdf", "~> 3.2.0"
39
37
  spec.add_dependency "rdf-normalize", "~> 0.5.0"
40
- spec.add_dependency "relaton-bib", "~> 1.14.0"
41
- spec.add_dependency "relaton-index", "~> 0.2.0"
38
+ spec.add_dependency "relaton-bib", "~> 1.16.0"
39
+ spec.add_dependency "relaton-index", "~> 0.2.4"
42
40
  spec.add_dependency "rubyzip", "~> 2.3.0"
43
41
  spec.add_dependency "shex", "~> 0.7.0"
44
42
  spec.add_dependency "sparql", "~> 3.2.0"
metadata CHANGED
@@ -1,29 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-w3c
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.2
4
+ version: 1.16.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-05-19 00:00:00.000000000 Z
11
+ date: 2023-09-03 00:00:00.000000000 Z
12
12
  dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: equivalent-xml
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - "~>"
18
- - !ruby/object:Gem::Version
19
- version: '0.6'
20
- type: :development
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - "~>"
25
- - !ruby/object:Gem::Version
26
- version: '0.6'
27
13
  - !ruby/object:Gem::Dependency
28
14
  name: linkeddata
29
15
  requirement: !ruby/object:Gem::Requirement
@@ -86,28 +72,28 @@ dependencies:
86
72
  requirements:
87
73
  - - "~>"
88
74
  - !ruby/object:Gem::Version
89
- version: 1.14.0
75
+ version: 1.16.0
90
76
  type: :runtime
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
80
  - - "~>"
95
81
  - !ruby/object:Gem::Version
96
- version: 1.14.0
82
+ version: 1.16.0
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: relaton-index
99
85
  requirement: !ruby/object:Gem::Requirement
100
86
  requirements:
101
87
  - - "~>"
102
88
  - !ruby/object:Gem::Version
103
- version: 0.2.0
89
+ version: 0.2.4
104
90
  type: :runtime
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
94
  - - "~>"
109
95
  - !ruby/object:Gem::Version
110
- version: 0.2.0
96
+ version: 0.2.4
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: rubyzip
113
99
  requirement: !ruby/object:Gem::Requirement
@@ -203,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
203
189
  requirements:
204
190
  - - ">="
205
191
  - !ruby/object:Gem::Version
206
- version: 2.6.0
192
+ version: 2.7.0
207
193
  required_rubygems_version: !ruby/object:Gem::Requirement
208
194
  requirements:
209
195
  - - ">="