Support parsing VERSION with minimal checks.

Author: gkellogg

Gemfile

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

etc/turtle.bnf

@@ -1,10 +1,13 @@
 turtleDoc             ::= statement*
 statement             ::= directive | triples '.'
-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?

examples/version.ttl

@@ -0,0 +1,3 @@
+VERSION "1.2"
+@version "1.1" .
+<a> a <b> .

lib/rdf/turtle/reader.rb

@@ -38,8 +38,21 @@ class Reader < RDF::Reader
 
     terminal(:PREFIX,                           PREFIX)
     terminal(:BASE,                             BASE)
+    terminal(:VERSION,                          RDF_VERSION)
     terminal(:LANG_DIR,                         LANG_DIR)
 
+    ##
+    # Returns the RDF version determined by this reader.
+    #
+    # @example
+    #   reader.version  #=> RDF::URI('http://purl.org/dc/terms/')
+    #
+    # @return [String]
+    # @since  3.3.2
+    def version
+      @options[:version]
+    end
+
     ##
     # Reader options
     # @see https://ruby-rdf.github.io/rdf/RDF/Reader#options-class_method
@@ -50,6 +63,12 @@ def self.options
           datatype: TrueClass,
           on: ["--freebase"],
           description: "Use optimized Freebase reader.") {true},
+        RDF::CLI::Option.new(
+          symbol: :version,
+          control: :select,
+          datatype: %w{1.1 1.2 1.2-basic},
+          on: ["--version"],
+          description: "RDF Version."),
       ]
     end
 
@@ -90,6 +109,8 @@ def self.new(input = nil, **options, &block)
     #   Record error/info/debug output
     # @option options [Boolean] :freebase (false)
     #   Use optimized Freebase reader
+    # @option options [String] :version ("1.2")
+    #   Parse a specific version of RDF ("1.1', "1.2", or "1.2-basic"")
     # @return [RDF::Turtle::Reader]
     def initialize(input = nil, **options, &block)
       super do
@@ -259,7 +280,7 @@ def read_statement
       prod(:statement, %w{.}) do
         error("read_statement", "Unexpected end of file") unless token = @lexer.first
         case token.type
-        when :BASE, :PREFIX
+        when :BASE, :PREFIX, :VERSION
           read_directive || error("Failed to parse directive", production: :directive, token: token)
         else
           read_triples || error("Expected token", production: :statement, token: token)
@@ -277,7 +298,8 @@ def read_statement
     ##
     # Read directive
     #
-    #     directive ::= prefixID | base | sparqlPrefix | sparqlBase
+    #     directive ::= prefixID | base | version
+    #                 | sparqlPrefix | sparqlBase | sparqlVersion
     #
     # @return [void]
     def read_directive
@@ -322,6 +344,26 @@ def read_directive
               true
             end
           end
+        when :VERSION
+          prod(:version) do
+            @lexer.shift
+            terminated = token.value == '@version'
+            @options[:version] = @lexer.shift.value[1..-2]
+            if %w(1.2).include?(@options[:version])
+              progress("version") {@options[:version]}
+            else
+              warn("version", "Expected version to be 1.2, was #{@options[:version]}") unless @options[:version] == "1.2"
+            end
+
+            if terminated
+              error("version", "Expected #{token} to be terminated") unless @lexer.first === '.'
+              @lexer.shift
+            elsif @lexer.first === '.'
+              error("version", "Expected #{token} not to be terminated") 
+            else
+              true
+            end
+          end
         end
       end
     end
@@ -755,6 +797,14 @@ def debug(*args, &block)
       log_debug(*args, **opts, &block)
     end
 
+    def warn(*args, &block)
+      lineno = (options[:token].lineno if options[:token].respond_to?(:lineno)) || (@lexer && @lexer.lineno)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts[:level] ||= 0
+      opts[:lineno] ||= lineno
+      log_warn(*args, **opts, &block)
+    end
+
     ##
     # Error information, used as level `0` debug messages.
     #

lib/rdf/turtle/terminals.rb

@@ -15,63 +15,37 @@ module Terminals
     U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]", Regexp::FIXEDENCODING).freeze
     IRI_RANGE        = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]", Regexp::FIXEDENCODING).freeze
 
-    # 26
     UCHAR                = EBNF::LL1::Lexer::UCHAR
-    # 170s
     PERCENT              = /%[0-9A-Fa-f]{2}/u.freeze
-    # 172s
     PN_LOCAL_ESC         = /\\[_~\.\-\!$\&'\(\)\*\+,;=\/\?\#@%]/u.freeze
-    # 169s
     PLX                  = /#{PERCENT}|#{PN_LOCAL_ESC}/u.freeze
-    # 163s
     PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/u.freeze
-    # 164s
     PN_CHARS_U           = /_|#{PN_CHARS_BASE}/u.freeze
-    # 166s
     PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/u.freeze
     PN_LOCAL_BODY        = /(?:(?:\.|:|#{PN_CHARS}|#{PLX})*(?:#{PN_CHARS}|:|#{PLX}))?/u.freeze
     PN_CHARS_BODY        = /(?:(?:\.|#{PN_CHARS})*#{PN_CHARS})?/u.freeze
-    # 167s
     PN_PREFIX            = /#{PN_CHARS_BASE}#{PN_CHARS_BODY}/u.freeze
-    # 168s
     PN_LOCAL             = /(?:[0-9]|:|#{PN_CHARS_U}|#{PLX})#{PN_LOCAL_BODY}/u.freeze
-    # 154s
     EXPONENT             = /[eE][+-]?[0-9]+/u.freeze
-    # 159s
     ECHAR                = /\\[tbnrf\\"']/u.freeze
-    # 18
     IRIREF               = /<(?:#{IRI_RANGE}|#{UCHAR})*>/u.freeze
-    # 139s
     PNAME_NS             = /#{PN_PREFIX}?:/u.freeze
-    # 140s
     PNAME_LN             = /#{PNAME_NS}#{PN_LOCAL}/u.freeze
-    # 141s
     BLANK_NODE_LABEL     = /_:(?:[0-9]|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?/u.freeze
-    # 144s
     LANG_DIR              = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/u.freeze
-    # 19
     INTEGER              = /[+-]?[0-9]+/u.freeze
-    # 20
     DECIMAL              = /[+-]?(?:[0-9]*\.[0-9]+)/u.freeze
-    # 21
     DOUBLE               = /[+-]?(?:[0-9]+\.[0-9]*#{EXPONENT}|\.?[0-9]+#{EXPONENT})/u.freeze
-    # 22
     STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/u.freeze
-    # 23
     STRING_LITERAL_QUOTE             = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/u.freeze
-    # 24
     STRING_LITERAL_LONG_SINGLE_QUOTE = /'''(?:(?:'|'')?(?:[^'\\]|#{ECHAR}|#{UCHAR}))*'''/um.freeze
-    # 25
     STRING_LITERAL_LONG_QUOTE        = /"""(?:(?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/um.freeze
 
-    # 161s
     WS                   = /(?:\s|(?:#[^\n\r]*))+/um.freeze
-    # 162s
     ANON                 = /\[#{WS}*\]/um.freeze
-    # 28t
     PREFIX               = /@?prefix/ui.freeze
-    # 29t
     BASE                 = /@?base/ui.freeze
+    RDF_VERSION          = /@?version/ui.freeze
 
   end
 end

rdf-turtle.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'erubis',          '~> 2.7'
   gem.add_development_dependency 'getoptlong',      '~> 0.2'
   gem.add_development_dependency 'htmlentities',    '~> 4.3'
+  gem.add_runtime_dependency     'readline',        '~> 0.0'
   gem.add_development_dependency 'rspec',           '~> 3.12'
   gem.add_development_dependency 'rspec-its',       '~> 1.3'
   gem.add_development_dependency 'rdf-isomorphic',  '~> 3.3'

script/parse

@@ -19,6 +19,7 @@ end
 require 'rdf/ntriples'
 require 'ebnf/ll1/parser'
 require 'getoptlong'
+require 'amazing_print'
 
 def run(input, **options)
   if options[:profile]
@@ -106,7 +107,6 @@ OPT_ARGS = [
   ["--errors", GetoptLong::NO_ARGUMENT, "Display invalid statements"],
   ["--execute", "-e", GetoptLong::REQUIRED_ARGUMENT, "Run against source in argument"],
   ["--format", GetoptLong::REQUIRED_ARGUMENT, "Output format, any RDF format symbol, sxp, or inspect"],
-  ["--freebase", GetoptLong::NO_ARGUMENT, "Use Freebase reader (obsolete)"],
   ["--help", "-?", GetoptLong::NO_ARGUMENT, "print this message"],
   ["--input-format", GetoptLong::REQUIRED_ARGUMENT, "Format of the input file, defaults to ttl"],
   ["--info", GetoptLong::NO_ARGUMENT, "Show progress on execution"],
@@ -118,6 +118,7 @@ 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
@@ -143,14 +144,13 @@ opts = GetoptLong.new(*OPT_ARGS.map {|o| o[0..-2]})
 
 opts.each do |opt, arg|
   case opt
-  when '--debug'        then logger.level = Logger::DEBUG
   when '--uri'          then parser_options[:base_uri] = writer_options[:base_uri] = arg
   when '--benchmark'    then options[:benchmark] = true
   when '--canonicalize' then parser_options[:canonicalize] = true
+  when '--debug'        then logger.level = Logger::DEBUG
   when '--errors'       then options[:errors] = true
   when '--execute'      then input = arg
   when '--format'       then options[:output_format] = arg.to_sym
-  when '--freebase'     then parser_options[:freebase] = true
   when "--help"         then usage()
   when '--info'         then logger.level = Logger::INFO
   when '--input-format' then options[:input_format] = arg.to_sym
@@ -163,6 +163,7 @@ opts.each do |opt, arg|
   when '--stream'       then writer_options[:stream] = true
   when '--validate'     then parser_options[:validate] = true
   when '--verbose'      then $verbose = true
+  when '--version'      then writer_options[:version] = parser_options[:version] = arg
   end
 end
 

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
@@ -74,7 +75,6 @@ def run_tc(tc, **options)
       begin
         graph << reader
       rescue Exception => e
-        #require 'byebug'; byebug
         STDERR.puts "Unexpected exception: #{e.inspect}" if options[:verbose]
         result = "failed"
       end

spec/reader_spec.rb

@@ -647,7 +647,70 @@
         end
       end
     end
-    
+
+    describe "@prefix" do
+      it "sets RDF version from option" do
+        inner = double("inner")
+        expect(inner).to receive(:called)
+        RDF::Turtle::Reader.new(%{<a> <b> <c> .}, version: "1.2") do |reader|
+          inner.called(reader.class)
+          expect(reader.version).to eq "1.2"
+        end
+      end
+
+      it "sets RDF version from @version" do
+        inner = double("inner")
+        expect(inner).to receive(:called)
+        RDF::Turtle::Reader.new(%{@version "1.2" . <a> <b> <c> .}) do |reader|
+          inner.called(reader.class)
+          expect(reader.statements.count).to eq 1
+          expect(reader.version).to eq "1.2"
+        end
+      end
+
+      it "sets RDF version from VERSION" do
+        inner = double("inner")
+        expect(inner).to receive(:called)
+        RDF::Turtle::Reader.new(%{VERSION "1.2" <a> <b> <c> .}) do |reader|
+          inner.called(reader.class)
+          expect(reader.statements.count).to eq 1
+          expect(reader.version).to eq "1.2"
+        end
+      end
+
+      it "sets RDF version from version" do
+        inner = double("inner")
+        expect(inner).to receive(:called)
+        RDF::Turtle::Reader.new(%{version "1.2" <a> <b> <c> .}) do |reader|
+          inner.called(reader.class)
+          expect(reader.statements.count).to eq 1
+          expect(reader.version).to eq "1.2"
+        end
+      end
+
+      it "sets RDF version from version (single quotes)" do
+        inner = double("inner")
+        expect(inner).to receive(:called)
+        RDF::Turtle::Reader.new(%{version '1.2' <a> <b> <c> .}) do |reader|
+          inner.called(reader.class)
+          expect(reader.statements.count).to eq 1
+          expect(reader.version).to eq "1.2"
+        end
+      end
+
+      it "warns if version is not 1.2" do
+        logger = RDF::Spec.logger
+        inner = double("inner")
+        expect(inner).to receive(:called)
+        RDF::Turtle::Reader.new(%{@version "1.1" . <a> <b> <c> .}, logger: logger) do |reader|
+          inner.called(reader.class)
+          expect(reader.statements.count).to eq 1
+          expect(reader.version).to eq "1.1"
+          expect(logger.to_s).to include('Expected version to be 1.2, was 1.1')
+        end
+      end
+    end
+
     describe "BNodes" do
       it "should create BNode for identifier with '_' prefix" do
         ttl = %(@prefix a: <http://foo/a#> . _:a a:p a:v .)
@@ -1712,7 +1775,7 @@
     subject {
       RDF::Graph.load(doap_nt, format:  :ttl)
     }
-    it "parses test file" do
+    it "parses DOAP file" do
       expect(subject.count).to eq 23
     end
   end