liquidoc.rb in liquidoc-0.12.1.pre.rc1

- old
+ new

@@ -40,11 +40,11 @@
 @base_dir = @base_dir_def
 @build_dir_def = @base_dir + '_build'
 @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
 @attributes_file_def = '_data/asciidoctor.yml'
 @attributes_file = @attributes_file_def
@@ -153,11 +153,12 @@
           # Prep & perform a Liquid-parsed build
           @explainer.info build.message
           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
           build.data.remove_scope("data")
           build.data.remove_scope("vars")
@@ -1634,10 +1635,10 @@
 
   opts.on("-t PATH", "--template PATH", "Path to liquid template. Required unless --configuration is called." ) do |n|
     @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
   end
 