Add --extra CLI option for Vocabulary writer. Make compatibility changes to writer output.

Author: gkellogg

lib/rdf/cli.rb

@@ -8,17 +8,12 @@
   require 'linkeddata'
 rescue LoadError
   # Silently load without linkeddata, but try some others
-  %w(reasoner rdfa rdfxml turtle).each do |ser|
+  %w(reasoner rdfa rdfxml turtle json/ld ld/patch).each do |ser|
     begin
-      require "rdf/#{ser}"
+      require ser.include?('/') ? ser : "rdf/#{ser}"
     rescue LoadError
     end
   end
-
-  begin
-    require 'json/ld'
-  rescue LoadError
-  end
 end
 
 class OptionParser

lib/rdf/vocab/writer.rb

@@ -35,6 +35,12 @@ def self.options
             on: ["--strict"],
             description: "Make strict vocabulary"
           ) {true},
+          RDF::CLI::Option.new(
+            symbol: :extra,
+            datatype: String,
+            on: ["--extra URIEncodedJSON"],
+            description: "URI Encoded JSON representation of extra data"
+          ) {|arg| ::JSON.parse(::URI.decode(arg))},
         ]
       end
 
@@ -142,10 +148,10 @@ def from_node(name, attributes, term_type)
         op = term_type == :property ? "property" : "term"
 
         components = ["    #{op} #{name.to_sym.inspect}"]
-        attributes.keys.sort_by(&:to_s).each do |key|
+        attributes.keys.sort_by(&:to_s).map(&:to_sym).each do |key|
           next if key == :vocab
           value = Array(attributes[key])
-          component = key.is_a?(Symbol) ? "#{key}: " : ":#{key.inspect} => "
+          component = key.inspect.start_with?(':"') ? "#{key.inspect} => " : "#{key.to_s}: "
           value = value.first if value.length == 1
           component << if value.is_a?(Array)
             '[' + value.map {|v| serialize_value(v, key)}.sort.join(", ") + "]"
@@ -158,8 +164,8 @@ def from_node(name, attributes, term_type)
       end
 
       def serialize_value(value, key)
-        case key
-        when :comment, String
+        case key.to_s
+        when "comment", /:/
           "%(#{value.gsub('(', '\(').gsub(')', '\)')}).freeze"
         else
           "#{value.inspect}.freeze"