nanoc-conref-fs 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5408983216ce1f6c5960cb218a8730f98830e6
-  data.tar.gz: d5042c05beeb62145d09bce9fb749f7e8d125b7c
+  metadata.gz: 80883b64d0bb6285ba2dd26c11d991310170d5d3
+  data.tar.gz: b961ceb417cd9538101760a2c871e32e3bf86b2a
 SHA512:
-  metadata.gz: 5e23cd9f8d20ea64d178dc3e18aced5590db96e85a29d8fa209e471d31363bbf81c5eecf9e4d4dd3612bb886410e3fd595859676461df65dc2aa84dff89b07ef
-  data.tar.gz: 4ca2e1fc67fdb45ef2a0e171c3b20f1373d084026dfd6de796e1919a82ea6e15f1b16e9b1a0e76fd712c5d9ddbaafb8433918e016be5182b792536062f86be63
+  metadata.gz: 71dcfcc7919e46fe2bc62bf351149eb8af6ede84036e6236807508d72aab159aa05a40eb016d25b03bf40db42fb07a9ba737bc9133d51e12c29676fb3057a083
+  data.tar.gz: 3d73990232db307ab431627c5cd40dcbc286bf22dd35864bcbaa37f322c6b8ab7da31456a7b64a74f91e695c09a5858a6d814e80516938e9d92c2f148ee2c61b

data/lib/nanoc-conref-fs/conref-fs.rb

@@ -159,16 +159,37 @@ class ConrefFS < Nanoc::DataSource
     end
 
     begin
-      content.gsub(/(\s\{\{[^\}]+\}\})/m) do |match|
-        # This first pass converts the frontmatter variables,
-        # and inserts data variables into the body
-        result = Conrefifier.apply_liquid(match, page_vars)
-        # This second application renders the previously inserted
-        # data conditionals within the body
-        Conrefifier.apply_liquid(result, page_vars)
+      result = ''
+      # This pass replaces any conditionals
+      result = if content =~ Conrefifier::BLOCK_SUB
+                  Conrefifier.apply_liquid(content, page_vars)
+               else
+                  content
+               end
+
+      # This pass converts the frontmatter variables,
+      # and inserts data variables into the body
+      result = if result =~ Conrefifier::SINGLE_SUB
+                result.gsub(Conrefifier::SINGLE_SUB) do |match|
+                  Conrefifier.apply_liquid(match, page_vars)
+                end
+               else
+                result
+               end
+
+      # This second pass renders any previously inserted
+      # data conditionals within the body
+      if result =~ Conrefifier::SINGLE_SUB
+        result = result.gsub(Conrefifier::SINGLE_SUB) do |match|
+          Conrefifier.apply_liquid(match, page_vars)
+        end
       end
-    rescue Liquid::SyntaxError
+
+      result
+    rescue Liquid::SyntaxError => e
       # unrecognized Liquid, so just return the content
+      # STDERR.puts "Could not convert #{filename}: #{e.message}"
+      result
     rescue => e
       raise "#{e.message}: #{e.inspect}"
     end

data/lib/nanoc-conref-fs/conrefifier.rb

@@ -1,6 +1,10 @@
 require 'liquid'
 
 module Conrefifier
+
+  SINGLE_SUB = /(\{\{[^\}]+\}\})/m
+  BLOCK_SUB = /\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\}/m
+
   def self.file_variables(variables, path)
     return {} if variables.nil?
 

data/lib/nanoc-conref-fs/datafiles.rb

@@ -9,7 +9,7 @@ module Datafiles
     data_vars = Conrefifier.file_variables(config[:data_variables], path)
     data_vars = { :page => data_vars, :site => { :config => config } }
 
-    content = content.gsub(/(\s*\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/m) do |match|
+    content = content.gsub(Conrefifier::BLOCK_SUB) do |match|
       # We must obfuscate Liquid variables while replacing conditionals
       match = match.gsub(/{{/, '~~#~~')
       match = Conrefifier.apply_liquid(match, data_vars)

data/lib/nanoc-conref-fs/version.rb

@@ -1,3 +1,3 @@
 module Conrefifier
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-conref-fs
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Garen Torikian