nanoc-conref-fs 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c521a9f295c33c7aa6f4dc47ca92045539c467e5
-  data.tar.gz: 42ac9a18696599fd0f298899f48b7f6b4484bd3f
+  metadata.gz: 3b9b74d13a2d5e87fcc3a90d5072c25ad3dd82b2
+  data.tar.gz: 0a943c2e008ecd7b8f22e0b4fc4f7fcac64e867e
 SHA512:
-  metadata.gz: 3fad6cd16943d5e3b4cbda7579d7c0cc6b3b30b0ddf7194a9a198d2d2f01138ed564c3b353d510e78076f7b5c11fe35a088e06cf1332c7d0e1f883fb2525dd12
-  data.tar.gz: ca660bcfaf0287c737ff8a50186d61196cae39b39861fffbb4925f62a2539e1cfa0a56d79c2ccd0bd71815a125a4c41e143e2dde2c9314cf52cb314e3221c7f5
+  metadata.gz: 51ce48cb1edf56f86eb87d398c8626ab38e437c9b41b790e9274624d666cfe254aaf41453fc9738b90363077144f6eed0533d249c01d70d9f23c627e9d4ee5cd
+  data.tar.gz: 1414c576b31ece94c1bc30c38e56b3a443a02407c0b75b6eb3b6783f351665134ee861dc391222d5057d81592858c732eb0c77d55496bfa7a6f3945d5d4050c9

data/README.md

@@ -6,6 +6,21 @@ The idea is that you have a set of YAML files in a data folder which act as your
 
 [![Build Status](https://travis-ci.org/gjtorikian/nanoc-conref-fs.svg)](https://travis-ci.org/gjtorikian/nanoc-conref-fs)
 
+**NOTE:** If you use this library with nanoc's ERB filter, and want to use `render`, you'll need to monkey-patch an alias to avoid conflicts:
+
+``` ruby
+require 'nanoc-conref-fs'
+include Nanoc::Helpers::Rendering
+Nanoc::Helpers::Rendering.module_eval do
+  if respond_to? :render
+    alias_method :renderp, :render
+    remove_method :render
+  end
+end
+```
+
+Then, use `renderp` instead of `render`.
+
 ## Usage
 
 Nearly all the usage of this gem relies on a *data* folder, sibling to your *content* and *layouts* folders. See [the test fixture](test/fixtures/data) for an example.

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

@@ -8,8 +8,10 @@ class ConrefFS < Nanoc::DataSource
   # Before iterating over the file objects, this method loads the data folder
   # and applies to to an ivar for later usage.
   def load_objects(dir_name, kind, klass)
-    data = Datafiles.process(@site_config)
-    @vars = { 'site' => { 'config' => @site_config.to_h, 'data' => data } }
+    if klass == Nanoc::Int::Item && @vars.nil?
+      data = Datafiles.process(@site_config)
+      @vars = { 'site' => { 'config' => @site_config.to_h, 'data' => data } }
+    end
     super
   end
 
@@ -65,12 +67,15 @@ class ConrefFS < Nanoc::DataSource
       data = File.read(filename)
       return data unless filename.start_with?('content')
 
+      # we must obfuscate essential ExtendedMarkdownFilter content
+      data = data.gsub(/\{\{#/, '[[#').gsub(/\{\{ octicon-/, '[[ octicon-')
       # 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)
+      result.gsub('[[#', '{{#').gsub('{{ octicon-', '[[ octicon-')
     rescue => e
       raise RuntimeError.new("Could not read #{filename}: #{e.inspect}")
     end

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

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'active_support'
 require 'active_support/core_ext/hash'
 
 require_relative 'conrefifier'

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.0.1'
+  spec.version       = '0.1.0'
   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.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc