contentfs 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82208eb59ae04f8483de860c59b496e0bfe47488c6693ee80b2517bb69c37619
-  data.tar.gz: '0685aaaf67a70ee5f713015ffc1312b8554598e7153d8427d957b8785007b312'
+  metadata.gz: d306cf3d13ffb780150e9666fa6693854dbc890661f394347bbea65ae70729f0
+  data.tar.gz: 5c01ca933b98c6cdbb1d402796fcefc738a5557e5967ee2cf9ca802972a5d809
 SHA512:
-  metadata.gz: 89f9d947f2bff284a260b10da2207d0305f85ee8df746078dd8aa57c23c70314580b04472235818e9fb9acd24e745d0f0995e03a47a3e1dd12282eb2be3765fd
-  data.tar.gz: 890b635054dbe37744334035bf495205bf97a4aebe4acdea70ac0e4c9572d5103ff5b98994cfae633f5d62ae5c52351293aea311707edcdc1b3b568af9e74026
+  metadata.gz: 3f2196a1436b9057ccb50a69bcd38bffa40c9d171e846bb6aa5bda478cb26a9677cfc294f8ea5543b6169673173040ea12603bbc06aa74af354350f9c613bad9
+  data.tar.gz: 2b4e549b0481a2da7fb093de521532f2e32865fdf7a275915c7ff46f8571f3b897b6449bce4de6e549999594d7286cacba73008b41e4186ee4a6ed547426f57a

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## [v0.7.0](https://github.com/metabahn/contentfs/releases/tag/v0.7.0)
+
+*released on 2021-04-07*
+
+  * `add` [#15](https://github.com/metabahn/contentfs/pull/15) Add support for typed blockquotes ([bryanp](https://github.com/bryanp))
+
+## [v0.6.2](https://github.com/metabahn/contentfs/releases/tag/v0.6.2)
+
+*released on 2021-04-05*
+
+  * `fix` [#14](https://github.com/metabahn/contentfs/pull/14) Load metadata for root content ([bryanp](https://github.com/bryanp))
+
+## [v0.6.1](https://github.com/metabahn/contentfs/releases/tag/v0.6.1)
+
+*released on 2021-04-02*
+
+  * `fix` [#13](https://github.com/metabahn/contentfs/pull/13) Resolve includes after rendering ([bryanp](https://github.com/bryanp))
+
+## [v0.6.0](https://github.com/metabahn/contentfs/releases/tag/v0.6.0)
+
+*released on 2021-04-02*
+
+  * `add` [#12](https://github.com/metabahn/contentfs/pull/12) Provide a pattern for preprocessing content ([bryanp](https://github.com/bryanp))
+
+## [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*

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,8 +12,8 @@ module ContentFS
   #
   class Content
     class << self
-      def load(path, database:, metadata: {}, namespace: [])
-        new(path: path, database: database, metadata: metadata, namespace: namespace)
+      def load(path, database:, metadata: {}, namespace: [], &block)
+        new(path: path, database: database, metadata: metadata, namespace: namespace, &block)
       end
     end
 
@@ -22,7 +22,7 @@ module ContentFS
 
     attr_reader :format, :prefix, :slug, :metadata, :namespace
 
-    def initialize(path:, database:, metadata: {}, namespace: [])
+    def initialize(path:, database:, metadata: {}, namespace: [], &block)
       path = Pathname.new(path)
       extname = path.extname
       name = path.basename(extname)
@@ -34,6 +34,7 @@ module ContentFS
       @database = database
 
       content = path.read
+      content = block.call(content) if block
       @metadata = metadata.merge(parse_metadata(content))
       @content = content.gsub(FRONT_MATTER_REGEXP, "")
     end
@@ -43,19 +44,23 @@ module ContentFS
     end
 
     def render
-      working_content = @content.dup
+      if @format && (renderer = Renderers.resolve(@format))
+        resolve_includes(renderer.render(@content))
+      else
+        resolve_includes(to_s)
+      end
+    end
 
-      @content.scan(INCLUDE_REGEXP) do |match|
+    private def resolve_includes(content)
+      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(working_content)
-      else
-        to_s
-      end
+      working_content
     end
 
     private def parse_metadata(content)

data/lib/contentfs/database.rb

@@ -11,8 +11,8 @@ module ContentFS
   #
   class Database
     class << self
-      def load(path, parent: nil, namespace: [], root: true)
-        new(path: path, parent: parent, namespace: namespace, root: root)
+      def load(path, parent: nil, namespace: [], root: true, &block)
+        new(path: path, parent: parent, namespace: namespace, root: root, &block)
       end
     end
 
@@ -20,7 +20,7 @@ module ContentFS
 
     attr_reader :prefix, :slug, :namespace, :metadata
 
-    def initialize(path:, parent: nil, namespace: [], root: false)
+    def initialize(path:, parent: nil, namespace: [], root: false, &block)
       path = Pathname.new(path)
       name = path.basename(path.extname)
       prefix, remainder = Prefix.build(name)
@@ -43,8 +43,9 @@ module ContentFS
 
       content_path = path.join.glob("_content.*")[0]
 
-      @content = if content_path&.exist?
-        Content.load(content_path, database: self, metadata: @metadata, namespace: @namespace)
+      if content_path&.exist?
+        @content = Content.load(content_path, database: self, metadata: @metadata, namespace: @namespace, &block)
+        @metadata = @content.metadata.dup
       end
 
       children, nested, includes = {}, {}, {}
@@ -53,14 +54,14 @@ module ContentFS
         next if underscored && path.directory?
 
         if path.directory?
-          database = Database.load(path, parent: self, namespace: @namespace, root: false)
+          database = Database.load(path, parent: self, namespace: @namespace, root: false, &block)
           nested[database.slug] = database
         elsif underscored
-          content = Content.load(path, database: self, metadata: @metadata, namespace: @namespace)
+          content = Content.load(path, database: self, metadata: @metadata, namespace: @namespace, &block)
 
           includes[content.slug.to_s[1..].to_sym] = content
         else
-          content = Content.load(path, database: self, metadata: @metadata, namespace: @namespace)
+          content = Content.load(path, database: self, metadata: @metadata, namespace: @namespace, &block)
 
           children[content.slug] = content
         end

data/lib/contentfs/renderers/markdown.rb

@@ -8,7 +8,37 @@ module ContentFS
     class Markdown
       class << self
         def render(content)
-          CommonMarker.render_html(content, [:DEFAULT, :UNSAFE])
+          renderer.render(CommonMarker.render_doc(content))
+        end
+
+        private def renderer
+          ContentFSRenderer.new(options: [:DEFAULT, :UNSAFE])
+        end
+      end
+
+      class ContentFSRenderer < CommonMarker::HtmlRenderer
+        def blockquote(node)
+          blockquote_type = if (match = node.to_plaintext.strip.match(/\[(.*)\]/))
+            match[1]
+          end
+
+          blockquote_class = if blockquote_type
+            " class=\"#{blockquote_type}\""
+          end
+
+          block do
+            container("<blockquote#{sourcepos(node)}#{blockquote_class}>\n", "</blockquote>") do
+              node.each.with_index do |child, index|
+                content = if blockquote_class && index == 0
+                  child.to_html.gsub("<p>[#{blockquote_type}] ", "<p>")
+                else
+                  child
+                end
+
+                out(content)
+              end
+            end
+          end
         end
       end
     end

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

@@ -19,18 +19,22 @@ module ContentFS
           end
         end
 
-        class SyntaxRenderer < CommonMarker::HtmlRenderer
+        class SyntaxRenderer < ContentFSRenderer
           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>')
+              out("</code></pre></div>")
             end
           end
 
           private def syntax_highlight(source, language)
-            Rouge::Formatters::HTML.new.format(Rouge::Lexer.find(language).lex(source))
+            if (lexer = Rouge::Lexer.find(language))
+              Rouge::Formatters::HTML.new.format(lexer.lex(source))
+            else
+              source
+            end
           end
         end
       end

data/lib/contentfs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentfs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies: []
 description: A structured content file system.
 email: bryan@metabahn.com
@@ -40,7 +40,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="