nanoc-conref-fs 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cf69ee6e85496e24ff25128d9013457aba33741
-  data.tar.gz: dbed8da256b719eb52d1bda8640919060b3ab3e0
+  metadata.gz: 3b07a695903733da2e3cfe4002b57b013230b34c
+  data.tar.gz: 23cb84fe8bb0bd5e83d3e1e3b590a1066691b842
 SHA512:
-  metadata.gz: ab9faf957d43bc03944a47499989ae4f3fca7bcefe1a0976ad0c81a9776bc4315736a5d60fec3eac23203888a592882617f6b767dedb974845313bc7c7688c20
-  data.tar.gz: 751bdef5e71b825daffc335964334be1e14c237cbd5be52055ca83fcc5fcd2d8aa69c971614aac9bede21efffd8df655d2e184747dc609727f3a1d4cc1559f8b
+  metadata.gz: 43f5e209407425ce90419e4ead6d918652496b1f34add52be997e77b86b88af0d64ae865f0d7c6654723058def88a551f0a76edf8daad67357782bb199eebccf
+  data.tar.gz: 77039bc41c38db0b76c60655837651fe4e141fda8354c47c6197515d278cb11d0d2d18e9fb13f4c1644fa51e98d18039edaa50952e8852df37c3075487123264

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

@@ -31,8 +31,9 @@ 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?
-      data = Datafiles.process(@site_config)
-      @variables = { 'site' => { 'config' => @site_config.to_h, 'data' => data } }
+      config = @site_config.to_h.stringify_keys
+      data = Datafiles.process(config)
+      @variables = { 'site' => { 'config' => config, 'data' => data } }
       VariableMixin.variables = @variables
     end
     super
@@ -42,16 +43,16 @@ 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)
+      meta[:parents] = if toc.is_a?(Array)
                           find_array_parents(toc, meta['title'])
                         else
                           find_hash_parents(toc, meta['title'])
                         end
 
-      meta['children'] = if toc.is_a?(Array)
+      meta[:children] = if toc.is_a?(Array)
                            find_array_children(toc, meta['title'])
                          else
                            find_hash_children(toc, meta['title'])
@@ -143,7 +144,7 @@ class ConrefFS < Nanoc::DataSource
   def read(filename)
     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')

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

@@ -7,12 +7,12 @@ 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])
+      data_vars = data_vars.merge(scope[:values].stringify_keys)
     end
     data_vars
   end
 
   def self.apply_liquid(content, data_vars)
-    ::Liquid::Template.parse(content).render(data_vars.deep_stringify_keys)
+    ::Liquid::Template.parse(content).render(data_vars)
   end
 end

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

@@ -7,8 +7,7 @@ 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/nanoc-conref-fs.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'nanoc-conref-fs'
-  spec.version       = '0.3.0'
+  spec.version       = '0.3.1'
   spec.authors       = ['Garen Torikian']
   spec.email         = ['gjtorikian@gmail.com']
   spec.summary       = 'A Nanoc filesystem to permit using conrefs/reusables in your content.'

metadata

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