lib/caramelize/content_transferer.rb in caramelize-1.2.1 vs lib/caramelize/content_transferer.rb in caramelize-1.3.0

@@ -3,16 +3,16 @@
 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/media_wiki'
   require 'caramelize/input_wiki/redmine_wiki'
-  require 'caramelize/input_wiki/wikkawiki'
+  require 'caramelize/input_wiki/wikka_wiki'
 
-  class ContentTransferer # rubocop:todo Metrics/ClassLength
+  class ContentTransferer
     attr_reader :input_wiki, :options
 
     DEFAULT_GOLLUM_HOME_TITLE = 'Home'
     DEFAULT_AUTHOR_NAME = 'Caramelize'
     DEFAULT_AUTHOR_EMAIL = '[e-mail]'
@@ -92,62 +92,68 @@
       @commit_history_progress_bar ||=
         ProgressBar.create(title: 'Revisions',
                            total: revisions_count)
     end
 
-    # rubocop:todo Metrics/MethodLength
-    def migrate_markup_of_latest_revisions # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+    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)
+        convert_markup_of_revision(revision)
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
-    # rubocop:todo Metrics/MethodLength
-    def commit_history # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+    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
+        commit_page(page, index)
+      end
+    end
 
-        if verbose?
-          puts "(#{index + 1}/#{revisions_count}) #{page.time} #{page.title}"
-        else
-          commit_history_progress_bar.increment
-        end
+    def commit_page(page, index)
+      if input_wiki.excluded_pages.include?(page.title)
+        puts "Exclude Page: #{page.title}" if verbose?
+        return
       end
+
+      if verbose?
+        puts "(#{index + 1}/#{revisions_count}) #{page.time} #{page.title}"
+      else
+        commit_history_progress_bar.increment
+      end
     end
-    # rubocop:enable Metrics/MethodLength
 
-    def migrate_markup_of_revision(revision)
+    def run_filter_processor_on_revision(revision)
       body_new = filter_processor.run(revision.body)
 
       return if body_new == revision.body
 
-      message = "Markup of '#{revision.title}' converted to #{target_markup}"
+      revision.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])
+      commit_as_latest_page(revision)
     end
 
-    def build_revision_metadata(revision, body_new, message)
+    def convert_markup_of_revision(revision)
+      if input_wiki.excluded_pages.include?(revision.title)
+        puts "Exclude Page: #{revision.title}" if verbose?
+        return
+      end
+
+      if verbose?
+        puts "Filter source: #{revision.title} #{revision.time}"
+      else
+        migrate_markup_progress_bar.increment
+      end
+
+      run_filter_processor_on_revision(revision)
+    end
+
+    def commit_as_latest_page(revision)
+      output_wiki.commit_revision(build_revision_metadata(revision, body_new), options[:markup])
+    end
+
+    def build_revision_metadata(revision, body_new)
       revision.body = body_new
       revision.author = { name: DEFAULT_AUTHOR_NAME, email: DEFAULT_AUTHOR_EMAIL }
-      revision.time = Time.now
-      revision.message = message
+      revision.time = Time.zone.now
 
       revision
     end
 
     def rename_home_page