nanoc-conref-fs 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce3fca0efb82cce69239434123a5de9f135ad56
-  data.tar.gz: 421b51a89886f2354f4357f5b741b97ae3554aa0
+  metadata.gz: 5f97b581aa4c8787bdf2b6ce84f1dcc3b210b035
+  data.tar.gz: 34ae3ad02c8bbf04ae4c10322e2356590e28e763
 SHA512:
-  metadata.gz: 471d13dee8a6c72a1d3b2563f9c6e0205521c1c3ca324d906df534dde94f6af7d6275e6b15c718e21d22c8ad2ed8c7590ffe215755801e91b9fd1c05e9b56c0c
-  data.tar.gz: 4195c8a0227022562027eaabce6ebd078244a5dda6844a3e4719656461905ec5563e61d8c35777c55ac38f3111dd9655db1d6a5994141de8a11b7b39a9a0285c
+  metadata.gz: bf54ac5ff6c190200b73a587e0b67e01d5a13936853355ad86b6f2c0c1e833fd4a2b04ebdb9572070212d7acecdaa5e19f7cc5198dc3d2fc27c810f1af382261
+  data.tar.gz: 92dad5ef9e7bb28bc07b7b5d5bb788a84d831f26ce4fa42105a4f0cff714d2826cef1f23f081ed8f6c56106b701ad461fbac6f08511b9b93d6fa165587387b79

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

@@ -5,15 +5,17 @@ require_relative 'conrefifier'
 
 module NanocConrefFS
   module Datafiles
+    OBFUSCATION = '~~#~~'
+
     def self.apply_conditionals(config, path:, content:, rep:)
       vars = Conrefifier.file_variables(config[:data_variables], path, rep)
       data_vars = { :page => vars, :site => { :config => config } }
 
-      content = obfuscate_liquid(content, data_vars)
+      content = obfuscate_and_liquify(content, data_vars)
       begin
         doc = YAML.load(content)
       rescue Psych::SyntaxError => e
-        STDERR.puts "Could not convert \n#{content}"
+        STDERR.puts "\nCould not convert following file:\n#{content}"
         raise "#{e.message}: #{e.inspect}"
       end
 
@@ -57,13 +59,12 @@ module NanocConrefFS
       data
     end
 
-    def self.obfuscate_liquid(content, data_vars)
-      content.gsub(Conrefifier::BLOCK_SUB) do |match|
-        # We must obfuscate Liquid variables while replacing conditionals
-        match = match.gsub(/{{/, '~~#~~')
-        match = Conrefifier.apply_liquid(match, data_vars)
-        match.gsub('~~#~~', '{{')
-      end
+    def self.obfuscate_and_liquify(content, data_vars)
+       # We must obfuscate Liquid variables while replacing conditionals,
+       # else they get wiped out
+      content.gsub!(/\{\{/, OBFUSCATION)
+      content = Conrefifier.apply_liquid(content, data_vars)
+      content.gsub(OBFUSCATION, '{{')
     end
   end
 end

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.6.3'
+  spec.version       = '0.6.4'
   spec.authors       = ['Garen Torikian']
   spec.email         = ['gjtorikian@gmail.com']
   spec.summary       = 'A Nanoc filesystem to permit using conrefs/reusables in your content.'

data/test/datafiles_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class DatafilesTest < MiniTest::Test
   def test_it_collects_the_files
     files = NanocConrefFS::Datafiles.collect_data(File.join(FIXTURES_DIR, 'data')).keys.sort
-    names = %w(categories/category categories/simple reusables/intro reusables/names variables/asterisks variables/empty variables/product)
+    names = %w(categories/category categories/nested categories/simple reusables/intro reusables/names variables/asterisks variables/empty variables/product)
     names.map! { |name| File.join(FIXTURES_DIR, 'data', "#{name}.yml") }
     assert_equal files, names
   end
@@ -34,4 +34,12 @@ class DatafilesTest < MiniTest::Test
     assert_includes result.to_s, 'We use {{ site.data.reusables.names.new_name }}'
     assert_includes result.to_s, '{{ site.data.variables.product.product_name }} is great'
   end
+
+  def test_it_converts_nested_blocks
+    file = File.join(FIXTURES_DIR, 'data', 'categories', 'nested.yml')
+    content = File.read(file)
+    result = NanocConrefFS::Datafiles.apply_conditionals(CONFIG, path: file, content: content, rep: :default)
+    assert_includes result.to_s, 'About gists'
+    refute_includes result.to_s, 'Deleting an anonymous gist'
+  end
 end

data/test/fixtures/data/categories/nested.yml

@@ -0,0 +1,9 @@
+{% if page.version != 'cloud' %}
+Gists:
+  - About gists
+  - Creating gists
+  - Forking and cloning gists
+  {% if page.version == 'dotcom' %}
+  - Deleting an anonymous gist
+  {% endif %}
+{% endif %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-conref-fs
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc
@@ -164,6 +164,7 @@ files:
 - test/fixtures/content/parents/two_parents.html
 - test/fixtures/content/parents/two_parents.md
 - test/fixtures/data/categories/category.yml
+- test/fixtures/data/categories/nested.yml
 - test/fixtures/data/categories/simple.yml
 - test/fixtures/data/reusables/intro.yml
 - test/fixtures/data/reusables/names.yml
@@ -250,6 +251,7 @@ test_files:
 - test/fixtures/content/parents/two_parents.html
 - test/fixtures/content/parents/two_parents.md
 - test/fixtures/data/categories/category.yml
+- test/fixtures/data/categories/nested.yml
 - test/fixtures/data/categories/simple.yml
 - test/fixtures/data/reusables/intro.yml
 - test/fixtures/data/reusables/names.yml