lib/nanoc-conref-fs/conrefifier.rb in nanoc-conref-fs-0.6.10 vs lib/nanoc-conref-fs/conrefifier.rb in nanoc-conref-fs-0.7.0

- old
+ new

@@ -30,11 +30,11 @@ data_vars end def self.liquify(config, path:, content:, rep:) page_vars = NanocConrefFS::Conrefifier.file_variables(config[:page_variables], path, rep) - page_vars = { :page => page_vars }.merge(NanocConrefFS::Variables.variables[rep]) + page_vars = { page: page_vars }.merge(NanocConrefFS::Variables.variables[rep]) # we must obfuscate essential ExtendedMarkdownFilter content content = content.gsub(/\{\{\s*#(\S+)\s*\}\}/, '[[#\1]]') content = content.gsub(/\{\{\s*\/(\S+)\s*\}\}/, '[[/\1]]') content = content.gsub(/\{\{\s*(octicon-\S+\s*[^\}]+)\s*\}\}/, '[[\1]]') @@ -60,10 +60,10 @@ result end def self.apply_liquid(content, data_vars) data_vars['page'] = data_vars[:page].stringify_keys - result = Liquid::Template.parse(content, :error_mode => :warn).render(data_vars) + result = Liquid::Template.parse(content, error_mode: :warn).render(data_vars) # This second pass renders any previously inserted # data conditionals within the body. If a Liquid parse # returns a blank string, we'll return the original if result =~ NanocConrefFS::Conrefifier::SINGLE_SUB result = result.gsub(NanocConrefFS::Conrefifier::SINGLE_SUB) do |match|