ttl2html 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bd052e74baedc74a4f4a5d3f78770d00f281dea52371c9b795fd48fc98c08c4
-  data.tar.gz: 320a243b01882fed22cda54f1403f420b795f2bc8a3a0bd68f8648003a827382
+  metadata.gz: b9d57dc99fea0827d317a9dc3597cae9c69d1ac38dbcd66000327f1b913dea03
+  data.tar.gz: d30441245cd56e6322fe3ab0b27351a83900b6c6826b3c5a6d611bffa8245d3e
 SHA512:
-  metadata.gz: a6470f1e2fe766e98623869b1a0c08adba40e6bc8444d545d95fe42f9593ab2b805269e093a2efc69992acf6bf78f95468580ad42a1a21d7238a9909de22a67c
-  data.tar.gz: ed809702cdcf07a74b8dbe0db7552b663fb2a688dda840e094f45ca843dc8b9bfb3bf5778b416a4e2ad72a700609c305edfb68f1c993afbe9ecd3d719eef13dc
+  metadata.gz: 6c5068b43cc54072f3958f46b5192c5fe118d5942c0b53d4f2fc35f8e35560a6768a2905d1cd946efc8462faa51b2d2ea4d844f8f73f982e18fb73ea5a812ee5
+  data.tar.gz: 6dc8f656583fc5d8a96baab454b1ea47e446e5694c55f457b3e236e91945595d8b2838d7a7b628d918d7a9c85bb138e081e8919453edce96228572a93dd617eb

data/lib/ttl2html/template.rb

@@ -12,7 +12,7 @@ module TTL2HTML
     include I18n::Base
     def initialize(template, param = {})
       @template = template
-      @param = param
+      @param = param.dup
       @template_path = [ Dir.pwd, File.join(Dir.pwd, "templates") ]
       @template_path << File.join(File.dirname(__FILE__), "..", "..", "templates")
       I18n.load_path << Dir[File.join(File.dirname(__FILE__), "..", "..", "locales") + "/*.yml"]
@@ -113,6 +113,33 @@ module TTL2HTML
     end
 
     # helper method:
+    def uri_mapping_to_path(uri, suffix = ".html")
+      path = nil
+      if @param[:uri_mappings]
+        @param[:uri_mappings].each do |mapping|
+          local_file = uri.sub(@param[:base_uri], "")
+          if mapping["regexp"] =~ local_file
+            path = local_file.sub(mapping["regexp"], mapping["path"])
+          end
+        end
+      end
+      if path.nil?
+        if suffix == ".html"
+          if @param[:data_global] and @param[:data_global].keys.find{|e| e.start_with?(uri + "/") }
+            path = uri + "/index"
+          elsif uri.end_with?("/")
+            path = uri + "index"
+          else
+            path = uri
+          end
+        else
+          path = uri
+        end
+      end
+      path = path.sub(@param[:base_uri], "") if @param[:base_uri]
+      path << suffix
+      path
+    end
     def relative_path(dest)
       src = @param[:output_file]
       src = Pathname.new(src).relative_path_from(Pathname.new(@param[:output_dir])) if @param[:output_dir]
@@ -123,6 +150,7 @@ module TTL2HTML
     def relative_path_uri(dest_uri, base_uri)
       if dest_uri.start_with? base_uri
         dest = dest_uri.sub(base_uri, "")
+        dest = uri_mapping_to_path(dest, "")
         relative_path(dest)
       else
         dest_uri
@@ -173,7 +201,7 @@ module TTL2HTML
     def format_object(object, data)
       if object =~ /\Ahttps?:\/\//
         rel_path = relative_path_uri(object, param[:base_uri])
-        if data[object]
+        if param[:data_global][object]
           "<a href=\"#{rel_path}\">#{get_title(param[:data_global][object]) or object}</a>"
         else
           "<a href=\"#{rel_path}\">#{object}</a>"

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "1.1.1"
+TTL2HTML::VERSION = "1.2.0"

data/lib/ttl2html.rb

@@ -11,7 +11,6 @@ require "ttl2html/template"
 module TTL2HTML
   class App
     def initialize(config = "config.yml")
-      @template = {}
       @config = load_config(config)
       if not @config[:base_uri]
         raise "load_config: base_uri not found"
@@ -67,50 +66,41 @@ module TTL2HTML
     def format_turtle(subject, depth = 1)
       turtle = RDF::Turtle::Writer.new
       result = ""
-      if subject.iri?
-        result << "<#{subject}>\n#{"  "*depth}"
-      else
+      if subject =~ /^_:/
         result << "[\n#{"  "*depth}"
+      else
+        result << "<#{subject}>\n#{"  "*depth}"
       end
-      result << @graph.query([subject, nil, nil]).predicates.sort.map do |predicate|
+      result << @data[subject.to_s].keys.sort.map do |predicate|
         str = "<#{predicate}> "
-        str << @graph.query([subject, predicate, nil]).objects.sort_by do |object|
-          if object.resource? and not object.iri? # blank node:
-            @graph.query([object, nil, nil]).statements.sort_by{|e|
-              [ e.predicate, e.object ]
-            }.map{|e|
-              [ e.predicate, e.object ]
-            }
-          else
-            object
-          end
-        end.map do |object|
-          if object.resource? and not object.iri? # blank node:
+        str << @data[subject.to_s][predicate].sort.map do |object|
+          if object =~ /^_:/ # blank node:
             format_turtle(object, depth + 1)
+          elsif object =~ RDF::URI::IRI
+            turtle.format_uri(RDF::URI.new object)
+          elsif object.respond_to?(:first) and object.first.kind_of?(Symbol)
+            turtle.format_literal(RDF::Literal.new(object[1], language: object[0]))
           else
-            case object
-            when RDF::URI
-              turtle.format_uri(object)
-            else
-              turtle.format_literal(object)
-            end
+            turtle.format_literal(object)
           end
         end.join(", ")
         str
       end.join(";\n#{"  "*depth}")
-      result << " ." if subject.iri?
+      result << " ." if not subject =~ /^_:/
       result << "\n"
-      result << "#{"  "*(depth-1)}]" if not subject.iri?
+      result << "#{"  "*(depth-1)}]" if subject =~ /^_:/
       result
     end
     def format_turtle_inverse(object)
-      turtle = RDF::Turtle::Writer.new
       result = ""
-      @graph.query([nil, nil, object]).statements.sort_by do |e|
-        [ e.subject, e.predicate, object ]
-      end.map do |e|
-        next if e.subject.node?
-        result << "<#{e.subject}> <#{e.predicate}> <#{object}>.\n"
+      return result if not object.start_with? @config[:base_uri]
+      return result if not @data_inverse.has_key? object
+      turtle = RDF::Turtle::Writer.new
+      @data_inverse[object].keys.sort.each do |predicate|
+        @data_inverse[object.to_s][predicate].sort.each do |subject|
+          next if subject =~ /^_:/
+          result << "<#{subject}> <#{predicate}> <#{object}>.\n"
+        end
       end
       result
     end
@@ -122,7 +112,7 @@ module TTL2HTML
       end
     end
     def output_html_files
-      template = Template.new("")
+      template = Template.new("", @config)
       shapes = @graph.query([nil,
                              RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
                              RDF::URI("http://www.w3.org/ns/shacl#NodeShape")])
@@ -230,8 +220,8 @@ module TTL2HTML
           Dir.mkdir @config[:output_dir] if not File.exist? @config[:output_dir]
           file = File.join(@config[:output_dir], file)
         end
-        str = format_turtle(RDF::URI.new uri)
-        str << format_turtle_inverse(RDF::URI.new uri)
+        str = format_turtle(uri)
+        str << format_turtle_inverse(uri)
         open(file, "w") do |io|
           io.puts str.strip
         end

data/templates/layout.html.erb

@@ -22,7 +22,7 @@
     <hr>
     <footer>
       <%- if param[:uri] -%>
-      <p class="pull-right"><a href="<%=h param[:uri] %>.ttl"><img src="https://www.w3.org/RDF/icons/rdf_flyer.24" alt="<%=h t("layout.rdf_data") %>"></a></p>
+      <p class="pull-right"><a href="<%=h param[:uri] %>.ttl"><img src="https://www.w3.org/RDF/icons/rdf_flyer.24" alt="<%=h t("layout.rdf-data") %>"></a></p>
       <%- end -%>
     </footer>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Masao Takaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri