contentfs 0.2.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ec7d32c2ea2f8781ea440e9a2240f1d516401ee66aeb00d2ca930a5f5b5394
-  data.tar.gz: d30868419f6f99ab4ed87525b5c0e6cfcbc1177ddd182f8d99c3239247ca4341
+  metadata.gz: 2cae5ea3d85caa0a5a39f50c6714b20f5d17beb933e67ad7121f0b87a45b05b4
+  data.tar.gz: 88d7ada937d4d4cbeb5ced51f057f0d0c33152ab9c5d9148ab9abb1b2c9309a9
 SHA512:
-  metadata.gz: a5a5d4dde7a7911b252f0082e571c1d82c3913048ad0ace5ffff6588f177d8f4893687d5bb465d60db98a5f300e80b447dbcefef89f83e05724dca6b72906477
-  data.tar.gz: a7763f0bb3a268dc7b3a5e40f57e166ceb328289304af2781ca947ed219df2d76bda69832e4ae244c6c46dfd6912954184a02cb89c64edab2199747d72eb9d6c
+  metadata.gz: d7e36df02d4529994fd6b277cd22cd0476481bdb06738fac615be5f8ed1565a0625e55f12b836fdff6a97473a7acba4ad875fd3b5cef30c7250a5f609fb6d5f7
+  data.tar.gz: 60e419c7bfd92f2e710e42f004cb20f7af1b63720a8a86151e4a36067467afe136aee44fd7d585b825a72626ceaf839078e160518361fc81f5e9d9925d770ff9

data/CHANGELOG.md

@@ -1,7 +1,37 @@
-## v0.2.0
+## [v0.5.1](https://github.com/metabahn/contentfs/releases/tag/v0.5.1)
+
+*released on 2021-04-02*
+
+  * `fix` [#11](https://github.com/metabahn/contentfs/pull/11) Handle code blocks with no available lexer ([bryanp](https://github.com/bryanp))
+
+## [v0.5.0](https://github.com/metabahn/contentfs/releases/tag/v0.5.0)
+
+*released on 2021-04-01*
+
+  * `chg` [#10](https://github.com/metabahn/contentfs/pull/10) Replace redcarpet with cmark ([bryanp](https://github.com/bryanp))
+
+## [v0.4.0](https://github.com/metabahn/contentfs/releases/tag/v0.4.0)
+
+*released on 2021-04-01*
+
+  * `add` [#9](https://github.com/metabahn/contentfs/pull/9) Includes ([bryanp](https://github.com/bryanp))
+
+## [v0.3.0](https://github.com/metabahn/contentfs/releases/tag/v0.3.0)
+
+*released on 2020-11-18*
+
+  * `chg` [#8](https://github.com/metabahn/contentfs/pull/8) Load database content from _content to avoid collisions ([bryanp](https://github.com/bryanp))
+
+## v0.2.1
 
 *unreleased*
 
+  * `fix` [#7](https://github.com/metabahn/contentfs/pull/7) Order content and databases by prefix or slug ([bryanp](https://github.com/bryanp))
+
+## [v0.2.0](https://github.com/metabahn/contentfs/releases/tag/v0.2.0)
+
+*released on 2020-11-14*
+
   * `add` [#6](https://github.com/metabahn/contentfs/pull/6) Expose database metadata ([bryanp](https://github.com/bryanp))
 
 ## [v0.1.1](https://github.com/metabahn/contentfs/releases/tag/v0.1.1)

data/LICENSE

@@ -1,6 +1,6 @@
 This software is licensed under the MIT License.
 
-Copyright 2020 Metabahn.
+Copyright 2020-2021 Metabahn.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the

data/README.md

@@ -40,7 +40,7 @@ The `content` name is special in that it defines content for the containing fold
 
 ### Formats
 
-Markdown is supported by default. Simply add the `redcarpet` gem to your project's `Gemfile`. For automatic syntax highlighting, add the `rouge` to your `Gemfile` as well.
+Markdown is supported by default. Simply add the `commonmarker` gem to your project's `Gemfile`. For automatic syntax highlighting, add the `rouge` to your `Gemfile` as well.
 
 Unknown formats default to plain text.
 

data/lib/contentfs/content.rb

@@ -12,24 +12,26 @@ module ContentFS
   #
   class Content
     class << self
-      def load(path, metadata: {}, namespace: [])
-        new(path: path, metadata: metadata, namespace: namespace)
+      def load(path, database:, metadata: {}, namespace: [])
+        new(path: path, database: database, metadata: metadata, namespace: namespace)
       end
     end
 
     FRONT_MATTER_REGEXP = /\A---\s*\n(.*?\n?)^---\s*$\n?/m
+    INCLUDE_REGEXP = /<!-- @include\s*([a-zA-Z0-9\-_\/.]*) -->/
 
     attr_reader :format, :prefix, :slug, :metadata, :namespace
 
-    def initialize(path:, metadata: {}, namespace: [])
+    def initialize(path:, database:, metadata: {}, namespace: [])
       path = Pathname.new(path)
       extname = path.extname
       name = path.basename(extname)
       prefix, remainder = Prefix.build(name)
       @prefix = prefix
-      @format = extname.to_s[1..-1]&.to_sym
+      @format = extname.to_s[1..]&.to_sym
       @slug = Slug.build(remainder)
       @namespace = namespace.dup << @slug
+      @database = database
 
       content = path.read
       @metadata = metadata.merge(parse_metadata(content))
@@ -41,8 +43,16 @@ module ContentFS
     end
 
     def render
+      working_content = @content.dup
+
+      @content.scan(INCLUDE_REGEXP) do |match|
+        if (include = @database.find_include(match[0]))
+          working_content.gsub!($~.to_s, include.render)
+        end
+      end
+
       if @format && (renderer = Renderers.resolve(@format))
-        renderer.render(@content)
+        renderer.render(working_content)
       else
         to_s
       end

data/lib/contentfs/database.rb

@@ -11,8 +11,8 @@ module ContentFS
   #
   class Database
     class << self
-      def load(path, namespace: [], root: true)
-        new(path: path, namespace: namespace, root: root)
+      def load(path, parent: nil, namespace: [], root: true)
+        new(path: path, parent: parent, namespace: namespace, root: root)
       end
     end
 
@@ -20,14 +20,13 @@ module ContentFS
 
     attr_reader :prefix, :slug, :namespace, :metadata
 
-    def initialize(path:, namespace: [], root: false)
+    def initialize(path:, parent: nil, namespace: [], root: false)
       path = Pathname.new(path)
       name = path.basename(path.extname)
       prefix, remainder = Prefix.build(name)
       @prefix = prefix
-      @children = {}
-      @nested = {}
       @namespace = namespace.dup
+      @parent = parent
 
       unless root
         @slug = Slug.build(remainder)
@@ -42,22 +41,48 @@ module ContentFS
         {}
       end
 
+      content_path = path.join.glob("_content.*")[0]
+
+      @content = if content_path&.exist?
+        Content.load(content_path, database: self, metadata: @metadata, namespace: @namespace)
+      end
+
+      children, nested, includes = {}, {}, {}
       Pathname.new(path).glob("*") do |path|
-        next if path.basename.to_s.start_with?("_")
+        underscored = path.basename.to_s.start_with?("_")
+        next if underscored && path.directory?
 
         if path.directory?
-          database = Database.load(path, namespace: @namespace, root: false)
-          @nested[database.slug] = database
+          database = Database.load(path, parent: self, namespace: @namespace, root: false)
+          nested[database.slug] = database
+        elsif underscored
+          content = Content.load(path, database: self, metadata: @metadata, namespace: @namespace)
+
+          includes[content.slug.to_s[1..].to_sym] = content
         else
-          content = Content.load(path, metadata: @metadata, namespace: @namespace)
+          content = Content.load(path, database: self, metadata: @metadata, namespace: @namespace)
 
-          if content.slug == :content
-            @content = content
-          else
-            @children[content.slug] = content
-          end
+          children[content.slug] = content
         end
       end
+
+      @children = Hash[
+        children.sort_by { |key, content|
+          (content.prefix || content.slug).to_s
+        }
+      ]
+
+      @nested = Hash[
+        nested.sort_by { |key, database|
+          (database.prefix || database.slug).to_s
+        }
+      ]
+
+      @includes = Hash[
+        includes.sort_by { |key, content|
+          (content.prefix || content.slug).to_s
+        }
+      ]
     end
 
     def content
@@ -100,6 +125,35 @@ module ContentFS
       end
     end
 
+    def find_include(path)
+      @includes[path.to_sym] || find_child_include(path) || find_parent_include(path) || find_include_from_toplevel(path)
+    end
+
+    def toplevel
+      @parent ? @parent.toplevel : self
+    end
+
+    private def find_child_include(path)
+      return unless path.include?("/")
+
+      path_parts = path.split("/", 2)
+      @nested[path_parts[0].to_sym]&.find_include(path_parts[1])
+    end
+
+    private def find_parent_include(path)
+      return if @parent.nil?
+      return unless path.start_with?("../")
+
+      path_parts = path.split("../", 2)
+      @parent.find_include(path_parts[1])
+    end
+
+    private def find_include_from_toplevel(path)
+      return if @parent.nil?
+
+      toplevel.find_include(path)
+    end
+
     def to_s
       @content&.to_s.to_s
     end

data/lib/contentfs/renderers/markdown.rb

@@ -1,39 +1,14 @@
 # frozen_string_literal: true
 
-require "redcarpet"
+require "commonmarker"
 
 module ContentFS
   module Renderers
     # @api private
     class Markdown
       class << self
-        OPTIONS = {
-          autolink: true,
-          footnotes: true,
-          fenced_code_blocks: true,
-          tables: true
-        }.freeze
-
         def render(content)
-          renderer.render(content)
-        end
-
-        def options
-          OPTIONS
-        end
-
-        private def renderer
-          @_renderer ||= Redcarpet::Markdown.new(Renderer, options)
-        end
-      end
-
-      class Renderer < Redcarpet::Render::HTML
-        def block_quote(quote)
-          if (match = quote.match(/<p>\[(.*)\]/))
-            %(<blockquote class="#{match[1]}">#{quote.gsub("[#{match[1]}]", "")}</blockquote>)
-          else
-            super
-          end
+          CommonMarker.render_html(content, [:DEFAULT, :UNSAFE])
         end
       end
     end

data/lib/contentfs/renderers/markdown/code.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rouge"
-require "rouge/plugins/redcarpet"
 
 require_relative "../markdown"
 
@@ -12,16 +11,31 @@ module ContentFS
       class Code
         class << self
           def render(content)
-            renderer.render(content)
+            renderer.render(CommonMarker.render_doc(content))
           end
 
           private def renderer
-            @_renderer ||= Redcarpet::Markdown.new(Renderer, Markdown.options)
+            SyntaxRenderer.new(options: [:DEFAULT, :UNSAFE])
           end
         end
 
-        class Renderer < Markdown::Renderer
-          include Rouge::Plugins::Redcarpet
+        class SyntaxRenderer < CommonMarker::HtmlRenderer
+          def code_block(node)
+            block do
+              language = node.fence_info.split(/\s+/)[0]
+              out("<div class=\"highlight\"><pre class=\"highlight #{language}\"><code>")
+              out(syntax_highlight(node.string_content, language))
+              out('</code></pre></div>')
+            end
+          end
+
+          private def syntax_highlight(source, language)
+            if (lexer = Rouge::Lexer.find(language))
+              Rouge::Formatters::HTML.new.format(lexer.lex(source))
+            else
+              source
+            end
+          end
         end
       end
     end

data/lib/contentfs/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ContentFS
-  VERSION = "0.2.0"
+  VERSION = "0.5.1"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentfs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies: []
 description: A structured content file system.
 email: bryan@metabahn.com
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.4
 signing_key:
 specification_version: 4
 summary: A structured content file system.