rdf-tabular 0.2.1 → 0.3.0

data/lib/rdf/tabular/metadata.rb

@@ -137,7 +137,7 @@ module RDF::Tabular
     #
     # @param [String] path
     # @param [Hash{Symbol => Object}] options
-    #   see `RDF::Util::File.open_file` in RDF.rb and {#new}
+    #   see `RDF::Util::File.open_file` in RDF.rb and {new}
     # @yield [Metadata]
     # @raise [IOError] if file not found
     def self.open(path, options = {})
@@ -153,7 +153,7 @@ module RDF::Tabular
     end
 
     # Return the well-known configuration for a file, and remember using a weak-reference cache to avoid uncessary retreivles.
-    # @param [String] base, the URL used for finding the file
+    # @param [String] base the URL used for finding the file
     # @return [Array<String>, false]
     def self.site_wide_config(base)
       require 'rdf/util/cache' unless defined?(::RDF::Util::Cache)
@@ -433,7 +433,7 @@ module RDF::Tabular
     end
 
     # Getters and Setters
-    INHERITED_PROPERTIES.keys.each do |key|
+    INHERITED_PROPERTIES.each do |key, type|
       define_method(key) do
         object.fetch(key) do
           parent ? parent.send(key) : default_value(key)
@@ -459,12 +459,7 @@ module RDF::Tabular
           # We handle this through a separate datatype= setter
         end
 
-        if invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, type, value, invalid)
       end
     end
 
@@ -1223,6 +1218,24 @@ module RDF::Tabular
       (@warnings ||= []) << string
     end
 
+    def set_property(key, type, value, invalid)
+      if invalid
+        warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
+        case type
+        when :link, :uri_template
+          object[key] = ""
+        when :object
+          object[key] = {}
+        when :natural_language
+          object[key] = set_nl(value) || []
+        else
+          object.delete(key)
+        end
+      else
+        object[key] = value
+      end
+    end
+
     # When setting a natural language property, always put in language-map form
     # @param [Hash{String => String, Array<String>}, Array<String>, String] value
     # @return [Hash{String => Array<String>}]
@@ -1329,12 +1342,7 @@ module RDF::Tabular
           # We handle this through a separate setters
         end
 
-        if invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, type, value, invalid)
       end
     end
 
@@ -1421,8 +1429,7 @@ module RDF::Tabular
         end
 
         if invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
+          set_property(key, type, value, invalid)
         elsif key == :url
           # URL of CSV relative to metadata
           object[:url] = value
@@ -1490,12 +1497,7 @@ module RDF::Tabular
           "string or array of strings" unless !value.is_a?(Hash) && Array(value).all? {|v| v.is_a?(String)}
         end
 
-        if invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, type, value, invalid)
       end
     end
 
@@ -1619,16 +1621,7 @@ module RDF::Tabular
           valid_natural_language_property?(value)
         end
 
-        if invalid && key == :titles
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object[key] = set_nl(value)
-          object.delete(key) if object[key].nil?
-        elsif invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, t, value, invalid)
       end
     end
 
@@ -1700,12 +1693,7 @@ module RDF::Tabular
           "json or rdf" unless %w(json rdf).include?(value) || value.nil?
         end
 
-        if invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, type, value, invalid)
       end
     end
   end
@@ -1749,7 +1737,7 @@ module RDF::Tabular
     REQUIRED = [].freeze
 
     # Getters and Setters
-    PROPERTIES.keys.each do |key|
+    PROPERTIES.each do |key, type|
       define_method(key) do
         object.fetch(key, DEFAULTS[key])
       end
@@ -1772,16 +1760,7 @@ module RDF::Tabular
           valid_natural_language_property?(value)
         end
 
-        if invalid && key == :titles
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object[key] = set_nl(value)
-          object.delete(key) if object[key].nil?
-        elsif invalid
-          warn "#{type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, type, value, invalid)
       end
     end
 
@@ -1931,12 +1910,7 @@ module RDF::Tabular
           end
         end
 
-        if invalid
-          warn "#{self.type} has invalid property '#{key}' (#{value.inspect}): expected #{invalid}"
-          object.delete(key)
-        else
-          object[key] = value
-        end
+        set_property(key, type, value, invalid)
       end
     end
   end
@@ -2063,28 +2037,19 @@ module RDF::Tabular
         @values << cell = Cell.new(metadata, column, self, value)
 
         datatype = column.datatype || Datatype.new({base: "string"}, parent: column)
-        value = value.gsub(/\r\t\a/, ' ') unless %w(string json xml html anyAtomicType any).include?(datatype.base)
-        value = value.strip.gsub(/\s+/, ' ') unless %w(string json xml html anyAtomicType any normalizedString).include?(datatype.base)
+        value = value.gsub(/\r\n\t/, ' ') unless %w(string json xml html anyAtomicType).include?(datatype.base)
+        value = value.strip.gsub(/\s+/, ' ') unless %w(string json xml html anyAtomicType normalizedString).include?(datatype.base)
         # if the resulting string is an empty string, apply the remaining steps to the string given by the default property
         value = column.default || '' if value.empty?
 
         cell_values = column.separator ? value.split(column.separator) : [value]
 
         cell_values = cell_values.map do |v|
-          v = v.strip unless %w(string anyAtomicType any).include?(datatype.base)
+          v = v.strip unless %w(string anyAtomicType).include?(datatype.base)
           v = column.default || '' if v.empty?
           if Array(column.null).include?(v)
             nil
           else
-            # Trim value
-            if %w(string anyAtomicType any).include?(datatype.base)
-              v.lstrip! if %w(true start).include?(metadata.dialect.trim.to_s)
-              v.rstrip! if %w(true end).include?(metadata.dialect.trim.to_s)
-            else
-              # unless the datatype is string or anyAtomicType or any, strip leading and trailing whitespace from the string value
-              v.strip!
-            end
-
             expanded_dt = datatype.id || metadata.context.expand_iri(datatype.base, vocab: true)
             if (lit_or_errors = value_matching_datatype(v.dup, datatype, expanded_dt, column.lang)).is_a?(RDF::Literal)
               lit_or_errors

data/lib/rdf/tabular/reader.rb

@@ -1,4 +1,5 @@
 require 'rdf'
+require 'rdf/vocab'
 
 module RDF::Tabular
   ##
@@ -204,30 +205,30 @@ module RDF::Tabular
               # Provenance
               if prov?
                 activity = RDF::Node.new
-                add_statement(0, table_group, RDF::PROV.wasGeneratedBy, activity)
-                add_statement(0, activity, RDF.type, RDF::PROV.Activity)
-                add_statement(0, activity, RDF::PROV.wasAssociatedWith, RDF::URI("http://rubygems.org/gems/rdf-tabular"))
-                add_statement(0, activity, RDF::PROV.startedAtTime, RDF::Literal::DateTime.new(start_time))
-                add_statement(0, activity, RDF::PROV.endedAtTime, RDF::Literal::DateTime.new(Time.now))
+                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.startedAtTime, RDF::Literal::DateTime.new(start_time))
+                add_statement(0, activity, RDF::Vocab::PROV.endedAtTime, RDF::Literal::DateTime.new(Time.now))
 
                 unless (urls = input.tables.map(&:url)).empty?
                   usage = RDF::Node.new
-                  add_statement(0, activity, RDF::PROV.qualifiedUsage, usage)
-                  add_statement(0, usage, RDF.type, RDF::PROV.Usage)
+                  add_statement(0, activity, RDF::Vocab::PROV.qualifiedUsage, usage)
+                  add_statement(0, usage, RDF.type, RDF::Vocab::PROV.Usage)
                   urls.each do |url|
-                    add_statement(0, usage, RDF::PROV.entity, RDF::URI(url))
+                    add_statement(0, usage, RDF::Vocab::PROV.entity, RDF::URI(url))
                   end
-                  add_statement(0, usage, RDF::PROV.hadRole, CSVW.csvEncodedTabularData)
+                  add_statement(0, usage, RDF::Vocab::PROV.hadRole, CSVW.csvEncodedTabularData)
                 end
 
                 unless Array(input.filenames).empty?
                   usage = RDF::Node.new
-                  add_statement(0, activity, RDF::PROV.qualifiedUsage, usage)
-                  add_statement(0, usage, RDF.type, RDF::PROV.Usage)
+                  add_statement(0, activity, RDF::Vocab::PROV.qualifiedUsage, usage)
+                  add_statement(0, usage, RDF.type, RDF::Vocab::PROV.Usage)
                   Array(input.filenames).each do |fn|
-                    add_statement(0, usage, RDF::PROV.entity, RDF::URI(fn))
+                    add_statement(0, usage, RDF::Vocab::PROV.entity, RDF::URI(fn))
                   end
-                  add_statement(0, usage, RDF::PROV.hadRole, CSVW.tabularMetadata)
+                  add_statement(0, usage, RDF::Vocab::PROV.hadRole, CSVW.tabularMetadata)
                 end
               end
             ensure

data/lib/rdf/tabular/uax35.rb

@@ -211,6 +211,7 @@ module RDF::Tabular
 
       min_integer_digits = integer_part.gsub(groupChar, '').gsub('#', '').length
       all_integer_digits = integer_part.gsub(groupChar, '').length
+      all_integer_digits += 1 if all_integer_digits == min_integer_digits
       min_fractional_digits = fractional_part.gsub(groupChar, '').gsub('#', '').length
       max_fractional_digits = fractional_part.gsub(groupChar, '').length
       exponent_sign = exponent_part[0] if exponent_part =~ /^[+-]/
@@ -225,8 +226,9 @@ module RDF::Tabular
       fractional_grouping_size = fractional_parts[0].to_s.length
 
       # Construct regular expression for integer part
+      #require 'byebug'; byebug
       integer_str = if primary_grouping_size == 0
-        all_integer_digits > min_integer_digits ? "\\d{#{min_integer_digits},}" : "\\d{#{min_integer_digits}}"
+        "\\d{#{min_integer_digits},}"
       else
         # These number of groupings must be there
         integer_parts = []
@@ -235,8 +237,8 @@ module RDF::Tabular
           sz = [primary_grouping_size, min_integer_digits].min
           integer_rem = primary_grouping_size - sz
           integer_parts << "\\d{#{sz}}"
-          min_integer_digits -= primary_grouping_size
-          all_integer_digits -= primary_grouping_size
+          min_integer_digits -= sz
+          all_integer_digits -= sz
           primary_grouping_size = secondary_grouping_size
         end
         required_digits = integer_parts.reverse.join(ge)

data/spec/metadata_spec.rb

@@ -928,9 +928,9 @@ describe RDF::Tabular::Metadata do
           }
         },
         "PNames" => {
-          aboutUrl: [RDF::SCHEMA.addressCountry, RDF::SCHEMA.latitude, RDF::SCHEMA.longitude, RDF::SCHEMA.name],
-          propertyUrl: [RDF::SCHEMA.addressCountry, RDF::SCHEMA.latitude, RDF::SCHEMA.longitude, RDF::SCHEMA.name],
-          valueUrl: [RDF::SCHEMA.addressCountry, RDF::SCHEMA.latitude, RDF::SCHEMA.longitude, RDF::SCHEMA.name],
+          aboutUrl: [RDF::Vocab::SCHEMA.addressCountry, RDF::Vocab::SCHEMA.latitude, RDF::Vocab::SCHEMA.longitude, RDF::Vocab::SCHEMA.name],
+          propertyUrl: [RDF::Vocab::SCHEMA.addressCountry, RDF::Vocab::SCHEMA.latitude, RDF::Vocab::SCHEMA.longitude, RDF::Vocab::SCHEMA.name],
+          valueUrl: [RDF::Vocab::SCHEMA.addressCountry, RDF::Vocab::SCHEMA.latitude, RDF::Vocab::SCHEMA.longitude, RDF::Vocab::SCHEMA.name],
           md: {
             "aboutUrl" => "http://schema.org/{_name}",
             "propertyUrl" => 'schema:{_name}',
@@ -1332,28 +1332,25 @@ describe RDF::Tabular::Metadata do
 
   context "Number formats" do
     {
-      '0'          => {valid: %w(1 -1 +1), invalid: %w(12 1.2), base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1})(?<suffix>)$/},
-      '00'         => {valid: %w(12), invalid: %w(1 123 1,2), base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{2})(?<suffix>)$/},
+      '0'          => {valid: %w(1 -1 +1 12), invalid: %w(1.2), base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,})(?<suffix>)$/},
+      '00'         => {valid: %w(12 123), invalid: %w(1 1,2), base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{2,})(?<suffix>)$/},
       '#'          => {valid: %w(1 12 123), invalid: %w(1.2), base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{0,})(?<suffix>)$/},
       '##'         => {re: /^(?<prefix>[+-]?)(?<numeric_part>\d{0,})(?<suffix>)$/},
       '#0'         => {re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,})(?<suffix>)$/},
 
-      '0.0'         => {valid: %w(1.1 -1.1), invalid: %w(12.1 1.12), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{1})(?<suffix>)$/},
-      '0.00'        => {valid: %w(1.12 +1.12), invalid: %w(12.12 1.1 1.123), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{2})(?<suffix>)$/},
-      '0.#'         => {valid: %w(1 1.1), invalid: %w(12.1 1.12), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}(?:\.\d{0,1})?)(?<suffix>)$/},
-      '0.##'        => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}(?:\.\d{0,2})?)(?<suffix>)$/},
-
-      '+0'         => {valid: %w(+1), invalid: %w(1 -1 +10), base: "decimal", re: /^(?<prefix>\+)(?<numeric_part>\d{1})(?<suffix>)$/},
-      '-0'         => {valid: %w(-1), invalid: %w(1 +1 -10), base: "decimal", re: /^(?<prefix>\-)(?<numeric_part>\d{1})(?<suffix>)$/},
-      '%000'       => {valid: %w(%123 %+123 %-123), invalid: %w(%12 %1234 123%), base: "decimal", re: /^(?<prefix>%[+-]?)(?<numeric_part>\d{3})(?<suffix>)$/},
-      '‰000'       => {valid: %w(‰123 ‰+123 ‰-123), invalid: %w(‰12 ‰1234 123‰), base: "decimal", re: /^(?<prefix>‰[+-]?)(?<numeric_part>\d{3})(?<suffix>)$/},
-      '000%'       => {valid: %w(123% +123% -123%), invalid: %w(12% 1234% %123), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{3})(?<suffix>%)$/},
-      '000‰'       => {valid: %w(123‰ +123‰ -123‰), invalid: %w(12‰ 1234‰ ‰123), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{3})(?<suffix>‰)$/},
-      '000.0%'     => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{3}\.\d{1})(?<suffix>%)$/},
+      '0.0'         => {valid: %w(1.1 -1.1 12.1), invalid: %w(1.12), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{1})(?<suffix>)$/},
+      '0.00'        => {valid: %w(1.12 +1.12 12.12), invalid: %w(1.1 1.123), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{2})(?<suffix>)$/},
+      '0.#'         => {valid: %w(1 1.1 12.1), invalid: %w(1.12), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}(?:\.\d{0,1})?)(?<suffix>)$/},
+      '-0'         => {valid: %w(-1 -10), invalid: %w(1 +1), base: "decimal", re: /^(?<prefix>\-)(?<numeric_part>\d{1,})(?<suffix>)$/},
+      '%000'       => {valid: %w(%123 %+123 %-123 %1234), invalid: %w(%12 123%), base: "decimal", re: /^(?<prefix>%[+-]?)(?<numeric_part>\d{3,})(?<suffix>)$/},
+      '‰000'       => {valid: %w(‰123 ‰+123 ‰-123 ‰1234), invalid: %w(‰12 123‰), base: "decimal", re: /^(?<prefix>‰[+-]?)(?<numeric_part>\d{3,})(?<suffix>)$/},
+      '000%'       => {valid: %w(123% +123% -123% 1234%), invalid: %w(12% %123), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{3,})(?<suffix>%)$/},
+      '000‰'       => {valid: %w(123‰ +123‰ -123‰ 1234‰), invalid: %w(12‰ ‰123), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{3,})(?<suffix>‰)$/},
+      '000.0%'     => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{3,}\.\d{1})(?<suffix>%)$/},
 
       '###0.#####' => {valid: %w(1 1.1 12345.12345), invalid: %w(1,234.1 1.123456), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}(?:\.\d{0,5})?)(?<suffix>)$/},
       '###0.0000#' => {valid: %w(1.1234 1.12345 12345.12345), invalid: %w(1,234.1234 1.12), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{4,5})(?<suffix>)$/},
-      '00000.0000' => {valid: %w(12345.1234), invalid: %w(1.2 1,234.123,4), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{5}\.\d{4})(?<suffix>)$/},
+      '00000.0000' => {valid: %w(12345.1234), invalid: %w(1.2 1,234.123,4), base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{5,}\.\d{4})(?<suffix>)$/},
 
       '#0.0#E#0'   => {base: "double", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{1,2}E[+-]?\d{1,2})(?<suffix>)$/},
       '#0.0#E+#0'   => {base: "double", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{1,2}E\+\d{1,2})(?<suffix>)$/},
@@ -1366,14 +1363,14 @@ describe RDF::Tabular::Metadata do
       '#,##,000'   => {base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>(?:\d{1,2},)?(?:\d{2},)*\d{3})(?<suffix>)$/},
       '#,#0,000'   => {base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>(?:(?:\d{1,2},)?(?:\d{2},)*\d)?\d{1},\d{3})(?<suffix>)$/},
       '#,00,000'   => {base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>(?:\d{1,2},)?(?:\d{2},)*\d{2},\d{3})(?<suffix>)$/},
-      '0,00,000'   => {base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1},\d{2},\d{3})(?<suffix>)$/},
-
-      '0.0##,###'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{1}(?:\d(?:\d(?:,\d(?:\d(?:\d)?)?)?)?)?)(?<suffix>)$/},
-      '0.00#,###'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{2}(?:\d(?:,\d(?:\d(?:\d)?)?)?)?)(?<suffix>)$/},
-      '0.000,###'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{3}(?:,\d(?:\d(?:\d)?)?)?)(?<suffix>)$/},
-      '0.000,0##'  => {base: "decimal", re:/^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{3},\d{1}(?:\d(?:\d)?)?)(?<suffix>)$/},
-      '0.000,00#'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{3},\d{2}(?:\d)?)(?<suffix>)$/},
-      '0.000,000'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1}\.\d{3},\d{3})(?<suffix>)$/},
+      '0,00,000'   => {base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>(?:(?:\d{1,2},)?(?:\d{2},)*\d)?\d{1},\d{2},\d{3})(?<suffix>)$/},
+
+      '0.0##,###'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{1}(?:\d(?:\d(?:,\d(?:\d(?:\d)?)?)?)?)?)(?<suffix>)$/},
+      '0.00#,###'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{2}(?:\d(?:,\d(?:\d(?:\d)?)?)?)?)(?<suffix>)$/},
+      '0.000,###'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{3}(?:,\d(?:\d(?:\d)?)?)?)(?<suffix>)$/},
+      '0.000,0##'  => {base: "decimal", re:/^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{3},\d{1}(?:\d(?:\d)?)?)(?<suffix>)$/},
+      '0.000,00#'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{3},\d{2}(?:\d)?)(?<suffix>)$/},
+      '0.000,000'  => {base: "decimal", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,}\.\d{3},\d{3})(?<suffix>)$/},
 
       # Jeni's
       '##0'        => {valid: %w(1 12 123 1234), invalid: %w(1,234 123.4), base: "integer", re: /^(?<prefix>[+-]?)(?<numeric_part>\d{1,})(?<suffix>)$/},

data/spec/reader_spec.rb

@@ -240,7 +240,7 @@ describe RDF::Tabular::Reader do
             end
           end
 
-          it "ADT mode", skip: true do
+          it "ADT mode", unless: true do
             json = ttl.sub("-standard.ttl", "-atd.json")
             expected = File.expand_path("../data/#{json}", __FILE__)
 

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'rspec/its'
 require 'rdf/isomorphic'
 require 'rdf/turtle'
+require 'rdf/vocab'
 require 'rdf/spec/matchers'
 require 'json'
 require 'webmock/rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-tabular
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcp47
@@ -50,6 +50,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Tabular Data RDF Reader and JSON serializer.