ttl2html 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858625044e6a0e9ff78bacc944b6aebb8dc4fb95f07cda76d3eab790d0602163
-  data.tar.gz: 0d514bacd1ddd635dfa36ca7aca8e74b2a5ff78e15b16e21a2124eaa04660e40
+  metadata.gz: 3014009aab356311f3f36ff39087b63af87dc81a97d72ad34a74c4a685fd810a
+  data.tar.gz: 9f55838aee5811144d539ac036567803dbd34005335e6ab1762aef8c152c772b
 SHA512:
-  metadata.gz: 9958babbf93cd931926e4f56cc348fe16130f908a324d1978cd2d2f35c9ebca2646c4b86fa9ef97365377cb4ca23e7365f460e024207a3ccef8439fb545cde92
-  data.tar.gz: ceb241313491e6b67c633aa235c9bc74c5e2bf76fc6b4bc1479c9874e9aed07995f0655da48e2e29e36a4a22dc5efa14476e4394fce5b7465a3a3ef759f9990b
+  metadata.gz: 2d6756b3c78a0b13516475c11884e4c5f86e2945046101504e4810dbf83210d6d3c679eae74a8ac841d1e44cec3908e5c05364d9b5b606a1058d40af356b949f
+  data.tar.gz: 7b5b6c0d6c131e2a883e0781af9b11d999e1f35918e0b012a83ad926bf52621a1fd62be76620922800ebe27d0155fc547ddb5a49ff3eb1fc4f18804fd3925421

data/lib/ttl2html/template.rb

@@ -128,8 +128,13 @@ module TTL2HTML
         src = @param[:output_file]
         src = Pathname.new(src).relative_path_from(Pathname.new(@param[:output_dir])) if @param[:output_dir]
         path = Pathname(dest).relative_path_from(Pathname(File.dirname src))
-        path = path.to_s + "/" if File.directory? path
+        if @param[:output_dir] and File.directory?(Pathname.new(@param[:output_dir]) + path)
+          path = path.to_s + "/"
+        elsif File.directory?(path)
+          path = path.to_s + "/"
+        end
       end
+      #p [ :relative_path, path, dest, src ]
       path
     end
     def relative_path_uri(dest_uri, base_uri = @param[:base_uri])
@@ -152,8 +157,8 @@ module TTL2HTML
       titles.compact.join(" - ")
     end
     def shorten_title(title, length = 140)
-      if title.length > length
-        title[0..length] + "..."
+      if title.to_s.length > length
+        title.to_s[0..length] + "..."
       else
         title
       end
@@ -182,14 +187,15 @@ module TTL2HTML
       default_title
     end
     def get_language_literal(object)
-      if object.respond_to? :has_key?
-        if object.has_key?(I18n.locale)
-          object[I18n.locale]
+      if object.is_a? Array
+        object_lang = object.select do |e|
+          e.language? and e.language == I18n.locale
+        end
+        if not object_lang.empty?
+          object_lang.first
         else
-          object.values.first
+          object.first
         end
-      elsif object.is_a? Array
-        object.first
       else
         object
       end

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.0.1"
+TTL2HTML::VERSION = "2.0.3"

data/lib/ttl2html.rb

@@ -30,6 +30,11 @@ module TTL2HTML
           config[k.intern] = v
         end
       end
+      [ :css_file, :javascript_file ].each do |k|
+        if config[k]
+          config[k] = [ config[k] ].flatten
+        end
+      end
       config
     end
 
@@ -48,17 +53,14 @@ module TTL2HTML
           o = statement.object
           count += 1
           @data[s.to_s] ||= {}
-          if o.respond_to?(:has_language?) and o.has_language?
-            @data[s.to_s][v.to_s] ||= {}
-            @data[s.to_s][v.to_s][o.language] = o.to_s
-          else
-            @data[s.to_s][v.to_s] ||= []
-            @data[s.to_s][v.to_s] << o.to_s
-          end
+          @data[s.to_s][v.to_s] ||= []
           if o.is_a? RDF::URI or o.is_a? RDF::Node
