zarchitect 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469554302adb7c026b4d3fce6688def41c093072aae0f1d92c728ab65644d7c1
-  data.tar.gz: afebeacb1f9fa7ed5721d9a915260d4146608e3ab9b4f67f95687544a97ef71a
+  metadata.gz: 125b9fe09ed687c0d528fda4690c0226fb41a224951a87415cfbac2d2cc29c24
+  data.tar.gz: 2749112b098facb3e31595d78b1b983176d070fd3c5baeb76e1cd82b40e29248
 SHA512:
-  metadata.gz: aefca6ec59f4bb36de7580e9e1eae6f62f1540c4b298dbdaff6198a69f6314f3ee30ab81c6babf2506da6fc15b016d9733e9c24760c86f5f1136a7851c7cf281
-  data.tar.gz: 607cc4bbdf68f8731de85ed3f194b787168cb3afd6ac7e9d8ec421de4521b3d893115f56f72c51e03e3d212fdc506e37a1fe8a92fe058652cab70e235766db16
+  metadata.gz: 478c2b63250c223640c07135e8b57739a92765ccb32461af4c9e9423321a91527bb96a7269e4eee63d89e00db5762fbdbfb75471553a3e2f883a3a5184b3843e
+  data.tar.gz: 2f6c2a8ec07c575dc5b156e7a2de15b5f3474162ae0fcb26f6fd492c2e9be816557aff5dd4f9becc9b3517acd2fc458f369ccfef77edb03adff94d9384c20f11

data/lib/zarchitect/content.rb

@@ -26,96 +26,126 @@ class Content < Zarchitect
   def markup
     from_script if @post.conf.has_option?("script")
     return if @post.conf.has_option?("script")
-    GPI.print "Processing markdown", GPI::CLU.check_option('v')
-    chtml = @raw
-    @img_id = 0
-    @img_id_inc = 1
-    new_string = ""
-    regexp = /
-      \A
-      MEDIA:(?<filetype>img|img_full|video|yt|audio):
-      (?<id>[a-zA-Z0-9|._\-\/]+):"(?<caption>.*)":?(?<width>[0-9px%]*)
-      /x
-    chtml.each_line do |str|
-      if str.include?('MEDIA')
-        GPI.print "media processor: #{str}", GPI::CLU.check_option('v')
-      end
-      @m = regexp.match(str)
-      if @m
-        GPI.print "matched regex", GPI::CLU.check_option('v')
-        # file tag found
-        # replace with corresponding html :)
-        # m[0] whole tag
-        @caption = @m[:caption]
-        new_html = ""
-        case @m[:filetype]
-        when 'img'
-          html = media_img
-        when 'img_full'
-          html = media_img_full
-        when 'video'
-          html = media_video
-        when 'audio'
-          html = media_audio
-        when 'yt'
-          html = media_youtube
-        else
-          html = "[failed to render media]"
+    if !File.exist?(@post.html_path) || 
+        (File.stat(@post.source_path).mtime > File.stat(@post.html_path).mtime)
+      GPI.print "Processing markdown", GPI::CLU.check_option('v')
+      chtml = @raw
+      @img_id = 0
+      @img_id_inc = 1
+      new_string = ""
+      regexp = /
+        \A
+        MEDIA:(?<filetype>img|img_full|video|yt|audio):
+        (?<id>[a-zA-Z0-9|._\-\/]+):"(?<caption>.*)":?(?<width>[0-9px%]*)
+        /x
+      chtml.each_line do |str|
+        if str.include?('MEDIA')
+          GPI.print "media processor: #{str}", GPI::CLU.check_option('v')
         end
-        html.each_line do |substr|
-          if substr.lstrip
-            new_html << substr.lstrip
+        @m = regexp.match(str)
+        if @m
+          GPI.print "matched regex", GPI::CLU.check_option('v')
+          # file tag found
+          # replace with corresponding html :)
+          # m[0] whole tag
+          @caption = @m[:caption]
+          new_html = ""
+          case @m[:filetype]
+          when 'img'
+            html = media_img
+          when 'img_full'
+            html = media_img_full
+          when 'video'
+            html = media_video
+          when 'audio'
+            html = media_audio
+          when 'yt'
+            html = media_youtube
           else
-            new_html << substr
+            html = "[failed to render media]"
+          end
+          html.each_line do |substr|
+            if substr.lstrip
+              new_html << substr.lstrip
+            else
+              new_html << substr
+            end
+          end
+          if new_html.include?('\n')
+            str.sub!(@m[0], new_html.chomp!)
+          else
+            str.sub!(@m[0], new_html)
           end
         end
-        if new_html.include?('\n')
-          str.sub!(@m[0], new_html.chomp!)
-        else
-          str.sub!(@m[0], new_html)
-        end
+        new_string << str
       end
-      new_string << str
-    end
 
-    # process tables
-    tfound = false
-    tables = Array.new
-    ar = new_string.split("\n")
-    ar.each_with_index do |l,i| 
-      if l[0] == "|" && l[-1] == "|"
-        if tfound # part of current table
-          tables.last.add_line l
-        else # first line of a table
-          tables.push HTMLTable.new
-          tables.last.add_line l
-          tables.last.starts_at i
-          tfound = true
-        end 
-      else
-        if tfound # first line after a table!
-          tables.last.ends_at i-1
-          tfound = false
-          tables.last.process
+      # process tables
+      tfound = false
+      tables = Array.new
+      ar = new_string.split("\n")
+      ar.each_with_index do |l,i| 
+        if l[0] == "|" && l[-1] == "|"
+          if tfound # part of current table
+            tables.last.add_line l
+          else # first line of a table
+            tables.push HTMLTable.new
+            tables.last.add_line l
+            tables.last.starts_at i
+            tfound = true
+          end 
+        else
+          if tfound # first line after a table!
+            tables.last.ends_at i-1
+            tfound = false
+            tables.last.process
+          end
         end
       end
-    end
 
-    tables.each do |t|
-      ar = t.replace(ar)
-    end
+      tables.each do |t|
+        ar = t.replace(ar)
+      end
 
-    ar.delete_if { |x| x.nil? }
-    str = ar.join("\n")
+      ar.delete_if { |x| x.nil? }
+      str = ar.join("\n")
 
-    if @post.conf.has_option?("katex")
-      str = Katex.render(str)
-    end
-    markdown = Redcarpet::Markdown.new(RougeHTML,
+      if @post.conf.has_option?("katex")
+        str2 = ""
+        tmp = ""
+        i = 0
+        l = str.length
+        while (i < l)
+          if str[i] == "<" && str[i+1] == "?" && str[i+2] == "k" &&
+              str[i+3] == "t" && str[i+4] == "x"
+            i += 5
+            tmp = ""
+            loop do
+              if str[i] == "?" && str[i+1] == ">"
+                GPI.print "Rendering Katex string", GPI::CLU.check_option('v')
+                str2 << Katex.render(tmp.strip)
+                i += 1
+                break
+              else
+                tmp << str[i]
+                i += 1
+              end
+            end
+          else
+            str2 << str[i]
+          end
+          i += 1
+        end
+        str = str2
+      end
+      markdown = Redcarpet::Markdown.new(RougeHTML,
                                        autolink: true)
-    chtml = markdown.render(str)
+      chtml = markdown.render(str)
 
-    parse(chtml)
+      parse(chtml)
+    else
+      parse(nil)
+    end
 
   end
 
@@ -152,25 +182,41 @@ class Content < Zarchitect
   end
 
   def parse(html)
+    node_dir = Util.mkdir(File.join(NODEDIR, @source))
     debug_dir = File.join(File.join(BUILDIR, DEBUGSDIR), @source)
     if GPI::CLU.check_option('d')
       debug_dir = Util.mkdir(debug_dir)
     end
 
-    node = Nokogiri::HTML.fragment(html) do |config|
-      config.strict.noblanks
-    end
+    if html.nil? || html == "nil\n"
+      @post.write_block = true
+      GPI.print "Reading notes from build dir", GPI::CLU.check_option('v')
+      ar = Dir.files(File.join(node_dir)).sort
+      ar.each do |f|
+        @nodes.push(Marshal.load(File.read(File.join(node_dir,f))))
+        if GPI::CLU.check_option('d') # debug
+          f = File.join(File.join(debug_dir), "#{i}.txt")
+          File.open(f, "w") { |f| f.write(@nodes.last.html) }
+        end
+      end
+    else
+      node = Nokogiri::HTML.fragment(html) do |config|
+        config.strict.noblanks
+      end
 
-    nodes = node.children.select { |c| c.class == Nokogiri::XML::Element }
+      nodes = node.children.select { |c| c.class == Nokogiri::XML::Element }
 
-    nodes.each_with_index do |n,i|
-      @nodes.push ContentNode.new(n)
+      nodes.each_with_index do |n,i|
+        @nodes.push ContentNode.new(n)
+        File.write(File.join(File.join(node_dir), "#{i}.node"),
+                   Marshal.dump(@nodes.last))
 
-      if GPI::CLU.check_option('d') # debug
-        f = File.join(debug_dir, "#{i}.txt")
-        File.open(f, "w") { |f| f.write(@nodes.last.html) }
-      end
+        if GPI::CLU.check_option('d') # debug
+          f = File.join(File.join(debug_dir), "#{i}.txt")
+          File.open(f, "w") { |f| f.write(@nodes.last.html) }
+        end
 
+      end
     end
   end
 

data/lib/zarchitect/post.rb

@@ -1,6 +1,7 @@
 class Post < Zarchitect
-  attr_reader :source_path, :conf, :content, :name, :draft, :date,
+  attr_reader :source_path, :html_path, :conf, :content, :name, :draft, :date,
     :description, :url, :category
+  attr_accessor :write_block
 
   def initialize(path, section)
     GPI.print "Initializing post #{path}.", GPI::CLU.check_option('v')
@@ -10,19 +11,23 @@ class Post < Zarchitect
     @conf.validate_post
     @conf.setup
     @id = @conf.id.clone if @conf.has_option?("id")
+    if @conf.has_option?("always_write")
+      @always_write = @conf.always_write.clone 
+    else
+      @always_write = false
+    end
     @category = nil
+    @write_block = false
     set_draft
     set_rss
     set_date
     fetch_category if @conf.has_option?("category")
     create_dir
+    set_url
+    set_html_path
     fetch_content 
     set_description
     set_name
-    set_url
-    set_html_path
-    # construct path for html // maybe only necessray when writing html?
-    # set date
     setup_html
     rss.try_item(self)
   end
@@ -41,8 +46,14 @@ class Post < Zarchitect
   end
 
   def write_html
-    GPI.print "Writing HTML from #{@source_path}.", GPI::CLU.check_option('v')
-    @html.write
+    if @write_block && !@always_write
+      GPI.print "Skipping HTML write from #{@source_path}.",
+        GPI::CLU.check_option('v')
+    else
+      GPI.print "Writing HTML from #{@source_path}.",
+        GPI::CLU.check_option('v')
+      @html.write
+    end
   end
 
   def rss?
@@ -90,7 +101,8 @@ class Post < Zarchitect
 
   def set_html_path
     @html_path = @url.clone
-    @html_path = File.join(Dir.getwd, HTMLDIR, @url)
+    #@html_path = File.join(Dir.getwd, HTMLDIR, @url)
+    @html_path = File.join(HTMLDIR, @url)
   end
 
   def create_dir
@@ -146,15 +158,15 @@ class Post < Zarchitect
 
   def set_description
     if @conf.has_option?('description')
-      @description = @conf.description << "..."
+      @description = @conf.description
     elsif @conf.has_option?('preview')
-      @description = Sanitize.fragment(@conf.preview) << "..."
+      @description = Sanitize.fragment(@conf.preview) <<
     else
       nodes = @content.nodes.select { |n| n.type == "p" }
       if nodes.count > 0
         @description = Sanitize.fragment(nodes[0].html)
         if @description.length > 120
-          @description = @description[0..120] << "..."
+          @description = @description[0..120] << "…"
         end
       else
         @description = ""

data/lib/zarchitect.rb

@@ -10,6 +10,7 @@ class Zarchitect
 
   HTMLDIR = "_html"
   BUILDIR = "_build"
+  NODEDIR = "_build/nodes"
   FILEDIR = "_files"
   ASSETDIR = "_assets"
   DRAFTDIR = "_drafts"
@@ -83,6 +84,18 @@ class Zarchitect
   private
 
   def self.rebuild
+    # delte all nodes
+    Dir[ File.join(NODEDIR, "**", "*") ].reverse.reject do |fullpath|
+      if File.directory?(fullpath)
+        GPI.print "deleting dir #{fullpath}"
+        Dir.delete(fullpath)
+        GPI.print "deleted dir #{fullpath}"
+      else
+        GPI.print "deleting file #{fullpath}"
+        File.delete(fullpath)
+        GPI.print "deleted file #{fullpath}"
+      end
+    end
     # delete all contents of _html
     Dir[ File.join(HTMLDIR, "**", "*") ].reverse.reject do |fullpath|
       if File.directory?(fullpath)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zarchitect
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - ryu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies: []
 description: Yet another static website generator
 email: ryu@tohya.net