nanoc-conref-fs 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf03675daecb4694ef342f40682105c08117466
-  data.tar.gz: b654f9aec04cb0b670be30f8a292bca44f154c79
+  metadata.gz: 35dc702fdbe8ffa00711be829afcf827fe5565fe
+  data.tar.gz: 83767a5ade9f4945c99f25d3a03122e1ff3467e7
 SHA512:
-  metadata.gz: 21894f1ea9a1a74fdf32f0b8030687d424716bf8feae45fb0f9f8c965bdc0651de8ebd224337d3ac9d015f4c1b35b873bd831c1058692a510555208456a39001
-  data.tar.gz: 9d272820c3cc481104c5da4083e988b293335776fd595d453b5c0a83f575192d588f7a03eae571101136d23514feb196754b334fd89fa7ac339f416c4580be0c
+  metadata.gz: bf4dd287a13d192f38777a6dc31211976ba3e6398ce7b9f53a06769740086dc706217788e05b1a954c35425863b75a41bea4937eaaa801eef7a2c87487b56289
+  data.tar.gz: 37c643e5e0b2ac33cb40aa87025146d3549aad0d48f7215ce4cbb5f41aa79a65f2580104e4ae78fd7a54343fe5c466b1a6eb70a657e10d83b0c6b98256d69d62

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in jekyll-html-pipeline.gemspec
 gemspec

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

@@ -158,44 +158,41 @@ class ConrefFS < Nanoc::DataSource
     end
 
     begin
-      result = ''
-      # This pass replaces any conditionals
-      result = if content =~ Conrefifier::BLOCK_SUB
-                 content.gsub(Conrefifier::BLOCK_SUB) do |match|
-                   Conrefifier.apply_liquid(match, page_vars).chomp
-                 end
-               else
-                 content
-               end
-
-      # This pass converts the frontmatter variables,
-      # and inserts data variables into the body
-      if result =~ Conrefifier::SINGLE_SUB
-        result = result.gsub(Conrefifier::SINGLE_SUB) do |match|
-          resolution = Conrefifier.apply_liquid(match, page_vars).strip
-          if resolution.start_with?('*')
-            if resolution[1] != '*'
-              resolution = resolution.sub(/\*(.+?)\*/, '<em>\1</em>')
-            else
-              resolution = resolution.sub(/\*{2}(.+?)\*{2}/, '<strong>\1</strong>')
-            end
-          end
-          resolution
-        end
+      result = content
+
+      # This pass replaces any matched conditionals
+      if result =~ Conrefifier::BLOCK_SUB || result =~ Conrefifier::SINGLE_SUB
+        result = Conrefifier.apply_liquid(result, page_vars)
       end
 
       # This second pass renders any previously inserted
-      # data conditionals within the body
+      # data conditionals within the body. If a Liquid parse
+      # returns a blank string, we'll return the original
       if result =~ Conrefifier::SINGLE_SUB
         result = result.gsub(Conrefifier::SINGLE_SUB) do |match|
-          Conrefifier.apply_liquid(match, page_vars)
+          liquified = Conrefifier.apply_liquid(match, page_vars)
+          liquified.empty? ? match : liquified
+        end
+      end
+
+      # This converts ": *" frontmatter strings into HTML equivalents;
+      # otherwise, ": *" messes the YAML parsing
+      result = result.gsub(/\A---\s*\n(.*?\n?)^---\s*$\n?/m) do |frontmatter|
+        frontmatter.gsub(/:\s*(\*.+)/) do |_|
+          asterisk_match = Regexp.last_match[1]
+          if asterisk_match[1] != '*'
+            asterisk_match = asterisk_match.sub(/\*(.+?)\*/, ': <em>\1</em>')
+          else
+            asterisk_match = asterisk_match.sub(/\*{2}(.+?)\*{2}/, ': <strong>\1</strong>')
+          end
+          asterisk_match
         end
       end
 
       result
-    rescue Liquid::SyntaxError
+    rescue Liquid::SyntaxError => e
       # unrecognized Liquid, so just return the content
-      # STDERR.puts "Could not convert #{filename}: #{e.message}"
+      STDERR.puts "Could not convert #{filename}: #{e.message}"
       result
     rescue => e
       raise "#{e.message}: #{e.inspect}"

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

@@ -18,6 +18,6 @@ module Conrefifier
 
   def self.apply_liquid(content, data_vars)
     data_vars['page'] = data_vars[:page].stringify_keys
-    ::Liquid::Template.parse(content).render(data_vars)
+    Liquid::Template.parse(content, :error_mode => :warn).render(data_vars)
   end
 end

data/nanoc-conref-fs.gemspec

@@ -1,11 +1,9 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'nanoc-conref-fs/version'
-
 Gem::Specification.new do |spec|
   spec.name          = 'nanoc-conref-fs'
-  spec.version       = Conrefifier::VERSION
+  spec.version       = '0.5.0'
   spec.authors       = ['Garen Torikian']
   spec.email         = ['gjtorikian@gmail.com']
   spec.summary       = 'A Nanoc filesystem to permit using conrefs/reusables in your content.'

data/test/conref_fs_test.rb

@@ -212,4 +212,30 @@ class DatafilesTest < MiniTest::Test
       assert_equal output_file, test_file
     end
   end
+
+  def test_raw_tags
+    with_site(name: FIXTURES_DIR) do |site|
+
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compile
+
+      output_file = read_output_file('liquid', 'raw')
+      test_file = read_test_file('liquid', 'raw')
+
+      assert_equal output_file, test_file
+    end
+  end
+
+  def test_multiple_version_blocks
+    with_site(name: FIXTURES_DIR) do |site|
+
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compile
+
+      output_file = read_output_file('liquid', 'multiple_versions')
+      test_file = read_test_file('liquid', 'multiple_versions')
+
+      assert_equal output_file, test_file
+    end
+  end
 end

data/test/fixtures/content/liquid/multiple_versions.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+  Multiples
+  </title>
+</head>
+
+<body>
+
+Hi I am 2.0.
+
+Hi I am tiny.
+
+</body>
+</html>

data/test/fixtures/content/liquid/multiple_versions.md

@@ -0,0 +1,19 @@
+---
+title: Multiples
+---
+
+{% if page.version > 2.0 %}
+
+Hi I am 2.0.
+
+{% if page.version > 2.3 %}
+
+Hi I am 2.3.
+
+{% else %}
+
+Hi I am tiny.
+
+{% endif %}
+
+{% endif %}

data/test/fixtures/content/liquid/raw.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+  Raw
+  </title>
+</head>
+
+<body>
+
+For example, to list a project's name, you might write something like `The project is called {{ site.github.project_title }}` or to list an organization's open source repositories, you might use the following:
+
+``` liquid
+{% for repository in site.github.public_repositories %}
+  * [{{ repository.name }}]({{ repository.html_url }})
+{% endfor %}
+```
+
+</body>
+</html>

data/test/fixtures/content/liquid/raw.md

@@ -0,0 +1,15 @@
+---
+title: Raw
+---
+
+For example, to list a project's name, you might write something like `The project is called {% raw %}{{ site.github.project_title }}{% endraw %}` or to list an organization's open source repositories, you might use the following:
+
+{% raw %}
+
+``` liquid
+{% for repository in site.github.public_repositories %}
+  * [{{ repository.name }}]({{ repository.html_url }})
+{% endfor %}
+```
+
+{% endraw %}

data/test/fixtures/nanoc.yaml

@@ -31,6 +31,11 @@ page_variables:
       path: "different"
     values:
       version: "2.0"
+  -
+    scope:
+      path: "multiple_versions"
+    values:
+      version: 2.2
 
 string_pattern_type: glob
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-conref-fs
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc
@@ -111,7 +111,6 @@ files:
 - lib/nanoc-conref-fs/conref-fs.rb
 - lib/nanoc-conref-fs/conrefifier.rb
 - lib/nanoc-conref-fs/datafiles.rb
-- lib/nanoc-conref-fs/version.rb
 - nanoc-conref-fs.gemspec
 - script/bootstrap
 - test/conref_fs_test.rb
@@ -135,6 +134,10 @@ files:
 - test/fixtures/content/frontmatter/different.md
 - test/fixtures/content/frontmatter/title.html
 - test/fixtures/content/frontmatter/title.md
+- test/fixtures/content/liquid/multiple_versions.html
+- test/fixtures/content/liquid/multiple_versions.md
+- test/fixtures/content/liquid/raw.html
+- test/fixtures/content/liquid/raw.md
 - test/fixtures/content/maliciousness/asterisk_double.html
 - test/fixtures/content/maliciousness/asterisk_double.md
 - test/fixtures/content/maliciousness/asterisk_single.html
@@ -213,6 +216,10 @@ test_files:
 - test/fixtures/content/frontmatter/different.md
 - test/fixtures/content/frontmatter/title.html
 - test/fixtures/content/frontmatter/title.md
+- test/fixtures/content/liquid/multiple_versions.html
+- test/fixtures/content/liquid/multiple_versions.md
+- test/fixtures/content/liquid/raw.html
+- test/fixtures/content/liquid/raw.md
 - test/fixtures/content/maliciousness/asterisk_double.html
 - test/fixtures/content/maliciousness/asterisk_double.md
 - test/fixtures/content/maliciousness/asterisk_single.html

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

@@ -1,3 +0,0 @@
-module Conrefifier
-  VERSION = '0.4.4'
-end