ttl2html 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946f8e7de3a456635e40617b88ce014dcd7b54442557ded55a51ca3ad6dfb5b1
-  data.tar.gz: 4bbb58d451d13e71f84c2bd1efe9ca897b695691768337ebb45d97c19badbcfa
+  metadata.gz: 8120a06f3f763ca13d8b9f35c920f9129d57876a5dde434b264c052bd1aa9151
+  data.tar.gz: 9d1cd9d09f5a14a5d56856c00099b38abe059a9c27f775df2074b42db99e9a7a
 SHA512:
-  metadata.gz: 0db603f9cd36379e948f3a5a30e65db301af01d8df0a98c59dffcdc125934a8f006af140fb318d439466020ac1a4f7cebc2987f7ab06b49f3724431b1541f2d3
-  data.tar.gz: 51516e8a7b73c4260ad5d7f23a440462dda00c8300ace92bf567a955b14386981f38ed427d27a9e707873c5c83699beac709aa61aa9a81a7b53ca9167a819ebb
+  metadata.gz: 4935a3824f19a696ea4657d652c4afd482af6a8a2e33aa98725d4739375480654b86dd4a9781dae357d816d422dc7807a974bb7dfb38fbe1d6cb5d84a84a3792
+  data.tar.gz: 9e561cb7abbfc195e8a13f09af9161a0b88f301e73b040ab149707e5f47905728a9ed603210b9f2818771350fd11670072941df4b58d92e4f5c268c608845274

data/bin/catttl

@@ -1,18 +1,39 @@
 #!/usr/bin/env ruby
 
 require "zlib"
+require "getoptlong"
 require "ttl2html"
 include TTL2HTML
 
 prefix = {}
 ttl = []
+noexpand_filenames = false
+
+opts = GetoptLong.new(
+  ["--no-expand", "-f", GetoptLong::NO_ARGUMENT],
+  ["--help", "-h", GetoptLong::NO_ARGUMENT]
+)
+
+opts.each do |opt, arg|
+  case opt
+  when "--no-expand"
+    noexpand_filenames = true
+  when "--help"
+    puts "Usage: catttl [options] [files]"
+    puts "Options:"
+    puts "  -f, --no-expand  Do not expand filenames"
+    puts "  -h, --help        Show this help message"
+    exit
+  end
+end
 
 ARGV.each do |file|
-  filename = find_turtle(file)
+  filename = find_turtle(file, noexpand: noexpand_filenames)
   if filename.nil?
     STDERR.puts "#{file} not found. skipping."
     next
   end
+  STDERR.puts filename
   klass = File
   if File.extname(filename) == ".gz"
     klass = Zlib::GzipReader
@@ -29,13 +50,9 @@ ARGV.each do |file|
     end
   end
 end
-ARGV.each do |file|
-  filename = find_turtle(file)
-  STDERR.puts filename
-end
 
 prefix.each do |k, v|
-  STDERR.puts "Duplicate prefixes: #{k}: #{v}" if v.uniq.size > 1
+  STDERR.puts "Duplicate prefixes: #{k}: #{v.uniq}" if v.uniq.size > 1
   prefix[k] = v.sort.first
 end
 dups = prefix.values.group_by{|e| e }.select{|k, v| v.size > 1 }.keys

data/bin/ttl2html

@@ -36,6 +36,8 @@ ARGV.each do |file|
 end
 if opt_cleanup
   ttl2html.cleanup
+elsif ARGV.empty?
+  usage
 else
   ttl2html.output_files
 end

data/lib/ttl2html/template.rb

@@ -9,7 +9,6 @@ require "nokogiri"
 
 module TTL2HTML
   class Template
-    attr_reader :param
     include ERB::Util
     include I18n::Base
     include ActionView::Helpers::NumberHelper
@@ -20,15 +19,15 @@ module TTL2HTML
       @template_path << File.join(File.dirname(__FILE__), "..", "..", "templates")
       I18n.load_path << Dir[File.join(File.dirname(__FILE__), "..", "..", "locales") + "/*.yml"]
       I18n.load_path << Dir[File.expand_path("locales") + "/*.yml"]
-      I18n.locale = @param[:locale] if @param[:locale]
+      I18n.locale = @param[:locale].to_sym if @param[:locale]
     end
     def output_to(file, param = {})
-      @param.update(param)
-      @param[:output_file] = file
+      param = @param.merge(param)
+      param[:output_file] = file
       dir = File.dirname(file)
       FileUtils.mkdir_p(dir) if not File.exist?(dir)
-      open(file, "w") do |io|
-        io.print to_html(@param)
+      File.open(file, "w") do |io|
+        io.print to_html(param)
       end
     end
     def to_html(param)
@@ -37,9 +36,9 @@ module TTL2HTML
       to_html_raw(layout_fname, param)
     end
     def to_html_raw(template, param)
-      @param.update(param)
+      param = @param.merge(param)
       template = find_template_path(template)
-      tmpl = open(template){|io| io.read }
+      tmpl = File.open(template) { |io| io.read }
       erb = ERB.new(tmpl, trim_mode: "-")
       erb.filename = template
       erb.result(binding)
@@ -121,13 +120,12 @@ module TTL2HTML
 
     # helper method:
     include TTL2HTML::Util
-    def relative_path(dest)
+    def relative_path(src, dest)
       path = nil
       dest_uri = RDF::IRI.parse(dest)
       if dest_uri.absolute?
         path = dest
       else
-        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))
         if @param[:output_dir] and File.directory?(Pathname.new(@param[:output_dir]) + path)
@@ -139,11 +137,11 @@ module TTL2HTML
       #p [ :relative_path, path, dest, src ]
       path
     end
-    def relative_path_uri(dest_uri, base_uri = @param[:base_uri])
+    def relative_path_uri(src, 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, @param, "")
-        relative_path(dest)
+        relative_path(src, dest)
       else
         dest_uri
       end
@@ -196,20 +194,23 @@ module TTL2HTML
         object
       end
     end
-    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]
+    def format_property(property, param, subject = nil)
+      param = @param.merge(param)
+      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 param[:labels] and param[:labels][property]
+        param[:labels][property]
       else
         property.split(/[\/\#]/).last.capitalize
       end
     end
-    def format_object(object, data, type = {})
+    def format_object(object, param)
+      type = param[:type] || {}
+      data = param[:data] || {}
       if /\Ahttps?:\/\// =~ object.to_s
-        rel_path = relative_path_uri(object, param[:base_uri])
+        rel_path = relative_path_uri(param[:output_file], object)
         if param[:data_global][object]
           result = "<a href=\"#{rel_path}\">#{get_title(param[:data_global][object]) or ERB::Util.html_escape(object)}</a>"
           subtitle = get_subtitle(param[:data_global][object])
@@ -223,16 +224,17 @@ module TTL2HTML
         end
       elsif /\A_:/ =~ object.to_s and param[:data_global][object]
         if type[:inverse] and param[:data_inverse_global][object]
-          format_triples(param[:data_inverse_global][object], inverse: true, blank: true)
+          format_triples(param[:data_inverse_global][object], param, inverse: true, blank: true)
         else
-          format_triples(param[:data_global][object], blank: true)
+          format_triples(param[:data_global][object], param, blank: true)
         end
       else
         ERB::Util.html_escape object
       end
     end
-    def format_triples(triples, type = {})
-      param_local = @param.dup.merge(data: triples)
+    def format_triples(triples, param, type = {})
+      param_local = @param.dup.merge(param)
+      param_local = param_local.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"]
         @param[:labels_with_class].reverse_each do |k, v|
@@ -324,6 +326,7 @@ module TTL2HTML
       value && !(value.respond_to?(:empty?) && value.empty?)
     end
     def sort_criteria(val, data_global)
+      raise "sort_criteria got nil." if data_global.nil?
       resource = data_global[val]
       results = []
       [
@@ -350,4 +353,4 @@ module TTL2HTML
       results
     end
   end
-end
+end

data/lib/ttl2html/util.rb

@@ -1,29 +1,44 @@
 module TTL2HTML
   module Util
-    def uri_mapping_to_path(uri, param, suffix = ".html")
-      path = nil
+    def make_mapping_uris_cache(param)
+      @path_cache = Set.new
+      data = @data || @param[:data_global] || @param[:data] || {}
+      data.keys.each do |uri|
+        local_path = _uri_mapping_to_path(uri, param)
+        # 親パスをすべて抽出してSetに追加
+        idx = 0
+        while (idx = local_path.index("/", idx))
+          parent = local_path[0...idx]
+          @path_cache << parent unless parent.empty?
+          idx += 1
+        end
+      end
+      @path_cache
+    end
+    def _uri_mapping_to_path(uri, param, suffix = ".html")
+      local_path = uri.sub(param[:base_uri], "")
       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"])
+          if mapping["regexp"] =~ local_path
+            #p [mapping["regexp"], local_path]
+            local_path = local_path.sub(mapping["regexp"], mapping["path"])
+            #p [mapping["regexp"], local_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
+      local_path
+    end
+    def uri_mapping_to_path(uri, param, suffix = ".html")
+      path = nil
+      @path_cache ||= make_mapping_uris_cache(param)
+      path = _uri_mapping_to_path(uri, param, suffix)
+      if suffix == ".html"
+        if @path_cache.include? path
+          path += "/index"
+        elsif path.end_with?("/")
+          path += "index"
         end
       end
-      path = path.sub(param[:base_uri], "")
       path << suffix
       #p [uri, path]
       path

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.3.0"
+TTL2HTML::VERSION = "3.0.0"

data/lib/ttl2html.rb

@@ -27,7 +27,7 @@ module TTL2HTML
 
     def load_config(file)
       config = { output_turtle: true }
-      open(file) do |io|
+      File.open(file) do |io|
         YAML.safe_load(io, permitted_classes: [Regexp]).each do |k, v|
           config[k.intern] = v
         end
@@ -135,7 +135,9 @@ module TTL2HTML
         format: "(%t) %a %e %P% Processed: %c from %C"
       }
       data = @data.keys.sort_by do|uri|
-        [ uri.count("/"), uri.size, uri ] 
+        local_path = uri_mapping_to_path(uri, @config, ".html")
+        #p [ local_path.size, local_path.count("/"), local_path ]
+        [ local_path.size, local_path.count("/"), local_path ]
       end.reverse
       Parallel.each(data, progress: progressbar_options) do |uri|
         next if not uri.start_with? @config[:base_uri]
@@ -168,8 +170,8 @@ module TTL2HTML
       end
       @config[:orders_with_class] = shapes2orders(shapes)
       Dir.mkdir @config[:output_dir] if @config[:output_dir] and not File.exist? @config[:output_dir]
+      template = Template.new("default.html.erb", @config)
       each_data(:output_html_files) do |uri, v|
-        template = Template.new("default.html.erb", @config)
         param = @config.dup
         param[:uri] = uri
         param[:turtle_uri] = uri + ".ttl"
@@ -185,6 +187,7 @@ module TTL2HTML
           param[:breadcrumbs_items] = build_breadcrumbs(uri, template)
         end
         file = uri_mapping_to_path(uri, @config, ".html")
+        #p [:each_data, uri, file]
         if @config[:output_dir]
           file = File.join(@config[:output_dir], file)
         end
@@ -209,6 +212,7 @@ module TTL2HTML
           template = Template.new("index.html.erb", @config)
           param = @config.dup
           param[:class_label] = template.get_title(@data[@config[:top_class]], nil)
+          param[:class_label] ||= @config[:top_class].split(/[\/\#]/).last.capitalize
           param[:data_global] = @data
           param[:data_inverse_global] = @data_inverse
           param[:versions] = versions
@@ -261,7 +265,7 @@ module TTL2HTML
               label = template.get_title(@data[target_class], nil)
               comment = template.get_language_literal(@data[target_class]["http://www.w3.org/2000/01/rdf-schema#comment"]) if @data[target_class]["http://www.w3.org/2000/01/rdf-schema#comment"]
             else
-              label = template.format_property(target_class)
+              label = template.format_property(target_class, param)
             end
           else
             label = template.get_title(@data[subject.to_s])
@@ -486,12 +490,21 @@ module TTL2HTML
         if data["http://rdfs.org/ns/void#sparqlEndpoint"]
           endpoint = data["http://rdfs.org/ns/void#sparqlEndpoint"].first
         end
+        if data["http://www.w3.org/ns/dcat#accessService"]
+          service = data["http://www.w3.org/ns/dcat#accessService"].first
+          service_data = @data[service]
+          if service_data
+            endpoint = service_data["http://www.w3.org/ns/dcat#endpointURL"]&.first
+            endpoint_landingpage = service_data["http://www.w3.org/ns/dcat#landingPage"]&.first
+          end
+        end
         result = {
           uri: toplevel.to_s,
           description: data["http://purl.org/dc/terms/description"],
           license: license,
           contact: contact,
           endpoint: endpoint,
+          endpoint_landingpage: endpoint_landingpage,
           derivedfrom: derivedfrom,
         }
       end
@@ -522,6 +535,7 @@ module TTL2HTML
     end
 
     def cleanup
+      dirs = []
       @data.select do |uri, v|
         uri.start_with? @config[:base_uri]
       end.sort_by do |uri, v|
@@ -529,25 +543,41 @@ module TTL2HTML
       end.each do |uri, v|
         html_file = uri_mapping_to_path(uri, @config, ".html")
         html_file = File.join(@config[:output_dir], html_file) if @config[:output_dir]
+        dirs << File.dirname(html_file)
         File.unlink html_file if File.exist? html_file
         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], "")
         dir = File.join(@config[:output_dir], dir) if @config[:output_dir]
-        Dir.rmdir dir if File.exist? dir
+        dirs << dir
       end
       index_html = "index.html"
       index_html = File.join(@config[:output_dir], "index.html") if @config[:output_dir]
       if @config[:top_class] and File.exist? index_html
         File.unlink index_html
       end
+      about_html = (@config[:about_file] || "about.html")
+      about_html = File.join(@config[:output_dir], about_html) if @config[:output_dir]
+      File.unlink about_html if File.exist? about_html
+
+      dirs = dirs.uniq.sort_by{|e| -(e.size) }
+      #p dirs
+      dirs.each do |dir|
+        next if dir == "." # failsafe...
+        next if dir == @config[:output_dir] # failsafe...
+        FileUtils.remove_entry_secure(dir) if File.exist? dir
+      end
     end
   end
 
   def find_turtle(filename, params = {})
     if params[:noexpand] == true
-      filename if File.exists? filename
+      if File.exist? filename
+        filename
+      else
+        nil
+      end
     else
       file = nil
       basename = File.basename(filename, ".ttl")

data/locales/en.yml

@@ -16,6 +16,7 @@ en:
   default:
     details: Details
     inverse_data: Referred resources
+    copy-link: "Copy Link"
   index:
     derivedfrom-text: "This dataset is created by editing <a href=\"%{url}\">\"%{label}\"</a>."
     list: "List of %{resource}"
@@ -23,7 +24,8 @@ en:
     past-versions: "Past versions"
     license-text: "This dataset is freely usable as <a href=\"%{url}\">%{label}</a>."
     sparql-endpoint: "SPARQL Endpoint"
-    sparql-endpoint-text: "The SPARQL endpoint for the dataset is available at"
+    sparql-endpoint-text: "The SPARQL endpoint for the dataset is available at:"
+    sparql-endpoint-landingpage: "Search page"
   dataset:
     derivedfrom-text: "This dataset is created by editing <a href=\"%{url}\">\"%{label}\"</a>."
     license-text: "This dataset is freely usable as <a href=\"%{url}\">%{label}</a>."

data/locales/ja.yml

@@ -16,6 +16,7 @@ ja:
   default:
     details: 詳細情報
     inverse_data: 被参照情報
+    copy-link: "リンクをコピー"
   index:
     derivedfrom-text: "このデータセットは<a href=\"%{url}\">「%{label}」</a>を加工して作成。"
     list: "%{resource} 一覧"
@@ -23,7 +24,8 @@ ja:
     past-versions: 過去の更新履歴
     license-text: "このデータセットは<a href=\"%{url}\">%{label}</a>として自由に利用できます。"
     sparql-endpoint: "SPARQLエンドポイント"
-    sparql-endpoint-text: "このデータセットに対するSPARQLエンドポイントは以下のURLからアクセスできます"
+    sparql-endpoint-text: "このデータセットに対するSPARQLエンドポイントは以下のURLからアクセスできます:"
+    sparql-endpoint-landingpage: "クエリ画面"
   dataset:
     derivedfrom-text: "このデータセットは<a href=\"%{url}\">「%{label}」</a>を加工して作成。"
     license-text: "<a href=\"%{url}\">%{label}</a>として自由に利用できます。"

data/templates/about.html.erb

@@ -36,7 +36,7 @@
         <%- if param[:shapes].size > 0 -%>
           <h2 id="shapes"><%=h t("about.shape-heading") %></h2>
           <%- 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>
+            <h3 id="<%=h relative_path_uri(param[:output_file], 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 -%>
@@ -55,9 +55,13 @@
         <%- end -%>
         <%- if param[:toplevel][:endpoint] -%>
           <h2 id="sparql-endpoint"><%=h t("index.sparql-endpoint") %> <i class="bi bi-database-add"></i></h2>
-          <p>
-          <%= t("index.sparql-endpoint-text") %>: <a href="<%=h param[:toplevel][:endpoint] %>"><%=h param[:toplevel][:endpoint] %></a>
-          </p>
+          <p><%= t("index.sparql-endpoint-text") %></p>
+          <ul>
+            <%- if param[:toplevel][:endpoint_landingpage] -%>
+            <li><%= t("index.sparql-endpoint-landingpage") %>: <a href="<%=h param[:toplevel][:endpoint_landingpage] %>"><%=h param[:toplevel][:endpoint_landingpage] %></a></li>
+            <%- end -%>
+            <li><%= t("index.sparql-endpoint") %>: <a href="<%=h param[:toplevel][:endpoint] %>"><%=h param[:toplevel][:endpoint] %></a></li>
+          </ul>
         <%- end -%>
         <%- if param[:toplevel] and param[:toplevel][:contact] -%>
           <h2 id="contact"><%=h t("about.contact") %></h2>

data/templates/default.html.erb

@@ -4,7 +4,69 @@
         <%- if param[:subtitle] -%>
         <p class="lead"><%= param[:subtitle] %></p>
         <%- end -%>
-        <p><i class="bi bi-link-45deg"></i> <a href="<%=h param[:uri] %>"><%=h param[:uri] %></a></p>
+        <p>
+        <i class="bi bi-link-45deg"></i> <a href="<%=h param[:uri] %>"><%=h param[:uri] %></a>
+        <%- if param[:enable_copy_link_button] -%>
+        <button id="copy-link" class="btn btn-sm btn-outline-secondary" aria-live="polite">
+        <i class="bi bi-copy"></i> <span class="copy-link-text"><%=h t("default.copy-link") %></span>
+        </button>
+        <%- end -%>
+        </p>
+        <%- if param[:enable_copy_link_button] -%>
+        <script>
+        (() => {
+          const btn = document.getElementById("copy-link");
+          const url = '<%=h param[:uri] %>';
+          const originalHTML = btn.innerHTML;
+          let timerId = null;
+          async function copyText(text) {
+            // Clipboard API, or fallback
+            if (navigator.clipboard && window.isSecureContext) {
+              await navigator.clipboard.writeText(text);
+              return;
+            }
+            const ta = document.createElement("textarea");
+            ta.value = text;
+            ta.style.position = "fixed";
+            ta.style.left = "-9999px";
+            document.body.appendChild(ta);
+            ta.select();
+            document.execCommand("copy");
+            document.body.removeChild(ta);
+          }
+          function setCopiedState() {
+            btn.innerHTML = `<i class="bi bi-check2"></i> <span class="btn-label">Copied!</span>`;
+            btn.classList.remove("btn-outline-secondary");
+            btn.classList.add("btn-outline-success");
+          }
+          function resetState() {
+            btn.innerHTML = originalHTML;
+            btn.classList.remove("btn-outline-success");
+            btn.classList.add("btn-outline-secondary");
+          }
+          btn.addEventListener("click", async () => {
+            btn.disabled = true;
+            try {
+              await copyText(url);
+              setCopiedState();
+              clearTimeout(timerId);
+              timerId = setTimeout(() => {
+                resetState();
+                btn.disabled = false;
+              }, 1500);
+            } catch (e) {
+              // fail...
+              btn.innerHTML = `<span class="btn-label">Copy failed...</span>`;
+              clearTimeout(timerId);
+              timerId = setTimeout(() => {
+                resetState();
+                btn.disabled = false;
+              }, 1500);
+            }
+          });
+        })();
+        </script>
+        <%- end -%>
       </div>
     </div>
     <div class="container">
@@ -13,11 +75,11 @@
         <div class="col-md-12">
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb">
-              <li class="breadcrumb-item"><a href="<%=h relative_path_uri(param[:base_uri]) %>"><i class="bi bi-house-door-fill"></i> Home</a></li>
+              <li class="breadcrumb-item"><a href="<%=h relative_path_uri(param[:output_file], 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 relative_path_uri(e[:uri]) %>"><%=h e[:label] %></a>
+                  <a href="<%=h relative_path_uri(param[:output_file], e[:uri]) %>"><%=h e[:label] %></a>
                 <%- else -%>
                   <%=h e[:label] %>
                 <%- end -%>
@@ -31,7 +93,7 @@
       <div class="row">
         <div class="col-md-12">
           <h2><%=h t("default.details") %></h2>
-          <%= format_triples(param[:data]) %>
+          <%= format_triples(param[:data], param) %>
         </div>
       </div>
       <%- if param[:additional_content] -%>
@@ -41,7 +103,7 @@
       <div class="row inverse">
         <div class="col-md-12">
           <h2><%=h t("default.inverse_data") %></h2>
-          <%= format_triples(param[:data_inverse], inverse: true) %>
+          <%= format_triples(param[:data_inverse], param, inverse: true) %>
         </div>
       </div>
       <%- end -%>

data/templates/index-list.html.erb

@@ -4,11 +4,11 @@
   <ul>
     <%- param[:index_data].each do |e| -%>
       <%- e.each do |s, o| -%>
-      <li><%= format_object(s, param[:data_global]) %>
+      <li><%= format_object(s, param) %>
       <%- if o and o.size > 0 -%>
         <ul>
           <%- o.each do |o2| -%>
-          <li><%= format_object(o2.to_s, param[:data_global]) %></li>
+          <li><%= format_object(o2.to_s, param) %></li>
           <%- end -%>
         </ul>
       <%- end -%>

data/templates/index.html.erb

@@ -9,7 +9,7 @@
         <%- end -%>
         <p><i class="bi bi-link-45deg"></i> <a href="<%=h param[:base_uri] %>"><%=h param[:base_uri] %></a></p>
         <%- if param[:about_file] -%>
-        <p><a class="btn btn-info" href="<%=h relative_path(param[:about_file]) %>"><%=h t("about.title", title: param[:site_title]) %> &raquo;</a></p>
+        <p><a class="btn btn-info" href="<%=h relative_path(param[:output_file], param[:about_file]) %>"><%=h t("about.title", title: param[:site_title]) %> &raquo;</a></p>
         <%- end -%>
       </div>
     </div>
@@ -23,7 +23,7 @@
             <%= format_version_info(param[:versions].last) %>
           </dl>
           <%- if param[:about_file] and param[:versions].size > 1 -%>
-          <p><a href="<%=h relative_path(param[:about_file]) %>#versions">&raquo; <%=h t("index.past-versions") %></a></p>
+          <p><a href="<%=h relative_path(param[:output_file], param[:about_file]) %>#versions">&raquo; <%=h t("index.past-versions") %></a></p>
           <%- end -%>
           <%- if param[:toplevel] and not param[:toplevel][:license].empty? -%>
           <p class="license">
@@ -40,11 +40,19 @@
           <%- end -%>
         </div>
       </div>
-      <div class="col-md">
-        <h2 id="sparql-endpoint"><%=h t("index.sparql-endpoint") %> <i class="bi bi-database-add"></i></h2>
-        <p>
-        <%= t("index.sparql-endpoint-text") %>: <a href="<%=h param[:toplevel][:endpoint] %>"><%=h param[:toplevel][:endpoint] %></a>
-        </p>
+      <%- end -%>
+      <%- if param[:toplevel][:endpoint] -%>
+      <div class="row">
+        <div class="col-md">
+          <h2 id="sparql-endpoint"><%=h t("index.sparql-endpoint") %> <i class="bi bi-database-add"></i></h2>
+          <p><%= t("index.sparql-endpoint-text") %></p>
+          <ul>
+            <%- if param[:toplevel][:endpoint_landingpage] -%>
+            <li><%= t("index.sparql-endpoint-landingpage") %>: <a href="<%=h param[:toplevel][:endpoint_landingpage] %>"><%=h param[:toplevel][:endpoint_landingpage] %></a></li>
+            <%- end -%>
+            <li><%= t("index.sparql-endpoint") %>: <a href="<%=h param[:toplevel][:endpoint] %>"><%=h param[:toplevel][:endpoint] %></a></li>
+          </ul>
+        </div>
       </div>
       <%- end -%>
     </div>

data/templates/layout.html.erb

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc/dist/bootstrap-toc.min.css">
     <%- end -%>
     <%- Array(param[:css_file]).each do |file| -%>
-    <link rel="stylesheet" href="<%=h relative_path(file) %>">
+    <link rel="stylesheet" href="<%=h relative_path(param[:output_file], file) %>">
     <%- end -%>
     <%- if param[:custom_css] -%>
     <style type="text/css"><%=h param[:custom_css] %></style>
@@ -51,8 +51,8 @@
   <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]) %>">
-        <img src="<%=h relative_path(param[:logo]) %>" style="max-height: 54px" alt="<%=h param[:site_title] %>">
+      <a class="navbar-brand" href="<%=h relative_path_uri(param[:output_file], param[:base_uri]) %>">
+        <img src="<%=h relative_path(param[:output_file], 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">
@@ -61,16 +61,16 @@
       <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]) %>">Home</a>
+            <a class="nav-link" href="<%=h relative_path_uri(param[:output_file], param[:base_uri]) %>">Home</a>
           </li>
           <%- if param[:about_file] -%>
           <li class="nav-item<%= ' active' if @template == "about.html.erb" %>">
-            <a class="nav-link" href="<%=h relative_path(param[:about_file]) %>">About</a>
+            <a class="nav-link" href="<%=h relative_path(param[:output_file], param[:about_file]) %>">About</a>
           </li>
           <%- end -%>
           <%- if param[:additional_link] -%>
             <%- param[:additional_link].each do |link| -%>
-            <li class="nav-item"><a class="nav-link" href="<%=h link["href"] %>"><%=h link["label"] %></a></li>
+            <li class="nav-item"><a class="nav-link" href="<%=h relative_path_uri(param[:output_file], link["href"]) %>"><%=h link["label"] %></a></li>
             <%- end -%>
           <%- end -%>
         </ul>
@@ -103,7 +103,7 @@
     <script src="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc/dist/bootstrap-toc.min.js"></script>
     <%- end -%>
     <%- Array(param[:javascript_file]).each do |file| -%>
-    <script src="<%=h relative_path(file) %>"></script>
+    <script src="<%=h relative_path(param[:output_file], file) %>"></script>
     <%- end -%>
   </body>
 </html>

data/templates/triples-blank.html.erb

@@ -1,4 +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>
+  <dt class="col-sm-3"><%= format_object(param[:blank_subject], param) %></dt>
+  <dd class="col-sm-9"><%= format_triples(param[:blank_triples], param) %></dd>
 </dl>

data/templates/triples-inverse.html.erb

@@ -4,17 +4,17 @@
       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>
+  <dt class="col-sm-3"><%=h t('triples.inverse_refered', property: format_property(k, param, 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>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" lang="<%=h v2[0] %>"><%= format_object v2[1], param %></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>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>"><%= format_object v2, param %></dd>
     <%- end -%>
   <%- else -%>
-    <dd class="col-sm-9"><%= format_object v.first, param[:data], param[:type] %></dd>
+    <dd class="col-sm-9"><%= format_object v.first, param %></dd>
   <%- end -%>
 <%- end -%>
 </dl>

data/templates/triples.html.erb

@@ -1,21 +1,23 @@
+<%- itemtypes = param[:data][RDF.type.to_s].to_a.join(" ") -%>
 <%- if param[:type][:blank] -%>
-<dl class="row<%= if param[:type][:blank] then ' border' end %>" itemscope>
+<dl class="row<%= if param[:type][:blank] then ' border' end %>" itemscope<% unless itemtypes.empty? %> itemtype="<%=h itemtypes %>"<% end %>>
 <%- else -%>
-<dl class="row<%= if param[:type][:blank] then ' border' end %>" itemscope itemid="<%=h param[:uri] %>">
+<dl class="row<%= if param[:type][:blank] then ' border' end %>" itemscope itemid="<%=h param[:uri] %>"<% unless itemtypes.empty? %> itemtype="<%=h itemtypes %>"<% end %>>
 <%- 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| -%>
-  <dt class="col-sm-3"><%=h format_property(k, param[:labels]) %></dt>
+  <dt class="col-sm-3"><%=h format_property(k, param) %></dt>
     <%- v.sort_by{|e| sort_criteria(e, param[:data_global]) }.each_with_index do |v2, idx| -%>
       <%- if v2.respond_to? :language and v2.language? -%>
-      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" lang="<%=h v2.language %>" itemprop="<%=h k %>"><%= format_object v2, param[:data], param[:type] %></dd>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" lang="<%=h v2.language %>" itemprop="<%=h k %>"><%= format_object v2, param %></dd>
       <%- elsif /\Ahttps?:\/\// =~ v2.to_s -%>
-      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" itemscope itemprop="<%=h k %>" itemid="<%=h v2.to_s %>"><%= format_object v2, param[:data], param[:type] %></dd>
+      <%- itemtypes = param[:data_global][v2.to_s] ? param[:data_global][v2.to_s][RDF.type.to_s].to_a.join(" ") : "" -%>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" itemscope itemprop="<%=h k %>" itemid="<%=h v2.to_s %>"<% unless itemtypes.empty? %> itemtype="<%=h itemtypes %>"<% end %>><%= format_object v2, param %></dd>
       <%- else -%>
-      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" itemprop="<%=h k %>"><%= format_object v2, param[:data], param[:type] %></dd>
+      <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>" itemprop="<%=h k %>"><%= format_object v2, param %></dd>
       <%- end -%>
     <%- end -%>
 <%- end -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2025-12-22 00:00:00.000000000 Z
+date: 2026-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -180,9 +180,9 @@ dependencies:
 description: Static site generator for RDF/Turtle
 email: tmasao@acm.org
 executables:
+- catttl
 - ttl2html
 - xlsx2shape
-- catttl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: ttl2html
 test_files: []