raindown 0.15.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d201e22c68a6326752cd504b5cca6674384031244b3b91cbe9e8da2e1034d8b
-  data.tar.gz: 6b3cf1bbc8e03c353c0eb0bade6a7c1f9546c99fc2dfabc260963f50e7ff3063
+  metadata.gz: 3f181e2b7e348aefd77d7f22eef4aee64e16022ba3050d04493b829fbdabff7b
+  data.tar.gz: 9388ac597b48b784229155e26a96c535b67eb6ff84a277450d1c43d4e117b004
 SHA512:
-  metadata.gz: cb8dba488c6c4ca2ddd49f8cd699a3d660f9a12fb00e756e6f5cd65e433b2ac04d4d4124e078a41b39fbe2707632f5cc1a78acf97e033dfdbe5715c01e50985b
-  data.tar.gz: 4d1d7f48804fcdc7ee6ce0343d2f34fa0f797566dc222a645dae1d3f4b79cc9f7841c6acbbfb83c93c0dde681bf110139f9ed51b4fd7ef7c37181db1052137fe
+  metadata.gz: 6f0c4bd5677aa6f16058b8528f6af05f4ced2d4f8e4107225ae549e4d1c01e001342e45b8acf3f4e853034692094bcc684c5c8fc89d614ce39651e8307dbafc7
+  data.tar.gz: e2d10247dc4718f13909849c12feeed14a8c78e73e3de470908a3ed5684b36e0d4663c7cdbfaf45ba10a41a204f169922482739c3c81b49537df17d77a383ed4

data/lib/raindown/chart/points.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'yaml'
 
 require_relative '../node'
+require_relative '../utils'
 
 module Raindown
   class Chart < Node
@@ -43,6 +44,7 @@ module Raindown
         return numbers(numbers) if numbers.any? && numbers.all? { number(it) }
 
         path = File.expand_path(string, @root)
+        raise Error, "it's outside the project" unless Utils.inside?(path, @root)
         raise Error, 'no such file' unless File.file?(path)
 
         from(read(path))

data/lib/raindown/front_matter.rb

@@ -3,6 +3,8 @@
 require 'date'
 require 'yaml'
 
+require_relative 'utils'
+
 module Raindown
   # YAML between two --- lines at the very start of a file.
   module FrontMatter
@@ -19,6 +21,14 @@ module Raindown
       [metadata.is_a?(Hash) ? metadata : {}, match.post_match]
     end
 
+    # A file's metadata, or none when it can't be read, with a warning naming it, so one file can't stop a list of them.
+    def read(file_path)
+      parse(Utils.read_markdown(file_path)).first
+    rescue Psych::Exception, ArgumentError => e
+      warn "raindown: #{file_path}: #{e.message}, so it's listed without its front matter"
+      {}
+    end
+
     # How many of the lines are front matter, so directives in its YAML are left alone.
     def line_count(lines)
       lines.join.match(PATTERN)&.then { |match| match[0].lines.length } || 0

data/lib/raindown/list.rb

@@ -14,18 +14,26 @@ module Raindown
       @tags = tags
     end
 
-    # Each file has its front matter, its path and its content. Sorted by an order, files without it come last, and ones
-    # with the same value stay in the order they're listed.
+    # Each file has its front matter, its path and its content. Sorted by an order, numbers come first, then other values
+    # as text, then files without it, and ones with the same value stay in the order they're listed.
     def files(metadata: NoMetadata)
       files = metadata.list(**@tags)
       return files unless @order
 
       sorted, unsorted = files.partition { it[@order] }
-      sorted.sort_by.with_index { |file, index| [file[@order], index] } + unsorted
+      sorted.sort_by.with_index { |file, index| [*order_key(file[@order]), index] } + unsorted
     end
 
     def rewrite(metadata: NoMetadata)
-      files(metadata:).map { |file| "- [#{file.title || file.path}](#{file.path})" }.join("\n")
+      files(metadata:).map { |file| "- [#{file.title || File.basename(file.path, '.*')}](#{file.path})" }.join("\n")
+    end
+
+    private
+
+    def order_key(value)
+      return [0, value, ''] if value.is_a?(Numeric)
+
+      [1, 0, value.to_s]
     end
   end
 end

data/lib/raindown/pages.rb

@@ -25,10 +25,11 @@ module Raindown
         @front_matters ||= {}
       end
 
-      # The Markdown files under a project's root, the folder with its .raindown folder or else the file's folder.
+      # The Markdown files under a project's root, the folder with its .raindown folder, or a vault, or else the file's
+      # folder.
       def for(path)
-        file_directory = File.dirname(File.expand_path(path))
-        load(root: Nodes.find_folder(file_directory)&.then { File.dirname(it) } || file_directory)
+        require_relative 'projects'
+        load(root: Projects.content_root(path) || File.dirname(File.expand_path(path)))
       end
 
       # Lists the files under the root, without loading them, for Dirload.
@@ -118,7 +119,7 @@ module Raindown
       modified_then, front_matter = self.class.front_matters[file_path]
       return front_matter if modified_then == modified
 
-      FrontMatter.parse(Utils.read_markdown(file_path)).first.tap { self.class.front_matters[file_path] = [modified, it] }
+      FrontMatter.read(file_path).tap { self.class.front_matters[file_path] = [modified, it] }
     end
 
     # The path is relative to the root, like docs/_basics/_1-getting-started.md.

data/lib/raindown/projects.rb

@@ -44,6 +44,18 @@ module Raindown
       folder && File.dirname(folder)
     end
 
+    # The folder a file's paths are relative to: the nearest with a .raindown folder or that's a vault, or nil without one.
+    # A vault doesn't need a .raindown folder, as Obsidian's links and a table's path are from its top.
+    def content_root(path)
+      folder = File.dirname(File.expand_path(path))
+      until project?(folder) || vault?(folder)
+        return if folder == File.dirname(folder)
+
+        folder = File.dirname(folder)
+      end
+      folder
+    end
+
     # The project's Markdown files, sorted, leaving out ignored folders. The projects inside it are left out too,
     # since they have nodes of their own, and vaults, which their editor writes back to.
     def files(root)

data/lib/raindown/table/markdown_table.rb

@@ -35,7 +35,12 @@ module Raindown
     end
 
     def escape(cell)
-      cell.gsub('|', '\|').gsub(/\s*\R\s*/, ' ')
+      one_line(cell).gsub('|', '\|')
+    end
+
+    # The cell as a table shows it, on one line.
+    def one_line(cell)
+      cell.gsub(/\s*\R\s*/, ' ')
     end
   end
 end

data/lib/raindown/table/table.rb

@@ -5,6 +5,7 @@ require 'digest'
 require 'json'
 
 require_relative '../node'
+require_relative '../utils'
 require_relative 'markdown_table'
 require_relative 'table_formulas'
 require_relative 'written_table'
@@ -36,24 +37,31 @@ module Raindown
     # Written is what it wrote last time, so it can tell which of the table and the file changed since.
     def rewrite(written: [], metadata: NoMetadata)
       path = data_path(metadata)
-      data_error(path) || synced(path, written.map(&:chomp))
+      data_error(path, metadata) || synced(path, written.map(&:chomp))
     end
 
     # Write-in, in <{ }>, the table only shows its file, and never writes to it.
     def render(metadata: NoMetadata)
       path = data_path(metadata)
-      Raindown.commonmark(data_error(path) || MarkdownTable.format(with_total(TableFormulas.evaluate(read_rows(path)))))
+      Raindown.commonmark(data_error(path, metadata) || MarkdownTable.format(with_total(TableFormulas.evaluate(read_rows(path)))))
     end
 
     private
 
     def data_path(metadata)
-      File.expand_path(@data.to_s, metadata.respond_to?(:root) ? metadata.root : Dir.pwd)
+      File.expand_path(@data.to_s, data_root(metadata))
+    end
+
+    def data_root(metadata)
+      return metadata.root if metadata.respond_to?(:root)
+
+      Dir.pwd
     end
 
     # Why the file can't be a table, or nil when it can.
-    def data_error(path)
+    def data_error(path, metadata)
       return "Can't show #{@data.inspect} as a table: only CSV and TSV files can be" unless SEPARATORS.key?(File.extname(path).downcase)
+      return "Can't show #{@data.inspect} as a table: it's outside the project" unless Utils.inside?(path, data_root(metadata))
 
       "Can't show #{@data.inspect} as a table: no such file" unless File.file?(path)
     end
