ttl2html 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b5adc471f4582c8773ce30e684c4b21f013f717e2abd577ca31445c1d32058
-  data.tar.gz: e7b1f6c9463f8a16d3b4ecfb0df6ae5a67ee9d26a47d198a08cc759eaa21a82c
+  metadata.gz: 946f8e7de3a456635e40617b88ce014dcd7b54442557ded55a51ca3ad6dfb5b1
+  data.tar.gz: 4bbb58d451d13e71f84c2bd1efe9ca897b695691768337ebb45d97c19badbcfa
 SHA512:
-  metadata.gz: 88eecf013c95e8f90cb502b6c23590753b3cc8805e64ed4c5ee1ed98b42c2aa0e2c8b81725d2b73bded97ab8e1a0b1637f71013639770c811132ba93a645f341
-  data.tar.gz: 67395144f89f18dc418acf14cf0600d9e0a37faf7f814cc47382557c2d68b9cb1136c0dae03057f0d55c459dea450563641fc2165b2d0196df0a6de7acc36b12
+  metadata.gz: 0db603f9cd36379e948f3a5a30e65db301af01d8df0a98c59dffcdc125934a8f006af140fb318d439466020ac1a4f7cebc2987f7ab06b49f3724431b1541f2d3
+  data.tar.gz: 51516e8a7b73c4260ad5d7f23a440462dda00c8300ace92bf567a955b14386981f38ed427d27a9e707873c5c83699beac709aa61aa9a81a7b53ca9167a819ebb

data/lib/ttl2html/template.rb

@@ -5,6 +5,7 @@ require "pathname"
 require "erb"
 require "i18n"
 require "action_view"
+require "nokogiri"
 
 module TTL2HTML
   class Template
@@ -107,6 +108,7 @@ module TTL2HTML
           required: data[property]["http://www.w3.org/ns/shacl#minCount"] ? data[property]["http://www.w3.org/ns/shacl#minCount"].first.to_i > 0 : false,
           repeatable: repeatable,
           nodeKind: data[property]["http://www.w3.org/ns/shacl#nodeKind"] ? data[property]["http://www.w3.org/ns/shacl#nodeKind"].first : nil,
+          class: data[property]["http://www.w3.org/ns/shacl#class"] ? data[property]["http://www.w3.org/ns/shacl#class"].first : nil,
           nodes: nodes,
           node_mode: node_mode,
           prefix: prefix_used,
@@ -158,9 +160,10 @@ module TTL2HTML
     end
     def shorten_title(title, length = 140)
       if title.to_s.length > length
-        title.to_s[0..length] + "..."
+        short_title = Nokogiri::HTML::DocumentFragment.parse(title.to_s[0..length])
+        short_title.to_html + "..."
       else
-        title
+        ERB::Util.html_escape title
       end
     end
     def get_title(data, default_title = "no title")
@@ -208,7 +211,7 @@ module TTL2HTML
       if /\Ahttps?:\/\// =~ object.to_s
         rel_path = relative_path_uri(object, param[:base_uri])
         if param[:data_global][object]
-          result = "<a href=\"#{rel_path}\">#{get_title(param[:data_global][object]) or object}</a>"
+          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])
           if subtitle
             result += " <small>#{subtitle}</small>"
@@ -216,7 +219,7 @@ module TTL2HTML
             result
           end
         else
-          "<a href=\"#{rel_path}\">#{object}</a>"
+          "<a href=\"#{rel_path}\">#{ERB::Util.html_escape object}</a>"
         end
       elsif /\A_:/ =~ object.to_s and param[:data_global][object]
         if type[:inverse] and param[:data_inverse_global][object]
@@ -225,7 +228,7 @@ module TTL2HTML
           format_triples(param[:data_global][object], blank: true)
         end
       else
-        object
+        ERB::Util.html_escape object
       end
     end
     def format_triples(triples, type = {})

data/lib/ttl2html/version.rb

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

data/lib/ttl2html.rb

@@ -34,7 +34,7 @@ module TTL2HTML
       end
       [ :css_file, :javascript_file ].each do |k|
         if config[k]
-          config[k] = [ config[k] ].flatten
+          config[k] = Array(config[k]).flatten
         end
       end
       config
@@ -82,6 +82,7 @@ module TTL2HTML
       end
       result << @data[subject.to_s].keys.sort.map do |predicate|
         str = "<#{predicate}> "
+        #p [subject, predicate, @data[subject.to_s][predicate]]
         str << @data[subject.to_s][predicate].sort_by do |object|
           #p [subject, predicate, object, depth]
           if object.to_s =~ /^_:/ and @data[object.to_s]
@@ -94,7 +95,7 @@ module TTL2HTML
               format_turtle(object, depth + 1)
             ]
           else
-            object.to_s
+            [Float::INFINITY, Float::INFINITY, Float::INFINITY, object.to_s]
           end
         end.map do |object|
           if /^_:/ =~ object.to_s # blank node:
@@ -152,6 +153,8 @@ module TTL2HTML
       labels = shapes2labels(shapes)
       versions = extract_versions
       toplevel = extract_toplevel
+      about_required = template.find_template_path("about.html") || !shapes.empty? || !versions.empty? || !toplevel.empty?
+      about_file = (@config[:about_file] || "about.html") if about_required
       @config[:labels_with_class] ||= {}
       labels.each do |klass, props|
         props.each do |property, label|
@@ -188,6 +191,7 @@ module TTL2HTML
         if template.find_template_path("_default.html.erb")
           param[:additional_content] = template.to_html_raw("_default.html.erb", param)
         end
+        param[:about_file] = about_file if about_required
         template.output_to(file, param)
       end
       index_html = "index.html"
@@ -226,14 +230,16 @@ module TTL2HTML
           end
           param[:output_file] = index_html
           param[:index_list] = template.to_html_raw("index-list.html.erb", param)
+          param[:about_file] = about_file if about_required
           template.output_to(index_html, param)
         end
       end
-      if template.find_template_path("about.html") or shapes.size > 0 or versions.size > 0 or toplevel.size > 0
-        about_html = @config[:about_file] || "about.html"
+      if about_required
+        about_html = about_file
         about_html =  File.join(@config[:output_dir], about_html) if @config[:output_dir]
         template = Template.new("about.html.erb", @config)
         param = @config.dup
+        param[:about_file] = about_file
         param[:content] = template.to_html_raw("about.html", {}) if template.find_template_path("about.html")
         param[:data_global] = @data
         param[:versions] = versions

data/templates/default.html.erb

@@ -1,8 +1,8 @@
     <div class="jumbotron">
       <div class="container">
-        <h1><%=h param[:title] %></h1>
+        <h1><%= param[:title] %></h1>
         <%- if param[:subtitle] -%>
-        <p class="lead"><%=h param[:subtitle] %></p>
+        <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>
       </div>

data/templates/index.html.erb

@@ -8,7 +8,9 @@
         <div class="description"><%= param[:description] %></div>
         <%- 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>
+        <%- 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>
+        <%- end -%>
       </div>
     </div>
     <div class="container">
@@ -20,8 +22,8 @@
           <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>
+          <%- 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>
           <%- end -%>
           <%- if param[:toplevel] and not param[:toplevel][:license].empty? -%>
           <p class="license">

data/templates/layout.html.erb

@@ -8,16 +8,16 @@
     <%- if @template == "about.html.erb" and param[:about_toc] -%>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc/dist/bootstrap-toc.min.css">
     <%- end -%>
-    <%- param[:css_file].each do |file| -%>
+    <%- Array(param[:css_file]).each do |file| -%>
     <link rel="stylesheet" href="<%=h relative_path(file) %>">
-    <%- end if param[:css_file] -%>
+    <%- end -%>
     <%- if param[:custom_css] -%>
     <style type="text/css"><%=h param[:custom_css] %></style>
     <%- end -%>
-    <title><%=h html_title(param) %></title>
+    <title><%= html_title(param) %></title>
     <meta name="twitter:card" content="summary">
-    <meta name="twitter:title" content="<%=h html_title(param) %>">
-    <meta property="og:title" content="<%=h html_title(param) %>">
+    <meta name="twitter:title" content="<%= html_title(param) %>">
+    <meta property="og:title" content="<%= html_title(param) %>">
     <%- if param[:ogp] and param[:ogp]["type"] -%>
     <meta property="og:type" content="<%=h param[:ogp]["type"] %>">
     <%- else -%>
@@ -63,9 +63,11 @@
           <li class="nav-item<%= ' active' if @template == "index.html.erb" %>">
             <a class="nav-link" href="<%=h relative_path_uri(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.html") %>">About</a>
+            <a class="nav-link" href="<%=h relative_path(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>
@@ -100,8 +102,8 @@
     <%- if @template == "about.html.erb" and param[:about_toc] -%>
     <script src="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc/dist/bootstrap-toc.min.js"></script>
     <%- end -%>
-    <%- param[:javascript_file].each do |file| -%>
+    <%- Array(param[:javascript_file]).each do |file| -%>
     <script src="<%=h relative_path(file) %>"></script>
-    <%- end if param[:javascript_file] -%>
+    <%- end -%>
   </body>
 </html>

data/templates/shape-table.html.erb

@@ -1,4 +1,5 @@
 <table class="table table-sm">
+  <thead>
   <tr>
     <th><%=h t('shape-table.header.property-name') %></th>
     <th><%=h t('shape-table.header.description') %></th>
@@ -7,6 +8,7 @@
         <%=h t('shape-table.header.repeatable') %></th>
     <th><%=h t('shape-table.header.note') %></th>
   </tr>
+  </thead>
   <tbody>
   <%- param[:properties].each do |property| -%>
     <tr>
@@ -16,7 +18,7 @@
       <td class="url"><code><%=h property[:shorten_path] %></code></td>
       <%- end -%>
       <td><%= property[:name] %></td>
-      <%- if property[:nodeKind] == "http://www.w3.org/ns/shacl#IRI" -%>
+      <%- if property[:nodeKind] == "http://www.w3.org/ns/shacl#IRI" or property[:class] -%>
       <td class="url"><%= property[:example] %></td>
       <%- else -%>
       <td><%= property[:example] %></td>

data/templates/triples.html.erb

@@ -1,4 +1,8 @@
-<dl class="row<%= if param[:type][:blank] then ' border' end %>">
+<%- if param[:type][:blank] -%>
+<dl class="row<%= if param[:type][:blank] then ' border' end %>" itemscope>
+<%- else -%>
+<dl class="row<%= if param[:type][:blank] then ' border' end %>" itemscope itemid="<%=h param[:uri] %>">
+<%- end -%>
 <%- param[:data].sort_by{|k, v|
       order = param[:orders][k] if param[:orders] and param[:orders][k]
       order = Float::INFINITY if order.nil?
@@ -7,9 +11,11 @@
   <dt class="col-sm-3"><%=h format_property(k, param[:labels]) %></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 %>"><%= 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[:data], param[:type] %></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>
       <%- else -%>
-      <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 %>" itemprop="<%=h k %>"><%= format_object v2, param[:data], param[:type] %></dd>
       <%- end -%>
     <%- end -%>
 <%- end -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2025-07-10 00:00:00.000000000 Z
+date: 2025-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri