tractive 1.0.8 → 1.0.12

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

@@ -4,8 +4,8 @@ module Migrator
   module Converter
     class TracToGithub
       def initialize(args)
-        @tracticketbaseurl    = args[:cfg]["trac"]["ticketbaseurl"]
-        @attachurl            = args[:opts][:attachurl] || args[:cfg].dig("attachments", "url")
+        @trac_ticket_base_url = args[:cfg]["trac"]["ticketbaseurl"]
+        @attachurl            = args[:opts][:attachurl] || args[:cfg].dig("ticket", "attachments", "url")
         @changeset_base_url   = args[:cfg]["trac"]["changeset_base_url"] || ""
         @singlepost           = args[:opts][:singlepost]
         @labels_cfg           = args[:cfg]["labels"].transform_values(&:to_h)
@@ -14,8 +14,12 @@ module Migrator
         @trac_mails_cache     = {}
         @repo                 = args[:cfg]["github"]["repo"]
         @client               = GithubApi::Client.new(access_token: args[:cfg]["github"]["token"])
-        @wiki_attachments_url = args[:cfg]["trac"]["wiki_attachments_url"]
+        @wiki_attachments_url = args[:cfg].dig("wiki", "attachments", "url")
         @revmap_file_path     = args[:opts][:revmapfile] || args[:cfg]["revmap_path"]
+        @attachment_options   = {
+          url: @attachurl,
+          hashed: args[:cfg].dig("ticket", "attachments", "hashed")
+        }
 
         load_milestone_map
         create_labels_on_github(@labels_cfg["severity"].values)
@@ -24,12 +28,19 @@ module Migrator
         create_labels_on_github(@labels_cfg["component"].values)
 
         @uri_parser = URI::Parser.new
-        @twf_to_markdown = Migrator::Converter::TwfToMarkdown.new(@tracticketbaseurl, @attachurl, @changeset_base_url, @wiki_attachments_url, @revmap_file_path)
+        @twf_to_markdown = Migrator::Converter::TwfToMarkdown.new(
+          @trac_ticket_base_url,
+          @attachment_options,
+          @changeset_base_url,
+          @wiki_attachments_url,
+          @revmap_file_path,
+          git_repo: @repo, home_page_name: args[:opts]["home-page-name"]
+        )
       end
 
       def compose(ticket)
-        body   = ""
-        closed = nil
+        body = ""
+        closed_time = nil
 
         # summary line:
         # body += %i[id component priority resolution].map do |cat|
@@ -70,7 +81,7 @@ module Migrator
           @labels_cfg.fetch(x[:field], {})[x[:newvalue]]
           labels.delete(del) if del
           # labels.add(add) if add
-          closed = x[:time] if (x[:field] == "status") && (x[:newvalue] == "closed")
+          closed_time = x[:time] if x[:field] == "status" && x[:newvalue] == "closed"
         end
 
         # we separate labels from badges
@@ -149,8 +160,12 @@ module Migrator
           # issue["updated_at"] = format_time(ticket[:changetime])
         end
 
-        if issue["closed"] && closed
-          #  issue["closed_at"] = format_time(closed)
+        if issue["closed"]
+          issue["closed_at"] = if closed_time
+                                 format_time(closed_time)
+                               else
+                                 format_time(ticket[:closed_at].to_i)
+                               end
         end
 
         {
@@ -287,7 +302,7 @@ module Migrator
           name = meta[:filename]
           body = meta[:description]
           if @attachurl
-            url = @uri_parser.escape("#{@attachurl}/#{meta[:id]}/#{name}")
+            url = @uri_parser.escape("#{@attachurl}/#{Tractive::Utilities.attachment_path(meta[:id], name, @attachment_options)}")
             text += "[`#{name}`](#{url})"
             body += "\n![#{name}](#{url})" if [".png", ".jpg", ".gif"].include? File.extname(name).downcase
           else
@@ -335,9 +350,9 @@ module Migrator
       end
 
       def trac_ticket_link(ticket)
-        return "trac:#{ticket[:id]}" unless @tracticketbaseurl
+        return "trac:#{ticket[:id]}" unless @trac_ticket_base_url
 
-        "[trac:#{ticket[:id]}](#{@tracticketbaseurl}/#{ticket[:id]})"
+        "[trac:#{ticket[:id]}](#{@trac_ticket_base_url}/#{ticket[:id]})"
       end
     end
   end

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

@@ -1,26 +1,41 @@
 # frozen_string_literal: true
 
+require "cgi"
+
 module Migrator
   module Converter
     # twf => Trac wiki format
     class TwfToMarkdown
-      def initialize(base_url, attach_url, changeset_base_url, wiki_attachments_url, revmap_file_path)
+      def initialize(base_url, attachment_options, changeset_base_url, wiki_attachments_url, revmap_file_path, options = {})
         @base_url = base_url
-        @attach_url = attach_url
+        @attach_url = attachment_options[:url]
+        @attach_hashed = attachment_options[:hashed]
         @changeset_base_url = changeset_base_url
         @wiki_attachments_url = wiki_attachments_url
         @revmap = load_revmap_file(revmap_file_path)
+
+        @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]
       end
 
       def convert(str)
+        # Fix 'Windows EOL' to 'Linux EOL'
+        str.gsub!("\r\n", "\n")
+
+        convert_tables(str)
         convert_newlines(str)
+        convert_comments(str)
+        convert_html_snippets(str)
         convert_code_snippets(str)
         convert_headings(str)
-        convert_links(str)
+        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_ticket(str, @base_url)
+        revert_intermediate_references(str)
 
         str
       end
@@ -45,18 +60,12 @@ module Migrator
         revmap
       end
 
-      # CommitTicketReference
-      def convert_ticket_reference(str)
-        str.gsub!(/\{\{\{\n(#!CommitTicketReference .+?)\}\}\}/m, '\1')
-        str.gsub!(/#!CommitTicketReference .+\n/, "")
-      end
-
       # Ticket
       def convert_ticket(str, base_url)
         # replace a full ticket id with the github short refrence
         if base_url
           baseurlpattern = base_url.gsub("/", "\\/")
-          str.gsub!(%r{#{baseurlpattern}/(\d+)}) { "ticket:#{Regexp.last_match[1]}" }
+          str.gsub!(%r{#{baseurlpattern}/(\d+)}, '#\1')
         end
 
         # Ticket
@@ -79,16 +88,35 @@ module Migrator
         str.gsub!("\r\n", "\n")
       end
 
+      # Comments
+      def convert_comments(str)
+        str.gsub!(/\{\{\{(?>((?!(?:}}}|{{{)).+?|\g<0>))*\}\}\}/m) do |str_match|
+          str_match.gsub(/\{\{\{\s*#!comment(\s*)(.*)\}\}\}/m, '<!--\1\2\1-->')
+        end
+      end
+
+      # HTML Snippets
+      def convert_html_snippets(str)
+        str.gsub!(/\{\{\{#!html(.*?)\}\}\}/m, '\1')
+      end
+
+      # CommitTicketReference
+      def convert_ticket_reference(str)
+        str.gsub!(/\{\{\{\n(#!CommitTicketReference .+?)\}\}\}/m, '\1')
+        str.gsub!(/#!CommitTicketReference .+\n/, "")
+      end
+
       # Code
       def convert_code_snippets(str)
         str.gsub!(/\{\{\{([^\n]+?)\}\}\}/, '`\1`')
+        str.gsub!(/\{\{\{#!(.*?)\n(.+?)\}\}\}/m, "```\\1\n\\2\n```")
         str.gsub!(/\{\{\{(.+?)\}\}\}/m, '```\1```')
         str.gsub!(/(?<=```)#!/m, "")
       end
 
       # Changeset
       def convert_changeset(str, changeset_base_url)
-        str.gsub!(%r{#{Regexp.quote(changeset_base_url)}/(\d+)/?}, '[changeset:\1]') if changeset_base_url
+        str.gsub!(%r{#{Regexp.quote(changeset_base_url)}/(\d+)/?}, '[changeset:\1]') if changeset_base_url && !changeset_base_url.empty?
         str.gsub!(/\[changeset:"r(\d+)".*\]/, '[changeset:\1]')
         str.gsub!(/\[changeset:r(\d+)\]/, '[changeset:\1]')
         str.gsub!(/\br(\d+)\b/) { Tractive::Utilities.map_changeset(Regexp.last_match[1], @revmap, changeset_base_url) }
@@ -102,15 +130,170 @@ module Migrator
       def convert_font_styles(str)
         str.gsub!(/'''(.+?)'''/, '**\1**')
         str.gsub!(/''(.+?)''/, '*\1*')
-        str.gsub!(%r{[^:]//(.+?[^:])//}, '_\1_')
+        str.gsub!(%r{([^:])//(.+?[^:])//}, '\1_\2_')
+      end
+
+      # Tables
+      def convert_tables(str)
+        str.gsub!(/^( *\|\|[^\n]+\|\| *[^\n|]+$)+$/, '\1 ||')
+
+        str.gsub!(/(?:^( *\|\|[^\n]+\|\| *)\n?)+/) do |match_result|
+          rows = match_result.gsub("||", "|").split("\n")
+          rows.insert(1, "| #{"--- | " * (rows[0].split("|").size - 1)}".strip)
+
+          "#{rows.join("\n")}\n"
+        end
       end
 
       # Links
-      def convert_links(str)
-        str.gsub!(/\[(http[^\s\[\]]+)\s([^\[\]]+)\]/, '[\2](\1)')
+      def convert_links(str, git_repo)
+        convert_camel_case_links(str, git_repo)
+        convert_double_bracket_wiki_links(str, git_repo)
+        convert_single_bracket_wiki_links(str, git_repo)
+
+        str.gsub!(/(^!)\[(http[^\s\[\]]+)\s([^\[\]]+)\]/, '[\2](\1)')
         str.gsub!(/!(([A-Z][a-z0-9]+){2,})/, '\1')
       end
 
+      def convert_single_bracket_wiki_links(str, git_repo)
+        str.gsub!(/(!?)\[((?:wiki|source):)?([^\s\]]*) ?(.*?)\]/) do |match_result|
+          source = Regexp.last_match[2]
+          path = Regexp.last_match[3]
+          name = Regexp.last_match[4]
+
+          formatted_link(
+            match_result,
+            git_repo,
+            { source: source, path: path, name: name }
+          )
+        end
+      end
+
+      def convert_double_bracket_wiki_links(str, git_repo)
+        str.gsub!(/(!?)\[\[((?:wiki|source):)?([^|\n]*)\|?(.*?)\]\]/) do |match_result|
+          source = Regexp.last_match[2]
+          path = Regexp.last_match[3]
+          name = Regexp.last_match[4]
+
+          formatted_link(
+            match_result,
+            git_repo,
+            { source: source, path: path, name: name }
+          )
+        end
+      end
+
+      def formatted_link(unformatted_text, git_repo, url_options = {})
+        return unformatted_text.gsub("!", "{~") if unformatted_text.start_with?("!")
+
+        if url_options[:source] == "wiki:"
+          link, internal_link = url_options[:path].split("#")
+          link = "Home" if link == @home_page_name
+          internal_link = Tractive::Utilities.dasharize(internal_link) if internal_link
+          url_options[:name] = link if url_options[:name].empty?
+          "{{#{url_options[:name]}}}(https://github.com/#{git_repo}/wiki/#{link}##{internal_link})"
+        elsif url_options[:source] == "source:"
+          url_options[:name] = url_options[:path] if url_options[:name].empty?
+          "{{#{url_options[:name]}}}(https://github.com/#{git_repo}/#{source_git_path(url_options[:path])})"
+        elsif url_options[:path].start_with?("http")
+          url_options[:name] = url_options[:path] if url_options[:name].empty?
+          "{{#{url_options[:name]}}}(#{url_options[:path]})"
+        else
+          unformatted_text
+        end
+      end
+
+      def source_git_path(trac_path)
+        trac_path = trac_path.gsub("trunk/", "main/")
+        trac_path = trac_path.delete_prefix("/").delete_suffix("/")
+
+        return "" if trac_path.empty?
+
+        uri = URI.parse(trac_path)
+
+        trac_path = uri.path
+        line_number = uri.fragment
+        trac_path, revision = trac_path.split("@")
+
+        if trac_path.split("/").count <= 1
+          wiki_path(trac_path)
+        else
+          unless trac_path.start_with?("tags")
+            params = CGI.parse(uri.query || "")
+            revision ||= params["rev"].first
+
+            # TODO: Currently @ does not work with file paths except for main branch
+            sha = @revmap[revision]&.strip
+
+            trac_path = if sha && file?(trac_path)
+                          trac_path.gsub("main/", "#{sha}/")
+                        else
+                          sha || trac_path
+                        end
+          end
+
+          wiki_path(trac_path.delete_prefix("tags/"), line_number)
+        end
+      end
+
+      def index_paths
+        @index_paths ||= {
+          "tags" => "tags",
+          "tags/" => "tags",
+          "branch" => "branches/all"
+        }
+      end
+
+      def file?(trac_path)
+        return false unless trac_path
+
+        @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 index_paths[path] if index_paths[path]
+
+        prefix = if file?(path)
+                   "blob"
+                 else
+                   "tree"
+                 end
+
+        "#{prefix}/#{path}#{"#" unless line_number.to_s.empty?}#{line_number}"
+      end
+
+      # CamelCase page names follow these rules:
+      #   1. The name must consist of alphabetic characters only;
+      #      no digits, spaces, punctuation or underscores are allowed.
+      #   2. A name must have at least two capital letters.
+      #   3. The first character must be capitalized.
+      #   4. Every capital letter must be followed by one or more lower-case letters.
+      #   5. The use of slash ( / ) is permitted in page names, where it typically represents a hierarchy.
+      def convert_camel_case_links(str, git_repo)
+        name_regex = %r{(^| )(!?)(/?[A-Z][a-z]+(/?[A-Z][a-z]+)+/?)}
+        wiki_pages_names = Tractive::Wiki.select(:name).distinct.map(:name)
+        str.gsub!(name_regex) do
+          start = Regexp.last_match[2]
+          name = Regexp.last_match[3]
+
+          wiki_link = if start != "!" && wiki_pages_names.include?(name)
+                        make_wiki_link(name, git_repo)
+                      else
+                        name
+                      end
+
+          "#{Regexp.last_match[1]}#{wiki_link}"
+        end
+      end
+
+      def make_wiki_link(wiki_name, git_repo)
+        wiki_name = "Home" if wiki_name == @home_page_name
+        "[#{wiki_name}](https://github.com/#{git_repo}/wiki/#{wiki_name})"
+      end
+
       def convert_image(str, base_url, attach_url, wiki_attachments_url)
         # https://trac.edgewall.org/wiki/WikiFormatting#Images
         # [[Image(picture.gif)]] Current page (Ticket, Wiki, Comment)
@@ -118,28 +301,37 @@ module Migrator
         # [[Image(ticket:1:picture.gif)]] (file attached to a ticket)
 
         image_regex = /\[\[Image\((?:(?<module>(?:source|wiki)):)?(?<path>[^)]+)\)\]\]/
-        d = image_regex.match(str)
-        return if d.nil?
-
-        path = d[:path]
-        mod = d[:module]
-
-        image_path = if mod == "source"
-                       "![#{path.split("/").last}](#{base_url}#{path})"
-                     elsif mod == "wiki"
-                       _, file = path.split(":")
-                       upload_path = "#{wiki_attachments_url}/#{file}"
-                       "![#{file}](#{upload_path})"
-                     elsif path.start_with?("http")
-                       # [[Image(http://example.org/s.jpg)]]
-                       "![#{d[:path]}](#{d[:path]})"
-                     else
-                       _, id, file = path.split(":")
-                       file_path = "#{attach_url}/#{id}/#{file}"
-                       "![#{d[:path]}](#{file_path})"
-                     end
-
-        str.gsub!(image_regex, image_path)
+
+        str.gsub!(image_regex) do
+          path = Regexp.last_match[:path]
+          mod = Regexp.last_match[:module]
+
+          converted_image = if mod == "source"
+                              "!{{#{path.split("/").last}}}(#{base_url}#{path})"
+                            elsif mod == "wiki"
+                              id, file = path.split(":")
+                              upload_path = "#{wiki_attachments_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
+                              "!{{#{file}}}(#{upload_path})"
+                            elsif path.start_with?("http")
+                              # [[Image(http://example.org/s.jpg)]]
+                              "!{{#{path}}}(#{path})"
+                            else
+                              _, id, file = path.split(":")
+                              file_path = "#{attach_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
+                              "!{{#{path}}}(#{file_path})"
+                            end
+
+          # There are also ticket references in the format of ticket:1 so
+          # changing this now and will revert it at the end again
+          converted_image.gsub(/ticket:(\d+)/, 'ImageTicket~\1')
+        end
+      end
+
+      def revert_intermediate_references(str)
+        str.gsub!(/ImageTicket~(\d)/, 'ticket:\1')
+        str.gsub!("{{", "[")
+        str.gsub!("}}", "]")
+        str.gsub!(/(\{~)*/, "")
       end
     end
   end

data/lib/tractive/migrator/engine.rb

@@ -27,7 +27,7 @@ module Migrator
       input_file_name   = args[:opts][:importfromfile]
 
       @filter_applied   = args[:opts][:filter]
-      @filter_options   = { column_name: args[:opts][:columnname], operator: args[:opts][:operator], column_value: args[:opts][:columnvalue] }
+      @filter_options   = { column_name: args[:opts][:columnname], operator: args[:opts][:operator], column_value: args[:opts][:columnvalue], include_null: args[:opts][:includenull] }
 
       @trac  = Tractive::Trac.new(db)
       @repo  = github["repo"]
@@ -96,7 +96,7 @@ module Migrator
 
     def mock_ticket_details(ticket_id)
       summary = if @filter_applied
-                  "Not available in trac #{ticket_id}"
+                  "Placeholder issue #{ticket_id} created to align Github issue and trac ticket numbers during migration."
                 else
                   "DELETED in trac #{ticket_id}"
                 end
@@ -105,7 +105,8 @@ module Migrator
         summary: summary,
         time: Time.now.to_i,
         status: "closed",
-        reporter: "tractive"
+        reporter: "tractive",
+        closed_at: Time.at(0).utc
       }
     end
 

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

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Migrator
+  module Wikis
+    class MigrateFromDb
+      def initialize(args)
+        $logger.debug("OPTIONS = #{args}")
+
+        @config = args[:cfg]
+        @options = args[:opts]
+        @authors_map = @config["users"].to_h
+
+        @tracticketbaseurl    = @config["trac"]["ticketbaseurl"]
+        @git_repo             = @config["github"]["repo"]
+        @changeset_base_url   = @config["trac"]["changeset_base_url"] || ""
+        @revmap_path          = @config["revmap_path"]
+        @attachments_hashed   = @config.dig("wiki", "attachments", "hashed")
+
+        @wiki_attachments_url = @options["attachment-base-url"] || @config.dig("wiki", "attachments", "url") || ""
+        @repo_path            = @options["repo-path"] || ""
+        @home_page_name       = @options["home-page-name"]
+        @wiki_extensions      = @options["wiki-extensions"]
+        @source_folders       = @options["source-folders"]
+
+        @attachment_options   = {
+          hashed: @attachments_hashed
+        }
+
+        verify_options
+        verify_locations
+
+        @twf_to_markdown = Migrator::Converter::TwfToMarkdown.new(
+          @tracticketbaseurl,
+          @attachment_options,
+          @changeset_base_url,
+          @wiki_attachments_url,
+          @revmap_path,
+          git_repo: @git_repo,
+          home_page_name: @home_page_name,
+          wiki_extensions: @wiki_extensions,
+          source_folders: @source_folders
+        )
+      end
+
+      def migrate_wikis
+        $logger.info("Processing the wiki...")
+
+        Dir.chdir(@options["repo-path"]) do
+          # For every version of every file in the wiki...
+          Tractive::Wiki.for_migration.each do |wiki|
+            next if skip_file(wiki[:name])
+
+            comment = if wiki[:comment].nil? || wiki[:comment].empty?
+                        "Initial load of version #{wiki[:version]} of trac-file #{wiki[:name]}"
+                      else
+                        wiki[:comment].gsub('"', '\"')
+                      end
+
+            file_name = filename_for_wiki(wiki)
+
+            $logger.info("Working with file [#{file_name}]")
+            $logger.debug("Object: #{wiki}")
+
+            wiki_markdown_text = @twf_to_markdown.convert(wiki[:text])
+            wiki_markdown_text += wiki_attachments(wiki)
+
+            # Create file with content
+            File.open(file_name, "w") do |f|
+              f.puts(wiki_markdown_text)
+            end
+
+            # git-add it
+            unless execute_command("git add #{file_name}").success?
+              $logger.error("ERROR at git-add #{file_name}!!!")
+              exit(1)
+            end
+
+            author = generate_author(wiki[:author])
+
+            # git-commit it
+            commit_command = "git commit --allow-empty -m \"#{comment}\" --author \"#{author}\" --date \"#{wiki[:fixeddate]}\""
+            unless execute_command(commit_command).success?
+              $logger.error("ERROR at git-commit #{file_name}!!!")
+              exit(1)
+            end
+          end
+        end
+      end
+
+      private
+
+      def filename_for_wiki(wiki)
+        return "Home.md" if @home_page_name == wiki[:name]
+
+        "#{cleanse_filename(wiki[:name])}.md"
+      end
+
+      def verify_options
+        $logger.info("Verifying options...")
+
+        missing_options = []
+        missing_options << "attachment-base-url" if @wiki_attachments_url.empty?
+        missing_options << "repo-path" if @repo_path.empty?
+
+        return if missing_options.empty?
+
+        $logger.error("Following options are missing: #{missing_options} - exiting...")
+        exit(1)
+      end
+
+      def verify_locations
+        $logger.info("Verifying locations...")
+        missing_directories = []
+
+        # git-root exists?
+        missing_directories << "repo-path" unless Dir.exist?(@repo_path)
+
+        return if missing_directories.empty?
+
+        $logger.error("Following directories are missing: #{missing_directories} - exiting ...")
+        exit(1)
+      end
+
+      def cleanse_filename(name)
+        # Get rid of 'magic' characters from potential filename - replace with '_'
+        # Magic: [ /<>- ]
+        name.gsub(%r{[/<>-]}, "_")
+      end
+
+      def skip_file(file_name)
+        file_name.start_with?("Trac") || (file_name.start_with?("Wiki") && !file_name.start_with?("WikiStart"))
+      end
+
+      def generate_author(author)
+        return "" if author.nil? || author.empty?
+
+        author_name = @authors_map[author]&.[]("name") || author.split("@").first
+        author_email = @authors_map[author]&.[]("email") || author
+
+        "#{author_name} <#{author_email}>"
+      end
+
+      def wiki_attachments(wiki)
+        attachments = wiki.attachments
+        return "" if attachments.count.zero?
+
+        attachments_list = ["# Attachments\n"]
+
+        attachments.each do |attachment|
+          attachment_path = Tractive::Utilities.attachment_path(
+            wiki.name, attachment.filename, hashed: @attachments_hashed
+          )
+          attachments_list << "- [#{attachment.filename}](#{@wiki_attachments_url}/#{attachment_path})"
+        end
+
+        attachments_list.join("\n")
+      end
+
+      def execute_command(command)
+        `#{command}`
+        $CHILD_STATUS
+      end
+    end
+  end
+end

data/lib/tractive/migrator/wikis.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "wikis/migrate_from_db"

data/lib/tractive/migrator.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require_relative "migrator/engine"
+require_relative "migrator/wikis"

data/lib/tractive/models/attachment.rb

@@ -4,6 +4,7 @@ module Tractive
   class Attachment < Sequel::Model(:attachment)
     dataset_module do
       where(:tickets_attachments, type: "ticket")
+      where(:wiki_attachments, type: "wiki")
       select(:for_export, :id, :filename)
     end
   end

data/lib/tractive/models/ticket.rb

@@ -19,14 +19,18 @@ module Tractive
       def filter_column(options)
         return self if options.nil? || options.values.compact.empty?
 
-        case options[:operator].downcase
-        when "like"
-          where { Sequel.like(options[:column_name].to_sym, options[:column_value]) }
-        when "not like"
-          where { ~Sequel.like(options[:column_name].to_sym, options[:column_value]) }
-        else
-          where { Sequel.lit("#{options[:column_name]} #{options[:operator]} '#{options[:column_value]}'") }
-        end
+        query = case options[:operator].downcase
+                when "like"
+                  Sequel.like(options[:column_name].to_sym, options[:column_value])
+                when "not like"
+                  ~Sequel.like(options[:column_name].to_sym, options[:column_value])
+                else
+                  Sequel.lit("#{options[:column_name]} #{options[:operator]} '#{options[:column_value]}'")
+                end
+
+        query = Sequel.|(query, { options[:column_name].to_sym => nil }) if options[:include_null]
+
+        where { query }
       end
     end
 
@@ -35,5 +39,9 @@ module Tractive
       change_arr = changes + attachments
       change_arr.sort_by { |change| change[:time] }
     end
+
+    def closed_comments
+      changes_dataset.where(field: "status", newvalue: "closed")
+    end
   end
 end