ttl2html 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221f8ca33a9e3988ed12acf79e6c028a04e67e7733916611d2795e2c34a64056
-  data.tar.gz: 5ac1d7e52e7e65c016ed285d640d5bb03890cfc52048ce91801b949480a34252
+  metadata.gz: 50b5adc471f4582c8773ce30e684c4b21f013f717e2abd577ca31445c1d32058
+  data.tar.gz: e7b1f6c9463f8a16d3b4ecfb0df6ae5a67ee9d26a47d198a08cc759eaa21a82c
 SHA512:
-  metadata.gz: bf90d497ed178964e0f950f5c91902061347417e2e911ed965d4d61af00c11d5835d7d0360364c0874c1e70412e9e11a3069ef8dfcf7e5aadffd33bb5301dffe
-  data.tar.gz: 5ed644ef6b70846d6a355b7405df15950b5061d28085ab341794edeb3f188393525849c732449dfcec70e866c49a9562d32561f38435fed396358a269be98a7c
+  metadata.gz: 88eecf013c95e8f90cb502b6c23590753b3cc8805e64ed4c5ee1ed98b42c2aa0e2c8b81725d2b73bded97ab8e1a0b1637f71013639770c811132ba93a645f341
+  data.tar.gz: 67395144f89f18dc418acf14cf0600d9e0a37faf7f814cc47382557c2d68b9cb1136c0dae03057f0d55c459dea450563641fc2165b2d0196df0a6de7acc36b12

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.1"

data/lib/ttl2html.rb

@@ -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)
             ]
@@ -499,7 +502,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/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.1
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2025-06-07 00:00:00.000000000 Z
+date: 2025-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri