Make using context or graph_name conditional on RDF::VERSION.

Author: gkellogg

lib/rdf/spec/enumerable.rb

@@ -72,7 +72,7 @@
 
   context "when enumerating statements" do
     it {is_expected.to respond_to(:statements)}
-    its(:statements) {is_expected.to be_an_enumerator}
+    #its(:statements) {is_expected.to be_an_enumerator}
 
     context "#statements" do
       specify {expect(subject.statements.to_a.size).to eq @statements.size}
@@ -131,7 +131,7 @@
     it {is_expected.to respond_to(:each_triple)}
     it {is_expected.to respond_to(:enum_triple)}
 
-    its(:triples) {is_expected.to be_an_enumerator}
+    #its(:triples) {is_expected.to be_an_enumerator}
     context "#triples" do
       specify {expect(subject.triples.to_a.size).to eq @statements.size}
       specify {expect(subject.triples).to all(be_a_triple)}
@@ -175,7 +175,7 @@
     it {is_expected.to respond_to(:each_quad)}
     it {is_expected.to respond_to(:enum_quad)}
 
-    its(:quads) {is_expected.to be_an_enumerator}
+    #its(:quads) {is_expected.to be_an_enumerator}
     context "#quads" do
       specify {expect(subject.quads.to_a.size).to eq @statements.size}
       specify {expect(subject.quads).to all(be_a_quad)}
@@ -222,13 +222,13 @@
     it {is_expected.to respond_to(:each_subject)}
     it {is_expected.to respond_to(:enum_subject)}
 
-    its(:subjects) {is_expected.to be_an_enumerator}
+    #its(:subjects) {is_expected.to be_an_enumerator}
     context "#subjects" do
       subject { enumerable.subjects }
       specify {is_expected.to be_an_enumerator}
       specify {is_expected.to all(be_a_resource)}
-      context ":unique => false" do
-        subject { enumerable.subjects(:unique => false) }
+      context "unique: false" do
+        subject { enumerable.subjects(unique: false) }
         specify {is_expected.to be_an_enumerator}
         specify {is_expected.to all(be_a_resource)}
       end
@@ -273,13 +273,13 @@
     it {is_expected.to respond_to(:each_predicate)}
     it {is_expected.to respond_to(:enum_predicate)}
 
-    its(:predicates) {is_expected.to be_an_enumerator}
+    #its(:predicates) {is_expected.to be_an_enumerator}
     context "#predicates" do
       subject { enumerable.predicates }
       specify {is_expected.to be_an_enumerator}
       specify {is_expected.to all(be_a_uri)}
-      context ":unique => false" do
-        subject { enumerable.predicates(:unique => false) }
+      context "unique: false" do
+        subject { enumerable.predicates(unique: false) }
         specify {is_expected.to be_an_enumerator}
         specify {is_expected.to all(be_a_uri)}
       end
@@ -320,13 +320,13 @@
     it {is_expected.to respond_to(:each_object)}
     it {is_expected.to respond_to(:enum_object)}
 
-    its(:objects) {is_expected.to be_an_enumerator}
+    #its(:objects) {is_expected.to be_an_enumerator}
     context "#objects" do
       subject { enumerable.objects }
       specify {is_expected.to be_an_enumerator}
       specify {is_expected.to all(be_a_term)}
-      context ":unique => false" do
-        subject { enumerable.objects(:unique => false) }
+      context "unique: false" do
+        subject { enumerable.objects(unique: false) }
         specify {is_expected.to be_an_enumerator}
         specify {is_expected.to all(be_a_term)}
       end
@@ -363,7 +363,7 @@
     end
   end
 
-  context "when enumerating contexts" do
+  context "when enumerating contexts", unless: RDF::VERSION.to_s >= "1.99" do
     it {is_expected.to respond_to(:contexts)}
     it {is_expected.to respond_to(:has_context?)}
     it {is_expected.to respond_to(:each_context)}
@@ -375,7 +375,7 @@
       specify {is_expected.to be_an_enumerator}
       specify {is_expected.to all(be_a_resource)}
       context "unique: false" do
-        subject { enumerable.contexts(:unique => false) }
+        subject { enumerable.contexts(unique: false) }
         specify {is_expected.to be_an_enumerator}
         specify {is_expected.to all(be_a_resource)}
       end
@@ -423,38 +423,41 @@
     describe "#each_graph" do
       subject { enumerable.each_graph }
       it {is_expected.to be_an_enumerator}
-      specify {is_expected.to all(be_a_graph)} if @supports_context
+      specify {is_expected.to all(be_a_graph)} if @supports_named_graphs
+      specify {expect(subject.each_graph).to all(be_a_graph)}
+
+      it "has appropriate number of graphs" do
+        graph_names = @statements.map { |s| s.graph_name }.uniq.compact
+        expect(subject.each_graph.to_a.size).to eq (graph_names.size + 1)
+      end if @supports_named_graphs
     end
 
     describe "#enum_graph" do
       subject { enumerable.enum_graph }
       it {is_expected.to be_an_enumerator}
       it {is_expected.to be_countable}
       it "enumerates the same as #each_graph" do
-        expect(subject.to_a).to include(*enumerable.each_graph.to_a) if @supports_context # expect with match problematic
+        expect(subject.to_a).to include(*enumerable.each_graph.to_a) if @supports_named_graphs # expect with match problematic
       end
     end
   end
 
