rdf-aggregate-repo 2.1.0 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +19 -15
  3. data/UNLICENSE +1 -1
  4. data/VERSION +1 -1
  5. data/etc/doap.ttl +19 -21
  6. data/lib/rdf/aggregate_repo/merge_graph.rb +11 -13
  7. data/lib/rdf/aggregate_repo.rb +10 -9
  8. metadata +20 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e5f3d3e5a9358a895872f4792f1be972521dd827
4
- data.tar.gz: 3ad6f28ac9356838858e0126f13b1eabee0b691d
2
+ SHA256:
3
+ metadata.gz: 324af40178b78644a54749f57358ffc016ddc98adbca8e3b3497bf3349867bb3
4
+ data.tar.gz: 2fb306d4df121ce824fb3f2dfead4bf074d93c21b837c995610c3bb43f0671ec
5
5
  SHA512:
6
- metadata.gz: 6767ccf4c390c76b10d5b0a86fce3f83936963fd8c0dfe632d4128cf3f6f41400719e43f6285cc435a13fc5d22e7581d405def4b03c822a49eba78707cd08193
7
- data.tar.gz: 0452ab3885a4cb79a59ee3b368657b6af2f199b6d2efe98026bb8b4bd460be8eb71a208f4e4b950f72dc888b617c90a4f8df4bc94473a3b587dfd619cee91234
6
+ metadata.gz: 5b6bade9c752328f024cc45ead71ee1d56007a283c8acf54c974da0b1a533c43585d3e1e53ea0805492284bf824cc8e403e6950942a2a998e7e8df13bcb768d6
7
+ data.tar.gz: aebe1d54b00a7dabebbef8cd764c3ef3c59f2ae131e150841901f5d64104d2ebe5f408bf2ca8484905f9345f3d2da0eda7d0538833eb576681dab6ba8443cd07
data/README.md CHANGED
@@ -2,8 +2,10 @@
2
2
 
3
3
  An aggregate RDF::Dataset supporting a subset of named graphs and zero or more named graphs mapped to the default graph.
4
4
 
