ppz 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad1dbe093ab8a51881656c02401cfbefce4f3ca153a5dfc7b5f9cd5483a161c
-  data.tar.gz: 02a01ac4f61ef0e2edd725407ecf1baed235501b635065463049db698a2719d9
+  metadata.gz: d446dbd5570e54876363303e60e7d6b42c74074b231a62a7cd418fa4c241b768
+  data.tar.gz: cf6870884a629d64224f256ffe0c7e4620d525e1d1fa1fe7f7739a691981984a
 SHA512:
-  metadata.gz: 72f1066915ce586d43b514411d109c7016b754b30cfb192262044813d8db268ca14c99226edadd8bfd5f627f0ef48d96d8ca9337fdb6f7f13e33a10f8c5a67a9
-  data.tar.gz: 8e7267e62274f2ff85c89596ab7799a64574fba03da5c776f3293b0e39da4aeebba208b989b04756bb98304a58abb967a0317455a3533e04411917109af318c7
+  metadata.gz: 9b5e40c14d3e4b916a35fbb27691b31d1dff0bda542d09fabbc53b764addd59251e47986e09371a5ac9d1046a0612e783ce7e435b2596019da944c436a0a5104
+  data.tar.gz: 572592413bf31f57f23c32d797bc716a849aa1132d0010924d05ea0955fe466e1227c1d977467130f440a0237cc144211573632f9c793301dbf5da15e261ca69

data/lib/doc/index.rb

@@ -0,0 +1,9 @@
+module PPZ
+  # model
+  require_relative './model/index'
+  # parser
+  require_relative './parser/context'
+  require_relative './parser/abstract'
+  require_relative './parser/file'
+  require_relative './parser/string'
+end

data/lib/doc/model/index.rb

@@ -0,0 +1,17 @@
+module PPZ
+  require_relative './abstract/model'
+  require_relative './abstract/wrapper-model'
+  require_relative './section/abstract'
+  require_relative './section/leaf'
+  require_relative './section/root'
+  require_relative './comment/container'
+  require_relative './comment/item'
+  require_relative './common/escape'
+  require_relative './list/wrapper/abstract'
+  require_relative './list/wrapper/unordered'
+  require_relative './list/item/abstract'
+  require_relative './list/item/unordered'
+  require_relative './p/index'
+  require_relative './special-block/container'
+  require_relative './special-block/item'
+end

data/lib/{parser/doc → doc/parser}/abstract.rb

@@ -2,7 +2,7 @@
 
 class PPZ::AbstractDocParser
   def initialize
-    @context = PPZ::DocContext.new PPZ::RootSectionModel.new
+    @context = PPZ::ParserContext.new PPZ::RootSectionModel.new
   end
 
   def get_model

data/lib/{parser/common/context/doc.rb → doc/parser/context.rb}

@@ -1,4 +1,11 @@
-class PPZ::DocContext < PPZ::AbstractContext
+# 当前行，所处的上下文
+# 比如 一级 section 下面的 ul 下的 第 n 个 ul
+
+class PPZ::ParserContext
+  def initialize root
+    @stack = [root]
+  end
+
   def append target
     # ContainerClass: 容器类，如果上级不是，就造一个
     if(PPZ::Func::class_has_const? target, :ContainerClass) and (head.class != target.class::ContainerClass)
@@ -12,4 +19,24 @@ class PPZ::DocContext < PPZ::AbstractContext
     head.append target # 加入 model
     @stack.push target if target.is_a? PPZ::AbstractWrapperModel # 加入 stack
   end
+
+  def pop
+    @stack.pop
+  end
+
+  def head
+    @stack[-1]
+  end
+
+  def root
+    @stack[0]
+  end
+
+  private
+    def pop_to klass
+      loop do
+        break if head.is_a? klass
+        pop
+      end
+    end
 end

data/lib/{parser/folder → folder}/model/abstract.rb

@@ -26,13 +26,13 @@ module PPZ::Folder
     end
 
     def relative_link target
-      relative_level = target.level - @level # relative_level 是“当前 model 比目标 level 高几级”
+      relative_level = @level - target.level # relative_level 是“目标 model 比当前 level 高几级”
 
       (if relative_level > 0
         '../' * relative_level
       elsif relative_level < 0
         result = ''
-        father = @father_model
+        father = target.father_model
         (- relative_level).times do
           result = father.name + '/' + result
           father = father.father_model
@@ -40,7 +40,7 @@ module PPZ::Folder
         result
       else
         ''
-      end) + @name + '.html'
+      end) + target.name + '.html'
     end
 
     private
@@ -65,7 +65,7 @@ module PPZ::Folder
         end
         %~<div class="ancestor-nav"><ul>#{
           (list.collect do |node|
-            %`<li><a href="#{node.relative_link self}">#{node.name}</a></li>`
+            %`<li><a href="#{relative_link node}">#{node.name}</a></li>`
           end
           .join) + %`<li class="self">#{self.name}</li>`
         }</ul></div>~
@@ -75,12 +75,12 @@ module PPZ::Folder
         # prev_model nav_html
         prev_model_html = ''
         if @prev_model
-          prev_link = @prev_model.relative_link self
+          prev_link = relative_link @prev_model
           prev_model_html = "<li class=\"prev\"><a href=\"#{prev_link}\">#{@prev_model.name}</a></li>"
         end
         next_model_html = ''
         if @next_model
-          next_link = @next_model.relative_link self
+          next_link = relative_link @next_model
           next_model_html = "<li class=\"next\"><a href=\"#{next_link}\">#{@next_model.name}</a></li>"
         end
 

data/lib/{parser/folder → folder}/model/folder.rb

@@ -54,6 +54,23 @@ module PPZ::Folder
       end
     end
     
+    def get_content_table_html root
+      %~<ul>#{
+        @children
+        .select do |child|
+          (child.class == FolderModel) || (child.file_ext == '.ppz')
+        end
+        .map do |child|
+          result = "<li><a href=\"./#{root.relative_link child}\">#{child.name}</a></li>"
+          if child.is_a? FolderModel
+            result += child.get_content_table_html root
+          end
+          result
+        end
+        .join
+      }</ul>~
+    end
+
     # 设置页面的“上一篇、下一篇”
     private
       def set_prev_and_next_page
@@ -78,16 +95,7 @@ module PPZ::Folder
       end
 
       def get_content_html
-        %!<article><ul>#{
-          @children
-          .select do |child|
-            (child.class == FolderModel) || (child.file_ext == '.ppz')
-          end
-          .map do |child|
-            "<li><a href=\"./#{@name}/#{child.name}.html\">#{child.name}</a></li>"
-          end
-          .join
-        }</ul></article>!
+        "<article>#{get_content_table_html self}</article>"
       end
   end
 end

data/lib/ppz.rb

@@ -1,26 +1,5 @@
 module PPZ
   require_relative './func/util'
-
-  require_relative './model/abstract/model'
-  require_relative './model/abstract/wrapper-model'
-  require_relative './model/section/abstract'
-  require_relative './model/section/leaf'
-  require_relative './model/section/root'
-  require_relative './model/comment/container'
-  require_relative './model/comment/item'
-  require_relative './model/common/escape'
-  require_relative './model/list/wrapper/abstract'
-  require_relative './model/list/wrapper/unordered'
-  require_relative './model/list/item/abstract'
-  require_relative './model/list/item/unordered'
-  require_relative './model/p/index'
-  require_relative './model/special-block/container'
-  require_relative './model/special-block/item'
-
-  require_relative './parser/common/context/abstract'
-  require_relative './parser/common/context/doc'
-  require_relative './parser/doc/abstract'
-  require_relative './parser/doc/file'
-  require_relative './parser/doc/string'
-
+  require_relative './doc/index'
+  require_relative './folder/index'
 end

metadata

@@ -1,56 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: ppz
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - wuse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies: []
 description:
 email: 372301467@qq.com
-executables:
-- ppz
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- asset/style/ppz.css
-- asset/style/ppz.styl
-- bin/common.rb
-- bin/doc.rb
-- bin/folder.rb
-- bin/ppz
+- lib/doc/index.rb
+- lib/doc/model/abstract/model.rb
+- lib/doc/model/abstract/wrapper-model.rb
+- lib/doc/model/comment/container.rb
+- lib/doc/model/comment/item.rb
+- lib/doc/model/common/escape.rb
+- lib/doc/model/common/tag.rb
+- lib/doc/model/index.rb
+- lib/doc/model/list/item/abstract.rb
+- lib/doc/model/list/item/unordered.rb
+- lib/doc/model/list/wrapper/abstract.rb
+- lib/doc/model/list/wrapper/unordered.rb
+- lib/doc/model/p/index.rb
+- lib/doc/model/section/abstract.rb
+- lib/doc/model/section/leaf.rb
+- lib/doc/model/section/root.rb
+- lib/doc/model/special-block/container.rb
+- lib/doc/model/special-block/item.rb
+- lib/doc/parser/abstract.rb
+- lib/doc/parser/context.rb
+- lib/doc/parser/file.rb
+- lib/doc/parser/string.rb
+- lib/folder/index.rb
+- lib/folder/model/abstract.rb
+- lib/folder/model/file/abstract.rb
+- lib/folder/model/file/other.rb
+- lib/folder/model/file/ppz.rb
+- lib/folder/model/folder.rb
 - lib/func/util.rb
-- lib/model/abstract/model.rb
-- lib/model/abstract/wrapper-model.rb
-- lib/model/comment/container.rb
-- lib/model/comment/item.rb
-- lib/model/common/escape.rb
-- lib/model/common/tag.rb
-- lib/model/list/item/abstract.rb
-- lib/model/list/item/unordered.rb
-- lib/model/list/wrapper/abstract.rb
-- lib/model/list/wrapper/unordered.rb
-- lib/model/p/index.rb
-- lib/model/section/abstract.rb
-- lib/model/section/leaf.rb
-- lib/model/section/root.rb
-- lib/model/special-block/container.rb
-- lib/model/special-block/item.rb
-- lib/parser/common/context/abstract.rb
-- lib/parser/common/context/doc.rb
-- lib/parser/doc/abstract.rb
-- 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:
@@ -74,5 +68,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: 写作
+summary: compile ppz to html
 test_files: []

data/asset/style/ppz.css

@@ -1,141 +0,0 @@
-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%;
-  display: block;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.ancestor-nav ul {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  font-size: 0.8rem;
-  margin: 1rem 2rem 0 0;
-  text-align: right;
-}
-.ancestor-nav li {
-  margin: 0;
-  padding: 0;
-  display: inline-block;
-}
-.ancestor-nav li a {
-  display: inline-block;
-  opacity: 0.66;
-  transition: all 0.3s;
-}
-.ancestor-nav li a:hover {
-  opacity: 1;
-  transform: scale(1.1, 1.1);
-}
-.ancestor-nav li:not(.self)::after {
-  content: '/';
-  margin: 0 0.36rem;
-}
-article {
-  margin-left: 188px;
-  padding: 1px 2rem 1rem 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;
-}
-.interpage-nav {
-  margin: 1rem 2rem 2rem 188px;
-  padding: 0 2rem;
-  list-style: none;
-}
-.interpage-nav .prev {
-  float: left;
-}
-.interpage-nav .prev::before {
-  content: '上一篇：';
-  opacity: 0.6;
-}
-.interpage-nav .next {
-  float: right;
-}
-.interpage-nav .next::before {
-  content: '下一篇：';
-  opacity: 0.6;
-}
-.interpage-nav::after {
-  content: '';
-  display: block;
-  clear: both;
-}

data/asset/style/ppz.styl

@@ -1,126 +0,0 @@
-nav-width = 188px
-
-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 nav-width
-  height 100vh
-
-  ul
-    margin 0 0 0 1rem
-    padding 0
-    list-style none
-  a
-    width 100%
-    display block
-    overflow hidden
-    text-overflow ellipsis
-    white-space nowrap
-.ancestor-nav
-  ul
-    margin 0
-    padding 0
-    list-style none
-    font-size 0.8rem
-    margin 1rem 2rem 0 0
-    text-align right
-  li
-    margin 0
-    padding 0
-    display inline-block
-    a
-      display inline-block
-      opacity 0.66
-      transition all 0.3s
-      &:hover
-        opacity 1
-        transform scale(1.1, 1.1)
-    &:not(.self)::after
-      content '/'
-      margin 0 .36rem
-
-article
-  margin-left nav-width
-  padding: 1px 2rem 1rem 1rem
-h1
-  font-size 2rem
-h2
-  font-size 1.3rem
-h3
-  font-size 1.1rem
-  opacity 0.9
-
-h1, h2, 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 #eeeeee
-
-  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
-  &:hover::before
-    opacity 0.8
-
-.special-txt
-  background rgba(27, 31, 35, 0.05)
-  border-radius 4px
-  font-size 0.9em
-  padding 2px 4px
-
-.interpage-nav
-  margin 1rem 2rem 2rem nav-width
-  padding 0 2rem
-  list-style none
-  .prev
-    float left
-    &::before
-      content '上一篇：'
-      opacity 0.6
-  .next
-    float right
-    &::before
-      content '下一篇：'
-      opacity 0.6
-  &::after
-    content ''
-    display block
-    clear both

data/bin/common.rb

@@ -1,42 +0,0 @@
-require 'pathname'
-
-module PPZMain
-  CURRENT_PATH = File.dirname __FILE__
-  CSS_FILE_PATH = (Pathname CURRENT_PATH) + '../asset/style/ppz.css'
-
-  class Util
-    class << self
-      def get_in_and_out
-        target_in, target_out = ARGV
-
-        # 输入文件
-        abort '要编译哪那个文件？请告诉我' unless target_in # 检查参数存在
-        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
-        is_folder = File.directory? target_in
-
-        # 输出文件
-        unless target_out
-          # 从输入文件获取文件名
-          target_out = ((/(.*).ppz$/.match target_in)?$1:target_in) + '.pp'
-        end
-        # + 检查上级文件夹是否存在
-        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, is_folder]
-      end
-    end
-  end
-end

data/bin/doc.rb

@@ -1,17 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/ppz'
-require_relative './common'
-require 'fileutils'
-require 'pathname'
-
-TARGET_IN, TARGET_OUT, IS_FOLDER = PPZMain::Util.get_in_and_out
-
-if IS_FOLDER
-  require_relative './folder.rb'
-else
-  require_relative './doc.rb'
-end

data/lib/parser/common/context/abstract.rb

@@ -1,30 +0,0 @@
-# 当前行，所处的上下文
-# 比如 一级 section 下面的 ul 下的 第 n 个 ul
-
-class PPZ::AbstractContext
-  def initialize root
-    @stack = [root]
-  end
-
-  # def append # 交给子类实现
-
-  def pop
-    @stack.pop
-  end
-
-  def head
-    @stack[-1]
-  end
-
-  def root
-    @stack[0]
-  end
-
-  private
-    def pop_to klass
-      loop do
-        break if head.is_a? klass
-        pop
-      end
-    end
-end