review-retrovert 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40dda814381806e0927906afc41f12020c6208c5dae0dcddd8ac764bd641fd0
-  data.tar.gz: 43a77d50400f9241a8a3186bd1f243a9efc3a564151d2ed14779d80a30cc052a
+  metadata.gz: 4018ff4ea97d4ea7a151e769c871e9d1f91d6c1ce2b18a500ae68a569987d1d0
+  data.tar.gz: 862bc4e9be33d25e15a2b1b3bfac1b3f231af1568e35d320ee5458740629ac50
 SHA512:
-  metadata.gz: 94d70f7740602edc84f8e87fa0d9317481e61f179fa054a55267b8635f5b89f9fa2d506e6b99ed453c3babed9e1c1a20001cb6998fdb88c0eb749035520a03df
-  data.tar.gz: 6afa54492f1a57f1b5cf5d9066e173cd7113ce5e5d7a3544656c7464cf8393b8709468ebe50e558d488b18da198c71e924384b9cbd752631f174d4f1d5c28885
+  metadata.gz: 4423300d41d6ba1ad911c99145fa830c8c36a9dd4a54273dda177b27bca65ae8d86bb5300382f28b5bc05abe27ce8fb12c6313fb4967f2244d0583a4c32c1bed
+  data.tar.gz: 68d804e35464032a32bc6d4b0cd45f919128fecced2bf4e8692db0e0e9e62212e64c1e4539b943f076e32ea10baf5fdb631d146eb0afaaa465375f4a67b58886

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.3.2)
+    review-retrovert (0.3.3)
       review (>= 3.2.0, < 4.0)
       thor
 
@@ -15,7 +15,7 @@ GEM
       image_size
       rouge
       rubyzip
-    rouge (3.20.0)
+    rouge (3.21.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/lib/review/retrovert/cli.rb

@@ -7,6 +7,8 @@ module ReVIEW
       desc "convert {review_starter_configfile} {outdir}", "convert Re:VIEW Starter project to Re:VIEW project"
       method_option "force", aliases: "f", desc: 'Force output', type: :boolean
       method_option "strict", desc: 'Only process files registered in the catalog', type: :boolean
+      method_option "table-br-replace", desc: '@<br>{} in table replace string', type: :string, default: ''
+      method_option "table-empty-replace", desc: 'empty cell(.) in table replace string', type: :string, default: '　'
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end

data/lib/review/retrovert/converter.rb

@@ -95,8 +95,13 @@ module ReVIEW
         content = File.read(contentfile)
         content.gsub!(/(\/\/sideimage\[.*?\]\[.*?\])\[.*?\]/, '\1')
         content.gsub!(/\/\/sideimage/, '//image')
+        content.gsub!(/@<href>{(.*?)#.*?,(.*?)}/, '@<href>{\1,\2}')
         content.gsub!(/@<href>{(.*?)#.*?}/, '@<href>{\1}')
-        while !content.gsub!(/(\/\/table.*)@<br>(.*?\/\/})/m, '\1\2').nil? do
+        # table 内の @ コマンドは不安定らしい
+        while !content.gsub!(/(\/\/table.*)@<br>{}(.*?\/\/})/m, "\\1#{@table_br_replace}\\2").nil? do
+        end
+        # 空セルが2行になることがあるらしい
+        while !content.gsub!(/(\/\/table.*\s)\.(\s.*?\/\/})/m, "\\1#{@table_empty_replace}\\2").nil? do
         end
         delete_inline_command(content , 'xsmall')
         delete_inline_command(content , 'weak')
@@ -159,6 +164,8 @@ module ReVIEW
       end
 
       def execute(yamlfile, outdir, options)
+        @table_br_replace = options['table-br-replace']
+        @table_empty_replace = options['table-empty-replace']
         load_config(yamlfile)
         create_initial_project(outdir, options)
 

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor