ttl2html 1.3.5 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64841e5acabefa8d0ff72ab9a5b342d2cb8c6a5f3ecbcce5d70d9c223ae6f694
-  data.tar.gz: 4c17bd90212017eccb86e6b96d3d2d1fe87c13841f5a0003a8f19d3e011aa1c0
+  metadata.gz: 71b5a2abdcc42e13003a2ceca9c3c29ed0ff866c472a058354a469868a244269
+  data.tar.gz: de4d3bd146d80800f7f4358a0f843479e5f8583436d4af550ddef4643af60c06
 SHA512:
-  metadata.gz: dd727e999f72c76af779008495bb858eb27bbf05f4e79b8ac9aeee0c61e3b225f8d5710209dcc29538fa7133c0c4da93573e864b2144447840b36ddb22306b36
-  data.tar.gz: 24fd2e31ebd3df0eb3ee62c62005356f6c66ab7b43697a7e1d82206314d1c038038bc44f145035f7aae87506878f19e458c265a1ebcb2a6fe9b389e70f40ce66
+  metadata.gz: 54d9bfb81e8fce12a3b0158e888a67bd6b718f7ab1efa35d09fc18ba8d7c596c226a08017894823d1baf6f637f3080e7211f44c85f4ff5a37546fde3b25b5838
+  data.tar.gz: fc40d4fc10a284b152802eef7069d786ea307d4a6713ffff1fd30dee7d46c1605f8b328e5d598f3913b0345d8e20f038cae623497453f2e5e0b6e0adedb4aeb5

data/lib/ttl2html/template.rb

@@ -59,6 +59,7 @@ module TTL2HTML
     def expand_shape(data, uri, prefixes = {})
       return nil if not data[uri]
       return nil if not data[uri]["http://www.w3.org/ns/shacl#property"]
+      prefix_used = {}
       result = data[uri]["http://www.w3.org/ns/shacl#property"].sort_by do |e|
         e["http://www.w3.org/ns/shacl#order"]
       end.map do |property|
@@ -67,6 +68,7 @@ module TTL2HTML
         prefixes.each do |prefix, val|
           if path.index(val) == 0
             shorten_path = path.sub(/\A#{val}/, "#{prefix}:")
+            prefix_used[prefix] = val
           end
         end
         repeatable = false
@@ -107,41 +109,16 @@ module TTL2HTML
           nodeKind: data[property]["http://www.w3.org/ns/shacl#nodeKind"] ? data[property]["http://www.w3.org/ns/shacl#nodeKind"].first : nil,
           nodes: nodes,
           node_mode: node_mode,
+          prefix: prefix_used,
         }
       end
       template = "shape-table.html.erb"
       tmpl = Template.new(template)
-      tmpl.to_html_raw(template, {properties: result})
+      tmpl.to_html_raw(template, { properties: result, prefix: prefix_used })
     end
 
     # helper method:
-    def uri_mapping_to_path(uri, suffix = ".html")
-      path = nil
-      if @param[:uri_mappings]
-        @param[:uri_mappings].each do |mapping|
-          local_file = uri.sub(@param[:base_uri], "")
-          if mapping["regexp"] =~ local_file
-            path = local_file.sub(mapping["regexp"], mapping["path"])
-          end
-        end
-      end
-      if path.nil?
-        if suffix == ".html"
-          if @param[:data_global] and @param[:data_global].keys.find{|e| e.start_with?(uri + "/") }
-            path = uri + "/index"
-          elsif uri.end_with?("/")
-            path = uri + "index"
-          else
-            path = uri
-          end
-        else
-          path = uri
-        end
-      end
-      path = path.sub(@param[:base_uri], "") if @param[:base_uri]
-      path << suffix
-      path
-    end
+    include TTL2HTML::Util
     def relative_path(dest)
       path = nil
       dest_uri = RDF::IRI.parse(dest)
@@ -151,14 +128,19 @@ module TTL2HTML
         src = @param[:output_file]
         src = Pathname.new(src).relative_path_from(Pathname.new(@param[:output_dir])) if @param[:output_dir]
         path = Pathname(dest).relative_path_from(Pathname(File.dirname src))
-        path = path.to_s + "/" if File.directory? path
+        if @param[:output_dir] and File.directory?(Pathname.new(@param[:output_dir]) + path)
+          path = path.to_s + "/"
+        elsif File.directory?(path)
+          path = path.to_s + "/"
+        end
       end
+      #p [ :relative_path, path, dest, src ]
       path
     end
-    def relative_path_uri(dest_uri, base_uri)
+    def relative_path_uri(dest_uri, base_uri = @param[:base_uri])
       if dest_uri.start_with? base_uri
         dest = dest_uri.sub(base_uri, "")
-        dest = uri_mapping_to_path(dest, "")
+        dest = uri_mapping_to_path(dest, @param, "")
         relative_path(dest)
       else
         dest_uri
@@ -217,14 +199,18 @@ module TTL2HTML
         object
       end
     end
-    def format_property(property, labels = {})
-      if labels and labels[property]
+    def format_property(property, labels = {}, subject = nil)
+      subject = @param[:blank_subject] if not subject and @param[:blank_subject]
+      subject_class = @param[:data_global][subject][RDF.type.to_s]&.first if subject
+      if subject_class and @param[:labels_with_class][subject_class] and @param[:labels_with_class][subject_class][property]
+        @param[:labels_with_class][subject_class][property]
+      elsif labels and labels[property]
         labels[property]
       else
         property.split(/[\/\#]/).last.capitalize
       end
     end
-    def format_object(object, data)
+    def format_object(object, data, type = {})
       if object =~ /\Ahttps?:\/\//
         rel_path = relative_path_uri(object, param[:base_uri])
         if param[:data_global][object]
@@ -233,12 +219,16 @@ module TTL2HTML
           "<a href=\"#{rel_path}\">#{object}</a>"
         end
       elsif object =~ /\A_:/ and param[:data_global][object]
-        format_triples(param[:data_global][object])
+        if type[:inverse] and param[:data_inverse_global][object]
+          format_triples(param[:data_inverse_global][object], inverse: true, blank: true)
+        else
+          format_triples(param[:data_global][object], blank: true)
+        end
       else
         object
       end
     end
-    def format_triples(triples, type = :default)
+    def format_triples(triples, type = {})
       param_local = @param.dup.merge(data: triples)
       param_local[:type] = type
       if @param[:labels_with_class] and triples["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
@@ -265,7 +255,26 @@ module TTL2HTML
           end
         end
       end
-      to_html_raw("triples.html.erb", param_local)
+      if type[:inverse] == true
+        if type[:blank] == true
+          #p param_local[:data]
+          #p param_local[:data_inverse]
+          #p param_local[:data_inverse].values.first.first
+          param_local[:blank_subject] = param_local[:data].values.first.first
+          param_local[:blank_triples] = {
+            param_local[:data].keys.first => param_local[:data_global][param_local[:blank_subject]][param_local[:data].keys.first]
+          }
+          #p param_local[:blank_subject]
+          #p param_local[:blank_triples]
+          param_local[:type] = {}
+          #pp param_local
+          to_html_raw("triples-blank.html.erb", param_local)
+        else
+          to_html_raw("triples-inverse.html.erb", param_local)
+        end
+      else
+        to_html_raw("triples.html.erb", param_local)
+      end
     end
     def format_version_info(version)
       param_local = @param.dup.merge(data: version)

data/lib/ttl2html/util.rb

@@ -0,0 +1,32 @@
+module TTL2HTML
+  module Util
+    def uri_mapping_to_path(uri, param, suffix = ".html")
+      path = nil
+      if param[:uri_mappings]
+        param[:uri_mappings].each do |mapping|
+          local_file = uri.sub(param[:base_uri], "")
+          if mapping["regexp"] =~ local_file
+            path = local_file.sub(mapping["regexp"], mapping["path"])
+          end
+        end
+      end
+      if path.nil?
+        if suffix == ".html"
+          if @data.keys.find{|e| e.start_with?(uri + "/") }
+            path = uri + "/index"
+          elsif uri.end_with?("/")
+            path = uri + "index"
+          else
+            path = uri
+          end
+        else
+          path = uri
+        end
+      end
+      path = path.sub(param[:base_uri], "")
+      path << suffix
+      #p [uri, path]
+      path
+    end  
+  end
+end

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "1.3.3"
+TTL2HTML::VERSION = "2.0.2"

data/lib/ttl2html.rb

@@ -1,15 +1,18 @@
 #!/usr/bin/env ruby
 
 require "zlib"
+require "uri"
 require "yaml"
 require "nokogiri"
 require "rdf/turtle"
 require "ruby-progressbar"
 
+require "ttl2html/util"
 require "ttl2html/template"
 
 module TTL2HTML
   class App
+    include Util
     def initialize(config = "config.yml")
       @config = load_config(config)
       if not @config[:base_uri]
@@ -18,7 +21,6 @@ module TTL2HTML
       @data = {}
       @data_inverse = {}
       @prefix = {}
-      @graph = RDF::Graph.new
     end
 
     def load_config(file)
@@ -28,6 +30,11 @@ module TTL2HTML
           config[k.intern] = v
         end
       end
+      [ :css_file, :javascript_file ].each do |k|
+        if config[k]
+          config[k] = [ config[k] ].flatten
+        end
+      end
       config
     end
 
@@ -39,10 +46,8 @@ module TTL2HTML
       else
         io = File.open(file)
       end
-      RDF::Turtle::Reader.new(io) do |reader|
-        @prefix.merge! reader.prefixes
+      RDF::Format.for(:turtle).reader.new(io) do |reader|
         reader.statements.each do |statement|
-          @graph.insert(statement)
           s = statement.subject
           v = statement.predicate
           o = statement.object
@@ -55,12 +60,13 @@ module TTL2HTML
             @data[s.to_s][v.to_s] ||= []
             @data[s.to_s][v.to_s] << o.to_s
           end
-          if o.is_a? RDF::URI
+          if o.is_a? RDF::URI or o.is_a? RDF::Node
             @data_inverse[o.to_s] ||= {}
             @data_inverse[o.to_s][v.to_s] ||= []
             @data_inverse[o.to_s][v.to_s] << s.to_s
           end
         end
+        @prefix.merge! reader.prefixes
       end
       STDERR.puts "#{count} triples. #{@data.size} subjects."
       @data
@@ -111,18 +117,23 @@ module TTL2HTML
       progressbar = ProgressBar.create(title: label,
         total: @data.size,
         format: "(%t) %a %e %P% Processed: %c from %C")
-      @data.each do |uri, v|
+      @data.keys.sort_by do|uri|
+        [ uri.count("/"), uri.size, uri ] 
+      end.reverse_each do |uri|
         progressbar.increment
         next if not uri.start_with? @config[:base_uri]
-        yield uri, v
+        yield uri, @data[uri]
       end
       progressbar.finish
     end
     def output_html_files
       template = Template.new("", @config)
-      shapes = @graph.query([nil,
-                             RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-                             RDF::URI("http://www.w3.org/ns/shacl#NodeShape")])
+      shapes = []
+      @data.each do |s, v|
+        if v[RDF.type.to_s] and @data[s][RDF.type.to_s].include?("http://www.w3.org/ns/shacl#NodeShape")
+          shapes << s
+        end
+      end
       labels = shapes2labels(shapes)
       versions = extract_versions
       toplevel = extract_toplevel
@@ -145,38 +156,57 @@ module TTL2HTML
         param[:turtle_uri] = uri + ".ttl"
         param[:data] = v
         param[:data_inverse] = @data_inverse[uri]
+        param[:data_inverse_global] = @data_inverse
         param[:data_global] = @data
         param[:title] = template.get_title(v)
         if param[:breadcrumbs]
           param[:breadcrumbs_items] = build_breadcrumbs(uri, template)
         end
-        file = uri_mapping_to_path(uri, ".html")
+        file = uri_mapping_to_path(uri, @config, ".html")
         if @config[:output_dir]
           Dir.mkdir @config[:output_dir] if not File.exist? @config[:output_dir]
           file = File.join(@config[:output_dir], file)
         end
+        if template.find_template_path("_default.html.erb")
+          param[:additional_content] = template.to_html_raw("_default.html.erb", param)
+        end
         template.output_to(file, param)
       end
       index_html = "index.html"
       index_html = File.join(@config[:output_dir], "index.html") if @config[:output_dir]
       if @config.has_key? :top_class
-        subjects = @graph.query([nil,
-                                RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-                                RDF::URI(@config[:top_class])]).subjects
+        subjects = []
+        @data.each do |s, v|
+          if @data[s][RDF.type.to_s] and @data[s][RDF.type.to_s].include?(@config[:top_class])
+            subjects << s
+          end
+        end
         if subjects.empty?
           STDERR.puts "WARN: top_class parameter specified as [#{@config[:top_class]}], but there is no instance data."
-          STDERR.puts "  Skip generation of top page."
         else
           template = Template.new("index.html.erb", @config)
           param = @config.dup
           param[:class_label] = template.get_title(@data[@config[:top_class]], nil)
           param[:data_global] = @data
+          param[:data_inverse_global] = @data_inverse
           param[:versions] = versions
           param[:toplevel] = toplevel
           subjects.sort.each do |subject|
+            objects = []
+            if @config.has_key? :top_additional_property
+              @config[:top_additional_property].each do |property|
+                if @data[subject][property]
+                  objects += @data[subject][property]
+                end
+              end
+            end
             param[:index_data] ||= []
-            param[:index_data] << subject.to_s
+            param[:index_data] << {
+              subject.to_s => objects
+            }
           end
+          param[:output_file] = index_html
+          param[:index_list] = template.to_html_raw("index-list.html.erb", param)
           template.output_to(index_html, param)
         end
       end
@@ -190,7 +220,13 @@ module TTL2HTML
         param[:versions] = versions
         param[:toplevel] = toplevel
         param[:shapes] = {}
-        shapes.subjects.each do |subject|
+        shapes.each do |subject|
+          orders = []
+          if param[:shape_orders]
+            param[:shape_orders].index(subject)
+            orders << ( param[:shape_orders].index(subject) or Float::INFINITY )
+          end
+          orders << subject
           label = comment = nil
           target_class = @data[subject.to_s]["http://www.w3.org/ns/shacl#targetClass"]
           if target_class
@@ -209,6 +245,7 @@ module TTL2HTML
             comment: comment,
             html: template.expand_shape(@data, subject.to_s, @prefix),
             target_class: target_class,
+            order: orders,
           }
         end
         template.output_to(about_html, param)
@@ -227,30 +264,62 @@ module TTL2HTML
         @config[:breadcrumbs].each do |e|
           data_target = data
           data_target = @data_inverse[uri] if e["inverse"]
-          if data_target and data_target[e["property"]]
-            data_target[e["property"]].each do |parent|
-              data_parent = @data[parent]
-              label = template.get_title(data_parent)
-              label = data_parent[e["label"]].first if e["label"] and data_parent[e["label"]]
-              results << {
-                uri: parent,
-                label: label,
-              }
-              results += build_breadcrumbs(parent, template, depth + 1)
+          if data_target
+            if e["property"].kind_of? Array
+              parent = nil
+              data_target_sub = data_target
+              e["property"].each do |prop|
+                if data_target_sub[prop["property"]]
+                  data_target_sub[prop["property"]].each do |o|
+                    parent = o
+                    data_target_sub = @data[parent]
+                  end
+                end
+              end
+              if parent
+                results << build_breadcrumbs_sub(parent, template)
+                results += build_breadcrumbs(parent, template, depth + 1)
+                return results
+              end
+            elsif data_target[e["property"]]
+              data_target[e["property"]].each do |parent|
+                results << build_breadcrumbs_sub(parent, template, e["label"])
+                results += build_breadcrumbs(parent, template, depth + 1)
+                return results
+              end
             end
-            return results
           end
         end
       end
       results
     end
+    def build_breadcrumbs_sub(parent, template, label_prop = nil)
+      data_parent = @data[parent]
+      label = template.get_title(data_parent)
+      label = data_parent[label_prop].first if label_prop and data_parent[label_prop]
+      {
+        uri: parent,
+        label: label,
+      }
+    end
 
     def shapes_parse(shapes)
-      shapes.subjects.each do |shape|
-        target_class = @data[shape.to_s]["http://www.w3.org/ns/shacl#targetClass"]&.first
+      shapes.each do |shape|
+        target_class = @data[shape]["http://www.w3.org/ns/shacl#targetClass"]&.first
         if target_class
           properties = @data[shape.to_s]["http://www.w3.org/ns/shacl#property"]
-          if properties
+          if @data[shape.to_s]["http://www.w3.org/ns/shacl#or"]
+            properties ||= []
+            node_list = @data[shape.to_s]["http://www.w3.org/ns/shacl#or"].first
+            while node_list and @data[node_list] do
+              sub_shape = @data[node_list]["http://www.w3.org/1999/02/22-rdf-syntax-ns#first"].first
+              if @data[sub_shape] and @data[sub_shape]["http://www.w3.org/ns/shacl#property"]
+                properties += @data[sub_shape]["http://www.w3.org/ns/shacl#property"]
+              end
+              node_list = @data[node_list]["http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"].first
+            end
+          end
+          if not properties.empty?
             properties.each do |property|
               path = @data[property]["http://www.w3.org/ns/shacl#path"].first
               yield target_class, property
@@ -283,11 +352,17 @@ module TTL2HTML
     def extract_versions
       versions = []
       ["http://purl.org/pav/hasVersion", "http://purl.org/pav/hasCurrentVersion", "http://purl.org/dc/terms/hasVersion"].each do |prop|
-        objects = @graph.query([nil, RDF::URI(prop), nil]).objects
+        objects = []
+        @data.each do |s, v|
+          if @data[s][prop]
+            objects += @data[s][prop]
+          end
+        end
         objects.each do |o|
           uri = o.to_s
           version = @data[uri]
           next if not version
+          next if not version["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
           next if not version["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].include? "http://rdfs.org/ns/void#Dataset"
           description = version["http://purl.org/dc/terms/description"]
           link = nil
@@ -323,15 +398,24 @@ module TTL2HTML
     end
     def extract_toplevel
       result = {}
-      toplevel = @graph.query([nil, RDF::URI("http://purl.org/pav/hasCurrentVersion"), nil]).subjects.first
+      toplevel = nil
+      @data.each do |s, v|
+        if @data[s]["http://purl.org/pav/hasCurrentVersion"]
+          toplevel = s
+        end
+      end
       data  = @data[toplevel.to_s]
       if toplevel
         license = {}
         if data["http://purl.org/dc/terms/license"]
           license_data = @data[data["http://purl.org/dc/terms/license"].first]
-          license[:url] = license_data["http://www.w3.org/1999/02/22-rdf-syntax-ns#value"]&.first
-          license[:icon] = license_data["http://xmlns.com/foaf/0.1/thumbnail"]&.first
-          license[:label] = license_data["http://www.w3.org/2000/01/rdf-schema#label"]
+          if license_data
+            license[:url] = license_data["http://www.w3.org/1999/02/22-rdf-syntax-ns#value"]&.first
+            license[:icon] = license_data["http://xmlns.com/foaf/0.1/thumbnail"]&.first
+            license[:label] = license_data["http://www.w3.org/2000/01/rdf-schema#label"]
+          elsif data["http://purl.org/dc/terms/license"].first =~ URI::regexp
+            license[:url] = license[:label] = data["http://purl.org/dc/terms/license"].first
+          end
         end
         if data["http://purl.org/dc/terms/publisher"]
           publisher_data = @data[data["http://purl.org/dc/terms/publisher"].first]
@@ -363,7 +447,7 @@ module TTL2HTML
 
     def output_turtle_files
       each_data(:output_turtle_files) do |uri, v|
-        file = uri_mapping_to_path(uri, ".ttl")
+        file = uri_mapping_to_path(uri, @config, ".ttl")
         if @config[:output_dir]
           Dir.mkdir @config[:output_dir] if not File.exist? @config[:output_dir]
           file = File.join(@config[:output_dir], file)
@@ -383,44 +467,16 @@ module TTL2HTML
       output_turtle_files if @config[:output_turtle]
     end
 
-    def uri_mapping_to_path(uri, suffix = ".html")
-      path = nil
-      if @config[:uri_mappings]
-        @config[:uri_mappings].each do |mapping|
-          local_file = uri.sub(@config[:base_uri], "")
-          if mapping["regexp"] =~ local_file
-            path = local_file.sub(mapping["regexp"], mapping["path"])
-          end
-        end
-      end
-      if path.nil?
-        if suffix == ".html"
-          if @data.keys.find{|e| e.start_with?(uri + "/") }
-            path = uri + "/index"
-          elsif uri.end_with?("/")
-            path = uri + "index"
-          else
-            path = uri
-          end
-        else
-          path = uri
-        end
-      end
-      path = path.sub(@config[:base_uri], "")
-      path << suffix
-      #p [uri, path]
-      path
-    end
     def cleanup
       @data.select do |uri, v|
         uri.start_with? @config[:base_uri]
       end.sort_by do |uri, v|
         -(uri.size)
       end.each do |uri, v|
-        html_file = uri_mapping_to_path(uri, ".html")
+        html_file = uri_mapping_to_path(uri, @config, ".html")
         html_file = File.join(@config[:output_dir], html_file) if @config[:output_dir]
         File.unlink html_file if File.exist? html_file
-        ttl_file = uri_mapping_to_path(uri, ".ttl")
+        ttl_file = uri_mapping_to_path(uri, @config, ".ttl")
         ttl_file = File.join(@config[:output_dir], ttl_file) if @config[:output_dir]
         File.unlink ttl_file if File.exist? ttl_file
         dir = uri.sub(@config[:base_uri], "")

data/locales/en.yml

@@ -4,6 +4,7 @@ en:
     shape-heading: "Resources description"
     shape-note: "The properties for the %{resource} resources are as follows:"
     shape-target: Target class
+    shape-namespace: "The namespace URIs used in the table are as follows:"
     versions: Versions
     version-release: "Version %{version} released."
     version-triples: "%{triples} triples"
@@ -11,6 +12,7 @@ en:
     contact: Contact
     contact-contribution: "This dataset was developed by %{name}"
     contact-email: "For dataset inquiries, please contact at <a href=\"%{email}\">%{email}</a>"
+    toc: Table of Contents
   default:
     details: Details
     inverse_data: Referred resources
@@ -37,3 +39,4 @@ en:
     blank-node-or-structure: "The structural contents of a blank node are either of the followings:"
   triples:
     inverse_refered: "Referred to as '%{property}' from:"
+    blank_node: "Blank node"

data/locales/ja.yml

@@ -4,6 +4,7 @@ ja:
     shape-heading: "各リソースの説明"
     shape-note: "%{resource}リソースが持つプロパティを下表に示します"
     shape-target: 対象クラス
+    shape-namespace: "表内で用いている名前空間URIは以下の通りです"
     versions: 更新履歴
     version-release: "バージョン%{version}を公開。"
     version-triples: "%{triples}トリプル"
@@ -11,6 +12,7 @@ ja:
     contact: 連絡先
     contact-contribution: "本データセットは %{name} が開発したものです"
     contact-email: "データセットに関する問い合わせは <a href=\"%{email}\">%{email}</a> までお問い合わせください。"
+    toc: 目次
   default:
     details: 詳細情報
     inverse_data: 被参照情報
@@ -37,3 +39,4 @@ ja:
     blank-node-or-structure: ブランクノードの内容は以下のいずれかの内容からなる構造を持ちます。
   triples:
     inverse_refered: "'%{property}'としての参照元:"
+    blank_node: "空ノード"

data/templates/about.html.erb

@@ -17,19 +17,21 @@
           </nav>
         </div>
       </div>
-      <%- if param[:content] -%>
       <div class="row">
-        <div class="col-md">
-        <%= param[:content] %>
+        <%- if @template == "about.html.erb" and param[:about_toc] -%>
+        <div class="col-md-2 order-12">
+          <h2 data-toc-skip><%=h t('about.toc') %></h2>
+          <nav id="toc" data-toggle="toc" class="sticky-top"></nav>
         </div>
-      </div>
-      <%- end -%>
-      <%- if param[:shapes].size > 0 -%>
-      <div class="row">
+        <%- end -%>
         <div class="col-md">
+        <%- if param[:content] -%>
+        <%= param[:content] %>
+        <%- end -%>
+        <%- if param[:shapes].size > 0 -%>
           <h2 id="shapes"><%=h t("about.shape-heading") %></h2>
-          <%- param[:shapes].keys.sort.each do |shape| -%>
-            <h3><%=h param[:shapes][shape][:label] %></h3>
+          <%- param[:shapes].keys.sort_by{|k| param[:shapes][k][:order] }.each do |shape| -%>
+            <h3 id="<%=h relative_path_uri(shape) %>"><%=h param[:shapes][shape][:label] %></h3>
             <%- if param[:shapes][shape][:target_class] -%>
             <ul><li><%= t("about.shape-target") %>: <a href="<%=h param[:shapes][shape][:target_class] %>"><%=h param[:shapes][shape][:target_class] %></a></li></ul>
             <%- end -%>
@@ -37,24 +39,16 @@
             <p><%=h t("about.shape-note", resource: param[:shapes][shape][:label]) %></p>
             <%= param[:shapes][shape][:html] -%>
           <%- end -%>
-        </div>
-      </div>
-      <%- end -%>
-      <%- if param[:versions].size > 0 -%>
-      <div class="row">
-        <div class="col-md">
+        <%- end -%>
+        <%- if param[:versions].size > 0 -%>
           <h2 id="versions"><%=h t("about.versions") %> <i class="bi bi-info-circle"></i></h2>
           <dl>
           <%- param[:versions].reverse_each do |version| -%>
             <%= format_version_info(version) %>
           <%- end -%>
           </dl>
-        </div>
-      </div>
-      <%- end -%>
-      <%- if param[:toplevel] and param[:toplevel][:contact] -%>
-      <div class="row">
-        <div class="col-md">
+        <%- end -%>
+        <%- if param[:toplevel] and param[:toplevel][:contact] -%>
           <h2 id="contact"><%=h t("about.contact") %></h2>
           <%- if param[:toplevel][:contact][:name] -%>
           <p><%=h t("about.contact-contribution", name: get_language_literal(param[:toplevel][:contact][:name])) %></p>
@@ -72,7 +66,7 @@
           <%- if param[:toplevel][:contact][:email] -%>
           <p><%= t("about.contact-email", email: param[:toplevel][:contact][:email]) %></p>
           <%- end -%>
+        <%- end -%>
         </div>
       </div>
-      <%- end -%>
-    </div>
+    </div>

data/templates/default.html.erb

@@ -10,11 +10,11 @@
         <div class="col-md-12">
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb">
-              <li class="breadcrumb-item"><a href="./"><i class="bi bi-house-door-fill"></i> Home</a></li>
+              <li class="breadcrumb-item"><a href="<%=h relative_path_uri(param[:base_uri]) %>"><i class="bi bi-house-door-fill"></i> Home</a></li>
               <%- param[:breadcrumbs_items].reverse.each_with_index do |e, i| -%>
                 <li class="breadcrumb-item<%= ' active' if i == param[:breadcrumbs_items].size-1 %>" aria-current="page">
                 <%- if e[:uri] -%>
-                  <a href="<%=h e[:uri] %>"><%=h e[:label] %></a>
+                  <a href="<%=h relative_path_uri(e[:uri]) %>"><%=h e[:label] %></a>
                 <%- else -%>
                   <%=h e[:label] %>
                 <%- end -%>
@@ -31,11 +31,14 @@
           <%= format_triples(param[:data]) %>
         </div>
       </div>
+      <%- if param[:additional_content] -%>
+      <%= param[:additional_content] %>
+      <%- end -%>
       <%- if param[:data_inverse] -%>
       <div class="row inverse">
         <div class="col-md-12">
           <h2><%=h t("default.inverse_data") %></h2>
-          <%= format_triples(param[:data_inverse], :inverse) %>
+          <%= format_triples(param[:data_inverse], inverse: true) %>
         </div>
       </div>
       <%- end -%>

data/templates/index-list.html.erb

@@ -0,0 +1,20 @@
+<div class="row">
+<div class="col-md-12">
+  <h2><%=h t("index.list", resource: param[:class_label]) %></h2>
+  <ul>
+    <%- param[:index_data].each do |e| -%>
+      <%- e.each do |s, o| -%>
+      <li><%= format_object(s, param[:data_global]) %>
+      <%- if o and o.size > 0 -%>
+        <ul>
+          <%- o.each do |o2| -%>
+          <li><%= format_object(o2.to_s, param[:data_global]) %></li>
+          <%- end -%>
+        </ul>
+      <%- end -%>
+      </li>
+      <%- end -%>
+    <%- end -%>
+  </ul>
+</div>
+</div>

data/templates/index.html.erb

@@ -5,19 +5,11 @@
         <p><%= get_language_literal(param[:toplevel][:description]) %></p>
         <%- end -%>
         <p><i class="bi bi-link-45deg"></i> <a href="<%=h param[:base_uri] %>"><%=h param[:base_uri] %></a></p>
+        <p><a class="btn btn-info" href="<%=h relative_path(param[:about_file] || "about.html") %>"><%=h t("about.title", title: param[:site_title]) %> &raquo;</a></p>
       </div>
     </div>
     <div class="container">
-      <div class="row">
-        <div class="col-md-12">
-          <h2><%=h t("index.list", resource: param[:class_label]) %></h2>
-          <ul>
-            <%- param[:index_data].each do |e| -%>
-              <li><%= format_object(e, param[:data_global]) %></li>
-            <%- end -%>
-          </ul>
-        </div>
-      </div>
+      <%= param[:index_list] %>
       <%- if param[:versions].size > 0 -%>
       <div class="row">
         <div class="col-md">
@@ -39,4 +31,4 @@
         </div>
       </div>
       <%- end -%>
-    </div>
+    </div>

data/templates/layout.html.erb

@@ -1,13 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= param[:locale] || I18n.default_locale %>">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
-    <%- if param[:css_file] -%>
-    <link rel="stylesheet" href="<%=h relative_path(param[:css_file]) %>">
+    <%- if @template == "about.html.erb" and param[:about_toc] -%>
+    <link rel="stylesheet" href="https://cdn.rawgit.com/afeld/bootstrap-toc/v1.0.1/dist/bootstrap-toc.min.css">
     <%- end -%>
+    <%- param[:css_file].each do |file| -%>
+    <link rel="stylesheet" href="<%=h relative_path(file) %>">
+    <%- end if param[:css_file] -%>
     <%- if param[:custom_css] -%>
     <style type="text/css"><%=h param[:custom_css] %></style>
     <%- end -%>
@@ -32,10 +35,12 @@
     </script>
     <%- end -%>
   </head>
-  <body>
-    <nav class="navbar navbar-expand-lg navbar-light">
+  <body<%= ' data-spy="scroll" data-target="#toc"' if @template == "about.html.erb" and param[:about_toc] %>>
+    <nav class="navbar navbar-expand-lg <%=h param[:navbar_class] || "navbar-light" %>">
       <%- if param[:logo] -%>
-      <a class="navbar-brand" href="<%=h relative_path_uri(param[:base_uri], param[:base_uri]) %>"><img src="<%=h relative_path(param[:logo]) %>" height="30"></a>
+      <a class="navbar-brand" href="<%=h relative_path_uri(param[:base_uri]) %>">
+        <img src="<%=h relative_path(param[:logo]) %>" style="max-height: 54px" alt="<%=h param[:site_title] %>">
+      </a>
       <%- end -%>
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -43,7 +48,7 @@
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
           <li class="nav-item<%= ' active' if @template == "index.html.erb" %>">
-            <a class="nav-link" href="<%=h relative_path_uri(param[:base_uri], param[:base_uri]) %>">Home</a>
+            <a class="nav-link" href="<%=h relative_path_uri(param[:base_uri]) %>">Home</a>
           </li>
           <li class="nav-item<%= ' active' if @template == "about.html.erb" %>">
             <a class="nav-link" href="<%=h relative_path(param[:about_file] || "about.html") %>">About</a>
@@ -76,5 +81,11 @@
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+    <%- if @template == "about.html.erb" and param[:about_toc] -%>
+    <script src="https://cdn.rawgit.com/afeld/bootstrap-toc/v1.0.1/dist/bootstrap-toc.min.js"></script>
+    <%- end -%>
+    <%- param[:javascript_file].each do |file| -%>
+    <script src="<%=h relative_path(file) %>"></script>
+    <%- end if param[:javascript_file] -%>
   </body>
 </html>

data/templates/shape-table.html.erb

@@ -1,4 +1,4 @@
-<table class="table table-condensed">
+<table class="table table-sm">
   <tr>
     <th><%=h t('shape-table.header.property-name') %></th>
     <th><%=h t('shape-table.header.description') %></th>
@@ -56,5 +56,17 @@
     <%- end -%>
   <%- end -%>
   </tbody>
-</table>
-
+  <%- if param[:prefix] and not param[:prefix].empty? -%>
+  <tfoot>
+    <tr><td colspan="5">
+    <%=h t('about.shape-namespace') %>
+      <dl class="row small">
+      <%- param[:prefix].each do |prefix, url| -%>
+      <dt class="col-sm-2"><code><%=h prefix %>:</code></dt>
+      <dd class="col-sm-10"><%=h url %></dd>
+      <%- end -%>
+      </dl>
+    <%- end -%>
+  </td></tr>
+  </tfoot>
+</table>

data/templates/triples-blank.html.erb

@@ -0,0 +1,4 @@
+<dl class="row border">
+  <dt class="col-sm-3"><%= format_object(param[:blank_subject], param[:data]) %></dt>
+  <dd class="col-sm-9"><%= format_triples(param[:blank_triples]) %></dd>
+</dl>

data/templates/triples-inverse.html.erb

@@ -0,0 +1,20 @@
+<dl class="row">
+<%- param[:data].sort_by{|k, v|
+      order = param[:orders][k] if param[:orders] and param[:orders][k]
+      order = Float::INFINITY if order.nil?
+      [ order, k ]
+    }.each do |k, v| -%>
+  <dt class="col-sm-3"><%=h t('triples.inverse_refered', property: format_property(k, param[:labels], v.first)) %></dt>
+  <%- if v.respond_to? :has_key? -%>
+    <% v.each_with_index do |v2, idx| %>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" lang="<%=h v2[0] %>"><%= format_object v2[1], param[:data], param[:type] %></dd>
+    <% end %>
+  <%- elsif v.size > 1 -%>
+    <%- v.each_with_index do |v2, idx| -%>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>"><%= format_object v2, param[:data], param[:type] %></dd>
+    <%- end -%>
+  <%- else -%>
+    <dd class="col-sm-9"><%= format_object v.first, param[:data], param[:type] %></dd>
+  <%- end -%>
+<%- end -%>
+</dl>

data/templates/triples.html.erb

@@ -1,24 +1,26 @@
-<dl class="row">
+<dl class="row<%= if param[:type][:blank] then ' border' end %>">
 <%- param[:data].sort_by{|k, v|
       order = param[:orders][k] if param[:orders] and param[:orders][k]
       order = Float::INFINITY if order.nil?
       [ order, k ]
     }.each do |k, v| -%>
-  <%- if param[:type] == :inverse -%>
-  <dt class="col-sm-3"><%=h t('triples.inverse_refered', property: format_property(k, param[:labels])) %></dt>
-  <%- else -%>
   <dt class="col-sm-3"><%=h format_property(k, param[:labels]) %></dt>
-  <%- end -%>
   <%- if v.respond_to? :has_key? -%>
-    <% v.each_with_index do |v2, idx| %>
-      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" lang="<%=h v2[0] %>"><%= format_object v2[1], param[:data] %></dd>
-    <% end %>
-  <%- elsif v.size > 1 -%>
     <%- v.each_with_index do |v2, idx| -%>
-      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>"><%= format_object v2, param[:data] %></dd>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" lang="<%=h v2[0] %>"><%= format_object v2[1], param[:data], param[:type] %></dd>
+    <%- end -%>
+  <%- elsif v.size > 1 -%>
+    <%- v.sort_by{|e|
+          if e =~ /\A_:/ and param[:data_global][e]
+            param[:data_global][e].to_s
+          else
+            e
+          end
+        }.each_with_index do |v2, idx| -%>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>"><%= format_object v2, param[:data], param[:type] %></dd>
     <%- end -%>
   <%- else -%>
-    <dd class="col-sm-9"><%= format_object v.first, param[:data] %></dd>
+    <dd class="col-sm-9"><%= format_object v.first, param[:data], param[:type] %></dd>
   <%- end -%>
 <%- end -%>
 </dl>

data/templates/version.html.erb

@@ -1,6 +1,6 @@
         <dt><%=h param[:data][:date] %></dt>
         <dd><%=h t("about.version-release", version: param[:data][:version]) %></dd>
-        <dd><%=h get_language_literal(param[:data][:description]) %>
+        <dd><%= get_language_literal(param[:data][:description]) %>
         <%- if param[:data][:link] -%>
         <%= t("about.version-link", link: param[:data][:link]) %>
         <%- end -%>
@@ -28,5 +28,5 @@
           </ul>
           </li>
           <%- end -%>
-        </dd>
+        </ul></dd>
         <%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 2.0.2
 platform: ruby
 authors:
 - Masao Takaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -150,15 +150,19 @@ files:
 - bin/xlsx2shape
 - lib/ttl2html.rb
 - lib/ttl2html/template.rb
+- lib/ttl2html/util.rb
 - lib/ttl2html/version.rb
 - lib/xlsx2shape.rb
 - locales/en.yml
 - locales/ja.yml
 - templates/about.html.erb
 - templates/default.html.erb
+- templates/index-list.html.erb
 - templates/index.html.erb
 - templates/layout.html.erb
 - templates/shape-table.html.erb
+- templates/triples-blank.html.erb
+- templates/triples-inverse.html.erb
 - templates/triples.html.erb
 - templates/version.html.erb
 homepage: https://github.com/masao/ttl2html
@@ -180,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ttl2html