Improvements to vocabulary generation:

* Only use english or plain terms, as Ruby serialization does not preserve language.
* Use lists for top-level values as well as embedded.
* Order embedded property values.

Author: gkellogg

lib/rdf/vocab/writer.rb

@@ -231,6 +231,17 @@ def serialize_value(value, key, indent: "")
           value.to_ruby(indent: indent + "  ")
         elsif value.is_a?(RDF::Term)
           "#{value.to_s.inspect}.freeze"
+        elsif value.is_a?(RDF::List)
+          list_elements = value.map do |u|
+            if u.uri?
+              "#{u.pname.inspect}.freeze"
+            elsif u.respond_to?(:to_ruby)
+              u.to_ruby(indent: indent + "  ")
+            else
+              "#{u.to_s.inspect}.freeze"
+            end
+          end
+          "list(#{list_elements.join(', ')})"
         else
           "#{value.inspect}.freeze"
         end

lib/rdf/vocabulary.rb

@@ -492,6 +492,10 @@ def from_graph(graph, url: nil, class_name: nil, extra: nil)
           else                                              statement.predicate.pname.to_sym
           end
 
+          # Skip literals other than plain or english
+          # This is because the ruby representation does not preserve language
+          next if statement.object.literal? && (statement.object.language || :en).to_s !~ /^en-?/
+
           (term[key] ||= []) << statement.object
         end
 
@@ -1080,7 +1084,7 @@ def to_ruby(indent: "")
         "term(" +
         (self.uri? ? self.to_s.inspect + ",\n" : "\n") +
         "#{indent}  " +
-        attributes.keys.map do |k|
+        attributes.keys.sort.map do |k|
           values = attribute_value(k)
           values = [values].compact unless values.is_a?(Array)
           values = values.map do |value|