ttl2html 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6db7238da3700fba83d389bdab577f9bacc2c5da65f993612731716ac4899a
-  data.tar.gz: 1804e3b40f344e00618699202d331e03e2e5324519626df62389fc739925fe82
+  metadata.gz: 7291dd5276af9d25f9c91f5d798a1ad7614abe6d35ccf36aaa35beceb523d0ae
+  data.tar.gz: baca08577305a96a85b7c18015181a578dfbfc70344c73a599ebab582a591a69
 SHA512:
-  metadata.gz: 7bbcc86b1acc04ad04c8a5f98b11fe020366630b7fc3ad99067e7de19853afd3311e7534fe80facc150490a784d2e96600b20e43e66f6da7aa1380a1fe8c2163
-  data.tar.gz: c93964d3ef71fa6e300e8634ae49a3dd5f083f737ac3d0ae3224c9493b5d7bdb8846f6a95b1803110eab1b16971b951a38c802522c0a1099f30c16d11910632f
+  metadata.gz: fd0e4667b20caaa5444bf8c5013e8e2d9fabc944628201a340c33865f3ae747def16b4860a70eb11dad6da9b5db014bb2aeb48d8a00ef9a48ea0aa1b3bf6db84
+  data.tar.gz: 8e85d33dabd668ce182e0d10483ae95f46c44bb3a421d5153823ae6df6d0768d9ce00b8f0f010f219a8861aaa3f5349c20e1727ac3742383e22be518d2d3cebc

data/lib/ttl2html/template.rb

@@ -234,6 +234,18 @@ module TTL2HTML
           end
         end
       end
+      if @param[:orders_with_class] and triples["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
+        @param[:orders_with_class].reverse_each do |k, v|
+          triples["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].each do |entity_class|
+            if entity_class == k
+              v.each do |property, order|
+                param_local[:orders] ||= {}
+                param_local[:orders][property] = order || Float::INFINITY
+              end
+            end
+          end
+        end
+      end
       to_html_raw("triples.html.erb", param_local)
     end
   end

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "1.3.0"
+TTL2HTML::VERSION = "1.3.1"

data/lib/ttl2html.rb

@@ -128,6 +128,7 @@ module TTL2HTML
           end
         end
       end
+      @config[:orders_with_class] = shapes2orders(shapes)
       progressbar = ProgressBar.create(title: :output_html_files,
         total: @data.size,
         format: "(%t) %a %e %P% Processed: %c from %C")
@@ -186,7 +187,7 @@ module TTL2HTML
             target_class = target_class.first
             if @data[target_class]
               label = template.get_title(@data[target_class], nil)
-              comment = @data[target_class]["http://www.w3.org/2000/01/rdf-schema#comment"]&.first
+              comment = template.get_language_literal(@data[target_class]["http://www.w3.org/2000/01/rdf-schema#comment"]) if @data[target_class]["http://www.w3.org/2000/01/rdf-schema#comment"]
             else
               label = template.format_property(target_class)
             end
@@ -248,6 +249,21 @@ module TTL2HTML
       end
       labels
     end
+    def shapes2orders(shapes)
+      orders = {}
+      shapes.subjects.each do |shape|
+        target_class = @data[shape.to_s]["http://www.w3.org/ns/shacl#targetClass"]&.first
+        if target_class
+          @data[shape.to_s]["http://www.w3.org/ns/shacl#property"].each do |property|
+            path = @data[property]["http://www.w3.org/ns/shacl#path"].first
+            order = @data[property]["http://www.w3.org/ns/shacl#order"]
+            orders[target_class] ||= {}
+            orders[target_class][path] = order&.first&.to_i
+          end
+        end
+      end
+      orders
+    end
 
     def output_turtle_files
       progressbar = ProgressBar.create(title: :output_turtle_files,

data/templates/about.html.erb

@@ -3,13 +3,16 @@
         <h1><%=h t("about.title", title: param[:site_title]) %></h1>
       </div>
     </div>
-    <nav aria-label="breadcrumb">
-      <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a href="./"><i class="bi bi-house-door-fill"></i> Home</a></li>
-        <li class="breadcrumb-item active" aria-current="page"><%=h t("about.title", title: param[:site_title]) %></li>
-      </ol>
-    </nav>
     <div class="container">
+      <div class="row">
+        <div class="col-md-12">
+          <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+              <li class="breadcrumb-item"><a href="./"><i class="bi bi-house-door-fill"></i> Home</a></li>
+              <li class="breadcrumb-item active" aria-current="page"><%=h t("about.title", title: param[:site_title]) %></li>
+          </ol>
+        </nav>
+      </div>
       <div class="row">
         <div class="col-md">
           <%- param[:content].keys.sort.each do |shape| -%>
@@ -21,3 +24,4 @@
         </div>
       </div>
     </div>
+    

data/templates/triples.html.erb

@@ -1,5 +1,9 @@
 <dl class="row">
-<%- param[:data].each do |k, v| -%>
+<%- 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| -%>
   <%- if param[:type] == :inverse -%>
   <dt class="col-sm-3"><%=h t('triples.inverse_refered', property: format_property(k, param[:labels])) %></dt>
   <%- else -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Masao Takaku