ttl2html 2.2.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f4951cbe8d12cf99dd6563a2facae07c180d8e48bbab595f3cce942cf1da0f
-  data.tar.gz: 8232fb9eb944019274b5323cf44739ee147b032b60358d8e894a8daa36ab551f
+  metadata.gz: 1a699bd6e103ee6b88c617b6421fc7968fc63141c78d2dfff8aa75a64e7f271d
+  data.tar.gz: bfc5ccd8c37e16939d1cd1fcb2fe80a6b4902b408d2def30750f10bd71a1b1be
 SHA512:
-  metadata.gz: c31c198f569f638e9ab5007f9776cb979144464b6be6e3f21601b07a098559af1b50d97e7eed1e77958c7240eefd3ae49e422bf7f54738a6f957ee868d9f2fd1
-  data.tar.gz: 8ad682b50a9cd60843d52a503fa7ffbd2a4359553d254c0c7721587d1d371c36cc533da5188c9135b411ec5f0c9c5c12aa2cc23d9bf65b0448e626a264891508
+  metadata.gz: 88d8e9f520c749186b33001e4102b711ed75c3f9ee8c0dbcdab5c86896b68ce141d19800aa8fc6307926dfc3f65451d0ee0f674f80052ba606ef7815f32d120e
+  data.tar.gz: 2899b38935cc874ca678913830089f514b805ceb0ff55a64fd7cb2cda850a9238ad348b000aceb3be44bfc0bf5482e525050236d409d818eff16ec0b1019a655

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

@@ -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.2"
+TTL2HTML::VERSION = "2.3.1"

data/lib/ttl2html.rb

@@ -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:
@@ -208,6 +209,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
@@ -485,12 +487,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
@@ -546,7 +557,11 @@ module TTL2HTML
 
   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

@@ -23,7 +23,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

@@ -23,7 +23,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

@@ -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

@@ -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

@@ -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

@@ -14,10 +14,10 @@
     <%- 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 -%>

data/templates/shape-table.html.erb

@@ -18,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,9 @@
-<dl class="row<%= if param[:type][:blank] then ' border' end %>">
+<%- 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<% unless itemtypes.empty? %> itemtype="<%=h itemtypes %>"<% end %>>
+<%- else -%>
+<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?
@@ -7,9 +12,12 @@
   <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 -%>
+      <%- 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[: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.2
+  version: 2.3.1
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2025-09-11 00:00:00.000000000 Z
+date: 2026-01-24 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: []