Updates for TriG grammar and 1.2 semantics.

Author: gkellogg

Gemfile

@@ -16,6 +16,7 @@ group :development, :test do
   gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic",  branch: "develop"
   gem 'rdf-vocab',      git: "https://github.com/ruby-rdf/rdf-vocab",       branch: "develop"
   gem 'sxp',            git: "https://github.com/dryruby/sxp.rb",           branch: "develop"
+  gem 'irb'
   gem "redcarpet",      platform: :ruby
   gem 'simplecov',      '~> 0.22',  platforms: :mri
   gem 'simplecov-lcov', '~> 0.8',  platforms: :mri

etc/trig.bnf

@@ -8,13 +8,16 @@ triplesOrGraph        ::= labelOrSubject ( wrappedGraph | predicateObjectList '.
 triples2              ::= blankNodePropertyList predicateObjectList? '.'
                         | collection predicateObjectList '.'
 wrappedGraph          ::= '{' triplesBlock? '}'
-triplesBlock          ::=   triples ( '.' triplesBlock? )?
+triplesBlock          ::= triples ( '.' triplesBlock? )?
 labelOrSubject        ::= iri | BlankNode
-directive             ::= prefixID | base | sparqlPrefix | sparqlBase
+directive             ::= prefixID | base | version | sparqlPrefix | sparqlBase | sparqlVersion
 prefixID              ::= '@prefix' PNAME_NS IRIREF '.'
 base                  ::= '@base' IRIREF '.'
+version               ::= '@version' VersionSpecifier  '.'
 sparqlPrefix          ::=	"PREFIX" PNAME_NS IRIREF
 sparqlBase            ::=	"BASE" IRIREF
+sparqlVersion         ::=	"VERSION" VersionSpecifier
+VersionSpecifier      ::= STRING_LITERAL_QUOTE | STRING_LITERAL_SINGLE_QUOTE
 triples               ::= subject predicateObjectList
                         | blankNodePropertyList predicateObjectList?
                         | reifiedTriple predicateObjectList?

lib/rdf/trig/reader.rb

@@ -37,6 +37,7 @@ class Reader < RDF::Turtle::Reader
     terminal(:GRAPH,                            /graph/i)
     terminal(:PREFIX,                           PREFIX)
     terminal(:BASE,                             BASE)
+    terminal(:VERSION,                          RDF_VERSION)
     terminal(:LANG_DIR,                         LANG_DIR)
 
     ##

rdf-trig.gemspec

@@ -27,16 +27,17 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 3.0'
   gem.requirements          = []
-  gem.add_runtime_dependency     'rdf',             '~> 3.3'
-  gem.add_runtime_dependency     'ebnf',            '~> 2.4'
+  gem.add_runtime_dependency     'ebnf',            '~> 2.6'
   gem.add_runtime_dependency     'rdf-turtle',      '~> 3.3'
+  gem.add_runtime_dependency     'rdf',             '~> 3.3'
+  gem.add_runtime_dependency     'readline',        '~> 0.0'
   gem.add_development_dependency 'getoptlong',      '~> 0.2'
   gem.add_development_dependency 'json-ld',         '~> 3.3'
-  gem.add_development_dependency 'rspec',           '~> 3.12'
-  gem.add_development_dependency 'rspec-its',       '~> 1.3'
   gem.add_development_dependency 'rdf-isomorphic',  '~> 3.3'
-  gem.add_development_dependency 'yard' ,           '~> 0.9'
   gem.add_development_dependency 'rdf-spec',        '~> 3.3'
+  gem.add_development_dependency 'rspec-its',       '~> 1.3'
+  gem.add_development_dependency 'rspec',           '~> 3.13'
+  gem.add_development_dependency 'yard' ,           '~> 0.9'
 
   gem.post_install_message  = nil
 end

script/parse

@@ -8,6 +8,7 @@ require 'rdf/trig'
 require 'rdf/nquads'
 require 'ebnf/ll1/parser'
 require 'getoptlong'
+require 'amazing_print'
 
 def run(input, **options)
   if options[:profile]
@@ -101,11 +102,12 @@ OPT_ARGS = [
   ["--uri", GetoptLong::REQUIRED_ARGUMENT, "Default base URI"],
   ["--validate", GetoptLong::NO_ARGUMENT, "Run parser in strict validation mode"],
   ["--verbose", GetoptLong::NO_ARGUMENT, "Verbose output"],
+  ["--version", GetoptLong::REQUIRED_ARGUMENT, "Version of RDF (1.1, 1.2, or 1.2-basic)"],
 ]
 
 def usage
   STDERR.puts %{
-    RDF::Turtle version #{RDF::Turtle::VERSION}
+    RDF::TriG version #{RDF::Turtle::VERSION}
     
     Usage: #{$0} [options] file ...
   }.gsub(/^    /, '')
@@ -146,7 +148,8 @@ opts.each do |opt, arg|
   when '--stream'       then writer_options[:stream] = true
   when '--validate'     then parser_options[:validate] = true
   when '--verbose'      then $verbose = true
-  end
+  when '--version'      then writer_options[:version] = parser_options[:version] = arg
+   end
 end
 
 if ARGV.empty?

script/tc

@@ -8,6 +8,7 @@ require 'rdf/isomorphic'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'spec_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'suite_helper'))
 require 'getoptlong'
+require 'amazing_print'
 
 ASSERTOR = "https://greggkellogg.net/foaf#me"
 RUN_TIME = Time.now
@@ -130,7 +131,7 @@ def run_tc(tc, **options)
   options[:result_count][result] ||= 0
   options[:result_count][result] += 1
 
-  puts "#{"test result:" unless options[:quiet]} #{result}"
+  puts "#{" test result:" unless options[:quiet]} #{result}"
 end
 
 options = {
@@ -218,7 +219,7 @@ begin
   manifests.each do |manifest|
     Fixtures::SuiteTest::Manifest.open(manifest) do |m|
       m.entries.each do |tc|
-        next unless ARGV.empty? || ARGV.any? {|n| tc.name.match(/#{n}/)}
+        next unless ARGV.empty? || ARGV.any? {|n| tc.id.match?(/#{n}/) || tc.name.match(/#{n}/)}
         run_tc(tc, result_count: result_count, **options)
       end
     end

spec/star_spec.rb

@@ -6,7 +6,11 @@
     require 'suite_helper'
 
     # TriG/manifest.ttl
-    %w(rdf11/rdf-trig/manifest.ttl).each do |man|
+    %w(
+      rdf11/rdf-trig/manifest.ttl
+      rdf12/rdf-trig/syntax/manifest.ttl
+      rdf12/rdf-trig/eval/manifest.ttl
+    ).each do |man|
       Fixtures::SuiteTest::Manifest.open(Fixtures::SuiteTest::BASE + man) do |m|
         describe m.comment do
           m.entries.each do |t|
@@ -22,6 +26,7 @@
                     base_uri: t.base,
                     canonicalize: false,
                     validate:  true,
+                    rdfstar: true,
                     logger: t.logger)
 
                 repo = RDF::Repository.new
@@ -35,12 +40,12 @@
                 else
                   expect {
                     repo << reader
-                    expect(repo.dump(:nquads)).to produce("not this", t)
+                    expect(repo.dump(:nquads, rdfstar: true)).to produce("not this", t)
                   }.to raise_error(RDF::ReaderError)
                 end
 
                 if t.evaluate? && t.positive_test?
-                  output_repo = RDF::Repository.load(t.result, format: :nquads, base_uri: t.base)
+                  output_repo = RDF::Repository.load(t.result, format: :nquads, rdfstar: true, base_uri: t.base)
                   expect(repo).to be_equivalent_graph(output_repo, t)
                 elsif !t.evaluate?
                   expect(repo).to be_a(RDF::Enumerable)