+            @data[s.to_s][v.to_s] << o.to_s
             @data_inverse[o.to_s] ||= {}
             @data_inverse[o.to_s][v.to_s] ||= []
             @data_inverse[o.to_s][v.to_s] << s.to_s
+          else
+            @data[s.to_s][v.to_s] << o
           end
         end
         @prefix.merge! reader.prefixes
@@ -112,10 +114,12 @@ module TTL2HTML
       progressbar = ProgressBar.create(title: label,
         total: @data.size,
         format: "(%t) %a %e %P% Processed: %c from %C")
-      @data.each do |uri, v|
+      @data.keys.sort_by do|uri|
+        [ uri.count("/"), uri.size, uri ] 
+      end.reverse_each do |uri|
         progressbar.increment
         next if not uri.start_with? @config[:base_uri]
-        yield uri, v
+        yield uri, @data[uri]
       end
       progressbar.finish
     end
@@ -233,10 +237,12 @@ module TTL2HTML
           else
             label = template.get_title(@data[subject.to_s])
           end
+          html = template.expand_shape(@data, subject.to_s, @prefix)
+          next if html.nil?
           param[:shapes][subject] = {
             label: label,
             comment: comment,
-            html: template.expand_shape(@data, subject.to_s, @prefix),
+            html: html,
             target_class: target_class,
             order: orders,
           }
@@ -342,6 +348,37 @@ module TTL2HTML
       orders
     end
 
+    def extract_version_metadata(data)
+      description = data["http://purl.org/dc/terms/description"]
+      link = nil
+      if not description
+        qrev = data["http://www.w3.org/ns/prov#qualifiedRevision"]&.first
+        if @data[qrev]
+          description = @data[qrev]["http://www.w3.org/2000/01/rdf-schema#comment"]
+          link = @data[qrev]["http://www.w3.org/2000/01/rdf-schema#seeAlso"]&.first
+        end
+      end
+      subset = []
+      if data["http://rdfs.org/ns/void#subset"]
+        data["http://rdfs.org/ns/void#subset"].each do |s|
+          abort "#{s} not found" if not @data[s]
+          subset << extract_version_metadata(@data[s])
+        end
+      end
+      date = data["http://purl.org/pav/createdOn"]&.first
+      date = data["http://purl.org/dc/terms/issued"]&.first if date.nil?
+      return {
+        version: data["http://purl.org/pav/version"]&.first,
+        triples: data["http://rdfs.org/ns/void#triples"]&.first,
+        datadump: data["http://rdfs.org/ns/void#dataDump"]&.first,
+        bytesize: data["http://www.w3.org/ns/dcat#byteSize"]&.first,
+        date: date,
+        description: description,
+        subset: subset,
+        link: link,
+        license: extract_license(data),
+      }
+    end
     def extract_versions
       versions = []
       ["http://purl.org/pav/hasVersion", "http://purl.org/pav/hasCurrentVersion", "http://purl.org/dc/terms/hasVersion"].each do |prop|
@@ -357,37 +394,24 @@ module TTL2HTML
           next if not version
           next if not version["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
           next if not version["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].include? "http://rdfs.org/ns/void#Dataset"
-          description = version["http://purl.org/dc/terms/description"]
-          link = nil
-          if not description
-            qrev = version["http://www.w3.org/ns/prov#qualifiedRevision"]&.first
-            if @data[qrev]
-              description = @data[qrev]["http://www.w3.org/2000/01/rdf-schema#comment"]
-              link = @data[qrev]["http://www.w3.org/2000/01/rdf-schema#seeAlso"]&.first
-            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,
-            link: link,
-          }
+          versions << extract_version_metadata(version)
         end
       end
-      versions.sort_by{|v| [ v[:date], v[:uri] ] }
+      versions.sort_by{|v| [ v[:date], v[:version] ] }
+    end
+    def extract_license(data)
+      license = {}
+      if data["http://purl.org/dc/terms/license"]
+        license_data = @data[data["http://purl.org/dc/terms/license"].first]
+        if license_data
+          license[:url] = license_data["http://www.w3.org/1999/02/22-rdf-syntax-ns#value"]&.first
+          license[:icon] = license_data["http://xmlns.com/foaf/0.1/thumbnail"]&.first
+          license[:label] = license_data["http://www.w3.org/2000/01/rdf-schema#label"]
+        elsif data["http://purl.org/dc/terms/license"].first =~ URI::regexp
+          license[:url] = license[:label] = data["http://purl.org/dc/terms/license"].first
+        end
+      end
+      license
     end
     def extract_toplevel
       result = {}
@@ -399,17 +423,7 @@ module TTL2HTML
       end
       data  = @data[toplevel.to_s]
       if toplevel
-        license = {}
-        if data["http://purl.org/dc/terms/license"]
-          license_data = @data[data["http://purl.org/dc/terms/license"].first]
-          if license_data
-            license[:url] = license_data["http://www.w3.org/1999/02/22-rdf-syntax-ns#value"]&.first
-            license[:icon] = license_data["http://xmlns.com/foaf/0.1/thumbnail"]&.first
-            license[:label] = license_data["http://www.w3.org/2000/01/rdf-schema#label"]
-          elsif data["http://purl.org/dc/terms/license"].first =~ URI::regexp
-            license[:url] = license[:label] = data["http://purl.org/dc/terms/license"].first
-          end
-        end
+        license = extract_license(data)
         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

data/locales/en.yml

@@ -12,6 +12,7 @@ en:
     contact: Contact
     contact-contribution: "This dataset was developed by %{name}"
     contact-email: "For dataset inquiries, please contact at <a href=\"%{email}\">%{email}</a>"
+    toc: Table of Contents
   default:
     details: Details
     inverse_data: Referred resources
@@ -20,6 +21,8 @@ en:
     latest-news: "Latest news"
     past-versions: "Past versions"
     license-text: "This dataset is freely usable as <a href=\"%{url}\">%{label}</a>"
+  dataset:
+    license-text: "This dataset is freely usable as <a href=\"%{url}\">%{label}</a>"
   layout:
     rdf-data: RDF data
   shape-table:

data/locales/ja.yml

@@ -12,6 +12,7 @@ ja:
     contact: 連絡先
     contact-contribution: "本データセットは %{name} が開発したものです"
     contact-email: "データセットに関する問い合わせは <a href=\"%{email}\">%{email}</a> までお問い合わせください。"
+    toc: 目次
   default:
     details: 詳細情報
     inverse_data: 被参照情報
@@ -20,6 +21,8 @@ ja:
     latest-news: 最新のお知らせ
     past-versions: 過去の更新履歴
     license-text: "このデータセットは<a href=\"%{url}\">%{label}</a>として自由に利用できます。"
+  dataset:
+    license-text: "<a href=\"%{url}\">%{label}</a>として自由に利用できます"
   layout:
     rdf-data: RDFデータ
   shape-table:

data/templates/about.html.erb

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

data/templates/dataset.html.erb

@@ -0,0 +1,35 @@
+<%- if param[:datadump] -%>
+  <li><a href="<%=h param[:datadump] %>"><%=h File.basename(param[:datadump]) %></a>
+  <%- 
+  fileinfo = []
+  if param[:triples]
+    fileinfo << t("about.version-triples", triples: number_with_delimiter(param[:triples].to_i))
+  end
+  if param[:bytesize]
+    fileinfo << number_to_human_size(param[:bytesize])
+  end
+  -%>
+  <%- if fileinfo.size > 0 -%>
+  (<%=h fileinfo.join(", ") %>)
+  <%- end -%>
+  <%- if not param[:license].empty? -%>
+  <span class="license">
+    <%- if param[:license][:icon] -%>
+    <a href="<%=h param[:license][:url] %>"><img src="<%=h param[:license][:icon] %>"></a>
+    <%- end -%>
+    <%= t("dataset.license-text", label: get_language_literal(param[:license][:label]), url: param[:license][:url]) %>
+  </span>
+  <%- end -%>
+  <%- if param[:subset].size > 0 -%>
+    <ul>
+    <%- param[:subset].each do |subset| -%>
+    <%= to_html_raw("dataset.html.erb", subset) %>
+    <%- end -%>
+    </ul>
+  <%- end -%>
+  </li>
+<%- elsif param[:subset].size > 0 -%>
+  <%- param[:subset].each do |subset| -%>
+    <%= to_html_raw("dataset.html.erb", subset) %>
+  <%- end -%>
+<%- end -%>

data/templates/index.html.erb

@@ -20,7 +20,7 @@
           <%- 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] -%>
+          <%- if param[:toplevel] and not param[:toplevel][:license].empty? -%>
           <p>
             <%- if param[:toplevel][:license][:icon] -%>
             <a href="<%=h param[:toplevel][:license][:url] %>"><img src="<%=h param[:toplevel][:license][:icon] %>"></a>

data/templates/layout.html.erb

@@ -5,9 +5,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
-    <%- if param[:css_file] -%>
-    <link rel="stylesheet" href="<%=h relative_path(param[:css_file]) %>">
+    <%- if @template == "about.html.erb" and param[:about_toc] -%>
+    <link rel="stylesheet" href="https://cdn.rawgit.com/afeld/bootstrap-toc/v1.0.1/dist/bootstrap-toc.min.css">
     <%- end -%>
+    <%- param[:css_file].each do |file| -%>
+    <link rel="stylesheet" href="<%=h relative_path(file) %>">
+    <%- end if param[:css_file] -%>
     <%- if param[:custom_css] -%>
     <style type="text/css"><%=h param[:custom_css] %></style>
     <%- end -%>
@@ -32,7 +35,7 @@
     </script>
     <%- end -%>
   </head>
-  <body>
+  <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]) %>">
@@ -78,8 +81,11 @@
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
-    <%- if param[:javascript_file] -%>
-    <script src="<%=h relative_path(param[:javascript_file]) %>"></script>
+    <%- if @template == "about.html.erb" and param[:about_toc] -%>
+    <script src="https://cdn.rawgit.com/afeld/bootstrap-toc/v1.0.1/dist/bootstrap-toc.min.js"></script>
     <%- end -%>
+    <%- param[:javascript_file].each do |file| -%>
+    <script src="<%=h relative_path(file) %>"></script>
+    <%- end if param[:javascript_file] -%>
   </body>
 </html>

data/templates/triples.html.erb

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

data/templates/version.html.erb

@@ -1,32 +1,10 @@
         <dt><%=h param[:data][:date] %></dt>
         <dd><%=h t("about.version-release", version: param[:data][:version]) %></dd>
-        <dd><%=h get_language_literal(param[:data][:description]) %>
+        <dd><%= get_language_literal(param[:data][:description]) %>
         <%- if param[:data][:link] -%>
         <%= t("about.version-link", link: param[:data][:link]) %>
         <%- end -%>
         </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 -%>
-        </ul></dd>
-        <%- end -%>
+        <%- if param[:data][:dataDump] or param[:data][:subset] -%>
+        <dd><ul><%= to_html_raw("dataset.html.erb", param[:data]) %></ul></dd>
+        <%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Masao Takaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -156,6 +156,7 @@ files:
 - locales/en.yml
 - locales/ja.yml
 - templates/about.html.erb
+- templates/dataset.html.erb
 - templates/default.html.erb
 - templates/index-list.html.erb
 - templates/index.html.erb