Use graph equivalence check from rdf-spec.

Author: gkellogg

.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2.4
+  - 2.3.0
   - jruby-9.0.4.0
   - rbx-2
 cache: bundler

Gemfile

@@ -11,6 +11,7 @@ group :debug do
 end
 
 group :development, :test do
+  gem 'rdf-spec',       git: "git://github.com/ruby-rdf/rdf-spec.git", branch: "develop"
   gem "rdf-vocab",      git: "git://github.com/ruby-rdf/rdf-vocab.git", branch: "develop"
   gem 'rdf-turtle',     git: "git://github.com/ruby-rdf/rdf-turtle.git", branch: "develop"
   gem 'rest-client-components'

spec/matchers.rb

@@ -1,5 +1,4 @@
 # coding: utf-8
-require 'rdf/isomorphic'
 require 'json'
 JSON_STATE = JSON::State.new(
    indent:        "  ",
@@ -9,59 +8,6 @@
    array_nl:      "\n"
  )
 
-def normalize(graph)
-  case graph
-  when RDF::Queryable then graph
-  when IO, StringIO
-    RDF::Graph.new.load(graph, base_uri:  @info.about)
-  else
-    # Figure out which parser to use
-    g = RDF::Repository.new
-    reader_class = detect_format(graph)
-    reader_class.new(graph, base_uri:  @info.about).each {|s| g << s}
-    g
-  end
-end
-
-Info = Struct.new(:about, :coment, :trace, :input, :result, :action, :expected)
-
-RSpec::Matchers.define :be_equivalent_graph do |expected, info|
-  match do |actual|
-    @info = if info.respond_to?(:input)
-      info
-    elsif info.is_a?(Hash)
-      identifier = info[:identifier] || expected.is_a?(RDF::Enumerable) ? expected.context : info[:about]
-      trace = info[:trace]
-      if trace.is_a?(Array)
-        trace = trace.map {|s| s.dup.force_encoding(Encoding::UTF_8)}.join("\n")
-      end
-      Info.new(identifier, info[:comment] || "", trace)
-    else
-      Info.new(expected.is_a?(RDF::Enumerable) ? expected.context : info, info.to_s)
-    end
-    @expected = normalize(expected)
-    @actual = normalize(actual)
-    @actual.isomorphic_with?(@expected) rescue false
-  end
-
-  failure_message do |actual|
-    info = @info.respond_to?(:comment) ? @info.comment : @info.inspect
-    if @expected.is_a?(RDF::Graph) && @actual.size != @expected.size
-      "Graph entry count differs:\nexpected: #{@expected.size}\nactual:   #{@actual.size}"
-    elsif @expected.is_a?(Array) && @actual.size != @expected.length
-      "Graph entry count differs:\nexpected: #{@expected.length}\nactual:   #{@actual.size}"
-    else
-      "Graph differs"
-    end +
-    "\n#{info + "\n" unless info.empty?}" +
-    (@info.action ? "Input file: #{@info.action}\n" : "") +
-    (@info.result ? "Result file: #{@info.result}\n" : "") +
-    "Unsorted Expected:\n#{@expected.dump(:ttl, standard_prefixes:  true)}" +
-    "Unsorted Results:\n#{@actual.dump(:ttl, standard_prefixes:  true)}" +
-    (@info.trace ? "\nDebug:\n#{@info.trace}" : "")
-  end  
-end
-
 RSpec::Matchers.define :generate do |expected, options = {}|
   def parser(options = {})
     @debug = options[:progress] ? 2 : []

spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require "bundler/setup"
 require 'rspec/its'
+require 'rdf/spec'
+require 'rdf/spec/matchers'
 require 'matchers'
 require 'webmock/rspec'
 require 'rdf/turtle'