pbsimply 3.6.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6eba39306e8a547d2dc0cec4cafb7c683c47dcaf54a075101c144667135c03
-  data.tar.gz: 905f46a0b0cb44921d20e8c6a88459943f8c49245b06983e64738c1655445bc1
+  metadata.gz: 5d2819cbfc7057533e6c680ba3ee1b8dc30117eb532e7061a778437b2a5f3433
+  data.tar.gz: fe9e02ca45a41d2a7649ea4b47be2230f52bf516b8b03722a4c6448be75d99b1
 SHA512:
-  metadata.gz: ac06410f8bb7de354a978ff9011096e1532db1bbaf797b0c59651f91714bbf1a3d6e01138fbb5c14e8ca715c118d9f4f904844b34dfa51998b4aee8589941f1d
-  data.tar.gz: b9524c4a55b20615f81de41542e4808ab42d81baa53b7650fbd8f4b4af87052c54ebf2403d6d6b1de796fb8c152c1da4025ef3a3606a13dc3f1bcf39402773a4
+  metadata.gz: 20eefe2e45fb693831c91fda93007f64782d7ebcc37fc8a964709f506771a0e7b60b03612b16fdc5edd1f59c0e6ac0c51065c51447074bca1c3ca36727a4642b
+  data.tar.gz: 673a659f5af31b89441e048e1896e3773d385404a9dcc9055fcc93ec85f95d2945e7daef92c6d0fd86ed23c39e73767949a5f66da732a450e97a613e08c24557

data/lib/pbsimply/accs.rb

@@ -82,7 +82,7 @@ EOF
 
     @hooks.accs.run({index: @index, indexes: @indexes})
 
-    doc = ERB.new(erbtemplate, trim_mode: "%<>").result(binding)
+    doc = str_and_render(erbtemplate, binding)
     File.open(File.join(@dir, ".index.md"), "w") do |f|
       f.write doc
     end

data/lib/pbsimply/docengine/misc.rb

@@ -24,8 +24,7 @@ class PBSimply
         article_body = markdown.render(File.read procdoc)
 
         # Process with eRuby temaplte.
-        erb_template = ERB.new(File.read(@config["template"]), trim_mode: '%<>')
-        doc = erb_template.result(binding)
+        doc = expand_template binding
 
         doc
       end
@@ -51,8 +50,7 @@ class PBSimply
         article_body = markdown.to_html
 
         # Process with eRuby temaplte.
-        erb_template = ERB.new(File.read(@config["template"]), trim_mode: '%<>')
-        doc = erb_template.result(binding)
+        doc = expand_template binding
 
         doc
       end
@@ -71,13 +69,15 @@ class PBSimply
 
       def process_document(dir, filename, frontmatter, orig_filepath, ext, procdoc)
         options = @config["commonmarker_options"] ? @config["commonmarker_options"].transform_keys(&:to_sym) : {}
+        options.each do |k,v|
+          options[k] = v.transform_keys(&:to_sym)
+        end
 
         # Getting HTML string.
-        article_body = Commonmarker.parse(File.read(procdoc), options: options).to_html
+        article_body = Commonmarker.to_html(File.read(procdoc), options: options)
 
         # Process with eRuby temaplte.
-        erb_template = ERB.new(File.read(@config["template"]), trim_mode: '%<>')
-        doc = erb_template.result(binding)
+        doc = expand_template binding
 
         doc
       end

data/lib/pbsimply/docengine/rdoc.rb

@@ -20,8 +20,7 @@ class PBSimply
         article_body = rdoc.convert(get_markup_document(procdoc))
 
         # Process with eRuby temaplte.
-        erb_template = ERB.new(File.read(@config["template"]), trim_mode: '%<>')
-        doc = erb_template.result(binding)
+        doc = expand_template binding
 
         doc
       end

data/lib/pbsimply/eruby.rb

@@ -0,0 +1,112 @@
+#!/bin/env ruby
+require 'time'
+require 'erb'
+
+module PBSimply::ERuby
+  include ::ERB::Util
+
+  class WrapErubi
+    def initialize
+      require 'erubi'
+    end
+
+    def load_doc str
+      @processor = ::Erubi::Engine.new(str)
+      self
+    end
+
+    def generate bounded
+      eval(@processor.src, bounded)
+    end
+  end
+
+  class WrapErubis
+    def initialize
+      require 'erubis'
+    end
+
+    def load_doc str
+      @processor = ::Erubis::Eruby.new(str)
+      self
+    end
+
+    def generate bounded
+      @processor.result(bounded)
+    end
+  end
+
+  class WrapErb
+    def initialize config
+      @config = config
+    end
+
+    def load_doc str
+      @processor = ::ERB.new(str, trim_mode: (@config["erb_trm_mode"] || "%<>"))
+      self
+    end
+
+    def generate bounded
+      @processor.result(bounded)
+    end
+  end
+
+  def erblib
+    return @eruby_lib if @eruby_lib
+    case @config["eruby_lib"]
+    when "erubis"
+      @eruby_lib = WrapErubis.new
+    when "erubi"
+      @eruby_lib = WrapErubi.new
+    else
+      @eruby_lib = WrapErb.new @config
+    end
+
+    @eruby_lib
+  end
+
+  def file_and_render fp, bounded
+    erblib.load_doc(File.read(fp)).generate(bounded)
+  end
+
+  def str_and_render str, bounded
+    erblib.load_doc(str).generate(bounded)
+  end
+
+  private
+
+  def parse_time
+    if (Numeric === time_elem && time_elem > 1000000000000)
+      # JavaScript milliseconds
+      Time.at(time_elem / 1000)
+    elsif Numeric === time_elem
+      # Unix
+      Time.at(time_elem)
+    elsif String === time_elem
+      # Generic String
+      Time.parse(time_elem)
+    elsif Array === time_elem
+      # #local arguments array
+      Time.local(*time_elem)
+    else
+      Time.now
+    end
+  end
+
+  def iso8601 time_elem
+    parse_time(time_elem).iso8601
+  end
+
+  def httpdate time_elem
+    parse_time(time_elem).httpdate
+  end
+
+  def rfc822 time_elem
+    parse_time(time_elem).rfc822
+  end
+
+  alias rfc2822 rfc822
+
+  def xmldate time_elem
+    parse_time(time_elem).xmlschema
+  end
+end

data/lib/pbsimply/template-engine.rb

@@ -0,0 +1,46 @@
+#!/bin/env ruby
+
+module PBSimply::TemplateEngine
+  class TplEngineLiquid
+    def initialize template
+      require 'liquid'
+      @template = template
+    end
+
+    def generate frontmatter, article_body
+      Liquid::Template.parse(@template).render(
+        "frontmatter" => frontmatter,
+        "article_body" => body
+      )
+    end
+  end
+
+  class TplEngineMustache
+    def initialize template
+      require 'mustache'
+      @template = template
+    end
+
+    def generate frontmatter, article_body
+      Mustache.render(@template, {
+        frontmatter: frontmatter,
+        article_body: article_body
+      })
+    end
+  end
+
+  def expand_template binding
+    $stderr.puts @config["template_format"]
+    case @config["template_format"]
+    when "liquid"
+      tpl = TplEngineLiquid.new(File.read(@config["template"]))
+      tpl.generate(binding.local_variable_get(:frontmatter), binding.local_variable_get(:article_body))
+    when "mustache"
+      $stderr.puts "mustache"
+      tpl = TplEngineMustache.new(File.read(@config["template"]))
+      tpl.generate(binding.local_variable_get(:frontmatter), binding.local_variable_get(:article_body))
+    else
+      file_and_render(@config["template"], binding)
+    end
+  end
+end

data/lib/pbsimply.rb

@@ -17,13 +17,17 @@ require 'pbsimply/prayer'
 require 'pbsimply/plugger'
 require 'pbsimply/hooks'
 require 'pbsimply/accs'
-require 'pbsimply/config-checker.rb'
+require 'pbsimply/config-checker'
 require 'pbsimply/document'
+require 'pbsimply/eruby'
+require 'pbsimply/template-engine'
 
 class PBSimply
   include Prayer
   include Plugger
   include ACCS
+  include ERuby
+  include TemplateEngine
 
   # Custom exception
   class PBSimplyError < StandardError
@@ -442,7 +446,7 @@ class PBSimply
     ##### Post eRuby
     if @config["post_eruby"]
       $stderr.puts "Porcessing with eRuby."
-      doc = ERB.new(doc, nil, "%<>").result(binding)
+      doc = str_and_render(dov, binding)
     end
 
     # Write out

data/themes/pandoc/_pandoc_base/.accsindex.erb

@@ -16,35 +16,32 @@ else
   @indexes.each {|filename, index| articles[(index["category"] || "default")].push index }
 end
 
-%>
+articles.keys.sort.each do |catname|
+cat = articles[catname]
 
-% articles.keys.sort.each do |catname|
-% cat = articles[catname]
-
-% unless articles.length == 1
+unless articles.length == 1
 # <%= catname %>
-% end
+<% end
+
+sort_method = case @config["accs_sort_by"]
+when "title"
+  lambda {|i| [i["title"].to_s, i["date"]] }
+when "name"
+  lambda {|i| [i["_filename"].to_s, i["title"].to_s, i["date"]] }
+when "serial"
+  lambda {|i| [i["serial"].to_s, i["date"], i["_filename"].to_s] }
+else
+  lambda {|i| [i["date"], i["title"].to_s, i["_last_update"].to_i] }
+end
 
-<%
-  sort_method = case @config["accs_sort_by"]
-  when "title"
-    lambda {|i| [i["title"].to_s, i["date"]] }
-  when "name"
-    lambda {|i| [i["_filename"].to_s, i["title"].to_s, i["date"]] }
-  when "serial"
-    lambda {|i| [i["serial"].to_s, i["date"], i["_filename"].to_s] }
-  else
-    lambda {|i| [i["date"], i["title"].to_s, i["_last_update"].to_i] }
-  end
-  
-  list = if @config["accs_order"] == "desc"
-    cat.sort_by(&sort_method).reverse
-  else
-    cat.sort_by(&sort_method)
-  end
-
-  list.each do |i|
+list = if @config["accs_order"] == "desc"
+  cat.sort_by(&sort_method).reverse
+else
+  cat.sort_by(&sort_method)
+end
+
+list.each do |i|
 %>* [<%= i["title"] %>](<%= i["page_url"] %>)
-<% end %>
+<% end
 
-% end
+end %>

data/themes/pandoc/_pandoc_base/.pbsimply.yaml

@@ -7,6 +7,9 @@ outdir: ../Build
 # Template file path.
 # ./template.html by default.
 template: template.html
+# Configure the template engine/template format. The default is eruby, and liquid and mustache can be specified.
+# This setting is only effective when using a document processor that defaults to eRuby. It does not function when using a document processor that employs a different dedicated template engine (e.g., Pandoc).
+# template_format: eruby
 #
 # Loading CSS files (userd by Pandoc's default template.)
 # This values must be *server's URL*.
@@ -23,6 +26,13 @@ toc: true
 # Enable eRuby template expansion. true or false. false by default.
 # This settings is not avilable on rdoc, rdoc_markdown, kramdown, redcarpet or cmark engine.
 post_eruby: false
+# Specify the eRuby processor library.
+# The default is erb; erubis and erubi can be specified.
+# Since these libraries are not fully compatible with each other, specifying one may change behavior or cause it to fail to function properly.
+# eruby_lib: erb
+# Specifies the value for the `trim_mode` parameter passed to the ERB constructor. The default is `%<>`.
+# Specifying this value may cause .erb files used by the theme to malfunction.
+# erb_trim_mode: "%<>"
 # Default metadata. If same key exists in document's frontmatter, document's frontmatter is given priority to this settings.
 default_meta:
   author: "John Doe"

data/themes/pandoc/_pandoc_new/.accsindex.erb

@@ -16,35 +16,32 @@ else
   @indexes.each {|filename, index| articles[(index["category"] || "default")].push index }
 end
 
-%>
+articles.keys.sort.each do |catname|
+cat = articles[catname]
 
-% articles.keys.sort.each do |catname|
-% cat = articles[catname]
-
-% unless articles.length == 1
+unless articles.length == 1 %>
 # <%= catname %>
-% end
+<% end
+
+sort_method = case @config["accs_sort_by"]
+when "title"
+  lambda {|i| [i["title"].to_s, i["date"]] }
+when "name"
+  lambda {|i| [i["_filename"].to_s, i["title"].to_s, i["date"]] }
+when "serial"
+  lambda {|i| [i["serial"].to_s, i["date"], i["_filename"].to_s] }
+else
+  lambda {|i| [i["date"], i["title"].to_s, i["_last_update"].to_i] }
+end
 
-<%
-  sort_method = case @config["accs_sort_by"]
-  when "title"
-    lambda {|i| [i["title"].to_s, i["date"]] }
-  when "name"
-    lambda {|i| [i["_filename"].to_s, i["title"].to_s, i["date"]] }
-  when "serial"
-    lambda {|i| [i["serial"].to_s, i["date"], i["_filename"].to_s] }
-  else
-    lambda {|i| [i["date"], i["title"].to_s, i["_last_update"].to_i] }
-  end
-  
-  list = if @config["accs_order"] == "desc"
-    cat.sort_by(&sort_method).reverse
-  else
-    cat.sort_by(&sort_method)
-  end
-
-  list.each do |i|
+list = if @config["accs_order"] == "desc"
+  cat.sort_by(&sort_method).reverse
+else
+  cat.sort_by(&sort_method)
+end
+
+list.each do |i|
 %>* [<%= i["title"] %>](<%= i["page_url"] %>)
-<% end %>
+<% end
 
-% end
+end %>

data/themes/pandoc/_pandoc_new/.pbsimply.yaml

@@ -7,6 +7,9 @@ outdir: ../Build
 # Template file path.
 # ./template.html by default.
 template: template.html
+# Configure the template engine/template format. The default is eruby, and liquid and mustache can be specified.
+# This setting is only effective when using a document processor that defaults to eRuby. It does not function when using a document processor that employs a different dedicated template engine (e.g., Pandoc).
+# template_format: eruby
 #
 # Loading CSS files (userd by Pandoc's default template.)
 # This values must be *server's URL*.
@@ -20,6 +23,13 @@ toc: true
 # Enable eRuby template expansion. true or false. false by default.
 # This settings is not avilable on rdoc, rdoc_markdown, kramdown, redcarpet or cmark engine.
 post_eruby: false
+# Specify the eRuby processor library.
+# The default is erb; erubis and erubi can be specified.
+# Since these libraries are not fully compatible with each other, specifying one may change behavior or cause it to fail to function properly.
+# eruby_lib: erb
+# Specifies the value for the `trim_mode` parameter passed to the ERB constructor. The default is `%<>`.
+# Specifying this value may cause .erb files used by the theme to malfunction.
+# erb_trim_mode: "%<>"
 # Default metadata. If same key exists in document's frontmatter, document's frontmatter is given priority to this settings.
 default_meta:
   author: "John Doe"

data/themes/rbmdlib/init322/.accsindex.erb

@@ -11,25 +11,22 @@ articles = Hash.new {|h,k| h[k] = Array.new }
   articles[(index["category"] || "default")].push index
 end
 
-%>
+artkeys = articles.keys.sort
+artkeys.each do |catname|
+cat = articles[catname]
 
-% artkeys = articles.keys.sort
-% artkeys.each do |catname|
-% cat = articles[catname]
-
-% if articles.length > 1
+if articles.length > 1 %>
 # <%= catname %>
-% end
+<% end
 
-<%
-  list = if @config["accs_order"] == "desc" || @index["accs_order"] == "desc" || @index["blogmode"]
-    cat.sort_by {|i| [i["date"].to_s, i["title"].to_s, i["_last_update"].to_i] }.reverse
-  else
-    cat.sort_by {|i| [i["date"].to_s, i["title"].to_s, i["_last_update"].to_i] }
-  end
+list = if @config["accs_order"] == "desc" || @index["accs_order"] == "desc" || @index["blogmode"]
+  cat.sort_by {|i| [i["date"].to_s, i["title"].to_s, i["_last_update"].to_i] }.reverse
+else
+  cat.sort_by {|i| [i["date"].to_s, i["title"].to_s, i["_last_update"].to_i] }
+end
 
-  list.each do |i|
+list.each do |i|
 %>* [<%= i["title"].gsub('@', '\@') %>](<%= File.basename(i["_filename"].to_s, ".*") + ".html" %>) (<%= i["date"] %>)
-<% end %>
+<% end
 
-% end
+end %>

data/themes/rbmdlib/init322/.pbsimply.yaml.erb

@@ -7,6 +7,9 @@ outdir: ../Build
 # Template file path.
 # ./template.html by default.
 template: template.erb
+# Configure the template engine/template format. The default is eruby, and liquid and mustache can be specified.
+# This setting is only effective when using a document processor that defaults to eRuby. It does not function when using a document processor that employs a different dedicated template engine (e.g., Pandoc).
+# template_format: eruby
 #
 # Loading CSS files (userd by Pandoc's default template.)
 # This values must be *server's URL*.
@@ -21,6 +24,13 @@ template: template.erb
 # Enable eRuby template expansion. true or false. false by default.
 # This settings is not avilable on rdoc, rdoc_markdown, kramdown, redcarpet or cmark engine.
 post_eruby: false
+# Specify the eRuby processor library.
+# The default is erb; erubis and erubi can be specified.
+# Since these libraries are not fully compatible with each other, specifying one may change behavior or cause it to fail to function properly.
+eruby_lib: erb
+# Specifies the value for the `trim_mode` parameter passed to the ERB constructor. The default is `%<>`.
+# Specifying this value may cause .erb files used by the theme to malfunction.
+# erb_trim_mode: "%<>"
 # Default metadata. If same key exists in document's frontmatter, document's frontmatter is given priority to this settings.
 default_meta:
   author: "John Doe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbsimply
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.7.0
 platform: ruby
 authors:
 - Masaki Haruka
@@ -37,10 +37,12 @@ files:
 - lib/pbsimply/docengine/pandoc.rb
 - lib/pbsimply/docengine/rdoc.rb
 - lib/pbsimply/document.rb
+- lib/pbsimply/eruby.rb
 - lib/pbsimply/frontmatter.rb
 - lib/pbsimply/hooks.rb
 - lib/pbsimply/plugger.rb
 - lib/pbsimply/prayer.rb
+- lib/pbsimply/template-engine.rb
 - themes/contribute/README.md
 - themes/default.yaml
 - themes/pandoc/_pandoc_base/.accsindex.erb