rdf-tabular 2.2.1 → 3.2.0

data/spec/metadata_spec.rb

@@ -838,12 +838,6 @@ describe RDF::Tabular::Metadata do
         ":type Schema" => [{}, {type: :Schema}, RDF::Tabular::Schema],
         ":type Column" => [{}, {type: :Column}, RDF::Tabular::Column],
         ":type Dialect" => [{}, {type: :Dialect}, RDF::Tabular::Dialect],
-        "@type TableGroup" => [{}, {"@type" => "TableGroup"}, RDF::Tabular::TableGroup],
-        "@type Table" => [{"@type" => "Table"}, RDF::Tabular::Table],
-        "@type Template" => [{"@type" => "Template"}, RDF::Tabular::Transformation],
-        "@type Schema" => [{"@type" => "Schema"}, RDF::Tabular::Schema],
-        "@type Column" => [{"@type" => "Column"}, RDF::Tabular::Column],
-        "@type Dialect" => [{"@type" => "Dialect"}, RDF::Tabular::Dialect],
         "tables TableGroup" => [{"tables" => []}, RDF::Tabular::TableGroup],
         "dialect Table" => [{"dialect" => {}}, RDF::Tabular::Table],
         "tableSchema Table" => [{"tableSchema" => {}}, RDF::Tabular::Table],
@@ -874,7 +868,7 @@ describe RDF::Tabular::Metadata do
           options ||= {}
           options[:logger] = logger
           options[:context] ||= 'http://www.w3.org/ns/csvw'
-          expect(described_class.new(input, options)).to be_a(klass)
+          expect(described_class.new(input, **options)).to be_a(klass)
           expect(logger.to_s).not_to match(/ERROR|WARN/)
         end
       end
@@ -1088,6 +1082,89 @@ describe RDF::Tabular::Metadata do
           end
         end
       end
+
+      context "virtual columns" do
+        subject {
+          described_class.new(JSON.parse(%({
+            "@context": "http://www.w3.org/ns/csvw",
+            "url": "https://example.org/countries.csv",
+            "aboutUrl": "https://example.org/countries",
+            "@type": "Table",
+            "tableSchema": {
+              "@type": "Schema",
+              "columns": [{
+                "name": "countryCode",
+                "titles": "countryCode",
+                "propertyUrl": "https://example.org/countries.csv#countryCode"
+              }, {
+                "name": "latitude",
+                "titles": "latitude",
+                "propertyUrl": "https://example.org/countries.csv#latitude"
+              }, {
+                "name": "longitude",
+                "titles": "longitude",
+                "propertyUrl": "https://example.org/countries.csv#longitude"
+              }, {
+                "name": "name",
+                "titles": "name",
+                "propertyUrl": "https://example.org/countries.csv#name"
+              }, {
+                "virtual": true,
+                "propertyUrl": "https://example.org/countries.csv#virt1",
+                "valueUrl": "https://example.org/countries.csv#virt1"
+              }, {
+                "virtual": true,
+                "propertyUrl": "https://example.org/countries.csv#virt2",
+                "default": "default",
+                "datatype": "string"
+              }]
+            }
+          })), base: RDF::URI("http://example.org/base"), logger: logger)
+        }
+        let(:input) {RDF::Util::File.open_file("https://example.org/countries.csv")}
+        let(:rows) {subject.to_enum(:each_row, input).to_a}
+
+        it "has expected aboutUrls" do
+          subject.each_row(input) do |row|
+            expect(row.values[0].aboutUrl).to eq "https://example.org/countries"
+            expect(row.values[1].aboutUrl).to eq "https://example.org/countries"
+            expect(row.values[2].aboutUrl).to eq "https://example.org/countries"
+            expect(row.values[3].aboutUrl).to eq "https://example.org/countries"
+            expect(row.values[4].aboutUrl).to eq "https://example.org/countries"
+            expect(row.values[5].aboutUrl).to eq "https://example.org/countries"
+          end
+        end
+
+        it "has expected propertyUrls" do
+          subject.each_row(input) do |row|
+            expect(row.values[0].propertyUrl).to eq "https://example.org/countries.csv#countryCode"
+            expect(row.values[1].propertyUrl).to eq "https://example.org/countries.csv#latitude"
+            expect(row.values[2].propertyUrl).to eq "https://example.org/countries.csv#longitude"
+            expect(row.values[3].propertyUrl).to eq "https://example.org/countries.csv#name"
+            expect(row.values[4].propertyUrl).to eq "https://example.org/countries.csv#virt1"
+            expect(row.values[5].propertyUrl).to eq "https://example.org/countries.csv#virt2"
+          end
+        end
+
+        it "has expected valueUrls" do
+          subject.each_row(input) do |row|
+            expect(row.values[0].valueUrl).to be_nil
+            expect(row.values[1].valueUrl).to be_nil
+            expect(row.values[2].valueUrl).to be_nil
+            expect(row.values[3].valueUrl).to be_nil
+            expect(row.values[4].valueUrl).to eq "https://example.org/countries.csv#virt1"
+            expect(row.values[5].valueUrl).to be_nil
+          end
+        end
+
+        it "has expected values" do
+          rows = subject.to_enum(:each_row, input).to_a
+          expect(rows[0].values.map(&:to_s)).to produce(%w(AD 42.546245 1.601554 Andorra).push("", "default"), logger)
+          expect(rows[1].values.map(&:to_s)).to produce((%w(AE 23.424076 53.847818).push("United Arab Emirates", "", "default")), logger)
+          expect(rows[2].values.map(&:to_s)).to produce(%w(AF 33.93911 67.709953 Afghanistan).push("", "default"), logger)
+        end
+      end
+      
     end
 
     context "datatypes" do
@@ -1379,7 +1456,7 @@ describe RDF::Tabular::Metadata do
       context "Unsupported datatypes" do
         %w(anyType anySimpleType ENTITIES IDREFS NMTOKENS ENTITY ID IDREF NOTATAION foo).each do |base|
           it "detects #{base} as unsupported" do
-            md = RDF::Tabular::Table.new({
+            RDF::Tabular::Table.new({
              url: "http://example.com/table.csv",
               tableSchema: {
                 columns: [{

data/spec/reader_spec.rb

@@ -308,7 +308,7 @@ describe RDF::Tabular::Reader do
         ASK WHERE {
           [ prov:wasGeneratedBy [
               a prov:Activity;
-              prov:wasAssociatedWith <http://rubygems.org/gems/rdf-tabular>;
+              prov:wasAssociatedWith <https://rubygems.org/gems/rdf-tabular>;
               prov:startedAtTime ?start;
               prov:endedAtTime ?end;
               prov:qualifiedUsage [
@@ -331,7 +331,7 @@ describe RDF::Tabular::Reader do
         ASK WHERE {
           [ prov:wasGeneratedBy [
               a prov:Activity;
-              prov:wasAssociatedWith <http://rubygems.org/gems/rdf-tabular>;
+              prov:wasAssociatedWith <https://rubygems.org/gems/rdf-tabular>;
               prov:startedAtTime ?start;
               prov:endedAtTime ?end;
               prov:qualifiedUsage [

data/spec/spec_helper.rb

@@ -13,14 +13,26 @@ require 'json'
 require 'webmock/rspec'
 require 'matchers'
 require 'suite_helper'
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
-SimpleCov.start do
-  add_filter "/spec/"
+
+begin
+  require 'simplecov'
+  require 'simplecov-lcov'
+
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    #Coveralls is coverage by default/lcov. Send info results
+    config.report_with_single_file = true
+    config.single_report_path = 'coverage/lcov.info'
+  end
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter
+  ])
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+rescue LoadError => e
+  STDERR.puts "Coverage Skipped: #{e.message}"
 end
 
 require 'rdf/tabular'

data/spec/suite_helper.rb

@@ -23,7 +23,7 @@ module RDF::Util
     #   HTTP Request headers.
     # @return [IO] File stream
     # @yield [IO] File stream
-    def self.open_file(filename_or_url, options = {}, &block)
+    def self.open_file(filename_or_url, **options, &block)
       case
       when filename_or_url.to_s =~ /^file:/
         path = filename_or_url.to_s[5..-1]
@@ -73,7 +73,7 @@ module RDF::Util
           end
         end
       else
-        original_open_file(filename_or_url, options) do |remote_document|
+        original_open_file(filename_or_url, **options) do |remote_document|
           # Add Link header, if necessary
           remote_document.headers[:link] = options[:httpLink] if options[:httpLink]
 

data/spec/suite_spec.rb

@@ -25,11 +25,10 @@ describe RDF::Tabular::Reader do
               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?,
-                    logger:   t.logger,
-                  )
+                  base_uri: t.base,
+                  validate: t.validation?,
+                  logger:   t.logger,
+                  **t.reader_options
                 ) do |reader|
                   expect(reader).to be_a RDF::Reader
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-tabular
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcp47
@@ -34,232 +34,184 @@ dependencies:
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +250,6 @@ files:
 - lib/rdf/tabular.rb
 - lib/rdf/tabular/csvw.rb
 - lib/rdf/tabular/format.rb
-- lib/rdf/tabular/json.rb
 - lib/rdf/tabular/literal.rb
 - lib/rdf/tabular/metadata.rb
 - lib/rdf/tabular/reader.rb
@@ -369,11 +320,11 @@ files:
 - spec/suite_helper.rb
 - spec/suite_spec.rb
 - spec/uax35_spec.rb
-homepage: http://github.com/ruby-rdf/rdf-tabular
+homepage: https://github.com/ruby-rdf/rdf-tabular
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -381,81 +332,80 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Tabular Data RDF Reader and JSON serializer.
 test_files:
-- spec/spec_helper.rb
-- spec/metadata_spec.rb
+- spec/format_spec.rb
 - spec/matchers.rb
-- spec/suite_spec.rb
-- spec/suite_helper.rb
+- spec/metadata_spec.rb
 - spec/reader_spec.rb
-- spec/format_spec.rb
+- spec/spec_helper.rb
+- spec/suite_helper.rb
+- spec/suite_spec.rb
 - spec/uax35_spec.rb
-- spec/data/roles.json
-- spec/data/countries.csv-minimal.ttl
-- spec/data/countries_embed-standard.json
-- spec/data/tree-ops-standard.json
-- spec/data/countries.csv
-- spec/data/countries_embed-minimal.json
+- spec/data/countries-minimal.json
+- spec/data/countries-minimal.ttl
 - spec/data/countries-standard.json
-- spec/data/countries_html-minimal.json
+- spec/data/countries-standard.ttl
+- spec/data/countries.csv
 - spec/data/countries.csv-minimal.json
-- spec/data/senior-roles.csv
-- spec/data/roles-standard.ttl
+- spec/data/countries.csv-minimal.ttl
+- spec/data/countries.csv-standard.json
+- spec/data/countries.csv-standard.ttl
+- spec/data/countries.html
+- spec/data/countries.json
+- spec/data/countries_embed-minimal.json
+- spec/data/countries_embed-minimal.ttl
+- spec/data/countries_embed-standard.json
 - spec/data/countries_embed-standard.ttl
-- spec/data/senior-roles.json
+- spec/data/countries_embed.html
+- spec/data/countries_html-minimal.json
 - spec/data/countries_html-minimal.ttl
-- spec/data/junior-roles.csv
-- spec/data/countries.csv-standard.ttl
-- spec/data/tree-ops-ext-standard.json
+- spec/data/countries_html-standard.json
 - spec/data/countries_html-standard.ttl
-- spec/data/tree-ops-minimal.ttl
+- spec/data/country-codes-and-names-minimal.json
+- spec/data/country-codes-and-names-minimal.ttl
+- spec/data/country-codes-and-names-standard.json
+- spec/data/country-codes-and-names-standard.ttl
+- spec/data/country-codes-and-names.csv
+- spec/data/country_slice.csv
+- spec/data/junior-roles.csv
 - spec/data/junior-roles.json
 - spec/data/roles-minimal.json
-- spec/data/countries_html-standard.json
-- spec/data/country_slice.csv
-- spec/data/countries.csv-standard.json
-- spec/data/tree-ops-virtual-minimal.ttl
-- spec/data/countries.json
-- spec/data/tree-ops.tsv
-- spec/data/tree-ops-virtual.json
-- spec/data/countries-minimal.json
+- spec/data/roles-minimal.ttl
+- spec/data/roles-standard.json
+- spec/data/roles-standard.ttl
+- spec/data/roles.json
+- spec/data/senior-roles.csv
+- spec/data/senior-roles.json
+- spec/data/test232-metadata.json
+- spec/data/test232.csv
 - spec/data/tree-ops-atd.json
+- spec/data/tree-ops-ext-minimal.json
 - spec/data/tree-ops-ext-minimal.ttl
-- spec/data/tree-ops.csv
-- spec/data/tree-ops-standard.ttl
-- spec/data/tree-ops-virtual-standard.ttl
-- spec/data/countries-minimal.ttl
-- spec/data/tree-ops-virtual-standard.json
-- spec/data/countries.html
+- spec/data/tree-ops-ext-standard.json
 - spec/data/tree-ops-ext-standard.ttl
-- spec/data/country-codes-and-names-minimal.json
-- spec/data/tree-ops.html
-- spec/data/test232.csv
+- spec/data/tree-ops-ext.csv
 - spec/data/tree-ops-ext.json
-- spec/data/roles-minimal.ttl
-- spec/data/countries_embed.html
-- spec/data/country-codes-and-names-standard.json
-- spec/data/country-codes-and-names-minimal.ttl
-- spec/data/countries_embed-minimal.ttl
-- spec/data/roles-standard.json
-- spec/data/tree-ops-virtual-minimal.json
 - spec/data/tree-ops-minimal.json
+- spec/data/tree-ops-minimal.ttl
+- spec/data/tree-ops-standard.json
+- spec/data/tree-ops-standard.ttl
+- spec/data/tree-ops-virtual-minimal.json
+- spec/data/tree-ops-virtual-minimal.ttl
+- spec/data/tree-ops-virtual-standard.json
+- spec/data/tree-ops-virtual-standard.ttl
+- spec/data/tree-ops-virtual.json
+- spec/data/tree-ops.csv
 - spec/data/tree-ops.csv-metadata.json
-- spec/data/countries-standard.ttl
-- spec/data/tree-ops-ext-minimal.json
-- spec/data/country-codes-and-names-standard.ttl
-- spec/data/test232-metadata.json
-- spec/data/tree-ops-ext.csv
-- spec/data/country-codes-and-names.csv
+- spec/data/tree-ops.html
+- spec/data/tree-ops.tsv