liquidoc 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5ca3ecd0b1c24dfa6231479baec2d113e3c6a6255392416ab75d54918f51f3b
-  data.tar.gz: 3abde9ab8883e38c7484782afbb7c8a0bf683c45ca05e0ecc5ad62784fb3a52e
+  metadata.gz: b37eeec640e508911c065f9e9061c3f7b699ed7a939e4e827f468bba377b54d1
+  data.tar.gz: 559ed408ee31cb7f3f12deb07d0da7ac6b09e79d2b3fe7b52892ad39707379bd
 SHA512:
-  metadata.gz: 07b617083d1467b3d485b341d0192026fce6db31632ac4fc123c8827b39202cfa9968a1e599ff07fa115c5f4878b7e105ed11586271d1d3ce1ebc88a5ee09647
-  data.tar.gz: b25ec34f7f2e843e0fabbf5a572f133399e0716c56fe2c2c9e5ddeff93c318645552b6adcd0a4335bd5ebd0693091050b862b0e502fd8bc34442b32a1dd61946
+  metadata.gz: 2a1979905f8eb82a27cc8cc1cc2b97b8ff94c610cd9e18e26c75ee7ad99ed2af0aac074675f4c1a516b0a761b2966f801275511ea879618d1f9269c401239779
+  data.tar.gz: 57baff39f8f07381556c67916a060cf76e97ded4975d2ada78d6101bd18a28683f61efae42cbf81002e955767f6d7e9a576215b55fc297ee3eb2d01435a975bc

data/lib/liquidoc/version.rb

@@ -1,3 +1,3 @@
 module Liquidoc
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/liquidoc.rb

@@ -788,15 +788,12 @@ end
 
 # Copy images and other files into target dir
 def copy_assets src, dest, inclusive=true
-  if File.file?(src) # for sources that are files
-    target_dir = File.dirname(dest)
-  else # if src is a directory
+  unless File.file?(src)
     unless inclusive then src = src + "/." end
-    target_dir = dest
   end
   @logger.debug "Copying #{src} to #{dest}"
   begin
-    FileUtils.mkdir_p(target_dir) unless File.directory?(target_dir)
+    FileUtils.mkdir_p(dest) unless File.directory?(dest)
     if File.directory?(src)
       FileUtils.cp_r(src, dest)
     else
@@ -903,29 +900,23 @@ def asciidocify doc, build
   # Add attributes from config file build section
   attrs.merge!(build.attributes) # Finally merge attributes from the build step
   # Add attributes from command-line -a args
-  @logger.debug "Final pre-parse attributes: #{attrs.to_yaml}"
+  @logger.debug "Final pre-Asciidoctor attributes: #{attrs.to_yaml}"
   # Perform the aciidoctor convert
-  unless build.backend == "pdf"
-    Asciidoctor.convert_file(
-      doc.index,
-      to_file: to_file,
-      attributes: attrs,
-      require: "pdf",
-      backend: build.backend,
-      doctype: build.doctype,
-      safe: "unsafe",
-      sourcemap: true,
-      verbose: @verbose,
-      mkdirs: true
-    )
-  else # For PDFs, we're calling the asciidoctor-pdf CLI, as the main dependency doesn't seem to perform the same way
-    attrs = '-a ' + attrs.map{|k,v| "#{k}='#{v}'"}.join(' -a ')
-    command = "asciidoctor-pdf -o #{to_file} -b pdf -d #{build.doctype} -S unsafe #{attrs} -a no-header-footer --trace #{doc.index}"
+  if build.backend == "pdf"
     @logger.info "Generating PDF. This can take some time..."
-    @logger.debug "Running #{command}"
-    system command
   end
-  @logger.debug "AsciiDoc attributes: #{doc.attributes}"
+  Asciidoctor.convert_file(
+    doc.index,
+    to_file: to_file,
+    attributes: attrs,
+    require: "pdf",
+    backend: build.backend,
+    doctype: build.doctype,
+    safe: "unsafe",
+    sourcemap: true,
+    verbose: @verbose,
+    mkdirs: true
+  )
   @logger.info "Rendered file #{to_file}."
 end
 
@@ -961,7 +952,7 @@ def generate_site doc, build
   end
   if command
     @logger.info "Running #{command}"
-    @logger.debug "AsciiDoc attributes: #{doc.attributes.to_yaml} "
+    @logger.debug "Final pre-jekyll-asciidoc attributes: #{doc.attributes.to_yaml} "
     system command
   end
   jekyll_serve(build) if @jekyll_serve

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidoc
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Brian Dominick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,7 +49,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/liquidoc
-- lib/liquid_tags.rb
 - lib/liquidoc.rb
 - lib/liquidoc/version.rb
 homepage: https://github.com/scalingdata/liquidoc

data/lib/liquid_tags.rb

@@ -1,12 +0,0 @@
-require 'liquid'
-
-module LiquidTags
-  class IncludeTag < Liquid::Tag
-
-    def initialize(tag_name, markup, tokens)
-      super
-      @tag_name = tag_name
-      return "WORKING!"
-    end
-  end
-end