ppz 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db8561048fbdfb9e93187118596495ca8fad34f653d4ecc919ec1e3002c90b82
-  data.tar.gz: d3620d7c86e55d1c31b34d1a4ae530ec7e3240782974493663ad6a72b07fefe1
+  metadata.gz: 3b73ebb97359023698601b83e6e081bc37860d7a0e698dfe42bdfc4e00b6c0b6
+  data.tar.gz: 47d3ffb5a9d3e5aa6a4e5b6e48e6d1f36dfec625fc067014c712ce15914fd0d0
 SHA512:
-  metadata.gz: ca3f12b9c1abdc2ed308e0690aece4480ad8e27ba33bdb5f2f6e187f1ddc7ae53e48459f2e8b50e698b492581a21053eb70e903f20016fcb47de6abce4ed0671
-  data.tar.gz: 7f17a5aa3aff40111985b42e5544888d3f21c7295aa4d23ef81b56c5cb3193b4d3cca1d46062fcc88ea6023ef0e6492b7b9b5d05af32aefbc684fb93da0050ef
+  metadata.gz: 7f22341cf785fbe0becad3d299d2a9abd3b1c939489b37fca2f5e5120545178d6e1510e0d40b458b825a0f5b0eb8d15f82c5cd9902b8b84570556b478a89b676
+  data.tar.gz: 891541f4789e74d18f9847b133f59e4ad1f0c171be6a11b7e070caba65f08f03adf9cbe41a3c3047ec563081153f8d2ae92f4f38215d3253e38d43a0b31f6757

data/asset/style/ppz.css

@@ -1,90 +1,90 @@
-html {
-  line-height: 1.5;
-}
-body,
-div,
-p,
-aside {
-  box-sizing: border-box;
-}
-body {
-  margin: 0;
-  padding: 0;
-  position: relative;
-}
-aside {
-  overflow-y: auto;
-  padding: 2rem 1rem;
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 188px;
-  height: 100vh;
-}
-aside ul {
-  margin: 0 0 0 1rem;
-  padding: 0;
-  list-style: none;
-}
-aside a {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-article {
-  margin-left: 188px;
-  padding: 1px 1rem;
-}
-h1 {
-  font-size: 2rem;
-}
-h2 {
-  font-size: 1.3rem;
-}
-h3 {
-  font-size: 1.1rem;
-  opacity: 0.9;
-}
-h1::before,
-h2::before,
-h3::before {
-  content: '# ';
-  opacity: 0.3;
-  font-size: 1rem;
-}
-.comment-container {
-  margin: 1rem 0;
-  padding: 1rem 1.6rem;
-  background: rgba(0,0,0,0.2);
-  font-size: 0.9rem;
-  border-radius: 4px;
-}
-.comment-item {
-  opacity: 0.8;
-}
-.special-block-container {
-  background: #141c22;
-  overflow: auto;
-  border-radius: 4px;
-  color: #eee;
-  font-family: monospace;
-  white-space: pre;
-  margin: 1rem 0;
-  padding: 1rem;
-  counter-reset: line-index;
-}
-.special-block-item::before {
-  counter-increment: line-index;
-  content: counter(line-index) " |  ";
-  opacity: 0.3;
-}
-.special-block-item:hover::before {
-  opacity: 0.8;
-}
-.special-txt {
-  background: rgba(27,31,35,0.05);
-  border-radius: 4px;
-  font-size: 0.9em;
-  padding: 2px 4px;
-}
+html {
+  line-height: 1.5;
+}
+body,
+div,
+p,
+aside {
+  box-sizing: border-box;
+}
+body {
+  margin: 0;
+  padding: 0;
+  position: relative;
+}
+aside {
+  overflow-y: auto;
+  padding: 2rem 1rem;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 188px;
+  height: 100vh;
+}
+aside ul {
+  margin: 0 0 0 1rem;
+  padding: 0;
+  list-style: none;
+}
+aside a {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+article {
+  margin-left: 188px;
+  padding: 1px 1rem;
+}
+h1 {
+  font-size: 2rem;
+}
+h2 {
+  font-size: 1.3rem;
+}
+h3 {
+  font-size: 1.1rem;
+  opacity: 0.9;
+}
+h1::before,
+h2::before,
+h3::before {
+  content: '# ';
+  opacity: 0.3;
+  font-size: 1rem;
+}
+.comment-container {
+  margin: 1rem 0;
+  padding: 1rem 1.6rem;
+  background: rgba(0,0,0,0.2);
+  font-size: 0.9rem;
+  border-radius: 4px;
+}
+.comment-item {
+  opacity: 0.8;
+}
+.special-block-container {
+  background: #141c22;
+  overflow: auto;
+  border-radius: 4px;
+  color: #eee;
+  font-family: monospace;
+  white-space: pre;
+  margin: 1rem 0;
+  padding: 1rem;
+  counter-reset: line-index;
+}
+.special-block-item::before {
+  counter-increment: line-index;
+  content: counter(line-index) " |  ";
+  opacity: 0.3;
+}
+.special-block-item:hover::before {
+  opacity: 0.8;
+}
+.special-txt {
+  background: rgba(27,31,35,0.05);
+  border-radius: 4px;
+  font-size: 0.9em;
+  padding: 2px 4px;
+}

data/bin/common.rb

@@ -2,7 +2,6 @@ require 'pathname'
 
 module PPZMain
   CURRENT_PATH = File.dirname __FILE__
-  WORK_DIRECTORY = Pathname Dir.pwd
   CSS_FILE_PATH = (Pathname CURRENT_PATH) + '../asset/style/ppz.css'
 
   class Util
@@ -10,33 +9,33 @@ module PPZMain
       def get_in_and_out
         target_in, target_out = ARGV
 
-        # + 输入文件
+        # 输入文件
         abort '要编译哪那个文件？请告诉我' unless target_in # 检查参数存在
-        target_in = (WORK_DIRECTORY + target_in).to_s # 绝对路径
+        target_in = PPZ::Func.format_path target_in
         unless File.exist? target_in # 不存在的话，看看加上 .ppz 后是否存在
           target_in += '.ppz'
           abort target_in[0..-5] + ' 不存在' unless File.exist? target_in # 还不存在的话，就说明是写错了
         end
-        abort '尚未支持编译文件夹' if File.directory? target_in
+        is_folder = File.directory? target_in
 
-        # + 输出文件
+        # 输出文件
         unless target_out
           # 从输入文件获取文件名
           target_out = ((/(.*).ppz$/.match target_in)?$1:target_in) + '.pp'
         end
-        target_out = WORK_DIRECTORY + target_out
-        # ++ 检查上级文件夹是否存在
-        upper_dir = (target_out + '..').to_s
+        # + 检查上级文件夹是否存在
+        upper_dir = ((Pathname target_out) + '..').to_s
         abort upper_dir + ' 目录不存在' unless Dir.exist? upper_dir
-        # ++ 检查文件夹：有则检查里面有没有文件；无则创建文件夹
+        # + 检查文件夹：有则检查里面有没有文件；无则创建文件夹
         target_out = target_out.to_s
         if Dir.exist? target_out
           abort target_out + ' 不是一个空文件夹' unless (Dir.children target_out).size == 0
         else
           Dir.mkdir target_out
         end
+        target_out = PPZ::Func.format_path target_out
         
-        [target_in, target_out]
+        [target_in, target_out, is_folder]
       end
     end
   end

data/bin/doc.rb

@@ -0,0 +1,17 @@
+target_out = Pathname TARGET_OUT
+
+# css
+  # 输出文件路径
+  output_css_path = target_out + 'index.css'
+  # 复制
+  FileUtils.cp PPZMain::CSS_FILE_PATH, output_css_path
+
+# html
+  # 输出文件路径
+  output_html_path = target_out + 'index.html'
+  # 解析文档
+  parser = PPZ::FileDocParser.new TARGET_IN
+  # 拼接上 css 文件链接
+  output_html = '<link rel="stylesheet" href="./index.css"/>' + parser.get_model.to_html 
+  # 输出
+  PPZ::Func::write_to_file output_html_path.to_s, output_html

data/bin/folder.rb

@@ -0,0 +1,10 @@
+require_relative '../lib/parser/folder/index'
+
+puts '输入文件夹: ' + TARGET_IN
+puts '输出文件夹: ' + TARGET_OUT
+puts
+
+FileUtils.cp PPZMain::CSS_FILE_PATH, ((Pathname TARGET_OUT) + 'style.css').to_s
+
+model = PPZ::Folder::FolderModel.new TARGET_IN, 0
+model.compile TARGET_OUT

data/bin/ppz

@@ -5,14 +5,10 @@ require_relative './common'
 require 'fileutils'
 require 'pathname'
 
-target_in, target_out = PPZMain::Util.get_in_and_out
+TARGET_IN, TARGET_OUT, IS_FOLDER = PPZMain::Util.get_in_and_out
 
-target_out = Pathname target_out
-output_html_path = target_out + 'index.html'
-output_css_path = target_out + 'index.css'
-
-parser = PPZ::FileDocParser.new target_in
-model = parser.get_model
-output_html = '<link rel="stylesheet" href="./index.css"/>' + model.to_html 
-PPZ::Func::write_to_file output_html_path.to_s, output_html
-FileUtils.cp PPZMain::CSS_FILE_PATH, output_css_path
+if IS_FOLDER
+  require_relative './folder.rb'
+else
+  require_relative './doc.rb'
+end

data/lib/func/util.rb

@@ -4,7 +4,7 @@ class PPZ::Func
       if File.exist? filepath
         throw '文件已存在'
       end
-      file = File.new filepath, 'w'
+      file = File.new filepath, mode: 'w:UTF-8'
       file.print data
       file.close
     end
@@ -17,5 +17,13 @@ class PPZ::Func
     def class_has_const? instance, const_name
       has_const? instance.class, const_name
     end
+
+    def format_path path
+      if ['/', '\\'].include? path[-1]
+        path[0...-1]
+      else
+        path
+      end
+    end
   end
 end

data/lib/parser/folder/index.rb

@@ -1,7 +1,15 @@
 # 解析一个文件夹里的 .ppz 文件
 
-class FolderParser
-  def initialize
-    @context = Context.new
+module PPZ::Folder
+  class FolderParser
+    def initialize
+      @context = Context.new
+    end
   end
-end
+
+  require_relative './model/abstract'
+  require_relative './model/folder'
+  require_relative './model/file/abstract'
+  require_relative './model/file/other'
+  require_relative './model/file/ppz'
+end

data/lib/parser/folder/model/abstract.rb

@@ -0,0 +1,27 @@
+module PPZ::Folder
+  class AbstractModel
+    attr_reader :index, :name
+
+    def initialize path, level
+      throw '文件（夹）的名字得是字符串啊' unless path.is_a? String
+      @path = path
+      @basename = File.basename path
+      @level = level
+    end
+
+    def self.from_path path, level
+      level += 1
+      if Dir.exist? path
+        FolderModel.new path, level
+      elsif File.exist? path
+        AbstractFileModel.from_path path, level
+      else
+        throw path + '不存在？'
+      end
+    end
+
+    def get_css_path
+      ('../' * @level) + 'style.css'
+    end
+  end
+end

data/lib/parser/folder/model/file/abstract.rb

@@ -0,0 +1,23 @@
+module PPZ::Folder
+class AbstractFileModel < AbstractModel
+  def self.from_path path, level
+    if (File.extname path) == '.ppz'
+      PPZFileModel.new path, level
+    else
+      OtherFileModel.new path, level
+    end
+  end
+
+  attr_reader :file_ext
+
+  def initialize path, level
+    super
+    unless /^((\d+)_)?([^\.]+)(\.[^\.]+)?$/.match @basename
+      throw '文件的命名方式不太理解哦:' + path
+    end
+    @index = $2?($2.to_i):(Float::INFINITY)
+    @name = $3
+    @file_ext = $4 || ''
+  end
+end
+end

data/lib/parser/folder/model/file/other.rb

@@ -0,0 +1,7 @@
+module PPZ::Folder
+  class OtherFileModel < AbstractFileModel
+    def _compile dir_out
+      FileUtils.cp @path, (dir_out + '/' + @basename)
+    end
+  end
+end

data/lib/parser/folder/model/file/ppz.rb

@@ -0,0 +1,10 @@
+module PPZ::Folder
+  class PPZFileModel < AbstractFileModel
+    def _compile dir_out
+      parser = PPZ::FileDocParser.new @path
+      html_str = "<link rel=\"stylesheet\" href=\"#{get_css_path}\"/>" +
+        parser.get_model.to_html
+      PPZ::Func::write_to_file (dir_out + '/' + @name + '.html'), html_str
+    end
+  end
+end

data/lib/parser/folder/model/folder.rb

@@ -0,0 +1,51 @@
+module PPZ::Folder
+  class FolderModel < AbstractModel
+    def initialize path, level
+      super
+      /^((\d+)_)?(.+)/.match @basename
+      @index = $2?($2.to_i):(Float::INFINITY)
+      @name = $3
+
+      @children = []
+      (Dir.children path).each do |child_name|
+        @children.push AbstractModel.from_path (path + '/' + child_name), level
+      end
+      @children.sort! do |a, b|
+        a.index <=> b.index
+      end
+    end
+
+    def _compile out_dir # compile 是 _compile 的安全版本
+      PPZ::Func.write_to_file (out_dir + '/' + @name + '.html'),
+        "<link rel=\"stylesheet\" href=\"#{get_css_path}\"/><ul>#{
+          @children
+          .map do |child|
+            if child.file_ext == '.ppz'
+              "<li><a href=\"./#{@name}/#{child.name}.html\">#{child.name}</a></li>"
+            else
+              ''
+            end
+          end
+          .join
+        }</ul>"
+
+      children_dir = out_dir + '/' + @name
+      Dir.mkdir children_dir
+      @children.each { |child| child._compile children_dir }
+    end
+
+    def compile out_dir
+      unless out_dir.is_a? String
+        throw 'out_dir 只能是字符串'
+      end
+      unless Dir.exist? out_dir
+        throw "out_dir #{out_dir} 不存在"
+      end
+      if ['/', '\\'].include? out_dir[-1]
+        _compile out_dir[0...-1]
+      else
+        _compile out_dir
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppz
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - wuse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies: []
 description:
 email: 372301467@qq.com
@@ -20,6 +20,8 @@ files:
 - asset/style/ppz.css
 - asset/style/ppz.styl
 - bin/common.rb
+- bin/doc.rb
+- bin/folder.rb
 - bin/ppz
 - lib/func/util.rb
 - lib/model/abstract/model.rb
@@ -44,6 +46,11 @@ files:
 - lib/parser/doc/file.rb
 - lib/parser/doc/string.rb
 - lib/parser/folder/index.rb
+- lib/parser/folder/model/abstract.rb
+- lib/parser/folder/model/file/abstract.rb
+- lib/parser/folder/model/file/other.rb
+- lib/parser/folder/model/file/ppz.rb
+- lib/parser/folder/model/folder.rb
 - lib/ppz.rb
 homepage: https://github.com/daGaiGuanYu/ppz
 licenses: