Remove reader/writer bits for RDF 1.2 that are now implemented in RDF::Reader/Writer.

Simplify regexp for DOUBLE.

Author: gkellogg

etc/turtle.bnf

@@ -47,7 +47,7 @@ BLANK_NODE_LABEL  ::= '_:' ( PN_CHARS_U | [0-9] ) ((PN_CHARS|'.')* PN_CHARS)?
 LANG_DIR          ::= '@' [a-zA-Z]+ ( '-' [a-zA-Z0-9]+ )* ( '--' [a-zA-Z]+ )?
 INTEGER           ::= [+-]? [0-9]+
 DECIMAL           ::= [+-]?  ( ([0-9])* '.' ([0-9])+  )
-DOUBLE            ::= [+-]? ( [0-9]+ '.' [0-9]* EXPONENT | '.' ([0-9])+ EXPONENT | ([0-9])+ EXPONENT )
+DOUBLE            ::= [+-]? ( ([0-9]+ ('.' [0-9]*)?) | ('.' [0-9]+) ) EXPONENT
 EXPONENT          ::= [eE] [+-]? [0-9]+
 STRING_LITERAL_QUOTE              ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"' /* #x22=" #x5C=\ #xA=new line #xD=carriage return */
 STRING_LITERAL_SINGLE_QUOTE       ::= "'" ( [^#x27#x5C#xA#xD] | ECHAR | UCHAR )* "'" /* #x27=' #x5C=\ #xA=new line #xD=carriage return */

lib/rdf/turtle/reader.rb

@@ -41,18 +41,6 @@ class Reader < RDF::Reader
     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
@@ -63,12 +51,6 @@ 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
 
@@ -351,10 +333,10 @@ def read_directive
             vers_tok = @lexer.shift
             error("version", "Expected #{vers_tok} to be a string") unless [:STRING_LITERAL_QUOTE, :STRING_LITERAL_SINGLE_QUOTE].include?(vers_tok.type)
             @options[:version] = vers_tok.value[1..-2]
-            if %w(1.2).include?(@options[:version])
+            if %w(1.1 1.2 1.2-basic).include?(@options[:version])
               progress("version") {@options[:version]}
             else
-              warn("version", "Expected version to be 1.2, was #{@options[:version]}") unless @options[:version] == "1.2"
+              warn("version", "Expected version to be one of #{RDF::Format::VERSIONS.join(', ')}, was #{@options[:version]}") unless @options[:version] == "1.2"
             end
 
             if terminated

lib/rdf/turtle/terminals.rb

@@ -35,7 +35,7 @@ module Terminals
     LANG_DIR              = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/u.freeze
     INTEGER              = /[+-]?\d+/u.freeze
     DECIMAL              = /[+-]?(?:\d*\.\d+)/u.freeze
-    DOUBLE               = /[+-]?(?:\d+\.\d*#{EXPONENT}|\.\d+#{EXPONENT}|\d+#{EXPONENT})/u.freeze
+    DOUBLE               = /[+-]?(?:\d+(?:\.\d*)?|\.\d+)#{EXPONENT}/u.freeze
     STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/u.freeze
     STRING_LITERAL_QUOTE             = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/u.freeze
     STRING_LITERAL_LONG_SINGLE_QUOTE = /'''(?:(?:'|'')?(?:[^'\\]|#{ECHAR}|#{UCHAR}))*'''/um.freeze

rdf-turtle.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency     'base64',          '~> 0.2'
   gem.add_runtime_dependency     'bigdecimal',      '~> 3.1', '>= 3.1.9'
   gem.add_runtime_dependency     'ebnf',            '~> 2.6'
-  gem.add_runtime_dependency     'rdf',             '~> 3.3'
+  gem.add_runtime_dependency     'rdf',             '~> 3.3', '>= 3.3.4'
   gem.add_runtime_dependency     'readline',        '~> 0.0'
   gem.add_development_dependency 'erubis',          '~> 2.7'
   gem.add_development_dependency 'getoptlong',      '~> 0.2'

spec/reader_spec.rb

@@ -698,15 +698,15 @@
         end
       end
 
-      it "warns if version is not 1.2" do
+      it "warns if version is not 1.1, 1.2, or 1.2-basic" 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|
+        RDF::Turtle::Reader.new(%{@version "1.0" . <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')
+          expect(reader.version).to eq "1.0"
+          expect(logger.to_s).to include('Expected version to be one of 1.1, 1.2-basic, 1.2, was 1.0')
         end
       end
     end