Finish 2.2.2

ruby-rdf · Dec 14, 2017 · 03ff7e8 · 03ff7e8
2 parents 71a49d4 + f3f8f38
commit 03ff7e8
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 26 deletions.
diff --git a/Gemfile b/Gemfile
@@ -26,7 +26,8 @@ group :development do
   gem 'rdf-turtle',       github: "ruby-rdf/rdf-turtle",          branch: "develop"
   gem 'rdf-vocab',        github: "ruby-rdf/rdf-vocab",           branch: "develop"
   gem 'ld-patch',         github: "gkellogg/ld-patch",            branch: "develop"
-  gem "equivalent-xml",   '>= 0.2.8'
+  gem 'shex',             github: "ruby-rdf/shex",                branch: "develop"
+  gem "equivalent-xml",   '>= 0.6.0'
   gem 'psych',            platforms: [:mri, :rbx]
   gem 'simplecov',        require: false
   gem 'coveralls',        require: false

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.1
+2.2.2
diff --git a/examples/laksa-path-expression.sparql b/examples/laksa-path-expression.sparql
@@ -0,0 +1,9 @@
+PREFIX rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
+PREFIX owl: http://www.w3.org/2002/07/owl#
+
+SELECT ?class (group_concat(DISTINCT ?item;separator=",") as ?keys) WHERE {
+  ?class rdf:type owl:Class .
+  ?class owl:hasKey ?key .
+  ?key rdf:rest*/rdf:first ?item .
+}
+GROUP BY ?class ?key
diff --git a/lib/rack/sparql/conneg.rb b/lib/rack/sparql/conneg.rb
@@ -43,7 +43,7 @@ def initialize(app, options = {})
     #
     # @param  [Hash{String => String}] env
     # @return [Array(Integer, Hash, #each)]
-    # @see    http://rack.rubyforge.org/doc/SPEC.html
+    # @see    http://www.rubydoc.info/github/rack/rack/Rack/Runtime#call-instance_method
     def call(env)
       env['ORDERED_CONTENT_TYPES'] = parse_accept_header(env['HTTP_ACCEPT']) if env.has_key?('HTTP_ACCEPT')
       response = app.call(env)

diff --git a/lib/sparql/algebra.rb b/lib/sparql/algebra.rb
@@ -141,21 +141,21 @@ module SPARQL
   # ## Constructing operator expressions manually
   # 
   #     Operator(:isBlank).new(RDF::Node(:foobar)).to_sxp                        #=> "(isBlank _:foobar)"
-  #     Operator(:isIRI).new(RDF::URI('http://rdf.rubyforge.org/')).to_sxp       #=> "(isIRI <http://rdf.rubyforge.org/>)"
+  #     Operator(:isIRI).new(RDF::URI('http://rubygems.org/gems/rdf/')).to_sxp       #=> "(isIRI <http://rubygems.org/gems/rdf/>)"
   #     Operator(:isLiteral).new(RDF::Literal(3.1415)).to_sxp                    #=> "(isLiteral 3.1415)"
   #     Operator(:str).new(Operator(:datatype).new(RDF::Literal(3.1415))).to_sxp #=> "(str (datatype 3.1415))"
   # 
   # ## Constructing operator expressions using SSE forms
   # 
   #     SPARQL::Algebra::Expression[:isBlank, RDF::Node(:foobar)].to_sxp                          #=> "(isBlank _:foobar)"
-  #     SPARQL::Algebra::Expression[:isIRI, RDF::URI('http://rdf.rubyforge.org/')].to_sxp         #=> "(isIRI <http://rdf.rubyforge.org/>)"
+  #     SPARQL::Algebra::Expression[:isIRI, RDF::URI('http://rubygems.org/gems/rdf/')].to_sxp         #=> "(isIRI <http://rubygems.org/gems/rdf/>)"
   #     SPARQL::Algebra::Expression[:isLiteral, RDF::Literal(3.1415)].to_sxp                      #=> "(isLiteral 3.1415)"
   #     SPARQL::Algebra::Expression[:str, [:datatype, RDF::Literal(3.1415)]].to_sxp               #=> "(str (datatype 3.1415))"
   # 
   # ## Constructing operator expressions using SSE strings
   # 
   #     SPARQL::Algebra::Expression.parse('(isBlank _:foobar)')
-  #     SPARQL::Algebra::Expression.parse('(isIRI <http://rdf.rubyforge.org/>)')
+  #     SPARQL::Algebra::Expression.parse('(isIRI <http://rubygems.org/gems/rdf/>)')
   #     SPARQL::Algebra::Expression.parse('(isLiteral 3.1415)')
   #     SPARQL::Algebra::Expression.parse('(str (datatype 3.1415))')
   # 
@@ -220,7 +220,7 @@ module SPARQL
   # scarcity.
   # 
   # [memoization]:      http://en.wikipedia.org/wiki/Memoization
-  # [RDF::Util::Cache]: http://rdf.rubyforge.org/RDF/Util/Cache.html
+  # [RDF::Util::Cache]: http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Util/Cache
   # 
   # ## Documentation
   # 
@@ -426,7 +426,7 @@ def Operator(name, arity = nil)
     #
     # @param  [Symbol, #to_sym] name
     # @return [Variable]
-    # @see    http://rdf.rubyforge.org/RDF/Query/Variable.html
+    # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Variable
     def Variable(name)
       Variable.new(name)
     end

diff --git a/lib/sparql/algebra/operator/join.rb b/lib/sparql/algebra/operator/join.rb
@@ -32,8 +32,8 @@ class Join < Operator::Binary
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-      # @see    http://rdf.rubyforge.org/RDF/Query/Solution.html#merge-instance_method
-      # @see    http://rdf.rubyforge.org/RDF/Query/Solution.html#compatible%3F-instance_method
+      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#merge-instance_method
+      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#compatible%3F-instance_method
       def execute(queryable, options = {}, &block)
         # Join(Ω1, Ω2) = { merge(μ1, μ2) | μ1 in Ω1 and μ2 in Ω2, and μ1 and μ2 are compatible }
         # eval(D(G), Join(P1, P2)) = Join(eval(D(G), P1), eval(D(G), P2))

diff --git a/lib/sparql/algebra/operator/left_join.rb b/lib/sparql/algebra/operator/left_join.rb
@@ -32,8 +32,8 @@ class LeftJoin < Operator
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-      # @see    http://rdf.rubyforge.org/RDF/Query/Solution.html#merge-instance_method
-      # @see    http://rdf.rubyforge.org/RDF/Query/Solution.html#compatible%3F-instance_method
+      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#merge-instance_method
+      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#compatible%3F-instance_method
       def execute(queryable, options = {}, &block)
         filter = operand(2)
 

diff --git a/lib/sparql/algebra/operator/seq.rb b/lib/sparql/algebra/operator/seq.rb
@@ -1,12 +1,12 @@
 module SPARQL; module Algebra
   class Operator
     ##
-    # The SPARQL Property Path `reverse` (NegatedPropertySet) operator.
+    # The SPARQL Property Path `sequence` (SequencePath) operator.
     #
     # @example
     #   (seq :a :b)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_inverse
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_sequence
     class Seq < Operator::Binary
       include Query
 

diff --git a/lib/sparql/grammar/parser11.rb b/lib/sparql/grammar/parser11.rb
@@ -50,7 +50,6 @@ class Parser
     # The internal representation of the result using hierarchy of RDF objects and SPARQL::Algebra::Operator
     # objects.
     # @return [Array]
-    # @see http://sparql.rubyforge.org/algebra
     attr_accessor :result
 
     # Terminals passed to lexer. Order matters!

diff --git a/sparql.gemspec b/sparql.gemspec
@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.homepage           = "http://github.com/ruby-rdf/sparql"
   gem.license            = 'Unlicense'
   gem.summary            = "SPARQL Query and Update library for Ruby."
-  gem.rubyforge_project  = 'sparql'
 
   gem.authors            = ['Gregg Kellogg', 'Arto Bendiken']
   gem.email              = 'public-rdf-ruby@w3.org'
@@ -29,21 +28,28 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version      = '>= 2.2.2'
   gem.requirements               = []
-  gem.add_runtime_dependency     'rdf',                '~> 2.2'
-  gem.add_runtime_dependency     'rdf-aggregate-repo', '~> 2.2'
+  #gem.add_runtime_dependency     'rdf',                '~> 3.0'
+  #gem.add_runtime_dependency     'rdf-aggregate-repo', '~> 3.0'
+  gem.add_runtime_dependency     'rdf',                '>= 2.2', '< 4.0'
+  gem.add_runtime_dependency     'rdf-aggregate-repo', '>= 2.2', '< 4.0'
   gem.add_runtime_dependency     'ebnf',               '~> 1.1'
   gem.add_runtime_dependency     'builder',            '~> 3.2'
+  #gem.add_runtime_dependency     'sxp',                '~> 1.0'
+  #gem.add_runtime_dependency     'sparql-client',      '~> 2.1'
+  #gem.add_runtime_dependency     'rdf-xsd',            '~> 2.1'
   gem.add_runtime_dependency     'sxp',                '~> 1.0'
-  gem.add_runtime_dependency     'sparql-client',      '~> 2.1'
-  gem.add_runtime_dependency     'rdf-xsd',            '~> 2.1'
+  gem.add_runtime_dependency     'sparql-client',      '>= 2.1', '< 4.0'
+  gem.add_runtime_dependency     'rdf-xsd',            '>= 2.2', '< 4.0'
 
   gem.add_development_dependency 'sinatra',            '~> 2.0'
   gem.add_development_dependency 'rack',               '~> 2.0'
-  gem.add_development_dependency 'rack-test',          '~> 0.6'
-  gem.add_development_dependency 'linkeddata',         '~> 2.2'
-  gem.add_development_dependency 'rdf-spec',           '~> 2.2'
+  gem.add_development_dependency 'rack-test',          '~> 0.7'
+  #gem.add_development_dependency 'linkeddata',         '~> 3.0'
+  #gem.add_development_dependency 'rdf-spec',           '~> 3.0'
+  gem.add_development_dependency 'linkeddata',         '>= 2.2', '< 4.0'
+  gem.add_development_dependency 'rdf-spec',           '>= 2.2', '< 4.0'
   gem.add_development_dependency 'open-uri-cached',    '~> 0.0', '>= 0.0.5'
-  gem.add_development_dependency 'rspec',              '~> 3.6'
+  gem.add_development_dependency 'rspec',              '~> 3.7'
   gem.add_development_dependency 'rspec-its',          '~> 1.2'
   gem.add_development_dependency 'yard' ,              '~> 0.9'
 

diff --git a/spec/support/extensions/isomorphic.rb b/spec/support/extensions/isomorphic.rb
@@ -12,8 +12,8 @@ class RDF::Query
   # Same basic idea, but instead of solutions, we close over solutions with
   # multiple variables
   #
-  # @see http://rdf.rubyforge.org
-  # @see http://rdf.rubyforge.org/isomorphic
+  # @see http://rubygems.org/gems/rdf
+  # @see http://rubygems.org/gems/rdf-isomorphic
   class Solutions
 
     # Returns `true` if this RDF::Solutions is isomorphic with another.