ttl2html 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858625044e6a0e9ff78bacc944b6aebb8dc4fb95f07cda76d3eab790d0602163
-  data.tar.gz: 0d514bacd1ddd635dfa36ca7aca8e74b2a5ff78e15b16e21a2124eaa04660e40
+  metadata.gz: 71b5a2abdcc42e13003a2ceca9c3c29ed0ff866c472a058354a469868a244269
+  data.tar.gz: de4d3bd146d80800f7f4358a0f843479e5f8583436d4af550ddef4643af60c06
 SHA512:
-  metadata.gz: 9958babbf93cd931926e4f56cc348fe16130f908a324d1978cd2d2f35c9ebca2646c4b86fa9ef97365377cb4ca23e7365f460e024207a3ccef8439fb545cde92
-  data.tar.gz: ceb241313491e6b67c633aa235c9bc74c5e2bf76fc6b4bc1479c9874e9aed07995f0655da48e2e29e36a4a22dc5efa14476e4394fce5b7465a3a3ef759f9990b
+  metadata.gz: 54d9bfb81e8fce12a3b0158e888a67bd6b718f7ab1efa35d09fc18ba8d7c596c226a08017894823d1baf6f637f3080e7211f44c85f4ff5a37546fde3b25b5838
+  data.tar.gz: fc40d4fc10a284b152802eef7069d786ea307d4a6713ffff1fd30dee7d46c1605f8b328e5d598f3913b0345d8e20f038cae623497453f2e5e0b6e0adedb4aeb5

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])

data/lib/ttl2html/version.rb

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

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
 
@@ -112,10 +117,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

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

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: 被参照情報

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/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,4 +1,4 @@
-<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?
@@ -10,7 +10,13 @@
       <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| -%>
       <dd class="col-sm-9<%= ' offset-sm-3' if idx > 0 %>"><%= format_object v2, param[:data], param[:type] %></dd>
     <%- end -%>
   <%- else -%>

data/templates/version.html.erb

@@ -1,6 +1,6 @@
         <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 -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Masao Takaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri