ttl2html 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 179d7c92158302822e387bc70e386abc8ebc592c36b2ddf675f52471fda5a087
-  data.tar.gz: 3d8a36b2de920b07401a7360b11bdb501c0dfa41ffcae314746919d703d415da
+  metadata.gz: 6dd0b43f30e76da300f3b274bbb61c373971ee2ccdf39eb73260281f92ede9ab
+  data.tar.gz: 9495394ea8849bf3ee4b504db967e1617e39d1f6adab79693f8ebc6e5da372a9
 SHA512:
-  metadata.gz: fa1f3bf8f3e62ae2a73474b2469a86818af359f1ce67797f1f29f2738577b9edc12b9d2a91aada8c6d381404518815a33abb830186df2a722e488e80cb49848a
-  data.tar.gz: 1084e5c116dac281ec54a4ab79bedf13a545cb989ada95294d937deae6fdfd4663b52eb251927a4b1fea8f79012a46408235887b8ca7bcfeda026727d9bbe2ec
+  metadata.gz: 95fe91a4347194c0ef8ea2630617769984f2d6fc3cb94af663554b6d7321b3dc3f7748256c0c8fbf11efee903a01789a83ab73af55d2513689a2bb17239f7049
+  data.tar.gz: d03723dc65d280de442265ba848a7d84469daaffa32e584d5c84a6526684d82fb1aa6f6f5aa0685de236744e51868526baf77e00fd6709163140c222f102feb2

data/lib/ttl2html/template.rb

@@ -141,22 +141,23 @@ module TTL2HTML
       else
         dest.sub!(/^\/+/, "")
         #p [:relative_path, src, dest]
-        if @param[:output_dir]
-          src = Pathname.new(src).relative_path_from(Pathname.new(@param[:output_dir]))
-        else
-          src = Pathname.new(File.expand_path(src)).relative_path_from(Pathname.new(File.expand_path(".")))
-        end
-        path = Pathname(dest).relative_path_from(Pathname(File.dirname src))
-        if @param[:output_dir] and File.directory?(File.join(@param[:output_dir], path))
-          path = path.to_s + "/"
-        elsif File.directory?(path)
-          path = path.to_s + "/"
-        end
+        # src is always passed as an absolute path.
+        base_dir = Pathname.pwd
+        base_dir = Pathname.new(@param[:output_dir]).expand_path if @param[:output_dir]
+        # src is always passed as an absolute path, but normalize it to remove
+        # any "." or ".." components before calling relative_path_from.
+        src_path = Pathname.new(src).expand_path
+        src_relative = src_path.relative_path_from(base_dir)
+        path = Pathname.new(dest).relative_path_from(src_relative.dirname)
+        path = "#{path}/" if base_dir.join(dest).cleanpath.directory?
       end
       #p [ :relative_path, path, dest, src ]
       path
     end
     def relative_path_uri(src, dest_uri, base_uri = @param[:base_uri])
+      # A relative link cannot be calculated without the source output file.
+      # Fall back to the original absolute URI.
+      return dest_uri unless src
       if dest_uri.start_with? base_uri
         dest = dest_uri.sub(base_uri, "")
         dest = uri_mapping_to_path(dest, @param, "")

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "3.2.0"
+TTL2HTML::VERSION = "3.2.2"

data/lib/ttl2html.rb

@@ -78,33 +78,39 @@ module TTL2HTML
     SCHEMA_POSITION_URI_S = "https://schema.org/position"
     SHACL_ORDER_URI = "http://www.w3.org/ns/shacl#order"
     def sort_key_for_resource(resource)
+      @cache ||= {}
+      @cache[:sort_key_for_resource] ||= {}
+      resource_s = resource.to_s
+      return @cache[:sort_key_for_resource][resource_s] if @cache[:sort_key_for_resource].key?(resource_s)
+
       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]
-        schema_position = @data[resource.to_s][SCHEMA_POSITION_URI_S].first.to_i if @data[resource.to_s][SCHEMA_POSITION_URI_S]
-        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 @data[resource.to_s]
-        resource_str = "{" + @data[resource.to_s].sort_by do |p, o|
+      if @data[resource_s]
+        qb_order = @data[resource_s][QB_ORDER_URI].first.to_i if @data[resource_s][QB_ORDER_URI]
+        schema_position = @data[resource_s][SCHEMA_POSITION_URI].first.to_i if @data[resource_s][SCHEMA_POSITION_URI]
+        schema_position = @data[resource_s][SCHEMA_POSITION_URI_S].first.to_i if @data[resource_s][SCHEMA_POSITION_URI_S]
+        shacl_order = @data[resource_s][SHACL_ORDER_URI].first.to_i if @data[resource_s][SHACL_ORDER_URI]
+      end
+      value = if resource_s =~ /^_:/ and @data[resource_s]
+        resource_str = "{" + @data[resource_s].sort_by do |p, o|
           [p, o]
         end.join("\t") + "}"
         [ schema_position, qb_order, shacl_order, resource_str ]
       else
-        [ schema_position, qb_order, shacl_order, resource.to_s ]
+        [ schema_position, qb_order, shacl_order, resource_s ]
       end
+      @cache[:sort_key_for_resource][resource_s] = value
     end
     def format_uri(uri, writer = RDF::Turtle::Writer.new(nil, prefixes: @prefix))
       result = writer.format_uri(RDF::URI(uri))
       if result =~ /^#{RDF::Turtle::Terminals::PN_PREFIX}?:/
         @used_prefixes << result.split(":").first
+        #STDERR.puts [uri, @used_prefixes].inspect
       end
       result
     end
-    def format_turtle(subject, depth = 1, force = false)
-      turtle_writer = RDF::Turtle::Writer.new(nil, prefixes: @prefix)
+    def format_turtle(subject, depth = 1, force = false, turtle_writer = RDF::Turtle::Writer.new(nil, prefixes: @prefix))
       result = ""
       #p [:format_turtle, subject, depth, force]
       return result if !force && @cache[:output_turtle_files].include?(subject)
@@ -114,17 +120,21 @@ module TTL2HTML
         result << format_uri(subject) << "\n#{"  "*depth}"
       end
       result << @data[subject.to_s].keys.sort.map do |predicate|
-        str = format_uri(predicate, turtle_writer) << " "
+        str = format_uri(predicate, turtle_writer).dup
+        str << " "
         #p [subject, predicate, @data[subject.to_s][predicate]]
         str << @data[subject.to_s][predicate].sort_by do |object|
           #p [subject, predicate, object, depth]
           sort_key_for_resource(object)
         end.map do |object|
           if /^_:/ =~ object.to_s # blank node:
-            format_turtle(object, depth + 1, force)
+            format_turtle(object, depth + 1, force, turtle_writer)
           elsif RDF::URI::IRI =~ object.to_s
             format_uri(object, turtle_writer)
           else
+            if object.respond_to?(:datatype) and object.datatype?
+              datatype = format_uri(object.datatype) # to add @used_prefixes
+            end
             turtle_writer.format_literal(object)
           end
         end.join(", ")
@@ -201,9 +211,16 @@ module TTL2HTML
     end
     def find_inverse_roots(by_subject)
       all_subjects = by_subject.keys
-      all_objects  = by_subject.values.flat_map { |preds| preds.values.flatten }.uniq
+      all_object_ids = Set.new
+      by_subject.each_value do |predicates|
+        predicates.each_value do |objects|
+          objects.each do |object|
+            all_object_ids << object.to_s
+          end
+        end
+      end
       roots = all_subjects.reject do |subject|
-        all_objects.include?(subject)
+        all_object_ids.include?(subject.to_s)
       end
       roots.sort_by { |subject| sort_key_for_resource(subject) }
     end
@@ -420,8 +437,8 @@ module TTL2HTML
       data = @data[uri]
       if @config[:breadcrumbs]
         if depth == 0
-          first_label = template.get_title(data)
-          first_label = data[@config[:breadcrumbs].first["label"]].first if @config[:breadcrumbs].first["label"] and data[@config[:breadcrumbs].first["label"]]
+          label_prop = @config[:breadcrumbs].first["label"]
+          first_label = breadcrumb_label(data, template, label_prop)
           results << { label: first_label }
         end
         @config[:breadcrumbs].each do |e|
@@ -458,14 +475,20 @@ module TTL2HTML
     end
     def build_breadcrumbs_sub(parent, template, label_prop = nil)
       data_parent = @data[parent]
-      label = template.get_title(data_parent)
-      label = data_parent[label_prop].first if label_prop and data_parent[label_prop]
       {
         uri: parent,
-        label: label,
+        label: breadcrumb_label(data_parent, template, label_prop),
       }
     end
-
+    def breadcrumb_label(data, template, label_prop = nil)
+      default_label = template.get_title(data)
+      Array(label_prop).each do |property|
+        #p [property, data[property]]
+        values = data[property]
+        return values.first if values && !values.empty?
+      end
+      default_label
+    end
     def shapes_parse(shapes)
       shapes.each do |shape|
         target_class = @data[shape]["http://www.w3.org/ns/shacl#targetClass"]&.first
@@ -656,7 +679,8 @@ module TTL2HTML
         @cache ||= {}
         @cache[:output_turtle_files] = Set.new
         @used_prefixes = Set.new
-        str = format_turtle(uri)
+        turtle_writer = RDF::Turtle::Writer.new(nil, prefixes: @prefix)
+        str = format_turtle(uri, 1, false, turtle_writer)
         str << format_turtle_inverse(uri)
         File.open(file, "w") do |io|
           @used_prefixes.each do |prefix|

data/templates/default.html.erb

@@ -77,7 +77,11 @@
             <ol class="breadcrumb">
               <li class="breadcrumb-item"><a href="<%=h relative_path_uri(param[:output_file], param[:base_uri]) %>"><i class="bi bi-house-door-fill"></i> Home</a></li>
               <%- param[:breadcrumbs_items].reverse.each_with_index do |e, i| -%>
-                <li class="breadcrumb-item<%= ' active' if i == param[:breadcrumbs_items].size-1 %>" aria-current="page">
+                <%- if i == param[:breadcrumbs_items].size-1 -%>
+                <li class="breadcrumb-item active" aria-current="page">
+                <%- else -%>
+                <li class="breadcrumb-item">
+                <%- end -%>
                 <%- if e[:uri] -%>
                   <a href="<%=h relative_path_uri(param[:output_file], e[:uri]) %>"><%=h e[:label] %></a>
                 <%- else -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Masao Takaku
 bindir: bin
 cert_chain: []
-date: 2026-05-04 00:00:00.000000000 Z
+date: 2026-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri