liquidoc 0.12.0 → 0.12.1.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d74a9496774cfbc632e3710395229511d743d659f02231590a81088cb8d5df
-  data.tar.gz: 9f1c23073ea028aeba49e1f7cc2dd69b03db07eb797c62a9d79c617ed3138cf1
+  metadata.gz: f107b641cfd1830bbd0981ddfcd9fb70a26530e5ae2f5170fe0158a52fa6c127
+  data.tar.gz: 044732dfd60b6791b5f53b36800e9fb47d554ff310f3a47fd55fd272e0204560
 SHA512:
-  metadata.gz: a999074ce1451b31b34090b06243af452f80b5b3d1073066af0ca99ec7dd6ecbd1184b0b76a8b9bf12642f1178003f9cd167c4c02c199ac37a5bb116714a1bcc
-  data.tar.gz: 2d68508810718ce919494d244a70ad65198039a28bec78dc5152e62423f4ae17792d89ad7cd1341e6910af871388e2cc5778f962095551fdb50d5a5d563cac25
+  metadata.gz: e9081fed78ee715f97e142bc6533d70c023f7c251dc73b678e0e3b4210a9495abe64f2d4a64bb5dd1fa436594cece5c30f0dad5c3e8626a469564fbd91e8408d
+  data.tar.gz: c3fd2845f42e0bc41ef9aac90efaceca577fb699a57710e639092f9451a5d24befcd0e663a506a6ee9ffd48b45a2d69482cc038c875569ff5eda2ddf5d220e7f

data/lib/liquid/tags/jekyll.rb

@@ -112,13 +112,14 @@ MSG
 
       # Array of directories where includes are stored
       def tag_includes_dirs(context)
-        # context[:includes_dirs]
-        ['_templates','_templates/liquid','_templates/liquid/ops','theme/_includes','_theme/layouts']
+        context.stack do
+          context['includes_dirs']
+        end
       end
 
       # Traverse includes dirs, setting paths for includes
       def locate_include_file(context, file, safe)
-        includes_dirs = ['_templates','_templates/liquid','_templates/liquid/ops','_templates/ops','theme/_includes','theme/_layouts']
+        includes_dirs = self.tag_includes_dirs(context)
         includes_dirs.each do |dir|
           path = File.join(dir.to_s, file.to_s)
           return path if File.exist?(path)

data/lib/liquidoc/version.rb

@@ -1,3 +1,3 @@
 module Liquidoc
-  VERSION = "0.12.0"
+  VERSION = "0.12.1-rc1"
 end

data/lib/liquidoc.rb

@@ -42,7 +42,7 @@ require 'sterile'
 @build_dir = @build_dir_def
 @configs_dir = @base_dir + '_configs'
 @templates_dir = @base_dir + '_templates/'
-@includes_dirs_def = ['.','_templates','_templates/liquid','_templates/liquid/ops','_templates/ops','theme/_includes','_theme/layouts']
+@includes_dirs_def = ['_templates','_templates/liquid','_templates/liquid/ops','_templates/ops','theme/_includes','theme/_layouts']
 @includes_dirs = @includes_dirs_def
 @data_dir = @base_dir + '_data/'
 @data_files = nil
@@ -155,7 +155,8 @@ def iterate_build cfg
           build.add_data!(build.variables, "vars") if build.variables
           includes_dirs = @includes_dirs
           includes_dirs = build.includes_dirs if build.includes_dirs
-          build.add_data!({:includes_dirs=>includes_dirs})
+          includes_dirs.unshift(File.dirname(build.template))
+          build.add_data!(includes_dirs: includes_dirs)
           liquify(build.data, build.template, build.output) # perform the liquify operation
         else # Prep & perform a direct conversion
           # Delete nested data and vars objects
@@ -1636,7 +1637,7 @@ command_parser = OptionParser.new do|opts|
     @template_file = @base_dir + n
   end
 
-  opts.on("--includes PATH[,PATH]", "Paths to directories where includes (partials) can be found." ) do |n|
+  opts.on("--includes_dirs PATH[,PATH]", "Paths to directories where includes (partials) can be found. Overrides default directories." ) do |n|
     n = n.force_array
     # n.map { |p| @base_dir + p }
     @includes_dirs = @includes_dirs.concat n

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidoc
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1.pre.rc1
 platform: ruby
 authors:
 - Brian Dominick
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,7 +218,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -233,8 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.7.0
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A highly configurable command-line tool for parsing data and content in common
   flat-file formats.