rdf-tabular 0.1.3.1 → 0.2.0

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require "bundler/setup"
 require 'rspec'
 require 'rspec/its'
 require 'rdf/isomorphic'
-require 'rdf/tabular'
 require 'rdf/turtle'
 require 'rdf/spec/matchers'
 require 'json'
@@ -13,7 +12,16 @@ require 'webmock/rspec'
 require 'matchers'
 require 'suite_helper'
 require 'simplecov'
-SimpleCov.start
+require 'coveralls'
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
+require 'rdf/tabular'
 
 JSON_STATE = JSON::State.new(
   :indent       => "  ",

data/spec/suite_helper.rb

@@ -7,7 +7,7 @@ require 'open-uri'
 # For now, override RDF::Utils::File.open_file to look for the file locally before attempting to retrieve it
 module RDF::Util
   module File
-    REMOTE_PATH = "http://w3c.github.io/csvw/"
+    REMOTE_PATH = "http://www.w3.org/2013/csvw/"
     LOCAL_PATH = ::File.expand_path("../w3c-csvw", __FILE__) + '/'
 
     class << self
@@ -28,14 +28,20 @@ module RDF::Util
       when filename_or_url.to_s =~ /^file:/
         path = filename_or_url.to_s[5..-1]
         Kernel.open(path.to_s, &block)
-      when (filename_or_url.to_s =~ %r{^#{REMOTE_PATH}} && ::File.exist?(filename_or_url.to_s.sub(REMOTE_PATH, LOCAL_PATH)))
+      when filename_or_url.to_s =~ %r{http://www.w3.org/ns/csvw/?}
+        ::File.open(::File.expand_path("../../etc/csvw.jsonld", __FILE__), &block)
+      when filename_or_url.to_s == "http://www.w3.org/.well-known/csvm"
+        ::File.open(::File.expand_path("../../etc/well-known", __FILE__), &block)
+      when (filename_or_url.to_s =~ %r{^#{REMOTE_PATH}} && Dir.exist?(LOCAL_PATH))
         begin
           #puts "attempt to open #{filename_or_url} locally"
-          localpath = filename_or_url.to_s.sub(REMOTE_PATH, LOCAL_PATH)
+          localpath = RDF::URI(filename_or_url).dup
+          localpath.query = nil
+          localpath = localpath.to_s.sub(REMOTE_PATH, LOCAL_PATH)
           response = begin
             ::File.open(localpath)
-          rescue Errno::ENOENT
-            Kernel.open(filename_or_url.to_s, "r:utf-8", 'Accept' => "application/ld+json, application/json, text/csv")
+          rescue Errno::ENOENT => e
+            raise IOError, e.message
           end
           document_options = {
             base_uri:     RDF::URI(filename_or_url),
@@ -67,7 +73,22 @@ module RDF::Util
           end
         end
       else
-        original_open_file(filename_or_url, options, &block)
+        original_open_file(filename_or_url, options) do |remote_document|
+          # Add Link header, if necessary
+          remote_document.headers[:link] = options[:httpLink] if options[:httpLink]
+
+          # Override content_type
+          if options[:contentType]
+            remote_document.headers[:content_type] = options[:contentType]
+            remote_document.instance_variable_set(:@content_type, options[:contentType].split(';').first)
+          end
+
+          if block_given?
+            yield remote_document
+          else
+            remote_document
+          end
+        end
       end
     end
   end
@@ -75,10 +96,9 @@ end
 
 module Fixtures
   module SuiteTest
-    BASE = "http://w3c.github.io/csvw/tests/"
+    BASE = "http://www.w3.org/2013/csvw/tests/"
     class Manifest < JSON::LD::Resource
       def self.open(file, base)
-        #puts "open: #{file}"
         RDF::Util::File.open_file(file) do |file|
           json = ::JSON.load(file.read)
           yield Manifest.new(json, context: json['@context'].merge('@base' => base))
@@ -94,6 +114,7 @@ module Fixtures
     class Entry < JSON::LD::Resource
       attr_accessor :debug
       attr_accessor :warnings
+      attr_accessor :errors
       attr_accessor :metadata
 
       def id
@@ -110,7 +131,7 @@ module Fixtures
       end
 
       def result
-        RDF::URI(context['@base']).join(attributes["result"]).to_s
+        RDF::URI(context['@base']).join(attributes["result"]).to_s if attributes["result"]
       end
 
       def input
@@ -118,17 +139,13 @@ module Fixtures
       end
 
       def expected
-        @expected ||= RDF::Util::File.open_file(result) {|f| f.read}
+        @expected ||= RDF::Util::File.open_file(result) {|f| f.read} rescue nil
       end
       
       def evaluate?
-        type.include?("To")
+        type.to_s.include?("To")
       end
       
-      def sparql?
-        type.include?("Sparql")
-      end
-
       def rdf?
         result.to_s.end_with?(".ttl")
       end
@@ -138,11 +155,11 @@ module Fixtures
       end
 
       def validation?
-        type.include?("Validation")
+        type.to_s.include?("Validation")
       end
 
       def warning?
-        type.include?("Warning")
+        type.to_s.include?("Warning")
       end
 
       def positive_test?
@@ -150,7 +167,7 @@ module Fixtures
       end
       
       def negative_test?
-        type.include?("Negative")
+        type.to_s.include?("Negative")
       end
 
       def reader_options

data/spec/suite_spec.rb

@@ -9,23 +9,27 @@ describe RDF::Tabular::Reader do
   before(:all) {WebMock.allow_net_connect!(net_http_connect_on_start: true)}
   after(:all) {WebMock.allow_net_connect!(net_http_connect_on_start: false)}
 
-  %w(rdf json validation).each do |variant|
+  %w(rdf json validation nonnorm).each do |variant|
     describe "w3c csvw #{variant.upcase} tests" do
       manifest = Fixtures::SuiteTest::BASE + "manifest-#{variant}.jsonld"
 
       Fixtures::SuiteTest::Manifest.open(manifest, manifest[0..-8]) do |m|
         describe m.comment do
           m.entries.each do |t|
+            next if t.approval =~ /Rejected/
             specify "#{t.id.split("/").last}: #{t.name} - #{t.comment}" do
+              pending "rdf#test158 should be isomorphic" if t.id.include?("rdf#test158")
               t.debug = []
               t.warnings = []
+              t.errors = []
               begin
                 RDF::Tabular::Reader.open(t.action,
                   t.reader_options.merge(
                     base_uri: t.base,
                     validate: t.validation?,
                     debug:    t.debug,
-                    warnings: t.warnings
+                    warnings: t.warnings,
+                    errors: t.errors,
                   )
                 ) do |reader|
                   expect(reader).to be_a RDF::Reader
@@ -46,38 +50,36 @@ describe RDF::Tabular::Reader do
                         expect(::JSON.parse(result)).to be_a(Hash)
                       end
                     else # RDF or Validation
-                      begin
+                      if t.evaluate?
                         graph << reader
-                      rescue Exception => e
-                        expect(e.message).to produce("Not exception #{e.inspect}\n#{e.backtrace.join("\n")}", t.debug)
-                      end
-
-                      if t.sparql?
-                        RDF::Util::File.open_file(t.result) do |query|
-                          expect(graph).to pass_query(query, t)
-                        end
-                      elsif t.evaluate?
                         output_graph = RDF::Repository.load(t.result, format: :ttl, base_uri:  t.base)
                         expect(graph).to be_equivalent_graph(output_graph, t)
                       elsif t.validation?
-                        expect(graph).to be_a(RDF::Enumerable)
-
-                        if t.warning?
-                          expect(t.warnings.length).to produce 1, t
-                        else
-                          expect(t.warnings).to produce [], t
-                        end
+                        expect {reader.validate!}.not_to raise_error
                       end
                     end
-                  else
+
+                    if t.warning?
+                      expect(t.warnings.length).to be >= 1
+                    else
+                      expect(t.warnings).to produce [], t
+                    end
+                    expect(t.errors).to produce [], t
+                  elsif t.json?
                     expect {
-                      graph << reader
-                      expect(graph.dump(:ntriples)).to produce("not this", t.debug)
+                      reader.to_json
                     }.to raise_error(RDF::Tabular::Error)
+                  elsif t.evaluate?
+                    expect {
+                      graph << reader
+                    }.to raise_error(RDF::ReaderError)
+                  elsif t.validation?
+                    expect {reader.validate!}.to raise_error(RDF::Tabular::Error)
                   end
                 end
-              rescue Exception => e
-                unless t.negative_test? && t.validation?
+              rescue IOError, RDF::Tabular::Error
+                # Special case
+                unless t.negative_test?
                   raise
                 end
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-tabular
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcp47
@@ -169,6 +169,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,6 +179,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -215,10 +221,16 @@ files:
 - README.md
 - UNLICENSE
 - VERSION
+- etc/README
 - etc/csvw.jsonld
 - etc/doap.csv
 - etc/doap.csv-metadata.json
 - etc/doap.ttl
+- etc/earl.html
+- etc/earl.jsonld
+- etc/earl.ttl
+- etc/template.haml
+- etc/well-known
 - lib/rdf/tabular.rb
 - lib/rdf/tabular/csvw.rb
 - lib/rdf/tabular/format.rb
@@ -255,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Tabular Data RDF Reader and JSON serializer.