rdf-spec 1.1.0.p1 → 1.1.0.p2

data/lib/rdf/spec.rb

@@ -46,5 +46,25 @@ module RDF
   module Spec
     autoload :Matchers, 'rdf/spec/matchers'
     autoload :VERSION,  'rdf/spec/version'
+    TRIPLES_FILE = File.expand_path("../../../etc/triples.nt", __FILE__)
+    QUADS_FILE = File.expand_path("../../../etc/quads.nq", __FILE__)
+
+    ##
+    # Return quads for tests
+    #
+    # @return [Array<RDF::Statement>]
+    def self.quads
+      require 'rdf/nquads'
+      (@quads ||=  RDF::NQuads::Reader.new(File.open(QUADS_FILE)).to_a).dup
+    end
+
+    ##
+    # Return triples for tests
+    #
+    # @return [Array<RDF::Statement>]
+    def self.triples
+      require 'rdf/ntriples'
+      (@triples ||=  RDF::NTriples::Reader.new(File.open(TRIPLES_FILE)).to_a).dup
+    end
   end # Spec
 end # RDF

data/lib/rdf/spec/countable.rb

@@ -7,43 +7,38 @@ module RDF_Countable
   before :each do
     raise '+@countable+ must be defined in a before(:each) block' unless instance_variable_get('@countable')
 
-    @filename   = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'etc', 'doap.nt'))
-    @statements = RDF::NTriples::Reader.new(File.open(@filename)).to_a
+    @statements = RDF::Spec.quads
 
     if @countable.empty?
-      if @countable.respond_to?(:<<)
+      if @countable.respond_to?(:<<) && (@countable.writable? rescue true)
         @statements.each { |statement| @countable << statement }
       else
-        raise "+@countable+ must respond to #<< or be pre-populated with the statements in #{@filename} in a before(:each) block"
+        raise "+@countable+ must respond to #<< or be pre-populated with the statements in #{RDF::Spec::TRIPLES_FILE} in a before(:each) block"
       end
     end
   end
 
   describe RDF::Countable do
-    it "responds to #empty?" do
-      @countable.should respond_to(:empty?)
+    subject {@countable}
+
+    it {should respond_to(:empty?)}
+    it {should_not be_empty}
+    it {should respond_to(:count)}
+    its(:count) {should == @statements.size}
+    it {should respond_to(:size)}
+    its(:size) {should == @statements.size}
+
+    context "when empty" do
+      subject {[].extend(RDF::Countable)}
+      it {should be_empty}
+      its(:count) {should == 0}
+      its(:size) {should == 0}
     end
 
-    it "responds to #count and #size" do
-      @countable.should respond_to(:count, :size)
-    end
-
-    it "implements #empty?" do
-      ([].extend(RDF::Countable)).empty?.should be_true
-      ([42].extend(RDF::Countable)).empty?.should be_false
-      @countable.empty?.should be_false
-    end
-
-    it "implements #count and #size" do
-      %w(count size).each do |method|
-        @countable.send(method).should >= @statements.size
-      end
-    end
-
-    it "returns countable enumerators" do
-      @countable.to_enum.should be_countable
-      @countable.enum_for.should be_countable
-      @countable.enum_for(:each).should be_countable
+    its(:to_enum) {should be_countable}
+    its(:enum_for) {should be_countable}
+    it "#enum_for(:each)" do
+      subject.enum_for(:each).should be_countable
     end
   end
 end

data/lib/rdf/spec/durable.rb

@@ -23,29 +23,25 @@ module RDF_Durable
 
   before :each do
     raise '+@load_durable+ must be defined in a before(:each) block' unless instance_variable_get('@load_durable')
-    # RDF::Queryable cares about the contents of this file too much to let someone set it
-    @filename   = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'etc', 'doap.nt'))
   end
 
   describe RDF::Durable do
+    subject {@load_durable.call}
+    it {should respond_to(:durable?)}
     it "should support #durable?" do
-      @load_durable.call.should respond_to(:durable?)
-      [true,false].member?(@load_durable.call.durable?).should be_true
+      [true,false].member?(subject.durable?).should be_true
     end
 
+    it {should respond_to(:nondurable?)}
     it "should support #nondurable?" do
-      @load_durable.call.should respond_to(:nondurable?)
       [true,false].member?(@load_durable.call.nondurable?).should be_true
     end
-
-    it "should not be both durable and nondurable" do
-      @load_durable.call.nondurable?.should_not == @load_durable.call.durable?
-    end
+    its(:nondurable?) {should_not == subject.durable?}
 
     it "should save contents between instantiations" do
-      if @load_durable.call.durable?
-        @load_durable.call.load(@filename)
-        @load_durable.call.count.should == File.readlines(@filename).size
+      if subject.durable?
+       subject.load(RDF::Spec::TRIPLES_FILE)
+       subject.count.should == File.readlines(RDF::Spec::TRIPLES_FILE).size
       end
     end
   end

data/lib/rdf/spec/enumerable.rb

@@ -7,38 +7,32 @@ module RDF_Enumerable
   before :each do
     raise '+@enumerable+ must be defined in a before(:each) block' unless instance_variable_get('@enumerable')
 
-    @filename   = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'etc', 'doap.nt'))
-    @statements ||= RDF::NTriples::Reader.new(File.open(@filename)).to_a
+    @statements ||= RDF::Spec.quads
 
     if @enumerable.empty?
-      if @enumerable.respond_to?(:<<)
+      if @enumerable.respond_to?(:<<) && (@enumerable.writable? rescue true)
         @statements.each { |statement| @enumerable << statement }
       else
-        raise "@enumerable must respond to #<< or be pre-populated with the statements in #{@filename} in a before(:each) block"
+        raise "@enumerable must respond to #<< or be pre-populated with the statements in #{RDF::Spec::TRIPLES_FILE} in a before(:each) block"
       end
     end
 
-    @supports_context = @enumerable.respond_to?(:supports?) && @enumerable.supports?(:context)
+    @supports_context = @enumerable.supports?(:context) rescue true
   end
 
   describe RDF::Enumerable do
-    describe "#supports?" do
-      it "responds to #supports?" do
-        @enumerable.respond_to?(:support?)
-      end
-    end
+    subject {@enumerable}
+    it {should respond_to(:supports?)}
 
     describe "valid?" do
-      it "returns true if all statements are valid" do
-        @enumerable.should be_valid
-      end
+      it {should be_valid}
       
       it "returns false if any statement is invalid" do
-        if @enumerable.respond_to?(:<<)
+        if subject.respond_to?(:<<) && (subject.writable? rescue true)
           s = RDF::Statement.from([nil, nil, nil])
           s.should_not be_valid
-          @enumerable << s
-          @enumerable.should_not be_valid
+          subject << s
+          subject.should_not be_valid
         else
           pending("can't add statement to immutable enumerable")
         end
@@ -46,181 +40,152 @@ module RDF_Enumerable
     end
 
     context "when counting statements" do
-      it "should respond to #empty?" do
-        @enumerable.should respond_to(:empty?)
-      end
-
-      it "should respond to #count and #size" do
-        @enumerable.should respond_to(*%w(count size))
-      end
-
-      it "should implement #empty?" do
-        ([].extend(RDF::Enumerable)).empty?.should be_true
-        @enumerable.empty?.should be_false
-      end
-
-      it "should implement #count and #size" do
-        %w(count size).each do |method|
-          @enumerable.send(method).should == @statements.size
-        end
+      it {should respond_to(:empty?)}
+      it {should_not be_empty}
+      it {should respond_to(:count)}
+      its(:count) {should == @statements.size}
+      it {should respond_to(:size)}
+      its(:size) {should == @statements.size}
+
+      context "and empty" do
+        subject {[].extend(RDF::Enumerable)}
+        it {should be_empty}
+        its(:count) {should == 0}
+        its(:size) {should == 0}
       end
     end
 
     context "when enumerating statements" do
-      it "should respond to #statements" do
-        @enumerable.should respond_to(:statements)
-      end
+      it {should respond_to(:statements)}
+      its(:statements) {should be_an_enumerator}
 
-      it "should respond to #has_statement?" do
-        @enumerable.should respond_to(:has_statement?)
+      context "#statements" do
+        specify {subject.statements.to_a.size.should == @statements.size}
+        specify {subject.statements.each { |statement| statement.should be_a_statement }}
       end
 
-      it "should respond to #each_statement" do
-        @enumerable.should respond_to(:each_statement)
-      end
-
-      it "should respond to #enum_statement" do
-        @enumerable.should respond_to(:enum_statement)
-      end
-
-      it "should implement #statements" do
-        @enumerable.statements.should be_an_enumerator
-        @enumerable.statements.to_a.size.should == @statements.size
-        @enumerable.statements.each { |statement| statement.should be_a_statement }
-      end
-
-      it "should implement #has_statement?" do
-        @statements.each do |statement|
-          @enumerable.has_statement?(statement).should be_true
+      it {should respond_to(:has_statement?)}
+      context "#has_statement?" do
+        let(:unknown_statement) {RDF::Statement.new(RDF::Node.new, RDF::URI.new("http://example.org/unknown"), RDF::Node.new)}
+        it "should have all statements" do
+          # Don't check for BNodes, as equivalence depends on their being exactly the same, not just the same identifier. If subject is loaded separately, these won't match.
+          @statements.reject {|s| s.to_a.any?(&:node?)}.each do |statement|
+            subject.has_statement?(statement).should be_true
+          end
         end
 
-        if @supports_context
-          context = RDF::URI.new("urn:context:1")
-          @statements.each do |statement|
-            s = statement.dup
-            s.context = context
-            @enumerable.has_statement?(s).should be_false
+        it "does not have statement in different context" do
+          if @supports_context
+            context = RDF::URI.new("urn:context:1")
+            @statements.each do |statement|
+              s = statement.dup
+              s.context = context
+              subject.has_statement?(s).should be_false
+            end
           end
         end
 
-        unknown_statement = RDF::Statement.new(RDF::Node.new, RDF::URI.new("http://example.org/unknown"), RDF::Node.new)
-        @enumerable.has_statement?(unknown_statement).should be_false
+        it "does not have an unknown statement" do
+          subject.has_statement?(unknown_statement).should be_false
+        end
       end
 
+      it {should respond_to(:each_statement)}
+      its(:each_statement) {should be_an_enumerator}
       it "should implement #each_statement" do
-        @enumerable.each_statement.should be_an_enumerator
-        @enumerable.each_statement { |statement| statement.should be_a_statement }
+        subject.each_statement { |statement| statement.should be_a_statement }
       end
 
-      it "should implement #enum_statement" do
-        @enumerable.enum_statement.should be_an_enumerator
-        @enumerable.enum_statement.should be_countable
-        @enumerable.enum_statement.should be_enumerable
-        @enumerable.enum_statement.should be_queryable
-        @enumerable.enum_statement.to_a.should == @enumerable.each_statement.to_a
+      it {should respond_to(:enum_statement)}
+      its(:enum_statement) {should be_an_enumerator}
+      its(:enum_statement) {should be_countable}
+      its(:enum_statement) {should be_enumerable}
+      its(:enum_statement) {should be_queryable}
+      context "#enum_statement" do
+        it "should enumerate all statements" do
+          subject.enum_statement.to_a.should == @enumerable.each_statement.to_a
+        end
       end
     end
 
     context "when enumerating triples" do
-      it "should respond to #triples" do
-        @enumerable.should respond_to(:triples)
-      end
-
-      it "should respond to #has_triple?" do
-        @enumerable.should respond_to(:has_triple?)
-      end
-
-      it "should respond to #each_triple" do
-        @enumerable.should respond_to(:each_triple)
-      end
+      it {should respond_to(:triples)}
+      it {should respond_to(:has_triple?)}
+      it {should respond_to(:each_triple)}
+      it {should respond_to(:enum_triple)}
 
-      it "should respond to #enum_triple" do
-        @enumerable.should respond_to(:enum_triple)
+      its(:triples) {should be_an_enumerator}
+      context "#triples" do
+        specify {subject.triples.to_a.size.should == @statements.size}
+        specify {subject.triples.each { |triple| triple.should be_a_triple }}
       end
 
-      it "should implement #triples" do
-        @enumerable.triples.should be_an_enumerator
-        @enumerable.triples.to_a.size.should == @statements.size
-        @enumerable.triples.each { |triple| triple.should be_a_triple }
-      end
-
-      it "should implement #has_triple?" do
-        @statements.each do |statement|
-          @enumerable.has_triple?(statement.to_triple).should be_true
+      context "#has_triple?" do
+        specify do
+          @statements.each do |statement|
+            subject.has_triple?(statement.to_triple).should be_true
+          end
         end
       end
 
-      it "should implement #each_triple" do
-        @enumerable.each_triple.should be_an_enumerator
-        @enumerable.each_triple { |*triple| triple.should be_a_triple }
+      its(:each_triple) {should be_an_enumerator}
+      context "#each_triple" do
+        specify {subject.each_triple { |*triple| triple.should be_a_triple }}
       end
 
-      it "should implement #enum_triple" do
-        @enumerable.enum_triple.should be_an_enumerator
-        @enumerable.enum_triple.should be_countable
-        @enumerable.enum_triple.to_a.should == @enumerable.each_triple.to_a
+      its(:enum_triple) {should be_an_enumerator}
+      its(:enum_triple) {should be_countable}
+      context "#enum_triple" do
+        it "should enumerate all triples" do
+          subject.enum_triple.to_a.should == @enumerable.each_triple.to_a
+        end
       end
     end
 
     context "when enumerating quads" do
-      it "should respond to #quads" do
-        @enumerable.should respond_to(:quads)
-      end
-
-      it "should respond to #has_quad?" do
-        @enumerable.should respond_to(:has_quad?)
-      end
-
-      it "should respond to #each_quad" do
-        @enumerable.should respond_to(:each_quad)
-      end
-
-      it "should respond to #enum_quad" do
-        @enumerable.should respond_to(:enum_quad)
-      end
-
-      it "should implement #quads" do
-        @enumerable.quads.should be_an_enumerator
-        @enumerable.quads.to_a.size.should == @statements.size
-        @enumerable.quads.each { |quad| quad.should be_a_quad }
-      end
-
-      it "should implement #has_quad?" do
-        @statements.each do |statement|
-          @enumerable.has_quad?(statement.to_quad).should be_true
+      it {should respond_to(:quads)}
+      it {should respond_to(:has_quad?)}
+      it {should respond_to(:each_quad)}
+      it {should respond_to(:enum_quad)}
+
+      its(:quads) {should be_an_enumerator}
+      context "#quads" do
+        specify {subject.quads.to_a.size.should == @statements.size}
+        specify {subject.quads.each { |quad| quad.should be_a_quad }}
+      end
+
+      context "#has_quad?" do
+        specify do
+          if @supports_context
+            @statements.each do |statement|
+              subject.has_quad?(statement.to_quad).should be_true
+            end
+          end
         end
       end
 
-      it "should implement #each_quad" do
-        @enumerable.each_quad.should be_an_enumerator
-        @enumerable.each_quad { |*quad| quad.should be_a_quad }
+      its(:each_quad) {should be_an_enumerator}
+      context "#each_quad" do
+        specify {subject.each_quad {|*quad| quad.should be_a_quad }}
       end
 
-      it "should implement #enum_quad" do
-        @enumerable.enum_quad.should be_an_enumerator
-        @enumerable.enum_quad.should be_countable
-        @enumerable.enum_quad.to_a.should == @enumerable.each_quad.to_a
+      its(:enum_quad) {should be_an_enumerator}
+      its(:enum_quad) {should be_countable}
+      context "#enum_quad" do
+        it "should enumerate all quads" do
+          subject.enum_quad.to_a.should == @enumerable.each_quad.to_a
+        end
       end
     end
 
     context "when enumerating subjects" do
-      it "should respond to #subjects" do
-        @enumerable.should respond_to(:subjects)
-      end
-
-      it "should respond to #has_subject?" do
-        @enumerable.should respond_to(:has_subject?)
-      end
+      it {should respond_to(:subjects)}
+      it {should respond_to(:has_subject?)}
+      it {should respond_to(:each_subject)}
+      it {should respond_to(:enum_subject)}
 
-      it "should respond to #each_subject" do
-        @enumerable.should respond_to(:each_subject)
-      end
-
-      it "should respond to #enum_subject" do
-        @enumerable.should respond_to(:enum_subject)
-      end
-
-      describe "#subjects" do
+      its(:subjects) {should be_an_enumerator}
+      context "#subjects" do
         subject {@enumerable.subjects}
         specify {subject.should be_an_enumerator}
         specify {subject.each { |value| value.should be_a_resource }}
@@ -231,212 +196,198 @@ module RDF_Enumerable
         end
       end
 
-      it "should implement #has_subject?" do
-        checked = []
-        @statements.each do |statement|
-          @enumerable.has_subject?(statement.subject).should be_true unless checked.include?(statement.subject)
-          checked << statement.subject
+      context "#has_subject?" do
+        specify do
+          checked = []
+          @statements.each do |statement|
+            @enumerable.has_subject?(statement.subject).should be_true unless checked.include?(statement.subject)
+            checked << statement.subject
+          end
+          uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
+          @enumerable.has_subject?(uri).should be_false
         end
-        uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
-        @enumerable.has_predicate?(uri).should be_false
       end
 
-      it "should implement #each_subject" do
-        @enumerable.each_subject.should be_an_enumerator
-        subjects = @statements.map { |s| s.subject }.uniq
-        @enumerable.each_subject.to_a.size.should == subjects.size
-        @enumerable.each_subject do |value|
-          value.should be_a_value
-          subjects.should include(value)
-        end
+      its(:each_subject) {should be_an_enumerator}
+      context "#each_subject" do
+        let(:subjects) {@statements.map { |s| s.subject }.uniq}
+        specify {subject.each_subject.to_a.size.should == subjects.size}
+        specify {subject.each_subject {|value| value.should be_a_resource}}
+        specify {subject.each_subject {|value| subjects.should include(value)}}
       end
 
-      it "should implement #enum_subject" do
-        @enumerable.enum_subject.should be_an_enumerator
-        @enumerable.enum_subject.should be_countable
-        @enumerable.enum_subject.to_a.should == @enumerable.each_subject.to_a
+      its(:enum_subject) {should be_an_enumerator}
+      its(:enum_subject) {should be_countable}
+      context "#enum_subject" do
+        it "should enumerate all subjects" do
+          subject.enum_subject.to_a.should == @enumerable.each_subject.to_a
+        end
       end
     end
 
     context "when enumerating predicates" do
-      it "should respond to #predicates" do
-        @enumerable.should respond_to(:predicates)
-      end
-
-      it "should respond to #has_predicate?" do
-        @enumerable.should respond_to(:has_predicate?)
-      end
-
-      it "should respond to #each_predicate" do
-        @enumerable.should respond_to(:each_predicate)
-      end
+      it {should respond_to(:predicates)}
+      it {should respond_to(:has_predicate?)}
+      it {should respond_to(:each_predicate)}
+      it {should respond_to(:enum_predicate)}
 
-      it "should respond to #enum_predicate" do
-        @enumerable.should respond_to(:enum_predicate)
-      end
-
-      describe "#predicates" do
+      its(:predicates) {should be_an_enumerator}
+      context "#predicates" do
         subject {@enumerable.predicates}
         specify {subject.should be_an_enumerator}
         specify {subject.each { |value| value.should be_a_uri }}
         context ":unique => false" do
           subject {@enumerable.predicates(:unique => false)}
           specify {subject.should be_an_enumerator}
-          specify {subject.each { |value| value.should be_a_resource }}
+          specify {subject.each { |value| value.should be_a_uri }}
         end
       end
 
-      it "should implement #has_predicate?" do
-        checked = []
-        @statements.each do |statement|
-          @enumerable.has_predicate?(statement.predicate).should be_true unless checked.include?(statement.object)
-          checked << statement.predicate
+      context "#has_predicate?" do
+        specify do
+          checked = []
+          @statements.each do |statement|
+            @enumerable.has_predicate?(statement.predicate).should be_true unless checked.include?(statement.predicate)
+            checked << statement.predicate
+          end
+          uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
+          @enumerable.has_predicate?(uri).should be_false
         end
-        uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
-        @enumerable.has_predicate?(uri).should be_false
       end
 
-      it "should implement #each_predicate" do
-        predicates = @statements.map { |s| s.predicate }.uniq
-        @enumerable.each_predicate.should be_an_enumerator
-        @enumerable.each_predicate.to_a.size.should == predicates.size
-        @enumerable.each_predicate do |value|
-          value.should be_a_uri
-          predicates.should include(value)
-        end
+      its(:each_predicate) {should be_an_enumerator}
+      context "#each_predicate" do
+        let(:predicates) {@statements.map { |s| s.predicate }.uniq}
+        specify {subject.each_predicate.to_a.size.should == predicates.size}
+        specify {subject.each_predicate {|value| value.should be_a_uri}}
+        specify {subject.each_predicate {|value| predicates.should include(value)}}
       end
 
-      it "should implement #enum_predicate" do
-        @enumerable.enum_predicate.should be_an_enumerator
-        @enumerable.enum_predicate.should be_countable
-        @enumerable.enum_predicate.to_a.should == @enumerable.each_predicate.to_a
+      its(:enum_predicate) {should be_an_enumerator}
+      its(:enum_predicate) {should be_countable}
+      context "#enum_predicate" do
+        it "should enumerate all predicates" do
+          subject.enum_predicate.to_a.should == @enumerable.each_predicate.to_a
+        end
       end
     end
 
     context "when enumerating objects" do
-      it "should respond to #objects" do
-        @enumerable.should respond_to(:objects)
-      end
-
-      it "should respond to #has_object?" do
-        @enumerable.should respond_to(:has_object?)
-      end
+      it {should respond_to(:objects)}
+      it {should respond_to(:has_object?)}
+      it {should respond_to(:each_object)}
+      it {should respond_to(:enum_object)}
 
-      it "should respond to #each_object" do
-        @enumerable.should respond_to(:each_object)
-      end
-
-      it "should respond to #enum_object" do
-        @enumerable.should respond_to(:enum_object)
-      end
-
-      describe "#objects" do
+      its(:objects) {should be_an_enumerator}
+      context "#objects" do
         subject {@enumerable.objects}
         specify {subject.should be_an_enumerator}
-        specify {subject.each { |value| value.should be_a_value }}
+        specify {subject.each { |value| value.should be_a_term }}
         context ":unique => false" do
           subject {@enumerable.objects(:unique => false)}
           specify {subject.should be_an_enumerator}
-          specify {subject.each { |value| value.should be_a_value }}
+          specify {subject.each { |value| value.should be_a_term }}
         end
       end
 
-      it "should implement #has_object?" do
-        checked = []
-        @statements.each do |statement|
-          @enumerable.has_object?(statement.object).should be_true unless checked.include?(statement.object)
-          checked << statement.object
+      context "#has_object?" do
+        specify do
+          checked = []
+          @statements.each do |statement|
+            @enumerable.has_object?(statement.object).should be_true unless checked.include?(statement.object)
+            checked << statement.object
+          end
+          uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
+          @enumerable.has_object?(uri).should be_false
         end
-        uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
-        @enumerable.has_object?(uri).should be_false
       end
 
-      it "should implement #each_object" do
-        objects = @statements.map { |s| s.object }.uniq
-        @enumerable.each_object.should be_an_enumerator
-        @enumerable.each_object.to_a.size.should == objects.size
-        @enumerable.each_object do |value|
-          value.should be_a_value
-          objects.should include(value)
-        end
+      its(:each_object) {should be_an_enumerator}
+      context "#each_object" do
+        let(:objects) {@statements.map { |s| s.object }.uniq}
+        specify {subject.each_object.to_a.size.should == objects.size}
+        specify {subject.each_object {|value| value.should be_a_term}}
+        specify {subject.each_object {|value| objects.should include(value)}}
       end
 
-      it "should implement #enum_object" do
-        @enumerable.enum_object.should be_an_enumerator
-        @enumerable.enum_object.should be_countable
-        @enumerable.enum_object.to_a.should == @enumerable.each_object.to_a
+      its(:enum_object) {should be_an_enumerator}
+      its(:enum_object) {should be_countable}
+      context "#enum_object" do
+        it "should enumerate all objects" do
+          subject.enum_object.to_a.should == @enumerable.each_object.to_a
+        end
       end
     end
 
     context "when enumerating contexts" do
-      it "should respond to #contexts" do
-        @enumerable.should respond_to(:contexts)
-      end
-
-      it "should respond to #has_context?" do
-        @enumerable.should respond_to(:has_context?)
-      end
-
-      it "should respond to #each_context" do
-        @enumerable.should respond_to(:each_context)
-      end
-
-      it "should respond to #enum_context" do
-        @enumerable.should respond_to(:enum_context)
-      end
+      it {should respond_to(:contexts)}
+      it {should respond_to(:has_context?)}
+      it {should respond_to(:each_context)}
+      it {should respond_to(:enum_context)}
 
+      its(:contexts) {should be_an_enumerator}
       describe "#contexts" do
         subject {@enumerable.contexts}
         specify {subject.should be_an_enumerator}
-        specify {subject.each { |value| value.should be_a_resource }}
+        it "values should be resources" do
+          subject.each { |value| value.should be_a_resource }
+        end
         context ":unique => false" do
           subject {@enumerable.contexts(:unique => false)}
           specify {subject.should be_an_enumerator}
-          specify {subject.each { |value| value.should be_a_resource }}
+          it "values should be resources" do
+            subject.each { |value| value.should be_a_resource }
+          end
         end
       end
 
       it "should implement #has_context?" do
-        @statements.each do |statement|
-          if statement.has_context?
-            @enumerable.has_context?(statement.context).should be_true
+        if @supports_context
+          @statements.each do |statement|
+            if statement.has_context?
+              @enumerable.has_context?(statement.context).should be_true
+            end
+          end
+          uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
+          @enumerable.has_context?(uri).should be_false
+        end
+      end
+
+      its(:each_context) {should be_an_enumerator}
+      context "#each_context" do
+        let(:contexts) {@statements.map { |s| s.context }.uniq.compact}
+        it "has appropriate number of contexts" do
+          if @supports_context
+            subject.each_context.to_a.size.should == contexts.size
           end
         end
-        uri = RDF::URI.new('http://example.org/does/not/have/this/uri')
-        @enumerable.has_context?(uri).should be_false
-      end
-
-      it "should implement #each_context" do
-        contexts = @statements.map { |s| s.context }.uniq
-        contexts.delete nil
-        @enumerable.each_context.should be_an_enumerator
-        @enumerable.each_context.to_a.size.should == contexts.size
-        @enumerable.each_context do |value|
-          value.should be_a_resource
-          contexts.should include(value)
+        it "values should be resources" do
+          subject.each_context {|value| value.should be_a_resource}
+        end
+        it "should have all contexts" do
+          subject.each_context {|value| contexts.should include(value)}
         end
       end
 
-      it "should implement #enum_context" do
-        @enumerable.enum_context.should be_an_enumerator
-        @enumerable.enum_context.should be_countable
-        @enumerable.enum_context.to_a.should == @enumerable.each_context.to_a
+      its(:enum_context) {should be_an_enumerator}
+      its(:enum_context) {should be_countable}
+      context "#enum_context" do
+        it "should enumerate all contexts" do
+          subject.enum_context.to_a.should == @enumerable.each_context.to_a
+        end
       end
     end
 
     context "when enumerating graphs" do
-      it "should respond to #each_graph" do
-        @enumerable.should respond_to(:enum_graph)
-      end
-
-      it "should respond to #enum_graph" do
-        @enumerable.should respond_to(:enum_graph)
-      end
+      it {should respond_to(:each_graph)}
+      it {should respond_to(:enum_graph)}
 
       describe "#each_graph" do
         subject {@enumerable.each_graph}
         it {should be_an_enumerator}
-        specify {subject.each { |value| value.should be_a_graph }}
+        it "are all graphs" do
+          subject.each { |value| value.should be_a_graph } if @supports_context
+        end
       end
 
       describe "#enum_graph" do
@@ -444,33 +395,30 @@ module RDF_Enumerable
         it {subject.should be_an_enumerator}
         it {subject.should be_countable}
         it "enumerates the same as #each_graph" do
-          subject.to_a.should == @enumerable.each_graph.to_a
+          subject.to_a.should == @enumerable.each_graph.to_a if @supports_context
         end
       end
     end
 
     context "when converting" do
-      it "should respond to #to_hash" do
-        @enumerable.should respond_to(:to_hash)
-      end
-
-      it "should implement #to_hash" do
-        @enumerable.to_hash.should be_instance_of(Hash)
-        @enumerable.to_hash.keys.size.should == @enumerable.subjects.to_a.size
+      it {should respond_to(:to_hash)}
+      its(:to_hash) {should be_instance_of(Hash)}
+      context "#to_hash" do
+        it "should have as many keys as subjects" do
+          subject.to_hash.keys.size.should == @enumerable.subjects.to_a.size
+        end
       end
     end
   
     context "when dumping" do
-      it "should respond to #dump" do
-        @enumerable.should respond_to(:dump)
-      end
+      it {should respond_to(:dump)}
     
       it "should implement #dump" do
-        @enumerable.dump(:ntriples).should == RDF::NTriples::Writer.buffer() {|w| w << @enumerable}
+        subject.dump(:ntriples).should == RDF::NTriples::Writer.buffer() {|w| w << @enumerable}
       end
     
       it "raises error on unknown format" do
-        lambda {@enumerable.dump(:foobar)}.should raise_error(RDF::WriterError, /No writer found/)
+        lambda {subject.dump(:foobar)}.should raise_error(RDF::WriterError, /No writer found/)
       end
     end
   end