-  context "when enumerating graphs" do
+  context "when enumerating graphs", if: RDF::VERSION.to_s >= "1.99" do
     it {is_expected.to respond_to(:graph_names)}
     it {is_expected.to respond_to(:has_graph?)}
-    it {is_expected.to respond_to(:each_graph)}
-    it {is_expected.to respond_to(:enum_graph)}
 
-    its(:graph_names) {is_expected.to be_a(Array)}
     describe "#graph_names" do
       subject { enumerable.graph_names }
       specify {is_expected.to be_a(Array)}
       specify {is_expected.to all(be_a_resource)}
-      context ":unique => false" do
-        subject { enumerable.graph_names(:unique => false) }
+      context "unique: false" do
+        subject { enumerable.graph_names(unique: false) }
         specify {is_expected.to be_a(Array)}
         specify {is_expected.to all(be_a_resource)}
       end
     end
 
-    it "should implement #has_graph?" do
+    describe "#has_graph?" do
       if @supports_named_graphs
         @statements.each do |statement|
           if statement.has_graph?
@@ -465,27 +468,6 @@
         expect(enumerable).not_to have_graph(uri)
       end
     end
-
-    its(:each_graph) {is_expected.to be_an_enumerator}
-
-    describe "#each_graph" do
-      let(:graph_names) {@statements.map { |s| s.graph_name }.uniq.compact}
-      subject { enumerable.each_graph }
-      it {is_expected.to be_an_enumerator}
-      specify {expect(subject.each_graph).to all(be_a_graph)}
-      it "has appropriate number of graphs" do
-        expect(subject.each_graph.to_a.size).to eq (graph_names.size + 1)
-      end if @supports_named_graphs
-    end
-
-    describe "#enum_graph" do
-      subject { enumerable.enum_graph }
-      it {is_expected.to be_an_enumerator}
-      it {is_expected.to be_countable}
-      it "enumerates the same as #each_graph" do
-        expect(subject.to_a).to include(*enumerable.each_graph.to_a)
-      end if @supports_named_graphs # expect with match problematic
-    end
   end
 
   context "when converting" do

lib/rdf/spec/mutable.rb

@@ -64,14 +64,14 @@
         is_expected.to have_subject(resource)
       end
 
-      it "is_expected.to load statements with a context override" do
+      it "is_expected.to load statements with a context override", unless: RDF::VERSION.to_s >= "1.99" do
         skip("mutability and contextuality") unless (subject.mutable? && @supports_named_graphs)
         subject.load RDF::Spec::TRIPLES_FILE, context: graph_name
         is_expected.to have_context(graph_name)
         expect(subject.query(context: graph_name).size).to eq subject.size
       end
 
-      it "is_expected.to load statements with a graph_name override" do
+      it "is_expected.to load statements with a graph_name override", if: RDF::VERSION.to_s >= "1.99" do
         skip("mutability and contextuality") unless (subject.mutable? && @supports_named_graphs)
         subject.load RDF::Spec::TRIPLES_FILE, graph_name: graph_name
         is_expected.to have_graph(graph_name)

lib/rdf/spec/queryable.rb

@@ -285,7 +285,7 @@
           end
         end
 
-        context "with context" do
+        context "with context", unless: RDF::VERSION.to_s >= "1.99" do
           it "returns statements from all contexts with no context" do
             pattern = RDF::Query::Pattern.new(nil, nil, nil, context: nil)
             solutions = []
@@ -321,7 +321,7 @@
           end
         end
 
-        context "with graph_name" do
+        context "with graph_name", if: RDF::VERSION.to_s >= "1.99" do
           it "returns statements from all graphs with no graph_name" do
             pattern = RDF::Query::Pattern.new(nil, nil, nil, graph_name: nil)
             solutions = []

lib/rdf/spec/transaction.rb

@@ -16,7 +16,7 @@
       expect(this.graph).to eq g
     end
 
-    it "accepts a context" do
+    it "accepts a context", unless: RDF::VERSION.to_s >= "1.99" do
       c = double("context")
       this = subject.new(:graph => c)
       expect(this.graph).to eq c
@@ -27,7 +27,7 @@
       expect(this.context).to eq c
     end
 
-    it "accepts a graph_name" do
+    it "accepts a graph_name", if: RDF::VERSION.to_s >= "1.99" do
       c = double("graph_name")
       this = subject.new(:graph => c)
       expect(this.graph).to eq c

lib/rdf/spec/writable.rb

@@ -98,7 +98,7 @@
       expect(subject.count).to eq 1
     end
 
-    it "is_expected.to treat statements with a different context as distinct" do
+    it "is_expected.to treat statements with a different context as distinct", unless: RDF::VERSION.to_s >= "1.99" do
       skip("writability") unless subject.writable?
       s1 = statement.dup
       s1.context = nil
@@ -113,7 +113,7 @@
       expect(subject.count).to eq (supports_graph_name ? 3 : 1)
     end
 
-    it "is_expected.to treat statements with a different graph_name as distinct" do
+    it "is_expected.to treat statements with a different graph_name as distinct", if: RDF::VERSION.to_s >= "1.99" do
       skip("writability") unless subject.writable?
       s1 = statement.dup
       s1.graph_name = nil