@@ -64,7 +72,7 @@ module Raindown
       synced_hash = written.first&.[](COMMENT, 1)
       table = WrittenTable.new(written_rows(written), file)
       return markdown(file, table.revealed) if unchanged?(table.rows, synced_hash, shown)
-      return markdown(write_rows(path, with_formulas(table.rows, file, shown)), table.revealed) if hash_rows(shown) == synced_hash
+      return markdown(write_rows(path, with_file_cells(table.rows, file, shown)), table.revealed) if hash_rows(shown) == synced_hash
 
       warn "raindown: #{@data} and its table both changed, so neither is written until they match"
       ["<!-- table conflict · #{synced_hash} -->", *written.drop(1)].join("\n")
@@ -95,12 +103,13 @@ module Raindown
       revealed.each_with_object(values.map(&:dup)) { |(row, column), shown| shown[row][column] = rows[row][column] }
     end
 
-    # The table's rows, keeping the file's formula in each cell still showing its value.
-    def with_formulas(table, file, shown)
+    # The table's rows, keeping the file's cell where the table still shows it, like a formula as its value, or a cell
+    # with line breaks on one line.
+    def with_file_cells(table, file, shown)
       table.each_with_index.map do |row, row_index|
         row.each_with_index.map do |cell, column|
-          formula = file.dig(row_index, column)
-          next formula if TableFormulas.formula?(formula) && shown.dig(row_index, column) == cell
+          kept = file.dig(row_index, column)
+          next kept if kept && MarkdownTable.one_line(shown.dig(row_index, column).to_s) == cell
 
           cell
         end
@@ -146,8 +155,9 @@ module Raindown
       rows
     end
 
+    # As the table shows them, so a cell with line breaks hashes the same in both.
     def hash_rows(rows)
-      Digest::SHA256.hexdigest(JSON.generate(rows))[0, 6]
+      Digest::SHA256.hexdigest(JSON.generate(rows.map { |row| row.map { MarkdownTable.one_line(it.to_s) } }))[0, 6]
     end
   end
 end

data/lib/raindown/toc.rb

@@ -15,7 +15,7 @@ module Raindown
     TAG = /<[^>]*>/
 
     def rewrite(document:, metadata: nil, bare: false)
-      headings = headings(markdown: document, metadata:, bare:)
+      headings = headings_below_title(markdown: document, metadata:, bare:)
       return '' if headings.empty?
 
       min_level = headings.map { |heading| heading[:level] }.min
@@ -27,7 +27,7 @@ module Raindown
 
     # With the document's final HTML, the headings include ones its components render.
     def render(document:, html: nil, metadata: nil, bare: false)
-      items = headings(markdown: document, html:, metadata:, bare:).map do |heading|
+      items = headings_below_title(markdown: document, html:, metadata:, bare:).map do |heading|
         "<li class='h#{heading[:level]}'><a href='##{heading[:id]}'>#{CGI.escapeHTML(heading[:text])}</a></li>"
       end
 
@@ -43,6 +43,14 @@ module Raindown
       HTML
     end
 
+    # A lone top-level heading that starts the document is its title, so it's left out when there are headings below it.
+    def headings_below_title(**)
+      title, *below = headings = headings(**)
+      return headings if below.empty? || title[:level] != 1 || below.any? { it[:level] == 1 }
+
+      below
+    end
+
     # The document's headings, from its final HTML, or else by rendering it with its components.
     def headings(markdown:, html: nil, metadata: nil, bare: false)
       html ||= Fragments.collect { Raindown.assembled(Context.new(document: markdown, metadata: metadata || NoMetadata, bare:)) }

data/lib/raindown/utils.rb

@@ -4,6 +4,11 @@ module Raindown
   module Utils
     module_function
 
+    # Whether a path is below a folder, so a note can't reach a file outside its project, like '../../secrets.csv'.
+    def inside?(path, folder)
+      File.expand_path(path).start_with?(File.join(File.expand_path(folder), ''))
+    end
+
     # A Markdown file's text, with its line endings as LF, "\n", whatever they are in the file.
     #
     # Windows ends lines with CRLF, "\r\n", and Git for Windows checks files out that way, so a file written or cloned on

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Raindown
-  VERSION = '0.15.0'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: raindown
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.1
 platform: ruby
 authors:
 - maedi
 bindir: bin
 cert_chain: []
-date: 2026-11-06 00:00:00.000000000 Z
+date: 2026-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlers