ttl2html 2.0.6 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ba13439ae39fd922568aa533324a67b761e7cccde1ec8f5d443fe7a0147d9a
-  data.tar.gz: e214ea7dd81f5bd44d20d7012ce0cfbebe3399987d2739bb028c99bd7a05369c
+  metadata.gz: 3d8c7e6dce36bd989cd64b3ac4964afacc39dd7c7d523e6d7994e13b0627cce1
+  data.tar.gz: 196b493e732acbeaa8d49c7e1a6529fe5a3626b81c60d0fc3218dc6b23ad68c5
 SHA512:
-  metadata.gz: 7ea0403e8e26f58d089f60492c09ba40cf1bf61a4a0fae601f6721352e962f010b94cd92477940eb13d30cce5bad5c09aeac49e7c1a86a463fc9d24a61bc1979
-  data.tar.gz: 5af7c483a9568c8c1d289d4c5a9e5a824081193397425d19c517b5f7e52c9fd035bf04f46f8d73edefd9a1e703f251c321ede69aa3804175d532dc4f9d8e4a1c
+  metadata.gz: e0851e31375321f6dd210fd72522d6a21458d02b55c73847ebbd8d6f3b85f6439e59a34457004a6f4a2dd9f60f0522aaa987cd333375e347547f7f071c9bd3e8
+  data.tar.gz: 4d025717df665375a3cf6e13bcecd14b8e40b81428547f54ce8799bff6283c7f31fe747e8786e6f41ed1535a3294e5e7656a7b90e7730d4b68cc3289af6ea363

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.0.6"
+TTL2HTML::VERSION = "2.0.8"

data/lib/ttl2html.rb

@@ -79,7 +79,18 @@ module TTL2HTML
       end
       result << @data[subject.to_s].keys.sort.map do |predicate|
         str = "<#{predicate}> "
-        str << @data[subject.to_s][predicate].sort.map do |object|
+        str << @data[subject.to_s][predicate].sort_by do |object|
+          if /^_:/ =~ object.to_s and @data[object.to_s]
+            qb_order = "http://purl.org/linked-data/cube#order"
+            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][shacl_order] ? @data[object.to_s][shacl_order].first.to_i : Float::INFINITY,
+              format_turtle(object, depth + 1)
+            ]
+          else
+            object.to_s
+          end
+        end.map do |object|
           if /^_:/ =~ object.to_s # blank node:
             format_turtle(object, depth + 1)
           elsif RDF::URI::IRI =~ object.to_s
@@ -101,7 +112,6 @@ module TTL2HTML
       result = ""
       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 =~ /^_:/
@@ -321,7 +331,6 @@ module TTL2HTML
           end
           if not properties.empty?
             properties.each do |property|
-              path = @data[property]["http://www.w3.org/ns/shacl#path"].first
               yield target_class, property
             end
           end

data/templates/layout.html.erb

@@ -18,13 +18,25 @@
     <meta name="twitter:card" content="summary">
     <meta name="twitter:title" content="<%=h html_title(param) %>">
     <meta property="og:title" content="<%=h html_title(param) %>">
+    <%- if param[:ogp] and param[:ogp]["type"] -%>
+    <meta property="og:type" content="<%=h param[:ogp]["type"] %>">
+    <%- else -%>
     <meta property="og:type" content="website">
+    <%- end -%>
     <%- if param[:uri] -%>
     <meta property="og:url" content="<%=h param[:uri] %>">
     <%- end -%>
-    <%- if param[:logo] -%>
+    <%- if param[:ogp] and param[:ogp]["image"] -%>
+    <meta property="og:image" content="<%=h URI.parse(param[:base_uri]) + param[:ogp]["image"] %>">
+    <%- elsif param[:logo] -%>
     <meta property="og:image" content="<%=h URI.parse(param[:base_uri]) + param[:logo] %>">
     <%- end -%>
+    <%- if param[:ogp] -%>
+    <%- param[:ogp].each do |key, value| -%>
+      <%- next if key == "image" or key == "type" -%>
+      <meta property="og:<%=h key %>" content="<%=h value %>">
+    <%- end -%>
+    <%- end -%>
     <meta name="generator" content="ttl2html <%=h TTL2HTML::VERSION %>">
     <%- if param[:google_analytics] -%>
     <script async src="https://www.googletagmanager.com/gtag/js?id=<%=h param[:google_analytics] %>"></script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.8
 platform: ruby
 authors:
 - Masao Takaku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-12 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: getoptlong
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: ttl2html