ttl2html 1.2.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d57dc99fea0827d317a9dc3597cae9c69d1ac38dbcd66000327f1b913dea03
-  data.tar.gz: d30441245cd56e6322fe3ab0b27351a83900b6c6826b3c5a6d611bffa8245d3e
+  metadata.gz: 7971e142aa8344f4ef07bea779f430a94a986014768c1876dcb4ab0e56c0c788
+  data.tar.gz: aa5cca9ebcc358b4f2697f68a86ce2edf998f83bbe4c67e2c11512cdf2a7e5f6
 SHA512:
-  metadata.gz: 6c5068b43cc54072f3958f46b5192c5fe118d5942c0b53d4f2fc35f8e35560a6768a2905d1cd946efc8462faa51b2d2ea4d844f8f73f982e18fb73ea5a812ee5
-  data.tar.gz: 6dc8f656583fc5d8a96baab454b1ea47e446e5694c55f457b3e236e91945595d8b2838d7a7b628d918d7a9c85bb138e081e8919453edce96228572a93dd617eb
+  metadata.gz: 7f1d25cb74cdbbf69b6b7826edcdea833bc9286f9035a03a85c4f925553364da6c7a1f2713da767a75076a4c8ebc3ac064e639e04ed0c5625607f96cc2a52254
+  data.tar.gz: 04435256e3234d30eb7942e64a627cb6bf3e32dbe8e440f2f69711a62da4c14fc5d222d9cddc56bc11eebcd3708c8e27ea1ca0bd31e570b8be3654e8adac1eab

data/lib/ttl2html/template.rb

@@ -4,12 +4,14 @@ require "fileutils"
 require "pathname"
 require "erb"
 require "i18n"
+require "action_view"
 
 module TTL2HTML
   class Template
     attr_reader :param
     include ERB::Util
     include I18n::Base
+    include ActionView::Helpers::NumberHelper
     def initialize(template, param = {})
       @template = template
       @param = param.dup
@@ -156,16 +158,33 @@ module TTL2HTML
         dest_uri
       end
     end
+    def html_title(param)
+      titles = []
+      if @template.start_with? "about.html"
+        titles << t("about.title", title: param[:site_title])
+      else
+        titles << param[:title]
+        titles << param[:site_title]
+      end
+      titles.compact.join(" - ")
+    end
+    def shorten_title(title, length = 140)
+      if title.length > length
+        title[0..length] + "..."
+      else
+        title
+      end
+    end
     def get_title(data, default_title = "no title")
       if @param[:title_property_perclass] and data["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
         @param[:title_property_perclass].each do |klass, property|
           if data["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].include?(klass) and data[property]
-            return get_language_literal(data[property])
+            return shorten_title(get_language_literal(data[property]))
           end
         end
       end
       if @param[:title_property] and data[@param[:title_property]]
-        return get_language_literal(data[@param[:title_property]])
+        return shorten_title(get_language_literal(data[@param[:title_property]]))
       end
       %w(
         http://www.w3.org/2000/01/rdf-schema#label
@@ -174,7 +193,7 @@ module TTL2HTML
         http://schema.org/name
         http://www.w3.org/2004/02/skos/core#prefLabel
       ).each do |property|
-        return get_language_literal(data[property]) if data[property]
+        return shorten_title(get_language_literal(data[property])) if data[property]
       end
       default_title
     end
@@ -212,8 +231,9 @@ module TTL2HTML
         object
       end
     end
-    def format_triples(triples)
+    def format_triples(triples, type = :default)
       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"]
         @param[:labels_with_class].reverse_each do |k, v|
           triples["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].each do |entity_class|
@@ -226,7 +246,23 @@ module TTL2HTML
           end
         end
       end
+      if @param[:orders_with_class] and triples["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
+        @param[:orders_with_class].reverse_each do |k, v|
+          triples["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].each do |entity_class|
+            if entity_class == k
+              v.each do |property, order|
+                param_local[:orders] ||= {}
+                param_local[:orders][property] = order || Float::INFINITY
+              end
+            end
+          end
+        end
+      end
       to_html_raw("triples.html.erb", param_local)
     end
+    def format_version_info(version)
+      param_local = @param.dup.merge(data: version)
+      to_html_raw("version.html.erb", param_local)
+    end
   end
 end

data/lib/ttl2html/version.rb

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

data/lib/ttl2html.rb

@@ -105,11 +105,16 @@ module TTL2HTML
       result
     end
 
-    def each_data
+    def each_data(label = :each_data)
+      progressbar = ProgressBar.create(title: label,
+        total: @data.size,
+        format: "(%t) %a %e %P% Processed: %c from %C")
       @data.each do |uri, v|
+        progressbar.increment
         next if not uri.start_with? @config[:base_uri]
         yield uri, v
       end
+      progressbar.finish
     end
     def output_html_files
       template = Template.new("", @config)
@@ -117,6 +122,8 @@ module TTL2HTML
                              RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
                              RDF::URI("http://www.w3.org/ns/shacl#NodeShape")])
       labels = shapes2labels(shapes)
+      versions = extract_versions
+      toplevel = extract_toplevel
       @config[:labels_with_class] ||= {}
       labels.each do |klass, props|
         props.each do |property, label|
@@ -128,18 +135,19 @@ module TTL2HTML
           end
         end
       end
-      progressbar = ProgressBar.create(title: :output_html_files,
-        total: @data.size,
-        format: "(%t) %a %e %P% Processed: %c from %C")
-      each_data do |uri, v|
-        progressbar.increment
+      @config[:orders_with_class] = shapes2orders(shapes)
+      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_mapping_to_path(uri, ".ttl")
         param[:data] = v
         param[:data_inverse] = @data_inverse[uri]
         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")
         if @config[:output_dir]
           Dir.mkdir @config[:output_dir] if not File.exist? @config[:output_dir]
@@ -147,7 +155,6 @@ module TTL2HTML
         end
         template.output_to(file, param)
       end
-      progressbar.finish
       index_html = "index.html"
       index_html = File.join(@config[:output_dir], "index.html") if @config[:output_dir]
       if @config.has_key? :top_class
@@ -161,6 +168,8 @@ module TTL2HTML
           template = Template.new("index.html.erb", @config)
           param = @config.dup
           param[:data_global] = @data
+          param[:versions] = versions
+          param[:toplevel] = toplevel
           subjects.sort.each do |subject|
             param[:index_data] ||= []
             param[:index_data] << subject.to_s
@@ -168,24 +177,32 @@ module TTL2HTML
           template.output_to(index_html, param)
         end
       end
-      if shapes.size > 0
+      if shapes.size > 0 or versions.size > 0 or toplevel.size > 0
         about_html = @config[:about_file] || "about.html"
         about_html =  File.join(@config[:output_dir], about_html) if @config[:output_dir]
         template = Template.new("about.html.erb", @config)
         param = @config.dup
         param[:data_global] = @data
-        param[:content] = {}
+        param[:versions] = versions
+        param[:toplevel] = toplevel
+        param[:shapes] = {}
         shapes.subjects.each do |subject|
-          label = nil
+          label = comment = nil
           target_class = @data[subject.to_s]["http://www.w3.org/ns/shacl#targetClass"]
           if target_class
-            label = template.get_title(@data[target_class.first], nil) if @data[target_class.first]
-            label = template.format_property(target_class.first) if label.nil?
+            target_class = target_class.first
+            if @data[target_class]
+              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)
+            end
           else
             label = template.get_title(@data[subject.to_s])
           end
-          param[:content][subject] = {
+          param[:shapes][subject] = {
             label: label,
+            comment: comment,
             html: template.expand_shape(@data, subject.to_s, @prefix),
           }
         end
@@ -193,6 +210,36 @@ module TTL2HTML
       end
     end
 
+    def build_breadcrumbs(uri, template, depth = 0)
+      results = []
+      data = @data[uri]
+      if @config[:breadcrumbs]
+        if depth == 0
+          first_label = template.get_title(data)
+          first_label = data[@config[:breadcrumbs].first["label"]].first if @config[:breadcrumbs].first["label"] and data[@config[:breadcrumbs].first["label"]]
+          results << { label: first_label }
+        end
+        @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)
+            end
+            return results
+          end
+        end
+      end
+      results
+    end
+
     def shapes2labels(shapes)
       labels = {}
       shapes.subjects.each do |shape|
@@ -208,13 +255,102 @@ module TTL2HTML
       end
       labels
     end
+    def shapes2orders(shapes)
+      orders = {}
+      shapes.subjects.each do |shape|
+        target_class = @data[shape.to_s]["http://www.w3.org/ns/shacl#targetClass"]&.first
+        if target_class
+          @data[shape.to_s]["http://www.w3.org/ns/shacl#property"].each do |property|
+            path = @data[property]["http://www.w3.org/ns/shacl#path"].first
+            order = @data[property]["http://www.w3.org/ns/shacl#order"]
+            orders[target_class] ||= {}
+            orders[target_class][path] = order&.first&.to_i
+          end
+        end
+      end
+      orders
+    end
+
+    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.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"].include? "http://rdfs.org/ns/void#Dataset"
+          description = version["http://purl.org/dc/terms/description"]
+          if not description
+            qrev = version["http://www.w3.org/ns/prov#qualifiedRevision"]&.first
+            if description = @data[qrev]
+              description = @data[qrev]["http://www.w3.org/2000/01/rdf-schema#comment"]
+            end
+          end
+          subset = []
+          if version["http://rdfs.org/ns/void#subset"]
+            version["http://rdfs.org/ns/void#subset"].each do |s|
+              subset << @data[s]["http://rdfs.org/ns/void#dataDump"].first
+            end
+          end
+          date = version["http://purl.org/pav/createdOn"]&.first
+          date = version["http://purl.org/dc/terms/issued"]&.first if date.nil?
+          versions << {
+            uri: uri,
+            version: version["http://purl.org/pav/version"]&.first,
+            triples: version["http://rdfs.org/ns/void#triples"]&.first,
+            datadump: version["http://rdfs.org/ns/void#dataDump"]&.first,
+            bytesize: version["http://www.w3.org/ns/dcat#byteSize"]&.first,
+            date: date,
+            description: description,
+            subset: subset,
+          }
+        end
+      end
+      versions.sort_by{|v| [ v[:date], v[:uri] ] }
+    end
+    def extract_toplevel
+      result = {}
+      toplevel = @graph.query([nil, RDF::URI("http://purl.org/pav/hasCurrentVersion"), nil]).subjects.first
+      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"]
+        end
+        if data["http://purl.org/dc/terms/publisher"]
+          publisher_data = @data[data["http://purl.org/dc/terms/publisher"].first]
+          email = publisher_data["http://xmlns.com/foaf/0.1/mbox"]&.first
+          contact = { email: email }
+          name = publisher_data["http://xmlns.com/foaf/0.1/name"]
+          contact[:name] = name if name
+          members = []
+          if publisher_data["http://xmlns.com/foaf/0.1/member"]
+            publisher_data["http://xmlns.com/foaf/0.1/member"].each do |member|
+              member_data = @data[member]
+              members << {
+                name: member_data["http://xmlns.com/foaf/0.1/name"],
+                org: member_data["http://www.w3.org/2006/vcard/ns#organization-name"]
+              }
+            end
+            contact[:members] = members
+          end
+        end
+        result = {
+          uri: toplevel.to_s,
+          description: data["http://purl.org/dc/terms/description"],
+          license: license,
+          contact: contact,
+        }
+      end
+      result
+    end
 
     def output_turtle_files
-      progressbar = ProgressBar.create(title: :output_turtle_files,
-        total: @data.size,
-        format: "(%t) %a %e %P% Processed: %c from %C")
-      each_data do |uri, v|
-        progressbar.increment
+      each_data(:output_turtle_files) do |uri, v|
         file = uri_mapping_to_path(uri, ".ttl")
         if @config[:output_dir]
           Dir.mkdir @config[:output_dir] if not File.exist? @config[:output_dir]
@@ -226,7 +362,6 @@ module TTL2HTML
           io.puts str.strip
         end
       end
-      progressbar.finish
     end
     def uri_mapping_to_path(uri, suffix = ".html")
       path = nil
@@ -292,4 +427,4 @@ module TTL2HTML
       file
     end
   end
-end
+end

data/locales/en.yml

@@ -3,11 +3,20 @@ en:
     title: "About %{title}"
     The properties for the textbook resources are as follows:
     shape-note: "The properties for the %{resource} resources are as follows:"
+    versions: Versions
+    version-release: "Version %{version} released."
+    version-triples: "%{triples} triples"
+    contact: Contact
+    contact-contribution: "This dataset was developed by %{name}"
+    contact-email: "For dataset inquiries, please contact at <a href=\"%{email}\">%{email}</a>"
   default:
     details: Details
     inverse_data: Referred resources
   index:
     list: "List of %{resource}"
+    latest-news: "Latest news"
+    past-versions: "Past versions"
+    license-text: "This dataset is freely usable as <a href=\"%{url}\">%{label}</a>"
   layout:
     rdf-data: RDF data
   shape-table:
@@ -23,4 +32,6 @@ en:
     optional: "Optional"
     non-repeatable: "Non repeatable"
     blank-node-structure: "The structural contents of a blank node are as follows:"
-    blank-node-or-structure: "The structural contents of a blank node are either of the followings:"
+    blank-node-or-structure: "The structural contents of a blank node are either of the followings:"
+  triples:
+    inverse_refered: "Referred to as '%{property}' from:"

data/locales/ja.yml

@@ -2,11 +2,20 @@ ja:
   about:
     title: "%{title}について"
     shape-note: "%{resource}リソースが持つプロパティを下表に示します"
+    versions: 更新履歴
+    version-release: "バージョン%{version}を公開。"
+    version-triples: "%{triples}トリプル"
+    contact: 連絡先
+    contact-contribution: "本データセットは %{name} が開発したものです"
+    contact-email: "データセットに関する問い合わせは <a href=\"%{email}\">%{email}</a> までお問い合わせください。"
   default:
     details: 詳細情報
     inverse_data: 被参照情報
   index:
     list: "%{resource} 一覧"
+    latest-news: 最新のお知らせ
+    past-versions: 過去の更新履歴
+    license-text: "このデータセットは<a href=\"%{url}\">%{label}</a>として自由に利用できます。"
   layout:
     rdf-data: RDFデータ
   shape-table:
@@ -22,4 +31,6 @@ ja:
     optional: 省略可能
     non-repeatable: 繰り返し無し
     blank-node-structure: ブランクノードの内容は以下の内容からなる構造を持ちます。
-    blank-node-or-structure: ブランクノードの内容は以下のいずれかの内容からなる構造を持ちます。
+    blank-node-or-structure: ブランクノードの内容は以下のいずれかの内容からなる構造を持ちます。
+  triples:
+    inverse_refered: "'%{property}'としての参照元:"

data/templates/about.html.erb

@@ -1,25 +1,67 @@
     <div class="jumbotron">
       <div class="container">
         <h1><%=h t("about.title", title: param[:site_title]) %></h1>
+        <%- if param[:toplevel] and param[:toplevel][:description] -%>
+        <p><%= get_language_literal(param[:toplevel][:description]) %></p>
+        <%- end -%>
       </div>
     </div>
     <div class="container">
       <div class="row">
         <div class="col-md-12">
-          <ol class="breadcrumb">
-            <li><a href="./"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Home</a></li>
-            <li class="active"><%=h t("about.title", title: param[:site_title]) %></li>
-          </ol>
+          <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 active" aria-current="page"><%=h t("about.title", title: param[:site_title]) %></li>
+            </ol>
+          </nav>
         </div>
       </div>
-
+      <%- if param[:shapes] -%>
       <div class="row">
-        <div class="col-md-10">
-          <%- param[:content].keys.sort.each do |shape| -%>
-            <h3><%=h param[:content][shape][:label] %></h3>
-            <p><%= param[:content][shape][:comment] %></p>
-            <p><%=h t("about.shape-note", resource: param[:content][shape][:label]) %></p>
-            <%= param[:content][shape][:html] -%>
+        <div class="col-md">
+          <%- param[:shapes].keys.sort.each do |shape| -%>
+            <h3><%=h param[:shapes][shape][:label] %></h3>
+            <p><%= param[:shapes][shape][:comment] %></p>
+            <p><%=h t("about.shape-note", resource: param[:shapes][shape][:label]) %></p>
+            <%= param[:shapes][shape][:html] -%>
           <%- end -%>
         </div>
       </div>
+      <%- end -%>
+      <%- if param[:versions] -%>
+      <div class="row">
+        <div class="col-md">
+          <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">
+          <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>
+          <%- end -%>
+          <%- if param[:toplevel][:contact][:members] -%>
+          <ul>
+          <%- param[:toplevel][:contact][:members].each do |member| -%>
+            <li><%=h get_language_literal(member[:name]) %>
+            <%- if member[:org] -%>
+            (<%=h get_language_literal(member[:org]) %>)
+            <%- end -%>
+          <%- end -%>
+          </ul>
+          <%- end -%>
+          <%- if param[:toplevel][:contact][:email] -%>
+          <p><%= t("about.contact-email", email: param[:toplevel][:contact][:email]) %></p>
+          <%- end -%>
+        </div>
+      </div>
+      <%- end -%>
+    </div>

data/templates/default.html.erb

@@ -1,22 +1,42 @@
     <div class="jumbotron">
       <div class="container">
         <h1><%=h param[:title] %></h1>
-        <p><small><span class="glyphicon glyphicon-link"></span> <a href="<%=h param[:uri] %>"><%=h param[:uri] %></a></small></p>
+        <p><i class="bi bi-link-45deg"></i> <a href="<%=h param[:uri] %>"><%=h param[:uri] %></a></p>
       </div>
     </div>
     <div class="container">
+      <%- if param[:breadcrumbs] -%>
+      <div class="row">
+        <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>
+              <%- 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>
+                <%- else -%>
+                  <%=h e[:label] %>
+                <%- end -%>
+                </li>
+              <%- end -%>
+            </ol>
+          </nav>
+        </div>
+      </div>
+      <%- end -%>
       <div class="row">
         <div class="col-md-12">
           <h2><%=h t("default.details") %></h2>
           <%= format_triples(param[:data]) %>
         </div>
       </div>
-      <% if param[:data_inverse] %>
+      <%- 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]) %>
+          <%= format_triples(param[:data_inverse], :inverse) %>
         </div>
       </div>
-      <% end %>
-    </div>
+      <%- end -%>
+    </div>

data/templates/index.html.erb

@@ -1,7 +1,10 @@
     <div class="jumbotron">
       <div class="container">
         <h1><%=h param[:site_title] %></h1>
-        <p><small><span class="glyphicon glyphicon-link"></span> <a href="<%=h param[:base_uri] %>"><%=h param[:base_uri] %></a></small></p>
+        <%- if param[:toplevel] and param[:toplevel][:description] -%>
+        <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>
       </div>
     </div>
     <div class="container">
@@ -9,10 +12,31 @@
         <div class="col-md-12">
           <h2><%=h t("index.list", resource: param[:class_label]) %></h2>
           <ul>
-            <% param[:index_data].each do |e| %>
+            <%- param[:index_data].each do |e| -%>
               <li><%= format_object(e, param[:data_global]) %></li>
-            <% end %>
+            <%- end -%>
           </ul>
         </div>
       </div>
-    </div>
+      <%- if param[:versions].size > 0 -%>
+      <div class="row">
+        <div class="col-md">
+          <h2 id="versions"><%=h t("index.latest-news") %> <i class="bi bi-info-circle"></i></h2>
+          <dl>
+            <%= format_version_info(param[:versions].last) %>
+          </dl>
+          <%- if param[:versions].size > 1 -%>
+          <p><a href="about#versions">&raquo; <%=h t("index.past-versions") %></a></p>
+          <%- end -%>
+          <%- if param[:toplevel] and param[:toplevel][:license] -%>
+          <p>
+            <%- if param[:toplevel][:license][:icon] -%>
+            <a href="<%=h param[:toplevel][:license][:url] %>"><img src="<%=h param[:toplevel][:license][:icon] %>"></a>
+            <%- end -%>
+            <%= t("index.license-text", label: get_language_literal(param[:toplevel][:license][:label]), url: param[:toplevel][:license][:url]) %>
+          </p>
+          <%- end -%>
+        </div>
+      </div>
+      <%- end -%>
+    </div>

data/templates/layout.html.erb

@@ -4,17 +4,34 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <title><% if param[:title] %><%=h param[:title] %><% end %><% if param[:site_title] %> - <%=h param[:site_title] %><% end %></title>
+    <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]) %>">
+    <%- end -%>
+    <%- if param[:custom_css] -%>
+    <style type="text/css"><%=h param[:custom_css] %></style>
+    <%- end -%>
+    <title><%=h html_title(param) %></title>
     <meta name="twitter:card" content="summary">
-    <meta name="twitter:title" content="<% if param[:title] %><%=h param[:title] %><% end %><% if param[:site_title] %> - <%=h param[:site_title] %><% end %>">
+    <meta name="twitter:title" content="<%=h html_title(param) %>">
   </head>
   <body>
-    <nav class="navbar navbar-inverse">
-      <div class="container">
-        <ul class="nav navbar-nav navbar-right">
-          <li<%= ' class="active"' if param[:active] == :home %>><a class="navbar-brand" href="/">Home</a></li>
-          <li<%= ' class="active"' if param[:active] == :about %>><a href="/about">About</a></li>
+    <nav class="navbar navbar-expand-lg navbar-light">
+      <%- if param[:logo] -%>
+      <a class="navbar-brand" href="/"><img src="<%=h relative_path(param[:logo]) %>" height="30"></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>
+      </button>
+      <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="/">Home</a>
+          </li>
+          <li class="nav-item<%= ' active' if @template == "about.html.erb" %>">
+            <a class="nav-link" href="/about">About</a>
+          </li>
         </ul>
       </div>
     </nav>
@@ -22,13 +39,21 @@
     <hr>
     <footer>
       <%- if param[:uri] -%>
-      <p class="pull-right"><a href="<%=h param[:uri] %>.ttl"><img src="https://www.w3.org/RDF/icons/rdf_flyer.24" alt="<%=h t("layout.rdf-data") %>"></a></p>
+      <p class="float-right"><a href="<%=h relative_path(param[:turtle_uri]) %>"><img src="https://www.w3.org/RDF/icons/rdf_flyer.24" alt="<%=h t("layout.rdf-data") %>"></a></p>
+      <%- end -%>
+      <%- if param[:admin_name] -%>
+      <p>
+        <%- if param[:copyright_year] -%>
+        &copy; <%=h param[:copyright_year] %>
+        <%- end -%>
+        <%=h param[:admin_name] %>
+      </p>
       <%- end -%>
     </footer>
 
     <!-- jQuery first, then Popper.js, then Bootstrap JS -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+    <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>
   </body>
 </html>

data/templates/triples.html.erb

@@ -1,16 +1,24 @@
-<dl>
-<% param[:data].each do |k, v| %>
-  <dt><%=h format_property(k, param[:labels]) %></dt>
-  <% if v.respond_to? :has_key? %>
-    <% v.each do |lang, v2| %>
-    <dd lang="<%=h lang %>"><%= format_object v2, param[:data] %></dd>
+<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| -%>
+  <%- 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 do |v2| %>
-    <dd><%= format_object v2, param[:data] %></dd>
-    <% end %>
-  <% else %>
-    <dd><%= format_object v.first, 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>
+    <%- end -%>
+  <%- else -%>
+    <dd class="col-sm-9"><%= format_object v.first, param[:data] %></dd>
+  <%- end -%>
 <%- end -%>
-</dl>
+</dl>

data/templates/version.html.erb

@@ -0,0 +1,28 @@
+        <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>
+        <%- if param[:data][:datadump] -%>
+        <dd><ul>
+          <li><a href="<%=h param[:data][:datadump] %>"><%=h File.basename(param[:data][:datadump]) %></a>
+          <%- 
+          fileinfo = []
+          if param[:data][:triples]
+            fileinfo << t("about.version-triples", triples: number_with_delimiter(param[:data][:triples].to_i))
+          end
+          if param[:data][:bytesize]
+            fileinfo << number_to_human_size(param[:data][:bytesize])
+          end
+          -%>
+          <%- if fileinfo.size > 0 -%>
+          (<%=h fileinfo.join(", ") %>)
+          <%- end -%>
+          <%- if param[:data][:subset].size > 0 -%>
+          <ul>
+            <%- param[:data][:subset].each do |subset| -%>
+            <li><a href="<%=h subset %>"><%=h File.basename(subset) %></a></li>
+            <%- end -%>
+          </ul>
+          </li>
+          <%- end -%>
+        </dd>
+        <%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Masao Takaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ files:
 - templates/layout.html.erb
 - templates/shape-table.html.erb
 - templates/triples.html.erb
+- templates/version.html.erb
 homepage: https://github.com/masao/ttl2html
 licenses:
 - MIT
@@ -165,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: ttl2html