ttl2html 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2eebcb6951620e22dbb1253cdba6859065c7ced1c0f210209ccdb2e76a5609b
-  data.tar.gz: 704300fa50a6be13a99fb03eca1f55ca3375777858ad39949526bc66d0aa1631
+  metadata.gz: 221f8ca33a9e3988ed12acf79e6c028a04e67e7733916611d2795e2c34a64056
+  data.tar.gz: 5ac1d7e52e7e65c016ed285d640d5bb03890cfc52048ce91801b949480a34252
 SHA512:
-  metadata.gz: a0ab3fce6eeab88af14ca4eea3b8269dfaaf4afb77999a0558935dcbc8d85ccb8c646f1b2a9f283d70c549ebf6bebcd62252b4ae675797b43f35d51fc56e48f1
-  data.tar.gz: 3e17715b402b585fd5d24bae0f813fbeeedaadfe44f9a0e66c46f4c8fd6da122a13eb9b416fa9c95481552a001a5df0a399ef73a0b9e9561ef373a6fb8a61c3e
+  metadata.gz: bf90d497ed178964e0f950f5c91902061347417e2e911ed965d4d61af00c11d5835d7d0360364c0874c1e70412e9e11a3069ef8dfcf7e5aadffd33bb5301dffe
+  data.tar.gz: 5ed644ef6b70846d6a355b7405df15950b5061d28085ab341794edeb3f188393525849c732449dfcec70e866c49a9562d32561f38435fed396358a269be98a7c

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,45 @@ 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
   end
-end
+end

data/lib/ttl2html/version.rb

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

data/lib/ttl2html.rb

@@ -172,6 +172,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

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>

metadata

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