ppz 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52c9495b0dd9d71eb9f4cd1a6dcaec7805fb10c450dc1d96d664ae7c30d16e0f
-  data.tar.gz: 1a2959299c61dcdf554f6923f5c28c713d8667eba7669b6c683b5196081c27b6
+  metadata.gz: bad1dbe093ab8a51881656c02401cfbefce4f3ca153a5dfc7b5f9cd5483a161c
+  data.tar.gz: 02a01ac4f61ef0e2edd725407ecf1baed235501b635065463049db698a2719d9
 SHA512:
-  metadata.gz: 4fc7fbcf2fc28272ab0f453477f8f23eff28bc51040b032896fd58ddb2fd6a28be3afba1ada77b956d577db0ab23e60f7fdb8c9ddd030891687f2893595f6323
-  data.tar.gz: 7f6013e0106ee614b07b0ba255e4b812cd4f3fb2773dd98fbb71c2098d51a723b3ef7cd47086a96a33db3370448be9397ae32977abfe889113b66056bacdbd57
+  metadata.gz: 72f1066915ce586d43b514411d109c7016b754b30cfb192262044813d8db268ca14c99226edadd8bfd5f627f0ef48d96d8ca9337fdb6f7f13e33a10f8c5a67a9
+  data.tar.gz: 8e7267e62274f2ff85c89596ab7799a64574fba03da5c776f3293b0e39da4aeebba208b989b04756bb98304a58abb967a0317455a3533e04411917109af318c7

data/asset/style/ppz.css

@@ -28,13 +28,40 @@ aside ul {
 }
 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 1rem;
+  padding: 1px 2rem 1rem 1rem;
 }
 h1 {
   font-size: 2rem;
@@ -89,9 +116,9 @@ h3::before {
   padding: 2px 4px;
 }
 .interpage-nav {
-  margin-left: 188px;
+  margin: 1rem 2rem 2rem 188px;
+  padding: 0 2rem;
   list-style: none;
-  padding: 0 1rem;
 }
 .interpage-nav .prev {
   float: left;
@@ -112,6 +139,3 @@ h3::before {
   display: block;
   clear: both;
 }
-.folder-nav {
-  margin: 2rem 3rem;
-}

data/asset/style/ppz.styl

@@ -26,13 +26,36 @@ aside
     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 1rem
+  margin-left nav-width
+  padding: 1px 2rem 1rem 1rem
 h1
   font-size 2rem
 h2
@@ -84,9 +107,9 @@ h1, h2, h3
   padding 2px 4px
 
 .interpage-nav
-  margin-left nav-width
+  margin 1rem 2rem 2rem nav-width
+  padding 0 2rem
   list-style none
-  padding 0 1rem
   .prev
     float left
     &::before
@@ -100,7 +123,4 @@ h1, h2, h3
   &::after
     content ''
     display block
-    clear both
-
-.folder-nav
-  margin 2rem 3rem
+    clear both

data/lib/model/special-block/container.rb

@@ -1,10 +1,17 @@
 class PPZ::SpecialContainerModel < PPZ::AbstractWrapperModel
   UpperClass = PPZ::AbstractSectionModel
 
-  REG_EXP = /^```( (.*))?/
+  REG_EXP = /^```( (.*))?$/
   def self.from_line line
-    return nil unless REG_EXP.match(line)
-    PPZ::SpecialContainerModel.new $2
+    if REG_EXP.match line
+      if $2 && ($2.include? '```')
+        nil
+      else
+        PPZ::SpecialContainerModel.new $2
+      end
+    else
+      nil
+    end
   end
 
   def initialize name

data/lib/parser/folder/index.rb

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

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

@@ -1,6 +1,7 @@
 module PPZ::Folder
   class AbstractModel
-    attr_reader :index, :name
+    attr_reader :index, :name, :level
+    attr_accessor :prev_model, :next_model, :father_model
 
     def initialize path, level
       throw '文件（夹）的名字得是字符串啊' unless path.is_a? String
@@ -23,5 +24,67 @@ module PPZ::Folder
     def get_css_path
       ('../' * @level) + 'style.css'
     end
+
+    def relative_link target
+      relative_level = target.level - @level # relative_level 是“当前 model 比目标 level 高几级”
+
+      (if relative_level > 0
+        '../' * relative_level
+      elsif relative_level < 0
+        result = ''
+        father = @father_model
+        (- relative_level).times do
+          result = father.name + '/' + result
+          father = father.father_model
+        end
+        result
+      else
+        ''
+      end) + @name + '.html'
+    end
+
+    private
+      def to_html
+        get_head_html +
+        get_ancestor_html +
+        get_content_html +
+        get_nav_html
+      end
+
+      def get_head_html
+        %~<title>#{@name}</title><link rel="stylesheet" href="#{get_css_path}"/>~
+      end
+      
+      def get_ancestor_html
+        list = []
+        father = self
+        loop do
+          break unless father.father_model
+          father = father.father_model
+          list.unshift father
+        end
+        %~<div class="ancestor-nav"><ul>#{
+          (list.collect do |node|
+            %`<li><a href="#{node.relative_link self}">#{node.name}</a></li>`
+          end
+          .join) + %`<li class="self">#{self.name}</li>`
+        }</ul></div>~
+      end
+
+      def get_nav_html
+        # prev_model nav_html
+        prev_model_html = ''
+        if @prev_model
+          prev_link = @prev_model.relative_link self
+          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_model_html = "<li class=\"next\"><a href=\"#{next_link}\">#{@next_model.name}</a></li>"
+        end
+
+        %~<ul class="interpage-nav">#{prev_model_html}#{next_model_html}</ul>~
+      end
   end
 end

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

@@ -10,7 +10,6 @@ class AbstractFileModel < AbstractModel
   end
 
   attr_reader :file_ext
-
   def initialize path, level
     super
     unless /^((\d+)_)?([^\.]+)(\.[^\.]+)?$/.match @basename

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

@@ -3,19 +3,13 @@ module PPZ::Folder
     attr_accessor :left, :right
 
     def _compile dir_out
-      parser = PPZ::FileDocParser.new @path
-      html_str = %!<link rel="stylesheet" href="#{get_css_path}"/>
-<title>#{@name}</title>#{
-  parser.get_model.to_html
-}<ul class="interpage-nav">#{
-  (@left ?
-    "<li class=\"prev\"><a href=\"#{@left.name}.html\">#{@left.name}</a></li>"
-    : "") +
-  (@right ?
-    "<li class=\"next\"><a href=\"#{@right.name}.html\">#{@right.name}</a></li>"
-    : "")
-}</ul>!
-      PPZ::Func::write_to_file (dir_out + '/' + @name + '.html'), html_str
+      PPZ::Func::write_to_file (dir_out + '/' + @name + '.html'), to_html
     end
+
+    private
+      def get_content_html
+        (PPZ::FileDocParser.new @path)
+          .get_model.to_html
+      end
   end
 end

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

@@ -1,5 +1,7 @@
 module PPZ::Folder
   class FolderModel < AbstractModel
+    attr_reader :children
+
     def initialize path, level
       super
       /^((\d+)_)?(.+)/.match @basename
@@ -14,8 +16,11 @@ module PPZ::Folder
         a.index <=> b.index
       end
 
+      # 设置上级 和 左右
       left = right = nil
       @children.each do |child|
+        child.father_model = self # 上级
+
         next unless child.is_a? PPZFileModel
         if left
           left.right = child
@@ -25,21 +30,8 @@ module PPZ::Folder
       end
     end
 
-    def title
-      @name
-    end
-
     def _compile out_dir # compile 是 _compile 的安全版本
-      PPZ::Func.write_to_file (out_dir + '/' + @name + '.html'), %!<title>#{title}</title>
-<link rel="stylesheet" href="#{get_css_path}"/><div class="folder-nav"><ul>#{
-@children
-  .map do |child|
-    child.file_ext == '.ppz' ?
-      "<li><a href=\"./#{@name}/#{child.name}.html\">#{child.name}</a></li>"
-      : ''
-  end
-  .join
-}</ul></div>!
+      PPZ::Func.write_to_file (out_dir + '/' + @name + '.html'), to_html
 
       children_dir = out_dir + '/' + @name
       Dir.mkdir children_dir
@@ -47,6 +39,8 @@ module PPZ::Folder
     end
 
     def compile out_dir
+      set_prev_and_next_page
+
       unless out_dir.is_a? String
         throw 'out_dir 只能是字符串'
       end
@@ -59,5 +53,41 @@ module PPZ::Folder
         _compile out_dir
       end
     end
+    
+    # 设置页面的“上一篇、下一篇”
+    private
+      def set_prev_and_next_page
+        list = []
+        linearize_children self, list
+        list.inject do |pre, nex|
+          pre.next_model = nex
+          nex.prev_model = pre
+          nex
+        end
+      end
+      
+      def linearize_children child, list
+        if child.is_a? PPZFileModel
+          list.push child
+        elsif child.is_a? FolderModel
+          list.push child
+          child.children.each do |cc|
+            linearize_children cc, list
+          end
+        end
+      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>!
+      end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppz
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - wuse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: 372301467@qq.com