jekyll-conrefifier 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7059a7736b67f01af3dfb5000cf2c686e98a5abe
-  data.tar.gz: 866a2d9c119d548c5028735df74500f8e57ae429
+  metadata.gz: efdff59b0efc358924f29d372fdde512b16c1280
+  data.tar.gz: 32e3178eb7720e9e7f8371251fc057495584f386
 SHA512:
-  metadata.gz: 32748009a5dcbd176b78dab0349ef649040e333a4005da9300db83720f8c87641a110bb672ce5eaa2589539f22693120d38da074741208e0f516137bdaa7ad27
-  data.tar.gz: 86411b8490361e483925086fccb6be2b49afd579b437890e83af0152d74b612da30f44302971da0194cfa256c8719bfc492b73e3ea5ff0202638f347e04190f8
+  metadata.gz: ebf92a86304459d5004088293efdd19e1586a30ccc3c61680eaee9fdfc875895c84cb4d221eeba215391fa51f2b7b4c3ff14ba0235327d66d3df2308148a00e8
+  data.tar.gz: 459315d522117b7db0d552cd053727c01f3959da75e7cfc67d792918c682096ff9c36336505c1890ee8e7cedafffd9a3abcecb5442ecdd83acc5df96b2492dc0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 spec/fixtures/_site
 .jekyll_metadata
+.DS_Store

data/lib/jekyll-conrefifier.rb

@@ -116,11 +116,9 @@ module Jekyll
             ConrefifierUtils.og_paths << path.slice(dir.index(src) + src.length + 1..-1).sub(/\.[^.]+\z/, '')
             # if we hit upon if/unless conditionals, we'll need to pause and render them
             contents = File.read(path)
-            if (matches = contents.scan /(\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/m)
+            if (matches = contents.scan /(\s*\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/m)
               unless ConrefifierUtils.data_file_variables(config, path).nil?
-                contents = contents.gsub(/\{\{/, '[[')
-                contents = apply_vars_to_datafile(contents, matches, path)
-                contents = contents.gsub(/\[\[/, '{{')
+                contents = apply_vars_to_datafile(contents, matches, path, { preserve_all: true } )
               end
             end
 
@@ -139,13 +137,14 @@ module Jekyll
         keys = path.split('/')
         value = keys.inject(data, :fetch)
         yaml_dump = YAML::dump value
+
         keys[0...-1].inject(data, :fetch)[keys.last] = SafeYAML.load transform_liquid_variables(yaml_dump, path)
       end
       old_read_collections
     end
 
     # apply the custom scope plus the rest of the `site.data` information
-    def apply_vars_to_datafile(contents, matches, path)
+    def apply_vars_to_datafile(contents, matches, path, preserve_all: true, preserve_non_vars: false)
       return contents if matches.empty?
 
       data_vars = path.nil? ? {} : ConrefifierUtils.data_file_variables(config, path)
@@ -155,16 +154,21 @@ module Jekyll
 
       matches.each do |match|
         match = match.is_a?(Array) ? match.first : match
+        safe_match = if preserve_all
+                       match.gsub(/\{\{/, '[[\1')
+                      elsif preserve_non_vars
+                        match.gsub(/\{\{(\s*)(?!\s*(site|page))/, '[[\1')
+                      end
 
         parsed_content = begin
-                          Liquid::Template.parse(match).render(config)
-                         rescue
+                          parsed = Liquid::Template.parse(safe_match).render(config)
+                          parsed.gsub(/\[\[/, '{{\1') if preserve_all || preserve_non_vars
+                         rescue Exception => e
+                          puts "Parse error in #{matches}: #{e}"
                           match
                          end
-
-        unless match =~ /\{\{/ && parsed_content.empty?
-          contents = contents.sub(match, parsed_content)
-        end
+        next if parsed_content.nil?
+        contents = contents.sub(match, parsed_content)
       end
       contents
     end
@@ -174,7 +178,7 @@ module Jekyll
     # renders as "GitHub Glossary" for dotcom, but "GitHub Enterprise Glossary" for Enterprise
     def transform_liquid_variables(contents, path = nil)
       if (matches = contents.scan /(\{\{.+?\}\})/)
-        contents = apply_vars_to_datafile(contents, matches, path)
+        contents = apply_vars_to_datafile(contents, matches, path, preserve_all: false, preserve_non_vars: true)
       end
 
       contents

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JekyllConrefifier
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

data/spec/conrefifier_spec.rb

@@ -64,4 +64,12 @@ describe("Conrefifier") do
     expect(filtering_layout_contents.scan(/Article v2.0/).count).to eq(1)
     expect(filtering_layout_contents.scan(/Ignored/).count).to eq(1)
   end
+
+  it 'filters items even if they have other curlies' do
+    warnings = @dest.join("warnings.html")
+    expect(warnings).to exist
+    warnings_contents = File.read(warnings)
+    expect(warnings_contents.scan(/- A dotcom Article/).count).to eq(1)
+    expect(warnings_contents.scan(/Article v2.0/).count).to eq(0)
+  end
 end

data/spec/fixtures/_config.yml

@@ -22,6 +22,11 @@ data_file_variables:
       path: ""
     values:
       version: "2.0"
+  -
+    scope:
+      path: "^warn"
+    values:
+      version: "dotcom"
   -
     scope:
       path: "^categories"

data/spec/fixtures/_data/warnings.yml

@@ -0,0 +1,6 @@
+article_name: |
+  {% if page.version == '2.1' %}
+    - Article v2.0
+  {% else %}
+    - A {{ page.version }} Article
+  {% endif %}

data/spec/fixtures/warnings.html

@@ -0,0 +1,5 @@
+---
+title: Using warning tags
+---
+
+{{ site.data.warnings.article_name }}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-conrefifier
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -79,12 +79,14 @@ files:
 - spec/fixtures/_data/conrefs.yml
 - spec/fixtures/_data/enterprise_filtered_categories.yml
 - spec/fixtures/_data/filtered_categories.yml
+- spec/fixtures/_data/warnings.yml
 - spec/fixtures/_layouts/article.html
 - spec/fixtures/_layouts/filtering_layout.html
 - spec/fixtures/enterprise_filtered_index.html
 - spec/fixtures/filtered_index.html
 - spec/fixtures/filtering_layout.html
 - spec/fixtures/index.html
+- spec/fixtures/warnings.html
 - spec/spec_helper.rb
 homepage: ''
 licenses: