nanoc-conref-fs 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643c54357fd0361c0123a9d722ba4894e62d5f55
-  data.tar.gz: 1ce617281d9e1f819fb0b2f4f6c0df22975eee2d
+  metadata.gz: 2d01c92aa582b947c2845c60898017b6ef47c30e
+  data.tar.gz: 2ecb11916d271d8ee34291c028dcd3bf7937fc38
 SHA512:
-  metadata.gz: 5748f945fe9a5a3472c6755b94bf9834517b3d939e5311fd736d9fe87cfed447cdf5ce79d7e0484398bb7db844187d81cd2a411a45bf45666db7bf10fb30b69b
-  data.tar.gz: 485936ca60828db60518f2f12f8796b8dab8532cb0e2cb0e19a69478afe4777e7e5e377ae51818a40997abc4192f386f919a3b5e26fe2d68d440480289abbcb4
+  metadata.gz: bdd96dbbb9abb7498a45cbc4821fb0690f648ac85c565ff5335c5bb046853cef50975631fc261bf39e941bc2b69bf8e9a02fa4c997347480e6d6125bed582596
+  data.tar.gz: 289b1f20ed550fbad9fd8b9a0536714252a99e5f1ef6eb85857c9163f4c6d6d6b0f6ac06039f9cfa1a84fa1973655ba66944183a36d9aa455f5e55e9e3fb7b37

data/README.md

@@ -25,6 +25,8 @@ data_sources:
       - :X
 ```
 
+You can add `filter :'conref-fs-filter'` to any of your `compile` Rules to then have them renderer through the conref processor.
+
 **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 with Liquid:
 
 ``` ruby

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

@@ -4,36 +4,27 @@ module NanocConrefFS
   module Conrefifier
     SINGLE_SUB = /(\{\{[^\}]+\}\})/m
     BLOCK_SUB = /\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\}/m
-    PATH_TO_VARS = {}
 
     def self.file_variables(variables, path, rep)
       return {} if variables.nil?
 
       data_vars = {}
 
-      # this saves a bunch of time because we don't need to
-      # recalculate the paths (looping over scopes, etc)
-      if PATH_TO_VARS[rep] && PATH_TO_VARS[rep][path]
-        data_vars = PATH_TO_VARS[rep][path]
+      scopes = variables.select do |v|
+        scope_block = v[:scope]
+        scoped_path = scope_block[:path].empty? || Regexp.new(scope_block[:path]) =~ path
+        scoped_rep  = scope_block[:reps].nil? || scope_block[:reps].include?(rep)
+        scoped_path && scoped_rep
+      end
+
+      # I benchmarked that assignment is much
+      # faster than merging an empty hash
+      if scopes.length == 1
+        data_vars = scopes.first[:values]
       else
-        scopes = variables.select do |v|
-          scope_block = v[:scope]
-          scoped_path = scope_block[:path].empty? || Regexp.new(scope_block[:path]) =~ path
-          scoped_rep  = scope_block[:reps].nil? || scope_block[:reps].include?(rep)
-          scoped_path && scoped_rep
-        end
-        # I benchmarked that assignment is much faster than
-        # merging an empty hash
-        if scopes.length == 1
-          data_vars = scopes.first[:values]
-        else
-          scopes.each do |scope|
-            data_vars = data_vars.merge(scope[:values])
-          end
+        scopes.each do |scope|
+          data_vars = data_vars.merge(scope[:values])
         end
-        # stash for later use
-        PATH_TO_VARS[rep] = {}
-        PATH_TO_VARS[rep][path] = data_vars
       end
 
       data_vars

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