lib/caramelize/content_transferer.rb in caramelize-1.1.1 vs lib/caramelize/content_transferer.rb in caramelize-1.2.0

@@ -1,50 +1,51 @@
+# frozen_string_literal: true
+
 require 'ruby-progressbar'
 
 module Caramelize
-
   require 'caramelize/page'
   require 'caramelize/content_transferer'
   require 'caramelize/database_connector'
   require 'caramelize/output_wiki/gollum'
   require 'caramelize/input_wiki/redmine_wiki'
   require 'caramelize/input_wiki/wikkawiki'
 
   class ContentTransferer
     attr_reader :input_wiki, :options
 
-    DEFAULT_GOLLUM_HOME_TITLE = 'Home'.freeze
+    DEFAULT_GOLLUM_HOME_TITLE = 'Home'
+    DEFAULT_AUTHOR_NAME = 'Caramelize'
+    DEFAULT_AUTHOR_EMAIL = '[e-mail]'
 
     def initialize(input_wiki, options)
       @input_wiki = input_wiki
       @options = options
 
-      options[:default_author] = options.fetch(:default_author, "Caramelize")
+      options[:default_author] = options.fetch(:default_author, 'Caramelize')
       options[:markup] = target_markup
     end
 
     def execute
       input_wiki.read_authors
-
       commit_history
+      print_meta_data if verbose?
 
-      if verbose?
-        puts "From markup: #{input_wiki.markup.to_s}"
-        puts "To markup: #{target_markup.to_s}"
-        puts "Convert latest revisions:"
-      end
-
       migrate_markup_of_latest_revisions
 
-      puts 'Create Namespace Overview' if verbose?
       create_overview_page_of_namespaces if options[:create_namespace_overview]
 
-      rename_home_page
+      rename_home_page if options[:home_page_title]
     end
 
     private
 
+    def print_meta_data
+      puts "From markup: #{input_wiki.markup}"
+      puts "To markup: #{target_markup}"
+    end
+
     def target_markup
       @target_markup ||=
         needs_conversion_to_target_markup? ? input_wiki.markup : :markdown
     end
 
@@ -75,62 +76,80 @@
     def latest_revisions_count
       input_wiki.latest_revisions.count
     end
 
     def create_overview_page_of_namespaces
+      puts 'Create Namespace Overview' if verbose?
       output_wiki.commit_namespace_overview(input_wiki.namespaces)
     end
 
     def migrate_markup_progress_bar
       @migrate_markup_progress_bar ||=
-        ProgressBar.create(title: "Markup filters",
+        ProgressBar.create(title: 'Markup filters',
                            total: latest_revisions_count)
     end
 
     def commit_history_progress_bar
       @commit_history_progress_bar ||=
-        ProgressBar.create(title: "Revisions",
+        ProgressBar.create(title: 'Revisions',
                            total: revisions_count)
     end
 
     def migrate_markup_of_latest_revisions
+      puts 'Convert latest revisions:' if verbose?
       input_wiki.latest_revisions.each do |revision|
+        if input_wiki.excluded_pages.include?(revision.title)
+          puts "Exclude Page: #{revision.title}" if verbose?
+          next
+        end
+
+        if verbose?
+          puts "Filter source: #{revision.title} #{revision.time}"
+        else
+          migrate_markup_progress_bar.increment
+        end
+
         migrate_markup_of_revision(revision)
       end
     end
 
     def commit_history
       output_wiki.commit_history(revisions, options) do |page, index|
+        if input_wiki.excluded_pages.include?(page.title)
+          puts "Exclude Page: #{page.title}" if verbose?
+          next
+        end
+
         if verbose?
           puts "(#{index + 1}/#{revisions_count}) #{page.time} #{page.title}"
         else
           commit_history_progress_bar.increment
         end
       end
     end
 
     def migrate_markup_of_revision(revision)
-      if verbose?
-        puts "Filter source: #{revision.title} #{revision.time}"
-      else
-        migrate_markup_progress_bar.increment
-      end
-
       body_new = filter_processor.run(revision.body)
 
-      unless body_new == revision.body
-        revision.body = body_new
-        revision.author_name = 'Caramelize'
-        revision.time = Time.now
-        revision.author = nil
-        revision.message = "Markup of '#{revision.title}' converted to #{target_markup}"
+      return if body_new == revision.body
 
-        # commit as latest page revision
-        output_wiki.commit_revision(revision, options[:markup])
-      end
+      message = "Markup of '#{revision.title}' converted to #{target_markup}"
+
+      # commit as latest page revision
+      output_wiki.commit_revision(build_revision_metadata(revision, body_new, message), options[:markup])
     end
 
+    def build_revision_metadata(revision, body_new, message)
+      revision.body = body_new
+      revision.author = { name: DEFAULT_AUTHOR_NAME, email: DEFAULT_AUTHOR_EMAIL }
+      revision.time = Time.now
+      revision.message = message
+
+      revision
+    end
+
     def rename_home_page
+      puts "Rename page #{options[:home_page_title]} to #{DEFAULT_GOLLUM_HOME_TITLE}" if verbose?
       output_wiki.rename_page(options[:home_page_title], DEFAULT_GOLLUM_HOME_TITLE)
     end
   end
 end