ttl2html 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f13fa56c6aa39a5b5b4b2840c7b2ac754666158f17cacc1171eeb721c182f89
-  data.tar.gz: e1ea1d14fb60997d3fc7f53801d9493eaf034735cb0fbb782e0eaaa4dec4ab32
+  metadata.gz: 3ce729d5fa24ee0f0bee7469c246866b66be29d929264cdadc0407eeca74d4ee
+  data.tar.gz: 765e30007a06fc04e570ad870eb503dddb0a7eefc119a24df9d6a09e32b65555
 SHA512:
-  metadata.gz: bb9c6d751120b2fed652bebfac79064efcbd4c782ca5387d2c532417144f7416e3147d027a3338f25891f418ca5f9c894c4edf6446dd3cfc7e57efd76232764a
-  data.tar.gz: 89dfcc561db158ccbd51572f0cefdf33fa281702a014c345a1867adc02b9b228e33a11309984367ddf2e43cad3efcf62c335324ea9f5ab8bc7cfaeaa1c98800b
+  metadata.gz: c382e6bdbd98bd83bdcfa658a13b1567102a71fdc52f20c47a64fa7f75b084b47a4754e485e8d3a20276029941822c6f27cacde4782244d51bf44be957e2b93b
+  data.tar.gz: f17d0a336b5e56d73876ef33de8936bc3250ee61dbaf0a940d3b8feb716131c2d5beb16f64c8a0c1fb9cd293db3d054bb36b421bbe07f7f0856ae48b88ed38d7

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.0.5"
+TTL2HTML::VERSION = "2.0.7"

data/lib/ttl2html.rb

@@ -9,6 +9,7 @@ require "ruby-progressbar"
 
 require "ttl2html/util"
 require "ttl2html/template"
+require "ttl2html/version"
 
 module TTL2HTML
   class App
@@ -78,7 +79,13 @@ 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]
+            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

data/templates/layout.html.erb

@@ -18,13 +18,26 @@
     <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>
     <script>
@@ -59,6 +72,10 @@
             <%- end -%>
           <%- end -%>
         </ul>
+        <%- if param[:google_custom_search_id] -%>
+        <script async src="https://cse.google.com/cse.js?cx=<%=h param[:google_custom_search_id] %>"></script>
+        <div class="gcse-search"></div>
+        <%- end -%>
       </div>
     </nav>
     <%= param[:content] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Masao Takaku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -185,7 +185,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