obsidian-parser 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041aa2c11a3972e24477c8601a880276de98b0108ef7628d9c30b623a1b14cb9
-  data.tar.gz: 1843bb05271c17a14658c956b7418472f19a5c460d95708f9f3e3fbe7d115d09
+  metadata.gz: 900eecebc9fbedf86efa15e1913fcdbf661cab7e6cb19453ecbf5b7d956f95b1
+  data.tar.gz: 5bbfdbc5cf83fb3149536b54fb427e44a2d5521ca292d7b97af1345e85fa9779
 SHA512:
-  metadata.gz: 8c21ac0b8b64e487cfbdf7f35c15b486c4094a69dd4d068a90e5d7135159efd148f5df7aaa3ac2a52f327849cb30c5bd698938f0bca9ae4d45e558ab9cb142f2
-  data.tar.gz: e7f08dda0226319f82135e7bf7374c0f9b6448497f9e7e89a6b1e29a5d0fd0a281a0415d4fc246aae645a91b9cb8a2fb2ac024c941ec2ded63f5089a5ff51dec
+  metadata.gz: 9bac7a436c5a2bb2a8568c4ba306d769584813ac5da89f9d3051c601f347c22abe6b6009dc4ca988912dd13af32d2c25e7dc15943a3032a871b3ba656200271d
+  data.tar.gz: deba24083f278d7c0b060f798f86de8d95a2a451e899577fbcda4f98046c5d0083554c55d8cfd35eedde085c21fde64cc01d6923d3a8f60aa388f4a412f64183

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.5.1] - 2023-07-30
+- Fix handling of `index.md` at the root level.
+
+## [0.5.0] - 2023-07-30
+- Fix ordering of `Page#children` so that index pages come first.
+- Fix handling of `index.md` documents so that the slug reflects the directory path.
+
 ## [0.4.0] - 2023-07-30
 - Unify `Note` and `Index` classes into `Page`. This is a breaking API change. `Parser#notes is replaced by Parse#pages`. Call `Page#is_index?`to distinguish between directory derived pages and documents.
 - Remove `Parser#table_of_contents` and `Parser#walk_tree`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    obsidian-parser (0.4.0)
+    obsidian-parser (0.5.1)
       kramdown (~> 2.4)
       kramdown-parser-gfm (~> 1.1)
 

data/lib/obsidian/parser/page.rb

@@ -47,7 +47,11 @@ module Obsidian
     # are added before their descendents.
     def add_page(slug, last_modified: nil, content: nil)
       path_components = slug.split("/")
-      raise ArgumentError, "Expecting non-empty slug" if path_components.empty?
+
+      if path_components.empty?
+        update_content(content: content, last_modified: last_modified)
+        return
+      end
 
       title = path_components.pop
 
@@ -61,7 +65,9 @@ module Obsidian
         slug: slug,
         last_modified: last_modified,
         content: content
-      )
+      ).tap do |page|
+        page.update_content(content: content, last_modified: last_modified)
+      end
     end
 
     def get_or_create_child(title:, slug:, last_modified: nil, content: nil)
@@ -76,8 +82,13 @@ module Obsidian
       )
     end
 
+    def update_content(content:, last_modified:)
+      @content ||= content
+      @last_modified ||= last_modified
+    end
+
     def children
-      @children.values.sort_by { |c| [c.is_index? ? 1 : 0, c.title] }
+      @children.values.sort_by { |c| [c.is_index? ? 0 : 1, c.title] }
     end
 
     def walk_tree(&block)

data/lib/obsidian/parser/version.rb

@@ -2,6 +2,6 @@
 
 module Obsidian
   class Parser
-    VERSION = "0.4.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/obsidian/parser.rb

@@ -36,19 +36,21 @@ module Obsidian
 
         next if basename == "."
 
-        # TODO: handle index.md files
-        if basename != "index.md"
+        # Remove the path component "." from the start of the dirname
+        parent_slug = dirname.to_s.gsub(/\A\.\/?/, "")
+
+        if basename.to_s == "index.md"
+          slug = parent_slug.to_s.gsub(/\.md\z/, "")
+        else
           title = basename.to_s.gsub(/\.md\z/, "")
-          parent_slug = dirname.to_s.gsub(/\A\.\/?/, "")
           slug = Obsidian.build_slug(title, parent_slug)
-          content = MarkdownContent.new(path)
-
-          @index.add_page(
-            slug,
-            last_modified: path.mtime,
-            content: content
-          )
         end
+
+        @index.add_page(
+          slug,
+          last_modified: path.mtime,
+          content: MarkdownContent.new(path)
+        )
       end
 
       # TODO: capture links between notes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obsidian-parser
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mat Moore