jekyll-conrefifier 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc934e789af079d163dfb7bf9f994ea16ce5c6d
-  data.tar.gz: a004f777c732c6513a45ae389bfb1e37f0b5b9d6
+  metadata.gz: e2ed660e3593b7948aefd367012dde558e9b55db
+  data.tar.gz: 968ce0c43f883868038e4c6515675da48fde8411
 SHA512:
-  metadata.gz: 7744291afed0919d295e6cab3b66a320f532a23c672c443b70fb3a47b5e88866105bdaac043b1af1ce952231b9fc11492645c39c2021244c304b30444123f750
-  data.tar.gz: f16c934cb342edb0e4e0de3821a7b49a1e3c08df6731c3dde518b9809bc98ef146bbcd713506aebb65955560f719f5931816cbefe15168d72733ff3d5fa9d3af
+  metadata.gz: 9ebbd3f498ab1ba28ec66d932b8d1ac8da2f46962ff6c4647d12a0ec064f30825331cfd9042dbba467363f7a6f5a5037a8819af43cee4196eee2ce1990b711e2
+  data.tar.gz: e4bb16b125a702358237b7f4d00578fa2cbada23e0ca0a79b578086fbf0161b9e334fc1e19665184541b38e8209840cb597d92b0e72d39262e6dcd1df8ae1533

data/lib/jekyll-conrefifier.rb

@@ -1,4 +1,17 @@
 module Jekyll
+  module ConrefifierUtils
+    # fetch the custom scope vars, as defined in _config.yml
+    def self.data_file_variables(config, path)
+      data_vars = {}
+      scopes = config['data_file_variables'].select { |v| v['scope']['path'].empty? || Regexp.new(v['scope']['path']) =~ path }
+      scopes.each do |scope|
+        data_vars = data_vars.merge(scope['values'])
+      end
+
+      data_vars
+    end
+  end
+
   class Document
     alias_method :old_read, :read
 
@@ -8,8 +21,12 @@ module Jekyll
     def read(opts = {})
       old_read(opts)
       @data.each_pair do |key, value|
-        if value =~ /\{\{.+?\}\}/
-          value = Liquid::Template.parse(value).render({ 'site' => { 'data' => @site.data }.merge(@site.config) })
+        if value =~ /\{\{.+?\}\}/ || value =~ /(\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/
+          data_vars = path.nil? ? {} : ConrefifierUtils.data_file_variables(@site.config, opts[:actual_path] || path)
+          config = { 'page' => data_vars }
+          config = { 'site' => { 'data' => @site.data, 'config' => @site.config } }.merge(config)
+
+          value = Liquid::Template.parse(value).render(config)
           @data[key] = Jekyll::Renderer.new(@site, self).convert(value)
           @data[key] = @data[key].sub(/^<p>/, '').sub(/<\/p>$/, '').strip
         end
@@ -50,7 +67,7 @@ module Jekyll
             # 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)
-              unless data_file_variables(path).nil?
+              unless ConrefifierUtils.data_file_variables(config, path).nil?
                 contents = contents.gsub(/\{\{/, '[[')
                 contents = apply_vars_to_datafile(contents, matches, path)
                 contents = contents.gsub(/\[\[/, '{{')
@@ -75,10 +92,10 @@ module Jekyll
     def apply_vars_to_datafile(contents, matches, path)
       return contents if matches.empty?
 
-      data_vars = path.nil? ? {} : data_file_variables(path)
+      data_vars = path.nil? ? {} : ConrefifierUtils.data_file_variables(config, path)
 
       config = { 'page' => data_vars }
-      config = { 'site' => { 'data' => self.data } }.merge(config)
+      config = { 'site' => { 'data' => self.data, 'config' => self.config } }.merge(config)
 
       matches.each do |match|
         parsed_content = begin
@@ -94,17 +111,6 @@ module Jekyll
       contents
     end
 
-    # fetch the custom scope vars, as defined in _config.yml
-    def data_file_variables(path)
-      data_vars = {}
-      scopes = config['data_file_variables'].select { |v| v['scope']['path'].empty? || Regexp.new(v['scope']['path']) =~ path }
-      scopes.each do |scope|
-        data_vars = data_vars.merge(scope['values'])
-      end
-
-      data_vars
-    end
-
     # allow us to use any variable within Jekyll data files; for example:
     # - '{{ site.data.conrefs.product_name[site.audience] }} Glossary'
     # renders as "GitHub Glossary" for dotcom, but "GitHub Enterprise Glossary" for Enterprise
@@ -138,7 +144,7 @@ module Jekyll
       data_file = context.registers[:site].data["data_render_#{@id}"]
       return data_file unless data_file.nil?
 
-      path = @id.sub('.', '/')
+      path = @id.gsub('.', '/')
       data_source = File.join(context.registers[:site].source, context.registers[:site].config['data_source'])
       data_file = File.read("#{data_source}/#{path}.yml")
       context.registers[:site].data["data_render_#{@id}"] = data_file

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JekyllConrefifier
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/spec/fixtures/_articles/filtered_frontmatter.md

@@ -1,5 +1,5 @@
 ---
-title: Welcome to {{ site.data.conrefs.product_name[site.audience] }}
+title: Welcome to {{ site.data.conrefs.product_name[site.config.audience] }}
 ---
 
 Some other page.

data/spec/fixtures/_data/conrefs.yml

@@ -1,8 +1,8 @@
 product_name:
   dotcom: GitHub
-  '2.0': GitHub Enterprise
-  '2.1': GitHub Enterprise
-  11.10.340: GitHub Enterprise
+  '2.0': 'GitHub Enterprise'
+  '2.1': 'GitHub Enterprise'
+  11.10.340: 'GitHub Enterprise'
 
 product_type: 'Amazing'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-conrefifier
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll