N-Quads reader updates for VERSION.

Author: gkellogg

lib/rdf/nquads.rb

@@ -70,7 +70,11 @@ def read_triple
           line = @line    # for backtracking input in case of parse error
 
           begin
-            unless blank? || read_comment
+            if blank? || read_comment
+              # No-op
+            elsif version = read_version
+              @options[:version] = version
+            else
               # FIXME: quoted triples are now deprecated
               subject   = read_uriref || read_node || read_quotedTriple || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate

spec/nquads_spec.rb

@@ -47,14 +47,6 @@
     end
   end
 
-  describe "#to_sym" do
-    specify {expect(subject.to_sym).to eq :nquads}
-  end
-
-  describe "#name" do
-    specify {expect(subject.name).to eq "N-Quads"}
-  end
-
   describe ".detect" do
     {
       nquads: "<a> <b> <c> <d> . ",
@@ -82,6 +74,14 @@
       end
     end
   end
+
+  describe "#to_sym" do
+    specify {expect(subject.to_sym).to eq :nquads}
+  end
+
+  describe "#name" do
+    specify {expect(subject.name).to eq "N-Quads"}
+  end
 end
 
 describe RDF::NQuads::Reader do
@@ -123,6 +123,10 @@
     it "should accept strings" do
       expect { described_class.new('') }.to_not raise_error
     end
+
+    it "sets version from reader option" do
+      expect(described_class.new('', version: '1.2').version).to eql '1.2'
+    end
   end
 
   context "#initialize" do
@@ -143,104 +147,106 @@
     end
   end
 
-  context "with simple triples" do
-    [
-      ['<a> <b> <c> .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"))],
-      ['<a> <b> _:c .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::Node.new("c"))],
-      ['<a> <b> "c" .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::Literal("c"))],
-      ['_:a <b> <c> .', RDF::Statement(RDF::Node.new("a"), RDF::URI("b"), RDF::URI("c"))],
-    ].each do |(str, statement)|
-      it "parses #{str.inspect}" do
-        graph = RDF::Graph.new << described_class.new(str)
-        expect(graph.size).to eq 1
-        expect(graph.statements.first).to eq statement
-      end
-    end
-  end
-
-  context "with simple quads" do
-    [
-      ['<a> <b> <c> <d> .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"), graph_name: RDF::URI("d"))],
-      ['<a> <b> <c> _:d .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"), graph_name: RDF::Node.new("d"))],
-      ['<a> <b> <c> "d" .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"), graph_name: RDF::Literal("d"))],
-    ].each do |(str, statement)|
-      it "parses #{str.inspect}" do
-        graph = RDF::Graph.new << described_class.new(str)
-        expect(graph.size).to eq 1
-        expect(graph.statements.first).to eq statement
-      end
-
-      it "serializes #{statement.inspect}" do
-        expect(RDF::NQuads.serialize(statement).chomp).to eq str
-      end
-
-      it "unserializes #{str.inspect}" do
-        expect(RDF::NQuads.unserialize(str)).to eq statement
+  describe "Grammar" do
+    context "with simple triples" do
+      [
+        ['<a> <b> <c> .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"))],
+        ['<a> <b> _:c .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::Node.new("c"))],
+        ['<a> <b> "c" .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::Literal("c"))],
+        ['_:a <b> <c> .', RDF::Statement(RDF::Node.new("a"), RDF::URI("b"), RDF::URI("c"))],
+      ].each do |(str, statement)|
+        it "parses #{str.inspect}" do
+          graph = RDF::Graph.new << described_class.new(str)
+          expect(graph.size).to eq 1
+          expect(graph.statements.first).to eq statement
+        end
       end
     end
-  end
 
-  context "triple terms" do
-    ill_statements = {
-      "subject-iii": '<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/g> .',
-      "subject-iib": '<<<http://example/s1> <http://example/p1> _:o1>> <http://example/p> <http://example/o> <http://example/g> .',
-      "subject-iil": '<<<http://example/s1> <http://example/p1> "o1">> <http://example/p> <http://example/o> <http://example/g> .',
-      "subject-bii": '<<_:s1 <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/g> .',
-      "subject-bib": '<<_:s1 <http://example/p1> _:o1>> <http://example/p> <http://example/o> <http://example/g> .',
-      "subject-bil": '<<_:s1 <http://example/p1> "o">> <http://example/p> <http://example/o> <http://example/g> .',
-      "subject-ws":  '<< <http://example/s1> <http://example/p1> <http://example/o1> >> <http://example/p> <http://example/o> <http://example/g> .',
-      "recursive-subject": '<<(<<(<http://example/s2> <http://example/p2> <http://example/o2>)>> <http://example/p1> <http://example/o1>)>> <http://example/p> <http://example/o> <http://example/g> .',
-    }
+    context "with simple quads" do
+      [
+        ['<a> <b> <c> <d> .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"), graph_name: RDF::URI("d"))],
+        ['<a> <b> <c> _:d .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"), graph_name: RDF::Node.new("d"))],
+        ['<a> <b> <c> "d" .', RDF::Statement(RDF::URI("a"), RDF::URI("b"), RDF::URI("c"), graph_name: RDF::Literal("d"))],
+      ].each do |(str, statement)|
+        it "parses #{str.inspect}" do
+          graph = RDF::Graph.new << described_class.new(str)
+          expect(graph.size).to eq 1
+          expect(graph.statements.first).to eq statement
+        end
 
-    statements = {
-      "object-iii":  '<http://example/s> <http://example/p> <<(<http://example/s1> <http://example/p1> <http://example/o1>)>> <http://example/g> .',
-      "object-iib":  '<http://example/s> <http://example/p> <<(<http://example/s1> <http://example/p1> _:o1)>> <http://example/g> .',
-      "object-iil":  '<http://example/s> <http://example/p> <<(<http://example/s1> <http://example/p1> "o1")>> <http://example/g> .',
-      "object-ws":   '<http://example/s> <http://example/p> <<( <http://example/s1> <http://example/p1> <http://example/o1> )>> <http://example/g> .',
-    }
+        it "serializes #{statement.inspect}" do
+          expect(RDF::NQuads.serialize(statement).chomp).to eq str
+        end
 
-    context "without rdfstar option" do
-      it "Raises an error" do
-        expect do
-          expect {RDF::Repository.new << RDF::NQuads::Reader.new(statements.values.first)}.to raise_error(RDF::ReaderError)
-        end.to write(:something).to(:error)
+        it "unserializes #{str.inspect}" do
+          expect(RDF::NQuads.unserialize(str)).to eq statement
+        end
       end
     end
 
-    context "with rdfstar option" do
-      ill_statements.each do |name, st|
-        context name do
-          it "Raises an error" do
-            expect do
-              expect {RDF::Repository.new << RDF::NQuads::Reader.new(statements.values.first)}.to raise_error(RDF::ReaderError)
-            end.to write(:something).to(:error)
-          end
+    context "triple terms" do
+      ill_statements = {
+        "subject-iii": '<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/g> .',
+        "subject-iib": '<<<http://example/s1> <http://example/p1> _:o1>> <http://example/p> <http://example/o> <http://example/g> .',
+        "subject-iil": '<<<http://example/s1> <http://example/p1> "o1">> <http://example/p> <http://example/o> <http://example/g> .',
+        "subject-bii": '<<_:s1 <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/g> .',
+        "subject-bib": '<<_:s1 <http://example/p1> _:o1>> <http://example/p> <http://example/o> <http://example/g> .',
+        "subject-bil": '<<_:s1 <http://example/p1> "o">> <http://example/p> <http://example/o> <http://example/g> .',
+        "subject-ws":  '<< <http://example/s1> <http://example/p1> <http://example/o1> >> <http://example/p> <http://example/o> <http://example/g> .',
+        "recursive-subject": '<<(<<(<http://example/s2> <http://example/p2> <http://example/o2>)>> <http://example/p1> <http://example/o1>)>> <http://example/p> <http://example/o> <http://example/g> .',
+      }
+
+      statements = {
+        "object-iii":  '<http://example/s> <http://example/p> <<(<http://example/s1> <http://example/p1> <http://example/o1>)>> <http://example/g> .',
+        "object-iib":  '<http://example/s> <http://example/p> <<(<http://example/s1> <http://example/p1> _:o1)>> <http://example/g> .',
+        "object-iil":  '<http://example/s> <http://example/p> <<(<http://example/s1> <http://example/p1> "o1")>> <http://example/g> .',
+        "object-ws":   '<http://example/s> <http://example/p> <<( <http://example/s1> <http://example/p1> <http://example/o1> )>> <http://example/g> .',
+      }
+
+      context "without rdfstar option" do
+        it "Raises an error" do
+          expect do
+            expect {RDF::Repository.new << RDF::NQuads::Reader.new(statements.values.first)}.to raise_error(RDF::ReaderError)
+          end.to write(:something).to(:error)
         end
       end
 
-      statements.each do |name, st|
-        context name do
-          let(:graph) do
-            RDF::Repository.new {|r| r << RDF::NQuads::Reader.new(st, rdfstar: true)}
-          end
-
-          it "creates a statement" do
-            expect(graph.count).to eql(1)
+      context "with rdfstar option" do
+        ill_statements.each do |name, st|
+          context name do
+            it "Raises an error" do
+              expect do
+                expect {RDF::Repository.new << RDF::NQuads::Reader.new(statements.values.first)}.to raise_error(RDF::ReaderError)
+              end.to write(:something).to(:error)
+            end
           end
+        end
 
-          it "statements which are object of another statement are triple terms" do
-            referencing = graph.statements.first
-            expect(referencing).to be_a_statement
-            expect(referencing.object).to be_a_statement
-            expect(referencing.object).to be_tripleTerm
+        statements.each do |name, st|
+          context name do
+            let(:graph) do
+              RDF::Repository.new {|r| r << RDF::NQuads::Reader.new(st, rdfstar: true)}
+            end
+
+            it "creates a statement" do
+              expect(graph.count).to eql(1)
+            end
+
+            it "statements which are object of another statement are triple terms" do
+              referencing = graph.statements.first
+              expect(referencing).to be_a_statement
+              expect(referencing.object).to be_a_statement
+              expect(referencing.object).to be_tripleTerm
+            end
           end
         end
       end
     end
-  end
 
-  it "should parse W3C's test data" do
-    expect(described_class.new(File.open(testfile)).to_a.size).to eq 19
+    it "should parse W3C's test data" do
+      expect(described_class.new(File.open(testfile)).to_a.size).to eq 19
+    end
   end
 end
 

spec/ntriples_spec.rb

@@ -142,19 +142,19 @@
     end
 
     it "should accept files" do
-      expect { reader.new(File.open(testfile)) }.not_to raise_error
+      expect { described_class.new(File.open(testfile)) }.not_to raise_error
     end
 
     it "should accept IO streams" do
-      expect { reader.new(StringIO.new('')) }.not_to raise_error
+      expect { described_class.new(StringIO.new('')) }.not_to raise_error
     end
 
     it "should accept strings" do
-      expect { reader.new('') }.not_to raise_error
+      expect { described_class.new('') }.not_to raise_error
     end
 
     it "sets version from reader option" do
-      expect(reader.new('', version: '1.2').version).to eql '1.2'
+      expect(described_class.new('', version: '1.2').version).to eql '1.2'
     end
   end