ttl2html 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7254a4cc200e719bbb09c33d88dea4a22a8360e1c6453085f5331d541320b82
-  data.tar.gz: 43385ec41709d6b8a552dfe7bb2c2d7186b1142b0655bd8480b2fc0b91b336d8
+  metadata.gz: 5d181672a5b0aa4cd6f7f1599fb20b6102c5232b3f774069038023bfc65d05a0
+  data.tar.gz: 313970beef022f77e7f4d5bac9da410adcc6203a6dd7d073d6ab2b49a516ebae
 SHA512:
-  metadata.gz: 0be4d1d1550a1eb410ffb8747eeffbd8b3154a297966cb99cde5ecb6c249973a8c345e88b01ab8cd7c1c791064ea78b6708ad7bc1579231b2f5424b8643af709
-  data.tar.gz: a5ec01247b296e2be84d110e4742412152465f9925223950211ca99a5c9f6112ebe81820fa6a422589f8cf45f5d41ecfb3b619c33e833694b9811cb80fb86541
+  metadata.gz: fdd4152bfc2ab82d97bed51c63dd8814e89a40b31d2e84ca2a64406dcfd4be373a393ccf8b2ebd477adb8e1f4df844f355872537232e7ec9357063ff2c123760
+  data.tar.gz: 7821d98735d0fadf33671017573accb9d765e2e2bd571c9fb66435251a056cedab6e05ec20b760c940cc2f1daa16bbdde11496cadcf4045fa9016344904e36db

data/lib/ttl2html/template.rb

@@ -98,12 +98,24 @@ module TTL2HTML
           end
           #p nodes
         end
+        example = data[property]["http://www.w3.org/2004/02/skos/core#example"].first if data[property]["http://www.w3.org/2004/02/skos/core#example"]
+        if example.respond_to?(:datatype) and example.datatype?
+          datatype = example.datatype.pname or example.datatype.to_s
+          example = example.to_s + "<span class=\"datatype\">^^" + example.datatype.pname + "</span>"
+        end
+        descriptions = [ get_language_literal(data[property]["http://www.w3.org/ns/shacl#description"]) ]
+        if data[property]["http://www.w3.org/ns/shacl#datatype"]
+          datatypes = data[property]["http://www.w3.org/ns/shacl#datatype"].map do |datatype|
+            datatype.to_s.sub(%r{\Ahttp://www\.w3\.org/2001/XMLSchema#}, 'xsd:')
+          end.join(", ")
+          descriptions << t('shape-table.datatype') + datatypes
+        end
         {
           path: path,
           shorten_path: shorten_path,
           name: get_language_literal(data[property]["http://www.w3.org/ns/shacl#name"]),
-          example: data[property]["http://www.w3.org/2004/02/skos/core#example"] ? data[property]["http://www.w3.org/2004/02/skos/core#example"].first : nil,
-          description: get_language_literal(data[property]["http://www.w3.org/ns/shacl#description"]),
+          example: example,
+          description: descriptions.compact.join("<br>"),
           required: data[property]["http://www.w3.org/ns/shacl#minCount"] ? data[property]["http://www.w3.org/ns/shacl#minCount"].first.to_i > 0 : false,
           repeatable: repeatable,
           nodeKind: data[property]["http://www.w3.org/ns/shacl#nodeKind"] ? data[property]["http://www.w3.org/ns/shacl#nodeKind"].first : nil,

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "3.1.0"
+TTL2HTML::VERSION = "3.1.1"

data/lib/ttl2html.rb

@@ -72,6 +72,26 @@ module TTL2HTML
       $stderr.puts "#{count} triples. #{subjects.size} subjects."
       @data
     end
+    QB_ORDER_URI = "http://purl.org/linked-data/cube#order"
+    SCHEMA_POSITION_URI = "http://schema.org/position"
+    SHACL_ORDER_URI = "http://www.w3.org/ns/shacl#order"
+    def sort_key_for_resource(resource, depth = 1)
+      qb_order = Float::INFINITY
+      schema_position = Float::INFINITY
+      shacl_order = Float::INFINITY
+      if @data[resource.to_s]
+        qb_order = @data[resource.to_s][QB_ORDER_URI].first.to_i if @data[resource.to_s][QB_ORDER_URI]
+        schema_position = @data[resource.to_s][SCHEMA_POSITION_URI].first.to_i if @data[resource.to_s][SCHEMA_POSITION_URI]
+        shacl_order = @data[resource.to_s][SHACL_ORDER_URI].first.to_i if @data[resource.to_s][SHACL_ORDER_URI]
+      end
+      if resource.to_s =~ /^_:/ and depth < 5
+        [ schema_position, qb_order, shacl_order,
+          format_turtle(resource, depth + 1, true)
+        ]
+      else
+        [ schema_position, qb_order, shacl_order, resource.to_s]
+      end
+    end
     def format_turtle(subject, depth = 1, force = false)
       turtle = RDF::Turtle::Writer.new
       result = ""
@@ -87,18 +107,7 @@ module TTL2HTML
         #p [subject, predicate, @data[subject.to_s][predicate]]
         str << @data[subject.to_s][predicate].sort_by do |object|
           #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][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, true)
-            ]
-          else
-            [Float::INFINITY, Float::INFINITY, Float::INFINITY, object.to_s]
-          end
+          sort_key_for_resource(object, depth)
         end.map do |object|
           if /^_:/ =~ object.to_s # blank node:
             format_turtle(object, depth + 1, force)
@@ -315,7 +324,9 @@ module TTL2HTML
           param[:versions] = versions
           param[:toplevel] = toplevel
           param[:description] = template.to_html_raw("description.html", {}) if template.find_template_path("description.html")
-          subjects.sort.each do |subject|
+          subjects.sort_by do |subject|
+            sort_key_for_resource(subject)
+          end.each do |subject|
             objects = []
             if @config.has_key? :top_additional_property
               @config[:top_additional_property].each do |property|

data/locales/en.yml

@@ -45,6 +45,7 @@ en:
     non-repeatable: "Non repeatable"
     blank-node-structure: "The structural contents of a blank node are as follows:"
     blank-node-or-structure: "The structural contents of a blank node are either of the followings:"
+    datatype: "Datatype: "
   triples:
     inverse_refered: "Referred to as '%{property}' from:"
     blank_node: "Blank node"

data/locales/ja.yml

@@ -45,6 +45,7 @@ ja:
     non-repeatable: 繰り返し無し
     blank-node-structure: ブランクノードの内容は以下の内容からなる構造を持ちます。
     blank-node-or-structure: ブランクノードの内容は以下のいずれかの内容からなる構造を持ちます。
+    datatype: "データ型: "
   triples:
     inverse_refered: "'%{property}'としての参照元:"
     blank_node: "空ノード"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2026-04-12 00:00:00.000000000 Z
+date: 2026-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -210,7 +210,9 @@ files:
 homepage: https://github.com/masao/ttl2html
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/masao/ttl2html/issues
+  documentation_uri: https://ttl2html-doc.readthedocs.io/
 rdoc_options: []
 require_paths:
 - lib
@@ -225,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: ttl2html
 test_files: []