ppz 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d446dbd5570e54876363303e60e7d6b42c74074b231a62a7cd418fa4c241b768
-  data.tar.gz: cf6870884a629d64224f256ffe0c7e4620d525e1d1fa1fe7f7739a691981984a
+  metadata.gz: 5cc249a9892c07ef6b2f3325057c2d90574593435a90b4a097dd2d1f7d5a7d5b
+  data.tar.gz: f6573a7c9da1292fcf385a3bc0e23ca9d825219cb2d322316bd82395bde3604e
 SHA512:
-  metadata.gz: 9b5e40c14d3e4b916a35fbb27691b31d1dff0bda542d09fabbc53b764addd59251e47986e09371a5ac9d1046a0612e783ce7e435b2596019da944c436a0a5104
-  data.tar.gz: 572592413bf31f57f23c32d797bc716a849aa1132d0010924d05ea0955fe466e1227c1d977467130f440a0237cc144211573632f9c793301dbf5da15e261ca69
+  metadata.gz: c0a8ee4c7b4d6fe3c4bc8ae415d9a2b50cacc828723a0cf07c44fba5714468655cb803b44ba503ba58d70543acdd0d0cb7bfdebed4dab4890994a71d5a1e4a4a
+  data.tar.gz: 011012d0ed8c6e63e9fc1ccd6ce540e1098abaa45852cd19013b9bdf3edf8b4cf2a20d45da13b2ee5269ad4305529bf1466cd3f1005458b1573ecb4cef091e33

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

@@ -20,6 +20,6 @@ class PPZ::SpecialContainerModel < PPZ::AbstractWrapperModel
   end
   
   def to_html
-    "<div class=\"special-block-container #{@name}\">#{super}</div>"
+    "<ol class=\"special-block-container #{@name}\">#{super}</ol>"
   end
 end

data/lib/doc/model/special-block/item.rb

@@ -3,6 +3,6 @@ class PPZ::SpecialItemModel < PPZ::AbstractModel
     @line = line
   end
   def to_html
-    "<div class=\"special-block-item\">#{@line}</div>"
+    "<li>#{@line}</li>"
   end
 end

data/lib/folder/model/abstract.rb

@@ -1,12 +1,18 @@
+require 'pathname'
+
 module PPZ::Folder
   class AbstractModel
     attr_reader :index, :name, :level
     attr_accessor :prev_model, :next_model, :father_model
 
     def initialize path, level
-      throw '文件（夹）的名字得是字符串啊' unless path.is_a? String
+      if path.is_a? String
+        path = Pathname path
+      elsif !(path.is_a? Pathname)
+        throw '文件夹的名字必须是 String 或 Pathname'
+      end
       @path = path
-      @basename = File.basename path
+      @basename = path.basename.to_s
       @level = level
     end
 
@@ -21,10 +27,6 @@ module PPZ::Folder
       end
     end
 
-    def get_css_path
-      ('../' * @level) + 'style.css'
-    end
-
     def relative_link target
       relative_level = @level - target.level # relative_level 是“目标 model 比当前 level 高几级”
 
@@ -48,11 +50,13 @@ module PPZ::Folder
         get_head_html +
         get_ancestor_html +
         get_content_html +
-        get_nav_html
+        get_nav_html +
+        get_js_html
       end
 
       def get_head_html
-        %~<title>#{@name}</title><link rel="stylesheet" href="#{get_css_path}"/>~
+        css_path = ('../' * @level) + '.ppz/asset/style/index.css'
+        %~<title>#{@name}</title><link rel="stylesheet" href="#{css_path}">~
       end
       
       def get_ancestor_html
@@ -86,5 +90,10 @@ module PPZ::Folder
 
         %~<ul class="interpage-nav">#{prev_model_html}#{next_model_html}</ul>~
       end
+
+      def get_js_html
+        js_path = ('../' * @level) + '.ppz/asset/js/index.js'
+        %~<script type="module" src="#{js_path}"></script>~
+      end
   end
 end

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

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

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

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

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

@@ -3,7 +3,7 @@ module PPZ::Folder
     attr_accessor :left, :right
 
     def _compile dir_out
-      PPZ::Func::write_to_file (dir_out + '/' + @name + '.html'), to_html
+      PPZ::Func::write_to_file (dir_out + (@name + '.html')), to_html
     end
 
     private

data/lib/folder/model/folder.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module PPZ::Folder
   class FolderModel < AbstractModel
     attr_reader :children
@@ -9,8 +11,8 @@ module PPZ::Folder
       @name = $3
 
       @children = []
-      (Dir.children path, encoding: 'utf-8').each do |child_name|
-        @children.push AbstractModel.from_path (path + '/' + child_name), level
+      (Dir.children @path, encoding: 'utf-8').each do |child_name|
+        @children.push AbstractModel.from_path (@path + child_name), level
       end
       @children.sort! do |a, b|
         a.index <=> b.index
@@ -31,27 +33,28 @@ module PPZ::Folder
     end
 
     def _compile out_dir # compile 是 _compile 的安全版本
-      PPZ::Func.write_to_file (out_dir + '/' + @name + '.html'), to_html
+      out_file_pathname = out_dir + (@name + '.html')
+      PPZ::Func.write_to_file out_file_pathname, to_html
 
-      children_dir = out_dir + '/' + @name
+      children_dir = out_dir + @name
       Dir.mkdir children_dir
       @children.each { |child| child._compile children_dir }
     end
 
     def compile out_dir
+      if out_dir.is_a? String
+        out_dir = Pathname out_dir
+      elsif !(out_dir.is_a? Pathname)
+        throw '输出文件夹的名字必须是 String 或 Pathname'
+      end
+
       set_prev_and_next_page
 
-      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
+      
+      _compile out_dir
     end
     
     def get_content_table_html root

data/lib/func/util.rb

@@ -17,13 +17,5 @@ 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

metadata

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