tractive 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07fb75035716d30de8f58206ad93cd0b932d74807646d5577d519d848eb2bfa0
-  data.tar.gz: c4e50252da3aaf67b919041cdc682e8559abb28163dd847671d30c91808d15e0
+  metadata.gz: 6b9a604e9dd1c9d05edc6ebb71730d1c1660c7f5fc478a99ce87597fe48b567e
+  data.tar.gz: 6c70e06cd214b9b97d3ec17878774b5417ee3108f95b1ec09642179ca88c5c4a
 SHA512:
-  metadata.gz: efc63d0e9e8b08d3780cccd3877554c7a1df4408cd8db3c5bcf4fd11634eab73ac7f29fa300fb9191e77a892ba5d795c80e0d1a5a97283e6c541370372ef5725
-  data.tar.gz: b1dc726435943c2b0cf70f369c21ffd049d07e13147a5d88f162dc725fb1ad7d62a8a034b2adb05903cc9e393dd421497af457fbaf2ad8cf45684b783b63b5ba
+  metadata.gz: 67728d36b54a32045c49a69c873c49a63a87ac6242260f3eefe09c1511b88919af579fcffd4bc08919825606f99cbcdd12284f3c5d3b347adaf8226c6c770f57
+  data.tar.gz: 0caa7b60a2620eca00de262cd0d122cfab88a9fe6737800c7a281d9d36dfb0b02368722608cf130fe9c6faf8caf579bc96db111c130866df7fade690f8504bb4

data/lib/tractive/migrator/converter/trac_to_github.rb

@@ -281,7 +281,7 @@ module Migrator
           # text += "created the issue\n\n"
           if body && !body.lstrip.empty?
             # text += "\n___\n" if not append
-            text += @twf_to_markdown.convert(body)
+            text += @twf_to_markdown.convert(body, id: meta[:ticket])
           end
 
         when "comment"
@@ -295,7 +295,7 @@ module Migrator
                   end
 
           text += "\n___\n" unless append
-          text += @twf_to_markdown.convert(body) if body
+          text += @twf_to_markdown.convert(body, id: meta[:ticket]) if body
 
         when "attachment"
           text += "_uploaded file "

data/lib/tractive/migrator/converter/twf_to_markdown.rb

@@ -16,11 +16,11 @@ module Migrator
 
         @git_repo = options[:git_repo]
         @home_page_name = options[:home_page_name]
-        @wiki_extensions = options[:wiki_extensions] # || [".py", "changelog", "expire-ids"]
-        @source_folders = options[:source_folders] # || %w[personal attic sprint branch/hawk]
+        @wiki_extensions = options[:wiki_extensions]
+        @source_folders = options[:source_folders]
       end
 
-      def convert(str)
+      def convert(str, image_options = {})
         # Fix 'Windows EOL' to 'Linux EOL'
         str.gsub!("\r\n", "\n")
 
@@ -33,7 +33,7 @@ module Migrator
         convert_links(str, @git_repo)
         convert_font_styles(str)
         convert_changeset(str, @changeset_base_url)
-        convert_image(str, @base_url, @attach_url, @wiki_attachments_url)
+        convert_image(str, @base_url, @attach_url, @wiki_attachments_url, image_options)
         convert_ticket(str, @base_url)
         revert_intermediate_references(str)
 
@@ -247,13 +247,13 @@ module Migrator
       def file?(trac_path)
         return false unless trac_path
 
-        @wiki_extensions.any? { |extension| trac_path.end_with?(extension) }
+        @wiki_extensions&.any? { |extension| trac_path.end_with?(extension) }
       end
 
       def wiki_path(path, line_number = "")
         # TODO: This will not work for folders given in the source_folder parameter and
         # will not work for subfolders paths like `personal/rjs` unless given in the parameters.
-        return "branches/all?query=#{path}" if @source_folders.any? { |folder| folder == path }
+        return "branches/all?query=#{path}" if @source_folders&.any? { |folder| folder == path }
         return index_paths[path] if index_paths[path]
 
         prefix = if file?(path)
@@ -294,7 +294,7 @@ module Migrator
         "[#{wiki_name}](https://github.com/#{git_repo}/wiki/#{wiki_name})"
       end
 
-      def convert_image(str, base_url, attach_url, wiki_attachments_url)
+      def convert_image(str, base_url, attach_url, wiki_attachments_url, options = {})
         # https://trac.edgewall.org/wiki/WikiFormatting#Images
         # [[Image(picture.gif)]] Current page (Ticket, Wiki, Comment)
         # [[Image(wiki:WikiFormatting:picture.gif)]] (referring to attachment on another page)
@@ -316,7 +316,15 @@ module Migrator
                               # [[Image(http://example.org/s.jpg)]]
                               "!{{#{path}}}(#{path})"
                             else
-                              _, id, file = path.split(":")
+                              tmp = path.split(":")
+                              id, file = case tmp.size
+                                         when 3
+                                           [tmp[1], tmp[2]]
+                                         when 2
+                                           tmp
+                                         else
+                                           [options[:id].to_s, tmp[0]]
+                                         end
                               file_path = "#{attach_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
                               "!{{#{path}}}(#{file_path})"
                             end

data/lib/tractive/migrator/wikis/migrate_from_db.rb

@@ -63,7 +63,7 @@ module Migrator
             $logger.info("Working with file [#{file_name}]")
             $logger.debug("Object: #{wiki}")
 
-            wiki_markdown_text = @twf_to_markdown.convert(wiki[:text])
+            wiki_markdown_text = @twf_to_markdown.convert(wiki[:text], id: wiki[:name])
             wiki_markdown_text += wiki_attachments(wiki)
 
             # Create file with content

data/lib/tractive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tractive
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2