rdf-tabular 0.3.0 → 0.4.0.beta2

data/spec/reader_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'rdf/spec/reader'
 
 describe RDF::Tabular::Reader do
+  let(:logger) {RDF::Spec.logger}
   let!(:doap) {File.expand_path("../../etc/doap.csv", __FILE__)}
   let!(:doap_count) {9}
 
@@ -27,9 +28,8 @@ describe RDF::Tabular::Reader do
           {status: 401}
         end
       })
-
-    @debug = []
   end
+  after(:each) {|example| puts logger.to_s if example.exception}
   
   # @see lib/rdf/spec/reader.rb in rdf-spec
   # two failures specific to the way @input is handled in rdf-tabular make this a problem
@@ -52,33 +52,33 @@ describe RDF::Tabular::Reader do
 
   context "HTTP Headers" do
     before(:each) {
-      allow_any_instance_of(RDF::Tabular::Dialect).to receive(:embedded_metadata).and_return(RDF::Tabular::Table.new({}))
+      allow_any_instance_of(RDF::Tabular::Dialect).to receive(:embedded_metadata).and_return(RDF::Tabular::Table.new({}, logger: false))
       allow_any_instance_of(RDF::Tabular::Metadata).to receive(:each_row).and_yield(RDF::Statement.new)
     }
     it "sets delimiter to TAB in dialect given text/tsv" do
       input = double("input", content_type: "text/tsv", headers: {content_type: "text/tsv"}, charset: nil)
       expect_any_instance_of(RDF::Tabular::Dialect).to receive(:separator=).with("\t")
-      RDF::Tabular::Reader.new(input) {|r| r.each_statement {}}
+      RDF::Tabular::Reader.new(input, logger: false) {|r| r.each_statement {}}
     end
     it "sets header to false in dialect given header=absent" do
       input = double("input", content_type: "text/csv", headers: {content_type: "text/csv;header=absent"}, charset: nil)
       expect_any_instance_of(RDF::Tabular::Dialect).to receive(:header=).with(false)
-      RDF::Tabular::Reader.new(input) {|r| r.each_statement {}}
+      RDF::Tabular::Reader.new(input, logger: false) {|r| r.each_statement {}}
     end
     it "sets encoding to ISO-8859-4 in dialect given charset=ISO-8859-4" do
       input = double("input", content_type: "text/csv", headers: {content_type: "text/csv;charset=ISO-8859-4"}, charset: "ISO-8859-4")
       expect_any_instance_of(RDF::Tabular::Dialect).to receive(:encoding=).with("ISO-8859-4")
-      RDF::Tabular::Reader.new(input) {|r| r.each_statement {}}
+      RDF::Tabular::Reader.new(input, logger: false) {|r| r.each_statement {}}
     end
     it "sets lang to de in metadata given Content-Language=de", pending: "affecting some RSpec matcher" do
       input = double("input", content_type: "text/csv", headers: {content_language: "de"}, charset: nil)
       expect_any_instance_of(RDF::Tabular::Metadata).to receive(:lang=).with("de")
-      RDF::Tabular::Reader.new(input) {|r| r.each_statement {}}
+      RDF::Tabular::Reader.new(input, logger: false) {|r| r.each_statement {}}
     end
     it "does not set lang with two languages in metadata given Content-Language=de, en" do
       input = double("input", content_type: "text/csv", headers: {content_language: "de, en"}, charset: nil)
       expect_any_instance_of(RDF::Tabular::Metadata).not_to receive(:lang=)
-      RDF::Tabular::Reader.new(input) {|r| r.each_statement {}}
+      RDF::Tabular::Reader.new(input, logger: false) {|r| r.each_statement {}}
     end
   end
 
@@ -134,15 +134,16 @@ describe RDF::Tabular::Reader do
         ]
       }))
     }
+
     {
       StringIO: StringIO.new(File.read(File.expand_path("../data/country-codes-and-names.csv", __FILE__))),
       ArrayOfArrayOfString: CSV.new(File.open(File.expand_path("../data/country-codes-and-names.csv", __FILE__))).to_a,
       String: File.read(File.expand_path("../data/country-codes-and-names.csv", __FILE__)),
     }.each do |name, input|
       it name do
-        RDF::Tabular::Reader.new(input, noProv: true, debug: @debug) do |reader|
+        RDF::Tabular::Reader.new(input, noProv: true, logger: logger) do |reader|
           expect(JSON.parse(reader.to_json)).to produce(expected,
-            debug: @debug,
+            logger: logger,
             result: expected,
             noProv: true,
             metadata: reader.metadata
@@ -161,6 +162,8 @@ describe RDF::Tabular::Reader do
       "country-codes-and-names.csv" => "country-codes-and-names-standard.ttl",
       "countries.json" => "countries-standard.ttl",
       "countries.csv" => "countries.csv-standard.ttl",
+      "countries.html" => "countries_html-standard.ttl",
+      "countries_embed.html" => "countries_embed-standard.ttl",
       "roles.json" => "roles-standard.ttl",
     }
     context "#each_statement" do
@@ -171,11 +174,11 @@ describe RDF::Tabular::Reader do
 
           it "standard mode" do
             expected = File.expand_path("../data/#{ttl}", __FILE__)
-            RDF::Reader.open(input, format: :tabular, base_uri: about, noProv: true, debug: @debug) do |reader|
+            RDF::Reader.open(input, format: :tabular, base_uri: about, noProv: true, logger: logger) do |reader|
               graph = RDF::Graph.new << reader
               graph2 = RDF::Graph.load(expected, base_uri: about)
               expect(graph).to be_equivalent_graph(graph2,
-                                                   debug: @debug,
+                                                   logger: logger,
                                                    id: about,
                                                    action: about,
                                                    result: expected,
@@ -186,11 +189,11 @@ describe RDF::Tabular::Reader do
           it "minimal mode" do
             ttl = ttl.sub("standard", "minimal")
             expected = File.expand_path("../data/#{ttl}", __FILE__)
-            RDF::Reader.open(input, format: :tabular, base_uri: about, minimal: true, debug: @debug) do |reader|
+            RDF::Reader.open(input, format: :tabular, base_uri: about, minimal: true, logger: logger) do |reader|
               graph = RDF::Graph.new << reader
               graph2 = RDF::Graph.load(expected, base_uri: about)
               expect(graph).to be_equivalent_graph(graph2,
-                                                   debug: @debug,
+                                                   logger: logger,
                                                    id: about,
                                                    action: about,
                                                    result: expected,
@@ -210,10 +213,10 @@ describe RDF::Tabular::Reader do
             json = ttl.sub("-standard.ttl", "-standard.json")
             expected = File.expand_path("../data/#{json}", __FILE__)
 
-            RDF::Reader.open(input, format: :tabular, base_uri: about, noProv: true, debug: @debug) do |reader|
+            RDF::Reader.open(input, format: :tabular, base_uri: about, noProv: true, logger: logger) do |reader|
               expect(JSON.parse(reader.to_json)).to produce(
                 JSON.parse(File.read(expected)),
-                debug: @debug,
+                logger: logger,
                 id: about,
                 action: about,
                 result: expected,
@@ -227,10 +230,10 @@ describe RDF::Tabular::Reader do
             json = ttl.sub("-standard.ttl", "-minimal.json")
             expected = File.expand_path("../data/#{json}", __FILE__)
 
-            RDF::Reader.open(input, format: :tabular, base_uri: about, minimal: true, debug: @debug) do |reader|
+            RDF::Reader.open(input, format: :tabular, base_uri: about, minimal: true, logger: logger) do |reader|
               expect(JSON.parse(reader.to_json)).to produce(
                 JSON.parse(File.read(expected)),
-                debug: @debug,
+                logger: logger,
                 id: about,
                 action: about,
                 result: expected,
@@ -244,10 +247,10 @@ describe RDF::Tabular::Reader do
             json = ttl.sub("-standard.ttl", "-atd.json")
             expected = File.expand_path("../data/#{json}", __FILE__)
 
-            RDF::Reader.open(input, format: :tabular, base_uri: about, noProv: true, debug: @debug) do |reader|
+            RDF::Reader.open(input, format: :tabular, base_uri: about, noProv: true, logger: logger) do |reader|
               expect(JSON.parse(reader.to_json(atd: true))).to produce(
                 JSON.parse(File.read(expected)),
-                debug: @debug,
+                logger: logger,
                 id: about,
                 action: about,
                 result: expected,
@@ -273,7 +276,7 @@ describe RDF::Tabular::Reader do
     end
 
     it "errors on duplicate primary keys" do
-      RDF::Reader.open("http://example.org/test232-metadata.json", format: :tabular, validate: true, errors: []) do |reader|
+      RDF::Reader.open("http://example.org/test232-metadata.json", format: :tabular, validate: true, logger: logger) do |reader|
         expect {reader.validate!}.to raise_error(RDF::Tabular::Error)
 
         pks = reader.metadata.tables.first.object[:rows].map(&:primaryKey)
@@ -281,7 +284,7 @@ describe RDF::Tabular::Reader do
         # Each entry is an array of cells
         expect(pks.map {|r| r.map(&:value).join(",")}).to eql %w(1 1)
 
-        expect(reader.options[:errors]).to eq ["Table http://example.org/test232.csv has duplicate primary key 1"]
+        expect(logger.to_s).to include "Table http://example.org/test232.csv has duplicate primary key 1"
       end
     end
   end
@@ -352,9 +355,9 @@ describe RDF::Tabular::Reader do
       it file do
         about = RDF::URI("http://example.org").join(file)
         input = File.expand_path("../data/#{file}", __FILE__)
-        graph = RDF::Graph.load(input, format: :tabular, base_uri: about, debug: @debug)
+        graph = RDF::Graph.load(input, format: :tabular, base_uri: about, logger: logger)
 
-        expect(graph).to pass_query(query, debug: @debug, id: about, action: about)
+        expect(graph).to pass_query(query, logger: logger, id: about, action: about)
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,19 +5,20 @@ require "bundler/setup"
 require 'rspec'
 require 'rspec/its'
 require 'rdf/isomorphic'
+require 'rdf/spec'
+require 'rdf/spec/matchers'
 require 'rdf/turtle'
 require 'rdf/vocab'
-require 'rdf/spec/matchers'
 require 'json'
 require 'webmock/rspec'
 require 'matchers'
 require 'suite_helper'
 require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start do
   add_filter "/spec/"
 end

data/spec/suite_helper.rb

@@ -112,7 +112,7 @@ module Fixtures
     end
  
     class Entry < JSON::LD::Resource
-      attr_accessor :debug
+      attr_accessor :logger
       attr_accessor :warnings
       attr_accessor :errors
       attr_accessor :metadata

data/spec/suite_spec.rb

@@ -19,17 +19,16 @@ describe RDF::Tabular::Reader do
             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 = []
+              t.logger = RDF::Spec.logger
+              t.logger.formatter = lambda {|severity, datetime, progname, msg| "#{severity}: #{msg}\n"}
+              t.logger.info t.inspect
+              t.logger.info "source:\n#{t.input}"
               begin
                 RDF::Tabular::Reader.open(t.action,
                   t.reader_options.merge(
                     base_uri: t.base,
                     validate: t.validation?,
-                    debug:    t.debug,
-                    warnings: t.warnings,
-                    errors: t.errors,
+                    logger:   t.logger,
                   )
                 ) do |reader|
                   expect(reader).to be_a RDF::Reader
@@ -60,11 +59,11 @@ describe RDF::Tabular::Reader do
                     end
 
                     if t.warning?
-                      expect(t.warnings.length).to be >= 1
+                      expect(t.logger.log_statistics).to have_key(:warn)
                     else
-                      expect(t.warnings).to produce [], t
+                      expect(t.logger.log_statistics).not_to have_key(:warn)
                     end
-                    expect(t.errors).to produce [], t
+                    expect(t.logger.log_statistics).not_to have_key(:error)
                   elsif t.json?
                     expect {reader.to_json}.to raise_error(RDF::Tabular::Error)
                   elsif t.validation?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-tabular
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.beta2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcp47
@@ -34,64 +34,82 @@ dependencies:
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -107,109 +125,127 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rdf-turtle
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: sparql
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - '='
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - '='
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +260,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: RDF::Tabular processes tabular data with metadata creating RDF or JSON
   output.
 email: public-rdf-ruby@w3.org
@@ -253,7 +303,6 @@ files:
 - lib/rdf/tabular/metadata.rb
 - lib/rdf/tabular/reader.rb
 - lib/rdf/tabular/uax35.rb
-- lib/rdf/tabular/utils.rb
 - lib/rdf/tabular/version.rb
 - spec/format_spec.rb
 - spec/matchers.rb
@@ -264,7 +313,7 @@ files:
 - spec/suite_spec.rb
 homepage: http://github.com/ruby-rdf/rdf-tabular
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -274,15 +323,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tabular Data RDF Reader and JSON serializer.