asciidoctor-confluence_publisher 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02a16d80d2c6942088552370ab3f10033ec630caaaf6972830e48c1a11ceee3
-  data.tar.gz: 8a14b5a3ad568ce9fd8cc1151b5ad36a76ef3533bc24b4462ab78e351d6e2482
+  metadata.gz: 359010b3692d9380e1f7931460aca85de9f2bbb04056675facb6defeb99c464d
+  data.tar.gz: ac6328db049cd58b385e24ce5a4f99bd7a662ba4736e777d1c947f9a59dd1aae
 SHA512:
-  metadata.gz: e7bb82e7e9159b8a9c9a319fdb82ff6684d61c9af1fce1e85227fd9645e606cd547d549dc971d4c388c17c367a57af6fde3aa5f0154c979a0bcebf050da707f0
-  data.tar.gz: 2ec63862b46679825befa2c4aa878bead193426cf81c471791b275ac8c8e931486fc3de0401c3dc5ea478f97cb3040b13e91b3fc9b1ab40af589beca770de676
+  metadata.gz: 9d0357a11d1a2483d249526ebf10ee5ff308cc5e99b0db7d1875e7bb410e0fc83b40d82c6ecf6ea795208bb1eee5b138f9b3e7d536be723a05c87f7fb53f837a
+  data.tar.gz: 80e29b8e1a2b6f7b9b06086c8c906890693ef95dfd006a6db7bf490005902e2a0140446ed91abf388fcf3c7b9ea5ca5b01a4133b01464cc62ceb0b1b04bc4859

data/README.md

@@ -5,6 +5,8 @@ generate confluence compatible html and upload the content and attachment to con
 
 This repo inspired by [confluence-publisher](https://github.com/confluence-publisher/confluence-publisher)
 
+**It requires Ruby 2.x. works for Confluence 6+.**
+
 ## Installation
 
 ```ruby

data/bin/confluence-publisher

@@ -2,6 +2,5 @@
 # frozen_string_literal: true
 $LOAD_PATH.unshift File.expand_path '../../lib', __FILE__
 require 'asciidoctor/confluence_publisher/command'
-require 'pry-byebug'
 
 Asciidoctor::ConfluencePublisher::Command.execute ARGV

data/lib/asciidoctor/confluence_publisher/command.rb

@@ -18,22 +18,15 @@ module Asciidoctor
         source_dir = nil
         2.times do
           result = options.parse! args
-          if result.is_a? Integer
-            if args.size == 1
-              file = args.first
-              fstat = ::File.stat file
-              if fstat.ftype == 'directory' && (input_files = parse_directory_files(file)).size > 0
-                source_dir = file
-                orig_args.reject! { |_arg| file == _arg }
-                orig_args.concat input_files
-                args = orig_args
-              else
-                exit result
-              end
-            else
-              exit result
-            end
+          break unless result.is_a? Integer
+
+          can_retry = false
+          if args.size == 1
+            source_dir = args.first
+            args = convert_directory_to_files(source_dir, orig_args)
+            can_retry = true
           end
+          exit result unless can_retry
         end
 
         options[:asciidoc_source_dir] = source_dir
@@ -43,6 +36,16 @@ module Asciidoctor
       end
 
       private
+
+      def self.convert_directory_to_files(file, orig_args)
+        fstat = ::File.stat file
+        if fstat.ftype == 'directory' && (input_files = parse_directory_files(file)).size > 0
+          orig_args.reject! { |_arg| file == _arg }
+          orig_args.concat input_files
+          return orig_args
+        end
+      end
+
       # hack asciidoctor to support folder
       def self.parse_directory_files(directory)
         infiles = []

data/lib/asciidoctor/confluence_publisher/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ConfluencePublisher
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/template/block_listing.html.haml

@@ -15,4 +15,4 @@
   %ac:structured-macro{"ac:name" => "noformat"}
     - if title?
       %ac:parameter{"ac:name" => "title"}= title
-    %ac:plain-text-body= "<![CDATA[#{content}]]>"
+    %ac:plain-text-body= "<![CDATA[#{raw_content}]]>"

data/template/helpers.rb

@@ -65,6 +65,16 @@ module Haml::Helpers
     supported.include? lang
   end
 
+  # default block list with *specialcharactor* substitution, in confluence just keep it as it is.
+  def raw_content
+    return content if attr? 'subs'
+    orig_subs = @subs
+    @subs = []
+    result =  content
+    @subs = orig_subs
+    return result
+  end
+
   #--------------------------------------------------------
   # block_table
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-confluence_publisher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - polarlights
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor