pbsimply 3.7.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2819cbfc7057533e6c680ba3ee1b8dc30117eb532e7061a778437b2a5f3433
-  data.tar.gz: fe9e02ca45a41d2a7649ea4b47be2230f52bf516b8b03722a4c6448be75d99b1
+  metadata.gz: 975c294c043cdc42f1a27b4ca670452598895f14bf8f4d4af5861e8c042827c2
+  data.tar.gz: fea3998951bb0c26638d11bbc53bd74644ae3b768b8676a8636888b02c89357f
 SHA512:
-  metadata.gz: 20eefe2e45fb693831c91fda93007f64782d7ebcc37fc8a964709f506771a0e7b60b03612b16fdc5edd1f59c0e6ac0c51065c51447074bca1c3ca36727a4642b
-  data.tar.gz: 673a659f5af31b89441e048e1896e3773d385404a9dcc9055fcc93ec85f95d2945e7daef92c6d0fd86ed23c39e73767949a5f66da732a450e97a613e08c24557
+  metadata.gz: 23b6806940f2c7498d99df6ded9f50c6cd4c35a97f768e75ef5411330307accdfc696026202540e2f7a6ad1f097e1b1cd014ddf8deb6234f1c727bb7c3333628
+  data.tar.gz: a09f739635c30597857f7401fa6df02266dc26476a41f4afff13d0692a41bec6836224ea475ef9bcee0470934780458c75730ea03e134864738357d6d5a5cf0d

data/lib/pbsimply/document.rb

@@ -13,8 +13,8 @@ class PBSimply
       @now = pbs.now
       @accs_processing = pbs.accs_processing
       @outfile = pbs.outfile
-      frontmatter, @pos = read_frontmatter(pbs.dir, filename)
-      @frontmatter = pbs.frontmatter.merge frontmatter
+      fmt, @pos = read_frontmatter(pbs.dir, filename)
+      @frontmatter = pbs.frontmatter.merge fmt
       @modified = true
       @proc_doc_path = nil
     end
@@ -42,7 +42,7 @@ class PBSimply
     end
 
     def draft?
-      frontmatter["draft"]
+      frontmatter["draft"] || frontmatter["pbsimply_exclude"]
     end
 
     def to_a

data/lib/pbsimply/frontmatter.rb

@@ -1,6 +1,8 @@
 #!/bin/env ruby
 require 'erb'
 require 'yaml'
+require 'time'
+require 'date'
 
 module PBSimply::Frontmatter
   # Read Frontmatter from the document.
@@ -132,6 +134,11 @@ module PBSimply::Frontmatter
     end
 
     raise PBSimply::DocumentError.new("This document has no frontmatter") unless frontmatter
+
+    if (frontmatter["draft"] || frontmatter["pbsimply_exclude"])
+      return frontmatter, pos
+    end
+
     raise PBSimply::DocumentError.new("This document has no title.") unless frontmatter["title"]
 
     outpath = case
@@ -161,6 +168,7 @@ module PBSimply::Frontmatter
     this_url.sub!(%r!/\.([^/]+.html)$!, '/\1')
     this_url_external.sub!(%r!/\.([^/]+.html)$!, '/\1')
     frontmatter["page_url"] = this_url
+    frontmatter["page_url_external"] = this_url_external
     # URL in site with URI encode.
     frontmatter["page_url_encoded"] = ERB::Util.url_encode(this_url)
     frontmatter["page_url_encoded_external"] = ERB::Util.url_encode(this_url_external)
@@ -170,8 +178,7 @@ module PBSimply::Frontmatter
     frontmatter["title_encoded"] = ERB::Util.url_encode(frontmatter["title"])
     frontmatter["title_html_escaped"] = ERB::Util.html_escape(frontmatter["title"])
     fts = frontmatter["timestamp"]
-    fts = fts.to_datetime if Time === fts
-    if DateTime === fts
+    if Time === fts || DateTime === fts
       frontmatter["timestamp_xmlschema"] = fts.xmlschema
       frontmatter["timestamp_jplocal"] = fts.strftime('%Y年%m月%d日 %H時%M分%S秒')
       frontmatter["timestamp_rubytimestr"] = fts.strftime('%a %b %d %H:%M:%S %Z %Y')

data/lib/pbsimply/utils.rb

@@ -0,0 +1,83 @@
+require 'json'
+
+class PBSimply
+  class Utils
+    def self.normalize_source_path path
+      root = File.expand_path Dir.pwd
+      path = File.expand_path path
+      unless root == path[0, root.length]
+        raise InvalidPathError.new("source path not match to document root.")
+      end
+      path[root.length..].sub(%r:^/:, "")
+    end
+  end
+
+  class JsonlLogger
+    def initialize enabled
+      @logfile = nil
+      if enabled
+        unless File.exist? ".pbsimply_var"
+          Dir.mkdir(".pbsimply_var")
+        end
+        @logfile = File.open(File.join(".pbsimply_var", "log.jsonl"), "a")
+        @logfile.flock(File::LOCK_EX)
+        @logfile.seek(0, IO::SEEK_END)
+      end
+    end
+
+    def generate frontmatter
+      return unless @logfile
+      @logfile.puts JSON.generate({
+        "action" => "generate",
+        "filepath" => frontmatter["source_path"],
+        "timestamp" => Time.now.to_i,
+        "title" => frontmatter["title"],
+        "url" => frontmatter["page_url"],
+        "size" => frontmatter["_size"],
+        "format" => frontmatter["_docformat"]
+      })
+    end
+
+    def delete fp
+      return unless @logfile
+      @logfile.puts JSON.generate({
+        "action" => "delete",
+        "filepath" => Utils.normalize_source_path(fp),
+        "timestamp" => Time.now.to_i
+      })
+    end
+  end
+
+  class TitleMapDB
+    def initialize enabled
+      @db = nil
+      if enabled
+        require 'dbm'
+        unless File.exist? ".pbsimply_var"
+          Dir.mkdir(".pbsimply_var")
+        end
+        @db = DBM.new(File.join(".pbsimply_var", "titlemap"))
+        @key = "title"
+        @key = "title_encoded" if enabled == "url_encoded"
+        @key = "title_html_escaped" if enabled == "html_escaped"
+      end
+    end
+
+    def []=(path, frontmatter)
+      return unless @db
+      now = Time.now.to_i
+      val = @db[path]
+      val = val ? JSON.load(val) : {}
+      if val[frontmatter[@key]]
+        val[frontmatter[@key]]["last_update"] = now
+      else
+        val[frontmatter[@key]] = {
+          "since" => now,
+          "last_update" => now
+        }
+      end
+
+      @db[path] = val
+    end
+  end
+end

data/lib/pbsimply.rb

@@ -21,6 +21,7 @@ require 'pbsimply/config-checker'
 require 'pbsimply/document'
 require 'pbsimply/eruby'
 require 'pbsimply/template-engine'
+require 'pbsimply/utils'
 
 class PBSimply
   include Prayer
@@ -62,6 +63,8 @@ class PBSimply
     class InvalidConfigError < PBSimplyError
     end
   end
+  class InvalidPathError < PBSimplyError
+  end
 
   # Use Oj as JSON library for frontmatter passing if possible.
   begin
@@ -165,6 +168,9 @@ class PBSimply
     @frontmatter = {}
     @accs_processing = false
 
+    @logger = JsonlLogger.new config["enable_jsonl_log"]
+    @titlemap_db = TitleMapDB.new config["enable_titlemap"]
+
     $debug = (ENV["DEBUG"] == "yes")
   end
 
@@ -227,13 +233,19 @@ class PBSimply
     draft_articles = []
     target_docs = []
     effective_docs = []
+    exclude_files = []
     $stderr.puts "in #{@dir}..."
 
+    # Check exclude file
+    if File.exist?(File.join(@dir, ".pbsimply-exclude"))
+      exclude_files = File.read(File.join(@dir, ".pbsimply-exclude")).each_line.map(&:chomp).reject(&:empty?)
+    end
+
     $stderr.puts "Checking Frontmatter..."
     Dir.foreach(@dir) do |filename|
       next if filename == "." || filename == ".." || filename == ".index.md"
       next unless File.file? File.join(@dir, filename)
-      if filename =~ /^\./ || filename =~ /^draft-/
+      if filename =~ /^\./ || filename =~ /^draft-/ || exclude_files.include?(filename)
         draft_articles.push({
           article_filename: filename.sub(/^(?:\.|draft-)/, ""),
           filename: filename,
@@ -343,6 +355,7 @@ class PBSimply
         tfp = File.join(@config["outdir"], @dir, tfn)
         if File.file?(tfp)
           $stderr.puts "#{df} was turn to draft."
+          @logger.delete dah[:source_file_path]
           @hooks.delete.run({target_file_path: tfp, source_file_path: dah[:source_file_path]})
           File.delete tfp if @config["auto_delete"]
         end
@@ -361,6 +374,7 @@ class PBSimply
       unless File.exist? v["source_path"]
         $stderr.puts "#{k} is missing."
         missing_keys.push k
+        @logger.delete v["source_path"]
         @hooks.delete.run({target_file_path: v["dest_path"] ,source_file_path: v["source_path"]})
         File.delete v["dest_path"] if @config["auto_delete"]
       end
@@ -442,6 +456,7 @@ class PBSimply
 
     # Generated Document
     doc = process_document(dir, filename, frontmatter, orig_filepath, ext, procdoc) # at sub-class
+    @logger.generate frontmatter
 
     ##### Post eRuby
     if @config["post_eruby"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbsimply
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Masaki Haruka
@@ -43,6 +43,7 @@ files:
 - lib/pbsimply/plugger.rb
 - lib/pbsimply/prayer.rb
 - lib/pbsimply/template-engine.rb
+- lib/pbsimply/utils.rb
 - themes/contribute/README.md
 - themes/default.yaml
 - themes/pandoc/_pandoc_base/.accsindex.erb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Flexible and programmable static site generator with pluggable Markdown engines
 test_files: []