pbsimply 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f75e4f4e81729dbe5a291d473f1f2dc83bd51d52076179bd1a5517cf6bde380
-  data.tar.gz: df909fb121e61744b056e0d934e07acd43d88d1630873c78910cc92a6462c390
+  metadata.gz: 1e6667388a878546c3fb8b5c5880661c66012a3ad65f4ce834fba8da89d470dc
+  data.tar.gz: 14b13fbe88d551bffb92d5a2c61f8e6a1378a437baa2a805a170e152314f37c5
 SHA512:
-  metadata.gz: 06417d28977298a737faee844340700128d9d047d938ea16737ede93d1d8609e6844d0f3b49c138b4129b9c658f9a1444f38eb89e80848aa3362e1d04b47b720
-  data.tar.gz: da761d0166bc05e276296b449393f2914ea6b462ebe28d6d96ea1f392323bfa919864c3d655e1279029f57773cbdd7d89464cb33f0f74be28032455ddd275ac2
+  metadata.gz: d650ffb297c0bd3ce21e05fc0edbb8d67f01c24af295b4a2ca387ccfacecefd81649469e7ddd1600958ed0943ba2f4bf46839fb6fbd0ed0c5d7e4c8efeede449
+  data.tar.gz: 5d35227c8476719684bc8c0abf04bf49ba4c34cbf065b487230750aeea5a1d0582b187299603ccdaf93d0047017b8a9b276bd6d8a49fa04c17ad577d173da1db

data/lib/pbsimply/document.rb

@@ -4,15 +4,17 @@ class PBSimply
   class Document
     include Frontmatter
 
-    def initialize(config, dir, filename, base_frontmatter, now)
-      @config = config
-      @dir = dir
+    def initialize(pbs, filename)
+      @config = pbs.config
+      @dir = pbs.dir
       @filename = filename
       @ext = File.extname filename
-      @orig_filepath = File.join(dir, filename)
-      @now = now
-      frontmatter, @pos = read_frontmatter(dir, filename)
-      @frontmatter = base_frontmatter.merge frontmatter
+      @orig_filepath = File.join(pbs.dir, filename)
+      @now = pbs.now
+      @accs_processing = pbs.accs_processing
+      @outfile = pbs.outfile
+      frontmatter, @pos = read_frontmatter(pbs.dir, filename)
+      @frontmatter = pbs.frontmatter.merge frontmatter
       @modified = true
       @proc_doc_path = nil
     end

data/lib/pbsimply/prayer.rb

@@ -78,13 +78,13 @@ module PBSimply::Prayer
             begin
               @article_order = @indexes.to_a.sort_by {|i| i[1]["date"]}
             rescue
-              abort "*** Automatic Blessing Method Error: Maybe some article have no date."
+              abort "*** Automatic Blessing Method Error: Maybe some article has no date."
             end
           when "timestamp"
             begin
               @article_order = @indexes.to_a.sort_by {|i| i[1]["timestamp"]}
             rescue
-              abort "*** Automatic Blessing Method Error: Maybe some article have no timetsamp."
+              abort "*** Automatic Blessing Method Error: Maybe some article has no timetsamp."
             end
           when "lexical"
             @article_order = @indexes.to_a.sort_by {|i| i[1]["_filename"]}

data/lib/pbsimply.rb

@@ -129,10 +129,15 @@ class PBSimply
     @accs_index = {}
     @now = Time.now
     @hooks = PBSimply::Hooks.new(self, @config)
+    @dir = nil
+    @frontmatter = {}
+    @accs_processing = false
 
     @debug = (ENV["DEBUG"] == "yes")
   end
 
+  attr_reader :config, :dir, :frontmatter, :now, :accs_processing, :outfile
+
   # Process command-line
   def treat_cmdline(dir=nil)
     # Options definition.
@@ -188,6 +193,7 @@ class PBSimply
   def proc_dir
     draft_articles = []
     target_docs = []
+    effective_docs = []
     $stderr.puts "in #{@dir}..."
 
     $stderr.puts "Checking Frontmatter..."
@@ -207,7 +213,7 @@ class PBSimply
       end
 
       $stderr.puts "Checking frontmatter in #{filename}"
-      doc = Document.new(@config, @dir, filename, @frontmatter, @now)
+      doc = Document.new(self, filename)
 
       if doc.draft?
         draft_articles.push({
@@ -219,9 +225,13 @@ class PBSimply
       end
 
       doc.orig_frontmatter = @indexes[filename]
+      @indexes[filename] = doc.frontmatter
 
       # Push to target documents without checking modification.
       target_docs.push(doc)
+
+      # Push to all effective documents.
+      effective_docs.push(doc)
     end
     ENV.delete("pbsimply_currentdoc")
     ENV.delete("pbsimply_filename")
@@ -231,20 +241,9 @@ class PBSimply
     proc_docs target_docs
 
     delete_missing
-
-    # Update modified doc's frontmatter
-    if @preflight
-      target_docs.each do |doc|
-        @indexes[doc.filename] = doc.effective_forntmatter
-      end
-    else
-      target_docs.each do |doc|
-        @indexes[doc.filename] = doc.frontmatter
-      end
-    end
     
     # Save index.
-    @db.dump(@indexes) unless @skip_index
+    save_index(effective_docs) unless @skip_index
 
     # ACCS processing
     if @accs && !target_docs.empty?
@@ -371,7 +370,7 @@ class PBSimply
 
         load_index
 
-        doc = Document.new(@config, dir, filename, @frontmatter, @now)
+        doc = Document.new(self, filename)
         @index = doc.frontmatter
 
         proc_docs([doc])
@@ -479,4 +478,12 @@ class PBSimply
       raise CommandLineError.new "ACCS-only processing needs ACCS directory as an argument."
     end
   end
+
+  def save_index(effective_docs)
+    new_indexes = {}
+    effective_docs.each do |doc|
+      new_indexes[doc.filename] = doc.effective_forntmatter
+    end
+    @db.dump(new_indexes)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbsimply
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Masaki Haruka