jekyll-conrefifier 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb25d8f3d38048ed54156fe184dc31af222fcc5
-  data.tar.gz: 72174e21d25755198c72de9d19827d57cbd3a4e8
+  metadata.gz: 5636a02982502f6cd66e04cf1d53e37d8deb9362
+  data.tar.gz: ad4ed60e72f9f9b7ed0a8674c1f4fb0c5ab4ddc1
 SHA512:
-  metadata.gz: 940a25e5f7192d994824907a02d3e77740ab4924409834b3034f8449080067dbcb2898751869d3788973e560ae10a53d2a4df85ece34f3a9267adeab4f92079c
-  data.tar.gz: 59a48157047502a264c83156e95d3febb8ddacfd8290a2f5f599e404398db3e5e806ecbd12d7c05470acf6137920d0cdd1652d41e82084c61e66539cc75d469d
+  metadata.gz: 00a8124fb4aec662890b209a2b882ffb7d34c51d495c3673a0e731769c6fb5d9e8d7dd8c05953ff59341bdac52265d1d52735ced44e8bbf7f8a4e761f36f75da
+  data.tar.gz: 930fdf8713ef205dda7d1fae12b3c0d712458dc376ca76c603a6d25bc6719e129b137903eeb32fa08470b1e97a4b54e95142d43e200343dc81aa09f4e9011cf9

data/.gitignore

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

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - 2.1
   - 2.0
-  - 1.9.3
 script: "script/cibuild"

data/jekyll-conrefifier.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'jekyll',    '~> 2.0'
+  spec.add_development_dependency 'jekyll',    '>= 2.0'
+
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

data/lib/jekyll-conrefifier.rb

@@ -1,5 +1,7 @@
 module Jekyll
   module ConrefifierUtils
+    class << self; attr_accessor :og_paths; end
+
     # fetch the custom scope vars, as defined in _config.yml
     def self.data_file_variables(config, path)
       data_vars = {}
@@ -7,35 +9,74 @@ module Jekyll
       scopes.each do |scope|
         data_vars = data_vars.merge(scope['values'])
       end
-
       data_vars
     end
+
+    def self.setup_config(site, opts, path)
+      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)
+    end
+
+    def self.convert(content, data_vars)
+      value = Liquid::Template.parse(content).render(data_vars)
+      # protects against situations where [page.version] prevented a conversion
+      if value =~ /\{\{/
+        value = Liquid::Template.parse(value).render(data_vars)
+      end
+      value = value.gsub('"', '\"')
+    end
   end
 
   class Document
-    alias_method :old_read, :read
-
     # allow us to use any variable within Jekyll Frontmatter; for example:
     # title: What are {{ site.data.conrefs.product_name[site.audience] }} Pages?
     # renders as "GitHub Pages?" for dotcom, but "GitHub Enterprise Pages?" for Enterprise
     def read(opts = {})
-      old_read(opts)
+      if yaml_file?
+        @data = SafeYAML.load_file(path)
+      else
+        begin
+          defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
+          unless defaults.empty?
+            @data = defaults
+          end
+          @content = File.read(path, merged_file_read_opts(opts))
+          if content =~ YAML_FRONT_MATTER_REGEXP
+            @content = $POSTMATCH
+            prev_match = $1
+            prev_match = prev_match.gsub(/\{\{.+?\}\}/) do |match|
+              data_vars = ConrefifierUtils.setup_config(@site, opts, path)
+              value = ConrefifierUtils.convert(match, data_vars)
+              value = Jekyll::Renderer.new(@site, self).convert(value)
+              value.sub(/^<p>/, '').sub(/<\/p>$/, '').strip
+            end
+
+            data_file = SafeYAML.load(prev_match)
+            unless data_file.nil?
+              @data = Utils.deep_merge_hashes(defaults, data_file)
+            end
+          end
+        rescue SyntaxError => e
+          puts "YAML Exception reading #{path}: #{e.message}"
+        rescue Exception => e
+          puts "Error reading file #{path}: #{e.message}"
+        end
+      end
+
       @data.each_pair do |key, value|
-        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
+        if value =~ /(\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/
+          data_vars = ConrefifierUtils.setup_config(@site, opts, path)
+          value = ConrefifierUtils.convert(value, data_vars)
+          value = Jekyll::Renderer.new(@site, self).convert(value)
+          @data[key] = value.sub(/^<p>/, '').sub(/<\/p>$/, '').strip
         end
       end
     end
   end
 
   class Site
-    alias_method :old_read, :read
+    alias_method :old_read_collections, :read_collections
 
     def in_source_dir(*paths)
       paths.reduce(source) do |base, path|
@@ -51,6 +92,8 @@ module Jekyll
         Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
       end
 
+      ConrefifierUtils.og_paths = [] if ConrefifierUtils.og_paths.nil?
+
       # all of this is copied from the Jekyll source, except...
       entries.each do |entry|
         path = self.in_source_dir(dir, entry)
@@ -64,6 +107,8 @@ module Jekyll
           when '.csv'
             data[key] = CSV.read(path, :headers => true).map(&:to_hash)
           else
+            src = config['data_source']
+            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)
@@ -73,22 +118,28 @@ module Jekyll
                 contents = contents.gsub(/\[\[/, '{{')
               end
             end
+
             data[key] = SafeYAML.load(contents)
           end
         end
       end
+    end
 
-      # once we're all done, we need to iterate once more to parse out `{{ }}` blocks.
+    def read_collections
+      # once we're done reading in the data, we need to iterate once more to parse out `{{ }}` blocks.
       # two reasons for this: one, we need to collect every data file before attempting to
       # parse these vars; two, the Liquid parse above obliterates these tags, so we
       # first need to convert them into `[[ }}`, and *then* continue with the parse
-      data.each_pair do |datafile, value|
+      ConrefifierUtils.og_paths.each do |path|
+        keys = path.split('/')
+        value = keys.inject(data, :fetch)
         yaml_dump = YAML::dump value
-        data[datafile] = SafeYAML.load transform_liquid_variables(yaml_dump, datafile)
+        keys[0...-1].inject(data, :fetch)[keys.last] = SafeYAML.load transform_liquid_variables(yaml_dump, path)
       end
+      old_read_collections
     end
 
-    # apply the custom scoope plus the rest of the `site.data` information
+    # apply the custom scope plus the rest of the `site.data` information
     def apply_vars_to_datafile(contents, matches, path)
       return contents if matches.empty?
 
@@ -98,23 +149,25 @@ module Jekyll
       config = { 'site' => { 'data' => self.data, 'config' => self.config } }.merge(config)
 
       matches.each do |match|
+        match = match.is_a?(Array) ? match.first : match
+
         parsed_content = begin
-                          Liquid::Template.parse(match.first).render(config)
+                          Liquid::Template.parse(match).render(config)
                          rescue
-                          match.first
+                          match
                          end
-        unless match.first =~ /\{\{/ && parsed_content.empty?
-          contents = contents.sub(match.first, parsed_content)
+
+        unless match =~ /\{\{/ && parsed_content.empty?
+          contents = contents.sub(match, parsed_content)
         end
       end
-
       contents
     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
-    def transform_liquid_variables(contents, path=nil)
+    def transform_liquid_variables(contents, path = nil)
       if (matches = contents.scan /(\{\{.+?\}\})/)
         contents = apply_vars_to_datafile(contents, matches, path)
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JekyllConrefifier
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require "jekyll"
 require File.expand_path("lib/jekyll-conrefifier.rb")
 
+Jekyll::Document::YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-conrefifier
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency