nanoc-conref-fs 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8084c53b24aef8bc7312834d613080e4db9a113a
-  data.tar.gz: 8694bb5fd7471cf585bf315a32939ee5ea5edc52
+  metadata.gz: 9a5408983216ce1f6c5960cb218a8730f98830e6
+  data.tar.gz: d5042c05beeb62145d09bce9fb749f7e8d125b7c
 SHA512:
-  metadata.gz: 4463e0a3e0ad4072eaaf62f2839a36646fb52273f52b2b15ac8f7d7d9790cfd57cdf75b415987f1ae8f471673944222031b8cdbca3248fabf7ba15b3248b9f2d
-  data.tar.gz: 3fbd9bd87eb03c25a6426bf069e5ebe495cfbe63db828ab2e3e6a47cbad4ba383e671c0d5297bf74ac4fcc08de6e64f01a61a05aae93cfd9dbd0f24c3a61706e
+  metadata.gz: 5e23cd9f8d20ea64d178dc3e18aced5590db96e85a29d8fa209e471d31363bbf81c5eecf9e4d4dd3612bb886410e3fd595859676461df65dc2aa84dff89b07ef
+  data.tar.gz: 4ca2e1fc67fdb45ef2a0e171c3b20f1373d084026dfd6de796e1919a82ea6e15f1b16e9b1a0e76fd712c5d9ddbaafb8433918e016be5182b792536062f86be63

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

@@ -31,8 +31,8 @@ class ConrefFS < Nanoc::DataSource
   # and applies to to an ivar for later usage.
   def load_objects(dir_name, kind, klass)
     if klass == Nanoc::Int::Item && @variables.nil?
-      config = @site_config.to_h.stringify_keys
-      data = Datafiles.process(config)
+      data = Datafiles.process(@site_config)
+      config = @site_config.to_h
       @variables = { 'site' => { 'config' => config, 'data' => data } }
       VariableMixin.variables = @variables
     end
@@ -43,18 +43,18 @@ class ConrefFS < Nanoc::DataSource
   def parse(content_filename, meta_filename, _kind)
     meta, content = super
     page_vars = Conrefifier.file_variables(@site_config[:page_variables], content_filename)
-    unless page_vars['data_association'].nil?
-      association = page_vars['data_association']
+    unless page_vars[:data_association].nil?
+      association = page_vars[:data_association]
       toc = VariableMixin.fetch_data_file(association)
       meta[:parents] = if toc.is_a?(Array)
                           find_array_parents(toc, meta['title'])
-                        else
+                        elsif toc.is_a?(Hash)
                           find_hash_parents(toc, meta['title'])
                         end
 
       meta[:children] = if toc.is_a?(Array)
                            find_array_children(toc, meta['title'])
-                         else
+                         elsif toc.is_a?(Hash)
                            find_hash_children(toc, meta['title'])
                          end
     end
@@ -142,38 +142,36 @@ class ConrefFS < Nanoc::DataSource
   # (demarcated by Liquid's {{ }} tags) using both the data/ folder and any variables defined
   # within the nanoc.yaml config file
   def read(filename)
-    data = ''
+    content = ''
     begin
       page_vars = Conrefifier.file_variables(@site_config[:page_variables], filename)
-      page_vars = { 'page' => page_vars }.merge(@variables)
+      page_vars = { :page => page_vars }.merge(@variables)
 
-      data = File.read(filename)
-      return data unless filename.start_with?('content', 'layouts')
+      content = File.read(filename)
+      return content unless filename.start_with?('content', 'layouts')
 
       # we must obfuscate essential ExtendedMarkdownFilter content
-      data = data.gsub(/\{\{\s*#(\S+)\s*\}\}/, '[[#\1]]')
-      data = data.gsub(/\{\{\s*\/(\S+)\s*\}\}/, '[[/\1]]')
-      data = data.gsub(/\{\{\s*(octicon-\S+\s*[^\}]+)\s*\}\}/, '[[\1]]')
+      content = content.gsub(/\{\{\s*#(\S+)\s*\}\}/, '[[#\1]]')
+      content = content.gsub(/\{\{\s*\/(\S+)\s*\}\}/, '[[/\1]]')
+      content = content.gsub(/\{\{\s*(octicon-\S+\s*[^\}]+)\s*\}\}/, '[[\1]]')
     rescue => e
       raise "Could not read #{filename}: #{e.inspect}"
     end
 
-    result = data
-
     begin
-      # This first pass converts the frontmatter variables,
-      # and inserts data variables into the body
-      result = Conrefifier.apply_liquid(data, page_vars)
-      # This second application renders the previously inserted
-      # data conditionals within the body
-      result = Conrefifier.apply_liquid(result, page_vars)
+      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)
+      end
     rescue Liquid::SyntaxError
       # unrecognized Liquid, so just return the content
     rescue => e
       raise "#{e.message}: #{e.inspect}"
     end
-
-    result
   end
 
   # This method is extracted from the Nanoc default FS

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

@@ -7,12 +7,13 @@ module Conrefifier
     data_vars = {}
     scopes = variables.select { |v| v[:scope][:path].empty? || Regexp.new(v[:scope][:path]) =~ path }
     scopes.each do |scope|
-      data_vars = data_vars.merge(scope[:values].stringify_keys)
+      data_vars = data_vars.merge(scope[:values])
     end
     data_vars
   end
 
   def self.apply_liquid(content, data_vars)
+    data_vars['page'] = data_vars[:page].stringify_keys
     ::Liquid::Template.parse(content).render(data_vars)
   end
 end

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-conref-fs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc