jekyll-wkd 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a06312e387e2b7da2c7bc5071f2b614a435436c47b883da84430b1d1bbbaeb3f
-  data.tar.gz: 60196f579ce1740cab8ae47d787e18f7a0c6badeaf1c679b05926feda5f76446
+  metadata.gz: 4169163b6bfaa8e85e0d818d90e2aedf4726e9da547f5ded4bb073b2d0bdf1ac
+  data.tar.gz: ddcc2b92af6cd6d656cfad97dcc25725e922ab6fdccc0bc3c03f6546f77c059e
 SHA512:
-  metadata.gz: 9879f889d072ba3d0291105c901aa50b18fca5fa9fb2464af07f8a552bc6d393f818e62f1b6d1eafc5572f5c83656b3da1a579a9851ed8d4b2333ea97fafc913
-  data.tar.gz: bac3744510b72721c0c89e34c811af06287151185aaf60f02b92ed9a018e72b81d3227faf7f57e4b342830794a0a0e4d77c4b6b4fae48b864c990f8a68feba54
+  metadata.gz: 85cbd02d9b14dec3dfa8dffd0c38cec46a6d2f753546af11c60b309c7090ec9f61d27fcef2d3e728653a9c645e9a8ac90e8923954356c20d62e03d62f485d204
+  data.tar.gz: 3b6c1490e11823a7eb0bd43c39abed83f06ed9e015872cabf08c1c049fe6632a5a898633a89699794ef0c093c3f8509ad7b52f4b960247ad57589457baffad6d

data/lib/jekyll-wkd/generator.rb

@@ -12,8 +12,9 @@ module JekyllWKD
 
     CONF_KEY = "wkd"
     CONF_DEFAULT = {
-      "path" => "keys",
-      "exts" => %w[.asc .pub]
+      "exts" => %w[.asc .pub],
+      "mode" => "advanced",
+      "path" => "keys"
     }
 
     def generate site
@@ -22,7 +23,7 @@ module JekyllWKD
       pgp_home = Dir.mktmpdir "jekyll-wkd-"
       GPGME::Engine.home_dir = pgp_home
       Jekyll::Hooks.register :site, :post_write do
-        FileUtils.remove_dir pgp_home
+        FileUtils.remove_dir pgp_home if File.directory? pgp_home
       end
 
       domains = Set.new
@@ -35,7 +36,8 @@ module JekyllWKD
               @site.source,
               File.dirname(file.relative_path),
               File.basename(file.relative_path),
-              key.fingerprint
+              key.fingerprint,
+              advanced?
             )
             domains << kf.domain
             @site.static_files << kf
@@ -43,6 +45,10 @@ module JekyllWKD
         end
       end
 
+      if !advanced? && domains.size > 1
+        Jekyll.logger.warn "Cannot export multiple domains in direct mode"
+      end
+
       domains.each do |domain|
         @site.pages << make_policy(domain)
       end
@@ -54,6 +60,10 @@ module JekyllWKD
       @config ||= CONF_DEFAULT.merge @site.config.fetch(CONF_KEY, {})
     end
 
+    def advanced?
+      config["mode"] == "advanced"
+    end
+
     def in_path? file
       File.exist? @site.in_source_dir(config["path"], file.name)
     end
@@ -65,7 +75,7 @@ module JekyllWKD
     end
 
     def make_policy domain
-      path = File.join(PGP_PATH, domain, "policy")
+      path = File.join(PGP_PATH, advanced? ? domain : "", "policy")
       PolicyFile.new(@site, __dir__, "", path).tap do |page|
         page.content = "# Policy flags for domain `#{domain}`\n"
         page.data.merge!(

data/lib/jekyll-wkd/keyfile.rb

@@ -5,15 +5,18 @@ require "digest"
 
 module JekyllWKD
   class KeyFile < ::Jekyll::StaticFile
-    def initialize site, base, dir, name, fpr
-      @fpr = fpr
+    attr_reader :advanced, :fingerprint
+
+    def initialize site, base, dir, name, fpr, adv = true
+      @fingerprint = fpr
+      @advanced = adv
       super site, base, dir, name
     end
 
     def destination dest
       @destination ||= {}
       @destination[dest] ||= @site.in_dest_dir(
-        dest, PGP_PATH, domain, "hu", hash
+        dest, PGP_PATH, advanced ? domain : "", "hu", hash
       )
     end
 
@@ -45,7 +48,7 @@ module JekyllWKD
     private
 
     def pgpkey
-      @pgpkey ||= GPGME::Key.get(@fpr)
+      @pgpkey ||= GPGME::Key.get(fingerprint)
     end
   end
 end

data/lib/jekyll-wkd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllWKD
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-wkd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Fern Zapata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll