markdown_extension 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d7c32cfae2b681bc6f6e6d38748fb70d5d3d51ca9766d3847e713fc088d4d2
-  data.tar.gz: 5e7e661e48acc68946c3a17c1c0e7d32191d2ec3af35b7f26f67589447c6bd8a
+  metadata.gz: 6101b1a888999d59f89a4db3050eb8d72cbc8027210b6a113cb6e9250bd2d28e
+  data.tar.gz: f962ecfc313df40e61d4d1b320e5e3a542c4c41783d6c03437c6828759aa4904
 SHA512:
-  metadata.gz: 11ba5ee235ad603da4f65aa44d39b2f5c481ead42854a6f06c03ccc7d15d4cbfebba648d10b0568c28c8dc386a080115635d287c03b174ad315c06bcec369c1f
-  data.tar.gz: d347742662afa0826627bbab26fa3d50cda4656a3b021f2d7ffd8d9e9d2264879538f9935f4621a0a00940a99b2e35df253ac0b29738289cfb1b4c710416bd3d
+  metadata.gz: 357d38eab68c50ca38e18c4fa9223f2d40fc1229487f4637128504c481512537274df13a18f9dcc5983759d0935b34649d88a18e670dbcd60f6e714ec44c4ba5
+  data.tar.gz: a0d834f4d276778b0de7019acf71d2b95d4912745670c33540b93885d61c8e938d9961d396dd238ec474ccca397e342b73efa49ac959218ace1b03e8bf5c7bed

data/lib/markdown_extension/config.rb

@@ -4,7 +4,7 @@ module MarkdownExtension
     class Config
         attr_accessor :raw_config, :file, :type
 
-        def load_file(file, type)
+        def load_file(file)
             @raw_config = begin
                 Tomlrb.load_file(file)
             rescue
@@ -15,26 +15,33 @@ module MarkdownExtension
         def initialize(file, type)
             @file = file
             @type = type
-            load_file(file , type)
+            load_file(file)
             return self
         end
 
-        def title
+        def get_base_info(name)
             if @raw_config
                 if @raw_config[@type.to_s]
-                    return @raw_config[@type.to_s]["title"]
+                    return @raw_config[@type.to_s][name]
                 end
             end
             ""
         end
 
+        def title
+            get_base_info("title")
+        end
+
         def src
-            if @raw_config
-                if @raw_config[@type.to_s]
-                    return @raw_config[@type.to_s]["src"]
-                end
-            end
-            ""
+            get_base_info("src")
+        end
+
+        def pages
+            get_base_info("pages")
+        end
+
+        def journals
+            get_base_info("journals")
         end
 
         def preprocessing

data/lib/markdown_extension/page.rb

@@ -23,9 +23,15 @@ module MarkdownExtension
 
         def pre_processing
             if @site.config.preprocessing["backlinks"]
-                @markdown = @markdown.gsub(/\[\[(.*)\]\]/) do |s| 
-                    s = s[2..-3]
-                    "[#{s}](#{s}.html)"
+                @markdown = @markdown.gsub(/\[\[([^\]]+)\]\]/) do |s|
+                    index = @markdown.index(s)
+                    if (@markdown[index-1]=="(" && @markdown[index+s.size]==")")
+                        s = s[2..-3]
+                        "#{s}.html"
+                    else
+                        s = s[2..-3]
+                        "[#{s}](#{s}.html)"
+                    end
                 end
                 if @site.references[@item_name]
                     @markdown += "\n\n\n"

data/lib/markdown_extension/site.rb

@@ -2,12 +2,14 @@ require "json"
 
 module MarkdownExtension
     class Site
-        attr_accessor :config, :summary, :pages, :references, :reverse_references
+        attr_accessor :config, :summary, :pages, :journals, :references, :reverse_references
         attr_accessor :nodes, :links
 
         def initialize(config, type)
             @config = MarkdownExtension::Config.new(config, type)
-            @summary = MarkdownExtension::Summary.new(@config)
+            unless type == :logseq
+                @summary = MarkdownExtension::Summary.new(@config)
+            end
             @references = {}
             @reverse_references = {}
             @nodes = []
@@ -18,12 +20,23 @@ module MarkdownExtension
 
         def load_source_files
             @pages = []
+            @journals = []
             if @config
-                files = Dir.glob(@config.src + "/*.md")
+                if @config.type == :logseq
+                    journal_files = Dir.glob(@config.journals + "/*.md")
+                    journal_files.each do |file|
+                        page = MarkdownExtension::Page.new(file, self)
+                        @journals << page
+                    end
+                    pages_path = @config.pages
+                else
+                    pages_path = @config.src
+                end
+                files = Dir.glob(pages_path + "/*.md")
                 files.each do |file|
-                    unless file == @config.src + "/summary.md"                        
+                    unless file == @config.pages + "/summary.md"
                         page = MarkdownExtension::Page.new(file, self)
-                        pages << page
+                        @pages << page
                         gen_references(file , page.markdown)
                     end
                 end
@@ -31,7 +44,7 @@ module MarkdownExtension
         end
 
         def gen_references(file, text)
-            text.gsub(/\[\[(.*)\]\]/) do |s|
+            text.gsub(/\[\[([^\]]+)\]\]/) do |s|
                 s = s[2..-3]
                 item_name = file.split("/")[-1].gsub(".md","")
                 if @references[s]

data/lib/markdown_extension/version.rb

@@ -1,3 +1,3 @@
 module MarkdownExtension
-  Version = '0.0.5'
+  Version = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_extension
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Zhuang Biaowei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb