contentfs 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70692d20be1e5c1f76afe4397718ceadc6c71a3457c2e408ba35ae0e11d40611
-  data.tar.gz: cddc23e982270efde7b2e0e9102b9d44ec71e2bd5c2863a98904b104ce1d9261
+  metadata.gz: 77679e7cfe4c3077753ec0b425edec31318c17272070713a4831f80b6878de3e
+  data.tar.gz: b07a87ccbfa7e5adcfbd193076af48ed7109b0240224c68e640c2189058c41c0
 SHA512:
-  metadata.gz: 4677403196321b02096ea81e982e5499602b7f333cf826780fd407634b81da37b625fa1a0c1bbeb51c14dcb67dcc1cfbdc6fa6078394411464de3d8d1c12a9f7
-  data.tar.gz: b6caaa759c1ea97d5ab945327b2dee30ba8930431cbe74bc79a3a6aad1bf8fe8bb3b7f830d7cbafc6d95c89213adb0468687589677ce92787a1d27467b0898df
+  metadata.gz: 97667d012f6b9b94dfdf74281ce53bf47966b7bf2da4e375c6d433ef7917f6f906ea5e7497424aaac2bb95fd65ab8149c8d429749a14cc5389b8fd1e2b0d7deb
+  data.tar.gz: 65baae29aa627cb17ec18e657955dca9caad84eacff8a3ff2ce0c85696eeeb235820f3975a76dc66610c706605c2a892c64420ad775a977f1b0eef2a8c238fe6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [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*

data/lib/contentfs/content.rb

@@ -44,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentfs
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bryan Powell