rdf-tabular 3.1.0 → 3.1.1

data/lib/rdf/tabular/format.rb

@@ -22,7 +22,7 @@ module RDF::Tabular
   # @example Obtaining serialization format file extension mappings
   #     RDF::Format.file_extensions    #=> {:csv => "text/csv"}
   #
-  # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see https://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
     content_type     'text/csv;q=0.4',
                      extensions: [:csv, :tsv],
@@ -62,7 +62,7 @@ module RDF::Tabular
             raise ArgumentError, "Outputting Tabular JSON only allowed when input format is tabular." unless opts[:format] == :tabular
             out = opts[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
-            RDF::CLI.parse(argv, opts) do |reader|
+            RDF::CLI.parse(argv, **opts) do |reader|
               out.puts reader.to_json
             end
           end

data/lib/rdf/tabular/metadata.rb

@@ -16,7 +16,7 @@ require 'yaml'  # used by BCP47, which should have required it.
 # * Return Column-level annotations
 # * Return row iterator with column information
 #
-# @author [Gregg Kellogg](http://greggkellogg.net/)
+# @author [Gregg Kellogg](https://greggkellogg.net/)
 module RDF::Tabular
   class Metadata
     include RDF::Util::Logger
@@ -209,7 +209,9 @@ module RDF::Tabular
         log_debug("for_input", **options) {"templates: #{templates.map(&:to_s).inspect}"}
         locs = templates.map do |template|
           t = Addressable::Template.new(template)
-          RDF::URI(base).join(t.expand(url: base).to_s)
+          mapped = t.expand(url: base).to_s
+          mapped = RDF::URI.decode(mapped) if options[:decode_uri]
+          RDF::URI(base).join(mapped)
         end
         log_debug("for_input", **options) {"locs: #{locs.map(&:to_s).inspect}"}
 
@@ -314,6 +316,8 @@ module RDF::Tabular
     #   Context used for this metadata. Taken from input if not provided
     # @option options [RDF::URI] :base
     #   The Base URL to use when expanding the document. This overrides the value of `input` if it is a URL. If not specified and `input` is not an URL, the base URL defaults to the current document URL if in a browser context, or the empty string if there is no document context.
+    # @option options [Boolean] :decode_uri
+    #   Decode %-encodings in the result of a URI Template operation.
     # @option options [Boolean] :normalize normalize the object
     # @option options [Boolean] :validate Strict metadata validation
     # @raise [Error]
@@ -1947,13 +1951,14 @@ module RDF::Tabular
   class Row
     # Class for returning values
     Cell = Struct.new(:table, :column, :row, :stringValue, :aboutUrl, :propertyUrl, :valueUrl, :value, :errors) do
-      def set_urls(mapped_values)
+      def set_urls(mapped_values, decode_uri)
         %w(aboutUrl propertyUrl valueUrl).each do |prop|
           # If the cell value is nil, and it is not a virtual column
           next if prop == "valueUrl" && value.nil? && !column.virtual
           if v = column.send(prop.to_sym)
             t = Addressable::Template.new(v)
             mapped = t.expand(mapped_values).to_s
+            mapped = RDF::URI.decode(mapped) if decode_uri
             # FIXME: don't expand here, do it in CSV2RDF
             url = row.context.expand_iri(mapped, documentRelative: true)
             self.send("#{prop}=".to_sym, url)
@@ -2114,7 +2119,7 @@ module RDF::Tabular
           "_column" => cell.column.number,
           "_sourceColumn" => cell.column.sourceNumber
         )
-        cell.set_urls(mapped_values)
+        cell.set_urls(mapped_values, options[:decode_uri])
       end
     end
 

data/lib/rdf/tabular/reader.rb

@@ -5,7 +5,7 @@ module RDF::Tabular
   ##
   # A Tabular Data to RDF parser in Ruby.
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   class Reader < RDF::Reader
     format Format
     include RDF::Util::Logger
@@ -22,7 +22,7 @@ module RDF::Tabular
 
     ##
     # Writer options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -43,6 +43,13 @@ module RDF::Tabular
           control: :checkbox,
           on: ["--no-prov"],
           description: "do not output optional provenance information.") {true},
+        RDF::CLI::Option.new(
+          symbol: :decode_uri,
+          datatype: TrueClass,
+          control: :checkbox,
+          on: ["--decode-uri"],
+          description: "decode %-encodings in the result of a URI Template operation."
+        )
       ]
     end
 
@@ -54,11 +61,13 @@ module RDF::Tabular
     #   or an Array used as an internalized array of arrays
     # @param  [Hash{Symbol => Object}] options
     #   any additional options (see `RDF::Reader#initialize`)
+    # @option options [Boolean] :decode_uri
+    #   Decode %-encodings in the result of a URI Template operation.
+    # @option options [Array<Hash>] :fks_referencing_table
+    #   When called with Table metadata, a list of the foreign keys referencing this table
     # @option options [Metadata, Hash, String, RDF::URI] :metadata user supplied metadata, merged on top of extracted metadata. If provided as a URL, Metadata is loade from that location
     # @option options [Boolean] :minimal includes only the information gleaned from the cells of the tabular data
     # @option options [Boolean] :noProv do not output optional provenance information
-    # @option optinons [Array<Hash>] :fks_referencing_table
-    #   When called with Table metadata, a list of the foreign keys referencing this table
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
@@ -225,7 +234,7 @@ module RDF::Tabular
                 activity = RDF::Node.new
                 add_statement(0, table_group, RDF::Vocab::PROV.wasGeneratedBy, activity)
                 add_statement(0, activity, RDF.type, RDF::Vocab::PROV.Activity)
-                add_statement(0, activity, RDF::Vocab::PROV.wasAssociatedWith, RDF::URI("http://rubygems.org/gems/rdf-tabular"))
+                add_statement(0, activity, RDF::Vocab::PROV.wasAssociatedWith, RDF::URI("https://rubygems.org/gems/rdf-tabular"))
                 add_statement(0, activity, RDF::Vocab::PROV.startedAtTime, RDF::Literal::DateTime.new(start_time))
                 add_statement(0, activity, RDF::Vocab::PROV.endedAtTime, RDF::Literal::DateTime.new(Time.now))
 

data/lib/rdf/tabular/uax35.rb

@@ -3,7 +3,7 @@ module RDF::Tabular
   ##
   # Utilities for parsing UAX35 dates and numbers.
   #
-  # @see http://www.unicode.org/reports/tr35
+  # @see https://www.unicode.org/reports/tr35
   module UAX35
 
     ##

data/spec/metadata_spec.rb

@@ -1082,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

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 [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-tabular
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcp47
@@ -320,7 +320,7 @@ 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: {}
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Tabular Data RDF Reader and JSON serializer.