5
- [![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](http://badge.fury.io/rb/rdf-aggregate-repo)
6
- [![Build Status](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-aggregate-repo)
5
+ [![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](https://badge.fury.io/rb/rdf-aggregate-repo)
6
+ [![Build Status](https://github.com/ruby-rdf/rdf-aggregate-repo/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-aggregate-repo/actions?query=workflow%3ACI)
7
+ [![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-aggregate-repo/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-aggregate-repo?branch=develop)
8
+ [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
7
9
 
8
10
  ## Description
9
11
 
@@ -13,7 +15,7 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single data
13
15
 
14
16
  require 'rdf'
15
17
  require 'rdf/nquads'
16
- repo = RDF::Repository.load("http://ruby-rdf.github.com/rdf/etc/doap.nq")
18
+ repo = RDF::Repository.load("https://ruby-rdf.github.com/rdf/etc/doap.nq")
17
19
 
18
20
  # Instantiate a new aggregate repo based on an existing repo
19
21
  aggregate = RDF::AggregateRepo.new(repo)
@@ -22,23 +24,23 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single data
22
24
  aggregate.add_default(false)
23
25
 
24
26
  # Use a single named graph
25
- aggregate.add_named(RDF::URI("http://greggkellogg.net/foaf#me"))
27
+ aggregate.add_named(RDF::URI("https://greggkellogg.net/foaf#me"))
26
28
 
27
29
  # Retrieve all contexts
28
- aggreggate.contexts.to_a #=> [RDF::URI("http://greggkellogg.net/foaf#me")]
30
+ aggreggate.contexts.to_a #=> [RDF::URI("https://greggkellogg.net/foaf#me")]
29
31
 
30
32
  ## Dependencies
31
33
 
32
- * [Ruby](http://ruby-lang.org/) (>= 2.2.2)
33
- * [RDF.rb][] (>= 2.0)
34
+ * [Ruby](https://ruby-lang.org/) (>= 2.6)
35
+ * [RDF.rb][] (~> 3.2)
34
36
 
35
37
  ## Mailing List
36
38
 
37
- * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
39
+ * <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
38
40
 
39
41
  ## Author
40
42
 
41
- * [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
43
+ * [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
42
44
 
43
45
  ## Contributing
44
46
  This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
@@ -56,15 +58,17 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
56
58
  enough, be assured we will eventually add you in there.
57
59
  * Do note that in order for us to merge any non-trivial changes (as a rule
58
60
  of thumb, additions larger than about 15 lines of code), we need an
59
- explicit [public domain dedication][PDD] on record from you.
61
+ explicit [public domain dedication][PDD] on record from you,
62
+ which you will be asked to agree to on the first commit to a repo within the organization.
63
+ Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
60
64
 
61
65
  ## License
62
66
 
63
67
  This is free and unencumbered public domain software. For more information,
64
- see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
68
+ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
65
69
 
66
- [RDF.rb]: http://ruby-rdf.github.com/
70
+ [RDF.rb]: https://ruby-rdf.github.com/
67
71
  [RDF Datasets]: https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset
68
- [YARD]: http://yardoc.org/
69
- [YARD-GS]: http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
70
- [PDD]: http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
72
+ [YARD]: https://yardoc.org/
73
+ [YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
74
+ [PDD]: https://unlicense.org/#unlicensing-contributions
data/UNLICENSE CHANGED
@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21
21
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22
22
  OTHER DEALINGS IN THE SOFTWARE.
23
23
 
24
- For more information, please refer to <http://unlicense.org/>
24
+ For more information, please refer to <https://unlicense.org/>
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.0
1
+ 3.2.0
data/etc/doap.ttl CHANGED
@@ -1,3 +1,4 @@
1
+ @base <https://rubygems.org/gems/rdf-aggregate-repo> .
1
2
  @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
2
3
  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
3
4
  @prefix dc: <http://purl.org/dc/terms/> .
@@ -7,27 +8,24 @@
7
8
  @prefix ex: <http://example.org/> .
8
9
  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
9
10
 
10
- <http://rubygems.org/gems/rdf-aggregate-repo> a doap:Project, earl:Software ;
11
+ <> a doap:Project, earl:Software ;
11
12
  doap:name "RDF::AggregateRepo" ;
12
- doap:homepage <http://ruby-rdf.github.com/rdf-aggregate-repo> ;
13
- doap:license <http://creativecommons.org/licenses/publicdomain/> ;
14
- doap:shortdesc "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ;
15
- doap:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ;
13
+ doap:homepage <https://github.com/ruby-rdf/rdf-aggregate-repo> ;
14
+ doap:license <https://unlicense.org/1.0/> ;
15
+ doap:description "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ;
16
+ doap:shortdesc "RDF::AggregateRepo extends RDF.rb with SPARQL dataset construction semantics."@en ;
16
17
  doap:created "2013-04-26"^^xsd:date ;
17
18
  doap:programming-language "Ruby" ;
18
- doap:implements <http://www.w3.org/TR/sparql11-query/#specifyingDataset> ;
19
- doap:category <http://dbpedia.org/resource/Resource_Description_Framework>,
20
- <http://dbpedia.org/resource/Ruby_(programming_language)> ;
21
- doap:download-page <http://rubygems.org/gems/rdf-aggregate-repo> ;
22
- doap:mailing-list <http://lists.w3.org/Archives/Public/public-rdf-ruby/> ;
23
- doap:bug-database <http://github.com/ruby-rdf/rdf-aggregate-repo/issues> ;
24
- doap:blog <http://greggkellogg.net/> ;
25
- doap:developer <http://greggkellogg.net/foaf#me> ;
26
- doap:maintainer <http://greggkellogg.net/foaf#me> ;
27
- doap:documenter <http://greggkellogg.net/foaf#me> ;
28
- foaf:maker <http://greggkellogg.net/foaf#me> ;
29
- dc:title "RDF::AggregateRepo"@en ;
30
- dc:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ;
31
- dc:date "2013-04-26"^^xsd:date ;
32
- dc:creator <http://greggkellogg.net/foaf#me> ;
33
- dc:isPartOf <http://rubygems.org/gems/rdf> .
19
+ doap:implements <https://www.w3.org/TR/sparql11-query/#specifyingDataset> ;
20
+ doap:category <https://dbpedia.org/resource/Resource_Description_Framework>,
21
+ <https://dbpedia.org/resource/Ruby_(programming_language)> ;
22
+ doap:download-page <> ;
23
+ doap:mailing-list <https://lists.w3.org/Archives/Public/public-rdf-ruby/> ;
24
+ doap:bug-database <https://github.com/ruby-rdf/rdf-aggregate-repo/issues> ;
25
+ doap:blog <https://greggkellogg.net/> ;
26
+ doap:developer <https://greggkellogg.net/foaf#me> ;
27
+ doap:maintainer <https://greggkellogg.net/foaf#me> ;
28
+ doap:documenter <https://greggkellogg.net/foaf#me> ;
29
+ foaf:maker <https://greggkellogg.net/foaf#me> ;
30
+ dc:creator <https://greggkellogg.net/foaf#me> ;
31
+ dc:isPartOf <https://rubygems.org/gems/rdf> .
data/lib/rdf/aggregate_repo/merge_graph.rb CHANGED
@@ -18,7 +18,7 @@ module RDF
18
18
  # name false
19
19
  # end
20
20
  #
21
- # @see http://www.w3.org/TR/rdf11-mt/#dfn-merge
21
+ # @see https://www.w3.org/TR/rdf11-mt/#dfn-merge
22
22
  class MergeGraph
23
23
  include RDF::Value
24
24
  include RDF::Countable
@@ -40,16 +40,14 @@ module RDF
40
40
  ##
41
41
  # Create a new aggregation instance.
42
42
  #
43
- # @overload initialize(queryable = [], options = {})
44
- # @param [Hash{Symbol => Object}] options ({})
45
- # @option options [RDF::Resource] :graph_name
46
- # @option options [RDF::Resource] :name alias for :graph_name
47
- # @yield merger
48
- # @yieldparam [RDF::MergeGraph] self
49
- # @yieldreturn [void] ignored
50
- def initialize(options = {}, &block)
43
+ # @param [RDF::Resource] graph_name
44
+ # @param [RDF::Resource] name alias for `graph_name`
45
+ # @yield merger
46
+ # @yieldparam [RDF::MergeGraph] self
47
+ # @yieldreturn [void] ignored
48
+ def initialize(graph_name: nil, name: nil, &block)
51
49
  @sources = []
52
- @graph_name = options[:graph_name] || options[:name]
50
+ @graph_name = graph_name || name
53
51
 
54
52
  if block_given?
55
53
  case block.arity
@@ -186,12 +184,12 @@ module RDF
186
184
  ##
187
185
  # @private
188
186
  # @see RDF::Queryable#query_pattern
189
- def query_pattern(pattern, options = {}, &block)
190
- return enum_for(:query_pattern, pattern, options) unless block_given?
187
+ def query_pattern(pattern, **options, &block)
188
+ return enum_for(:query_pattern, pattern, **options) unless block_given?
191
189
  pattern = pattern.dup
192
190
  sources.each do |(source, gn)|
193
191
  pattern.graph_name = gn
194
- source.send(:query_pattern, pattern, options, &block)
192
+ source.send(:query_pattern, pattern, **options, &block)
195
193
  end
196
194
  end
197
195
  end
data/lib/rdf/aggregate_repo.rb CHANGED
@@ -52,7 +52,7 @@ module RDF
52
52
  ##
53
53
  # Create a new aggregation instance.
54
54
  #
55
- # @overload initialize(queryable = [], options = {})
55
+ # @overload initialize(queryable = [], **options)
56
56
  # @param [Array<RDF::Queryable>] queryable ([])
57
57
  # @param [Hash{Symbol => Object}] options ({})
58
58
  # @yield aggregation
@@ -117,8 +117,9 @@ module RDF
117
117
  # @see RDF::Enumerable#supports?
118
118
  def supports?(feature)
119
119
  case feature.to_sym
120
- when :graph_name then @options[:with_graph_name]
121
- when :validity then @options.fetch(:with_validity, true)
120
+ when :graph_name then @options[:with_graph_name]
121
+ when :validity then @options.fetch(:with_validity, true)
122
+ when :literal_equality then sources.all? {|s| s.supports?(:literal_equality)}
122
123
  else false
123
124
  end
124
125
  end
@@ -296,26 +297,26 @@ module RDF
296
297
  # @yieldreturn [void] ignored
297
298
  # @return [void] ignored
298
299
  # @see RDF::Queryable#query_pattern
299
- def query_pattern(pattern, options = {}, &block)
300
- return enum_for(:query_pattern, pattern, options) unless block_given?
300
+ def query_pattern(pattern, **options, &block)
301
+ return enum_for(:query_pattern, pattern, **options) unless block_given?
301
302
  case pattern.graph_name
302
303
  when nil
303
304
  # Query against all graphs
304
- each_graph {|graph| graph.send(:query_pattern, pattern, options, &block)}
305
+ each_graph {|graph| graph.send(:query_pattern, pattern, **options, &block)}
305
306
  when FalseClass
306
307
  # Query against default graph only
307
- default_graph.send(:query_pattern, pattern, options, &block)
308
+ default_graph.send(:query_pattern, pattern, **options, &block)
308
309
  when RDF::Query::Variable
309
310
  # Query against all named graphs
310
311
  each_graph do |graph|
311
312
  source = sources.reverse.detect {|s| s.has_graph?(graph.graph_name)}
312
- RDF::Graph.new(graph_name: graph.graph_name, data: source).send(:query_pattern, pattern, options, &block)
313
+ RDF::Graph.new(graph_name: graph.graph_name, data: source).send(:query_pattern, pattern, **options, &block)
313
314
  end
314
315
  else
315
316
  # Query against a specific graph
316
317
  if @named_graphs.include?(pattern.graph_name)
317
318
  source = sources.reverse.detect {|s| s.has_graph?(pattern.graph_name)}
318
- RDF::Graph.new(graph_name: pattern.graph_name, data: source).send(:query_pattern, pattern, options, &block)
319
+ RDF::Graph.new(graph_name: pattern.graph_name, data: source).send(:query_pattern, pattern, **options, &block)
319
320
  end
320
321
  end
321
322
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rdf-aggregate-repo
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gregg Kellogg
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-31 00:00:00.000000000 Z
11
+ date: 2021-12-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rdf
@@ -16,84 +16,84 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '2.0'
19
+ version: '3.2'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '2.0'
26
+ version: '3.2'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rdf-spec
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '2.0'
33
+ version: '3.2'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '2.0'
40
+ version: '3.2'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rdf-turtle
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '2.0'
47
+ version: '3.2'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '2.0'
54
+ version: '3.2'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '3.2'
61
+ version: '3.10'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '3.2'
68
+ version: '3.10'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec-its
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '1.0'
75
+ version: '1.3'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '1.0'
82
+ version: '1.3'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: yard
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '0.8'
89
+ version: '0.9'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '0.8'
96
+ version: '0.9'
97
97
  description: A gem extending RDF.rb with SPARQL dataset construction semantics.
98
98
  email: public-rdf-ruby@w3.org
99
99
  executables: []
@@ -108,11 +108,11 @@ files:
108
108
  - lib/rdf/aggregate_repo.rb
109
109
  - lib/rdf/aggregate_repo/merge_graph.rb
110
110
  - lib/rdf/aggregate_repo/version.rb
111
- homepage: http://ruby-rdf.github.com/rdf-aggregate-repo
111
+ homepage: https://github.com/ruby-rdf/rdf-aggregate-repo
112
112
  licenses:
113
113
  - Unlicense
114
114
  metadata: {}
115
- post_install_message:
115
+ post_install_message:
116
116
  rdoc_options: []
117
117
  require_paths:
118
118
  - lib
@@ -120,16 +120,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
120
120
  requirements:
121
121
  - - ">="
122
122
  - !ruby/object:Gem::Version
123
- version: 2.2.2
123
+ version: '2.6'
124
124
  required_rubygems_version: !ruby/object:Gem::Requirement
125
125
  requirements:
126
126
  - - ">="
127
127
  - !ruby/object:Gem::Version
128
128
  version: '0'
129
129
  requirements: []
130
- rubyforge_project:
131
- rubygems_version: 2.6.8
132
- signing_key:
130
+ rubygems_version: 3.3.3
131
+ signing_key:
133
132
  specification_version: 4
134
133
  summary: An aggregate RDF::Repository supporting a subset of named graphs and zero
135
134
  or more named graphs mapped to the default graph.