pbsimply 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8646259ef8d789b45379e1a72d861f96dc6d17b7c11fb5a8efd8211abed803f2
-  data.tar.gz: 26624a779547dd0620130266dfad5bfebf0c23c65b3e6d4c2d6e2f937dc81b87
+  metadata.gz: 5c2cee1a598dad5d08c823c51768afebae4d8e0459b3507658ca10a613c33bc4
+  data.tar.gz: c13273c93cc68212ad5bb72b785dc01a640415c03bc5be98faccee449f8c54ee
 SHA512:
-  metadata.gz: 6f80e3b59ec6a78e9630602d4090af1ae1b5b444946fb638c6e60bbb1e47f3c6ee9c0f8e9869c82321d0db4884622cedd57fd1c24aff12a7675942fb7b2fc495
-  data.tar.gz: 57d20e28c25f2eb944d61557a63321ae4799b17e135ede66321a6957598a531c858b27ff80350b33a4295721b3962dfe38f046dbdc599440644aea8653171da6
+  metadata.gz: 1e90c599fc508e0e44aa1e882dca4de285f150dde10eecfaf7c22d20ca674cd4b29be5ace1a139a8fe36b5581afd1d81438c168c2823739a0ef1ddfbeacf1116
+  data.tar.gz: e0a079093ca72cc0575b7858a687e838a8c848ff9c9eff036cba99e7678ee9de4f098890d619e1b5078049252f4b277bb20fc09c50d4db0488c4fb148e88ed58

data/lib/pbsimply/hooks.rb

@@ -16,7 +16,17 @@ class PBSimply::Hooks
       @hooks << proc
     end
 
-    alias :add :<<
+    def add(&proc)
+      @hooks << proc
+    end
+
+    # Invoke command updating files
+    def cmd(*cmdarg)
+      proc = ->(arg) do
+        system(*cmdarg)
+      end
+      self << proc
+    end
 
     def run(arg)
       STDERR.puts "Hooks processing (#{@name})"
@@ -32,14 +42,32 @@ class PBSimply::Hooks
     end
   end
 
+  # Timing Object for pre, process
+  class HooksHolderPre < HooksHolder
+    # Invoke command as filter.
+    def filter(*cmdarg)
+      proc = ->(arg) do
+        IO.popen(cmdarg, "w+") do |io|
+          io.print File.read ENV["pbsimply_currentdoc"]
+          io.close_write
+          File.open(ENV["pbsimply_currentdoc"], "w") do |f|
+            f.write io.read
+          end
+        end
+      end
+      self << proc
+    end
+  end
+
   def initialize(pbsimply)
     @pbsimply = pbsimply
+    @hooks_loaded = false
 
     # Called first phase before generate. This hooks called before blessing.
     #
     # Argument: frontmatter, procdoc.
     # procdoc is processing source document path.
-    @pre = HooksHolder.new "pre"
+    @pre = HooksHolderPre.new "pre"
 
     # Called after document was generated.
     # 
@@ -73,7 +101,8 @@ class PBSimply::Hooks
   def load
     if File.file?("./.pbsimply-hooks.rb")
       require './.pbsimply-hooks.rb'
-      PBSimply::Hooks.load_hooks(self)
+      PBSimply::Hooks.load_hooks(self) unless @hooks_loaded
+      @hooks_loaded = true
     end
   end
 

data/lib/pbsimply.rb

@@ -201,6 +201,8 @@ class PBSimply
       # Push to target documents without checking modification.
       target_docs.push([filename, frontmatter, pos])
     end
+    ENV.delete("pbsimply_currentdoc")
+    ENV.delete("pbsimply_filename")
 
     delete_turn_draft draft_articles
 
@@ -236,6 +238,8 @@ class PBSimply
     # Proccess documents
     target_docs.each do |filename, frontmatter, pos|
       ext = File.extname filename
+      ENV["pbsimply_currentdoc"] = File.join(@workdir, "current_document#{ext}")
+      ENV["pbsimply_filename"] = filename
       @index = frontmatter
       File.open(File.join(@dir, filename)) do |f|
         f.seek(pos)
@@ -396,21 +400,22 @@ class PBSimply
       modify = false if frontmatter["changes"] == index["changes"]
     when "mtimesize"
       # Use mtime and file size.
-      modify = false if frontmatter["_mtime"] <= frontmatter["_last_proced"] && frontmatter["_size"] == index["_size"]
+      modify = false if frontmatter["_mtime"] <= (index["_last_proced"] || 0) && frontmatter["_size"] == index["_size"]
     else
       # Default method, use mtime.
-      modify = false if frontmatter["_mtime"] <= frontmatter["_last_proced"]
+      modify = false if frontmatter["_mtime"] <= (index["_last_proced"] || 0)
     end
 
 
     if modify
-      STDERR.puts "#{path[1]} last modified at #{frontmatter["_mtime"]}, last processed at #{@indexes_orig[path[1]]&.[]("_last_proced") || 0}"
-      frontmatter["_last_proced"] = @now.to_i
-      frontmatter["last_update"] = @now.strftime("%Y-%m-%d %H:%M:%S")
+      STDERR.puts "#{filename} last modified at #{frontmatter["_mtime"]}, last processed at #{@indexes_orig[filename]&.[]("_last_proced") || 0}"
     else
-      STDERR.puts "#{path[1]} is not modified."
+      STDERR.puts "#{filename} is not modified."
     end
 
+    frontmatter["_last_proced"] = @now.to_i
+    frontmatter["last_update"] = @now.strftime("%Y-%m-%d %H:%M:%S")
+
     if @refresh
       # Refresh (force update) mode.
       true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbsimply
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Masaki Haruka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Pre compile, static serving website builder.
 email: