ttl2html 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221f8ca33a9e3988ed12acf79e6c028a04e67e7733916611d2795e2c34a64056
-  data.tar.gz: 5ac1d7e52e7e65c016ed285d640d5bb03890cfc52048ce91801b949480a34252
+  metadata.gz: 13f4951cbe8d12cf99dd6563a2facae07c180d8e48bbab595f3cce942cf1da0f
+  data.tar.gz: 8232fb9eb944019274b5323cf44739ee147b032b60358d8e894a8daa36ab551f
 SHA512:
-  metadata.gz: bf90d497ed178964e0f950f5c91902061347417e2e911ed965d4d61af00c11d5835d7d0360364c0874c1e70412e9e11a3069ef8dfcf7e5aadffd33bb5301dffe
-  data.tar.gz: 5ed644ef6b70846d6a355b7405df15950b5061d28085ab341794edeb3f188393525849c732449dfcec70e866c49a9562d32561f38435fed396358a269be98a7c
+  metadata.gz: c31c198f569f638e9ab5007f9776cb979144464b6be6e3f21601b07a098559af1b50d97e7eed1e77958c7240eefd3ae49e422bf7f54738a6f957ee868d9f2fd1
+  data.tar.gz: 8ad682b50a9cd60843d52a503fa7ffbd2a4359553d254c0c7721587d1d371c36cc533da5188c9135b411ec5f0c9c5c12aa2cc23d9bf65b0448e626a264891508

data/lib/ttl2html/template.rb

@@ -320,5 +320,31 @@ module TTL2HTML
     def valid_value?(value)
       value && !(value.respond_to?(:empty?) && value.empty?)
     end
+    def sort_criteria(val, data_global)
+      resource = data_global[val]
+      results = []
+      [
+         "http://purl.org/linked-data/cube#order",
+         "http://schema.org/position",
+      ].each do |order_elem|
+        if resource and resource[order_elem]
+          order_val = resource[order_elem].first.to_s
+          if data_global[order_val] and data_global[order_val][RDF::RDFV::value.to_s]
+            results << data_global[order_val][RDF::RDFV::value.to_s].first.to_i
+          else
+            results << order_val.to_i
+          end
+        else
+          results << Float::INFINITY
+        end
+      end
+      if val.to_s =~ /^_:/
+        results << resource.to_s
+      else
+        results << val.to_s
+      end
+      #p [val, results]
+      results
+    end
   end
 end

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.2.0"
+TTL2HTML::VERSION = "2.2.2"

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
@@ -83,10 +83,13 @@ module TTL2HTML
       result << @data[subject.to_s].keys.sort.map do |predicate|
         str = "<#{predicate}> "
         str << @data[subject.to_s][predicate].sort_by do |object|
-          if /^_:/ =~ object.to_s and @data[object.to_s]
+          #p [subject, predicate, object, depth]
+          if object.to_s =~ /^_:/ and @data[object.to_s]
             qb_order = "http://purl.org/linked-data/cube#order"
+            schema_position = "http://schema.org/position"
             shacl_order = "http://www.w3.org/ns/shacl#order"
-            [ @data[object.to_s][qb_order] ? @data[object.to_s][qb_order].first.to_i : Float::INFINITY,
+            [ @data[object.to_s][schema_position] ? @data[object.to_s][schema_position].first.to_i : Float::INFINITY,
+              @data[object.to_s][qb_order] ? @data[object.to_s][qb_order].first.to_i : Float::INFINITY,
               @data[object.to_s][shacl_order] ? @data[object.to_s][shacl_order].first.to_i : Float::INFINITY,
               format_turtle(object, depth + 1)
             ]
@@ -149,6 +152,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|
@@ -185,6 +190,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"
@@ -223,14 +229,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
@@ -499,7 +507,7 @@ module TTL2HTML
         end
         dir = File.dirname(file)
         FileUtils.mkdir_p(dir) if not File.exist?(dir)
-          str = format_turtle(uri)
+        str = format_turtle(uri)
         str << format_turtle_inverse(uri)
         open(file, "w") do |io|
           io.puts str.strip

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,9 +8,9 @@
     <%- 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 -%>
@@ -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>

data/templates/triples.html.erb

@@ -5,13 +5,7 @@
       [ order, k ]
     }.each do |k, v| -%>
   <dt class="col-sm-3"><%=h format_property(k, param[:labels]) %></dt>
-    <%- v.sort_by{|e|
-          if /\A_:/ =~ e.to_s and param[:data_global][e]
-            param[:data_global][e].to_s
-          else
-            e
-          end
-        }.each_with_index do |v2, idx| -%>
+    <%- 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>
       <%- else -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2025-06-07 00:00:00.000000000 Z
+date: 2025-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri