ttl2html 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2eebcb6951620e22dbb1253cdba6859065c7ced1c0f210209ccdb2e76a5609b
-  data.tar.gz: 704300fa50a6be13a99fb03eca1f55ca3375777858ad39949526bc66d0aa1631
+  metadata.gz: 50b5adc471f4582c8773ce30e684c4b21f013f717e2abd577ca31445c1d32058
+  data.tar.gz: e7b1f6c9463f8a16d3b4ecfb0df6ae5a67ee9d26a47d198a08cc759eaa21a82c
 SHA512:
-  metadata.gz: a0ab3fce6eeab88af14ca4eea3b8269dfaaf4afb77999a0558935dcbc8d85ccb8c646f1b2a9f283d70c549ebf6bebcd62252b4ae675797b43f35d51fc56e48f1
-  data.tar.gz: 3e17715b402b585fd5d24bae0f813fbeeedaadfe44f9a0e66c46f4c8fd6da122a13eb9b416fa9c95481552a001a5df0a399ef73a0b9e9561ef373a6fb8a61c3e
+  metadata.gz: 88eecf013c95e8f90cb502b6c23590753b3cc8805e64ed4c5ee1ed98b42c2aa0e2c8b81725d2b73bded97ab8e1a0b1637f71013639770c811132ba93a645f341
+  data.tar.gz: 67395144f89f18dc418acf14cf0600d9e0a37faf7f814cc47382557c2d68b9cb1136c0dae03057f0d55c459dea450563641fc2165b2d0196df0a6de7acc36b12

data/lib/ttl2html/template.rb

@@ -164,27 +164,20 @@ module TTL2HTML
       end
     end
     def get_title(data, default_title = "no title")
-      return default_title if data.nil?
-      if @param[:title_property_perclass] and data["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
-        @param[:title_property_perclass].each do |klass, property|
-          if data["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].include?(klass) and data[property]
-            return shorten_title(get_language_literal(data[property]))
-          end
-        end
-      end
-      if @param[:title_property] and data[@param[:title_property]]
-        return shorten_title(get_language_literal(data[@param[:title_property]]))
-      end
-      %w(
-        http://www.w3.org/2000/01/rdf-schema#label
-        http://purl.org/dc/terms/title
-        http://purl.org/dc/elements/1.1/title
-        http://schema.org/name
-        http://www.w3.org/2004/02/skos/core#prefLabel
-      ).each do |property|
-        return shorten_title(get_language_literal(data[property])) if data[property]
-      end
-      default_title
+      resolve_title(data,
+        default: default_title,
+        use_default: true,
+        property_key: :title_property,
+        perclass_key: :title_property_perclass
+      )
+    end
+    def get_subtitle(data, default_title = nil)
+      resolve_title(data,
+        default: default_title,
+        use_default: false,
+        property_key: :subtitle_property,
+        perclass_key: :subtitle_property_perclass
+      )
     end
     def get_language_literal(object)
       if object.is_a? Array
@@ -215,7 +208,13 @@ module TTL2HTML
       if /\Ahttps?:\/\// =~ object.to_s
         rel_path = relative_path_uri(object, param[:base_uri])
         if param[:data_global][object]
-          "<a href=\"#{rel_path}\">#{get_title(param[:data_global][object]) or object}</a>"
+          result = "<a href=\"#{rel_path}\">#{get_title(param[:data_global][object]) or object}</a>"
+          subtitle = get_subtitle(param[:data_global][object])
+          if subtitle
+            result += " <small>#{subtitle}</small>"
+          else
+            result
+          end
         else
           "<a href=\"#{rel_path}\">#{object}</a>"
         end
@@ -281,5 +280,71 @@ module TTL2HTML
       param_local = @param.dup.merge(data: version)
       to_html_raw("version.html.erb", param_local)
     end
+
+    private
+
+    def resolve_title(data, default:, use_default:, property_key:, perclass_key:)
+      return default if data.nil?
+      # rdf:type
+      type_key = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      # 1. クラスごとのプロパティ指定がある場合
+      if @param[perclass_key].is_a?(Hash) && data[type_key]
+        Array(data[type_key]).each do |klass|
+          if @param[perclass_key][klass]
+            prop = @param[perclass_key][klass]
+            if valid_value?(data[prop])
+              return shorten_title(get_language_literal(data[prop]))
+            end
+          end
+        end
+      end
+      # 2. 一般プロパティ
+      if @param[property_key] && valid_value?(data[@param[property_key]])
+        return shorten_title(get_language_literal(data[@param[property_key]]))
+      end
+      # 3. デフォルト候補を順にチェック
+      if use_default
+        [
+          "http://www.w3.org/2000/01/rdf-schema#label",
+          "http://purl.org/dc/terms/title",
+          "http://purl.org/dc/elements/1.1/title",
+          "http://schema.org/name",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ].each do |prop|
+          return shorten_title(get_language_literal(data[prop])) if valid_value?(data[prop])
+        end
+      end
+      # 4. fallback
+      default
+    end
+    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
+end

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.1.2"
+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)
             ]
@@ -172,6 +175,9 @@ module TTL2HTML
         param[:data_inverse_global] = @data_inverse
         param[:data_global] = @data
         param[:title] = template.get_title(v)
+        if @config[:subtitle_property] or @config[:subtitle_property_perclass]
+          param[:subtitle] = template.get_subtitle(v)
+        end
         if param[:breadcrumbs]
           param[:breadcrumbs_items] = build_breadcrumbs(uri, template)
         end
@@ -496,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/default.html.erb

@@ -1,6 +1,9 @@
     <div class="jumbotron">
       <div class="container">
         <h1><%=h param[:title] %></h1>
+        <%- if param[:subtitle] -%>
+        <p class="lead"><%=h param[:subtitle] %></p>
+        <%- end -%>
         <p><i class="bi bi-link-45deg"></i> <a href="<%=h param[:uri] %>"><%=h param[:uri] %></a></p>
       </div>
     </div>

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.1.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri