caramelize 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb93f32560a4999584cc9e883655f867ed7f02bdffc4ef9a7088a5c44e68b29b
-  data.tar.gz: a3ae3187dc3a45c831daa833e991692f7c7108c8967da53efcafb2a4330dbadc
+  metadata.gz: 949bb3270455131310d65fd3e8e7f7dae80c9012aa4497efb479c8d77a0f8be8
+  data.tar.gz: 3ba47fd373b387b1935e9c56315784f89d00f71a35e34a33816578098e1219eb
 SHA512:
-  metadata.gz: 0da855d0680a06673e8ad2b98734ee8fe4d04063ebd40e5b5a3b37cd1f7446fd4ea10502e349dfc1e27787b8f395b976f870595e7622e1524a2504f9676000a4
-  data.tar.gz: 886e63abc962ee8e830d12efc632bd832000ca70951081e9cfb185fabba1f40711db6574ef2df40b2c8c946f5ae61ef06f51877a66288eef9f9ef431c4237937
+  metadata.gz: 36b60fb485ca76922faa32e6c91c8e69f3e639cbcd009abd47eb555bf9f9e3d4a02cfff0f6fd29452321c65231a87e0169b5cea853543489654b44cf8399c888
+  data.tar.gz: f6bf9599cdff4c248e2393e63e476ce9adbb2a7de9ec9fd07bc180a19e8d4bd64265649c6ada7721902bbd5906c24d4628f8e766efa4006bfa9f5fc8931636ab

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/.github/workflows/main.yml

@@ -0,0 +1,48 @@
+name: CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: r-lib/actions/setup-pandoc@v2
+      with:
+        pandoc-version: '3.1.11' 
+    - name: Install Ruby and gems
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: 3.1.3
+    
+    - name: Configure sysctl limits
+      run: |
+        sudo swapoff -a
+        sudo sysctl -w vm.swappiness=1
+        sudo sysctl -w fs.file-max=262144
+        sudo sysctl -w vm.max_map_count=262144
+    - name: Setup DB, Run tests
+      run: |
+        bundle exec rspec
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: 3.1.3
+      # - name: Security audit dependencies
+      #  uses: andrewmcodes/bundler-audit-action@main
+      # - name: Security audit application code
+      #   uses: devmasx/brakeman-linter-action@v1.0.0
+      #   env:
+      #     GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Lint Ruby files
+        run: bundle exec rubocop --parallel
+      

data/.rubocop.yml

@@ -1,6 +1,9 @@
+inherit_from: .rubocop_todo.yml
+
 require:
   - rubocop-rake
   - rubocop-rspec
+  - rubocop-performance
 
 AllCops:
   NewCops: enable
@@ -14,7 +17,6 @@ AllCops:
   TargetRubyVersion: 3.1
   SuggestExtensions: false
 
-
 Style/Documentation:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledocumentation

data/.rubocop_todo.yml

@@ -0,0 +1,55 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-03-04 19:34:06 UTC using RuboCop version 1.61.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Lint/NestedMethodDefinition:
+  Exclude:
+    - 'lib/caramelize/filters/textile_to_markdown.rb'
+
+# Offense count: 5
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 79
+
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 118
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+# Offense count: 10
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 102
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 9
+
+# Offense count: 2
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/lib/caramelize/filters/add_newline_to_page_end_spec.rb'
+    - 'spec/lib/caramelize/filters/mediawiki_to_markdown_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - '**/spec/routing/**/*'
+    - 'spec/lib/caramelize/filters/add_newline_to_page_end_spec.rb'
+    - 'spec/lib/caramelize/filters/mediawiki_to_markdown_spec.rb'

data/Gemfile

@@ -4,3 +4,14 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in testgem.gemspec
 gemspec
+
+gem 'bundler', '~> 2'
+gem 'byebug'
+gem 'guard'
+gem 'guard-rspec'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-performance'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    caramelize (1.2.0)
+    caramelize (1.3.0)
       commander
       gollum-lib
       mysql2
+      paru
       ruby-progressbar
 
 GEM
@@ -50,7 +51,7 @@ GEM
     highline (3.0.1)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.22.0)
@@ -60,11 +61,11 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.0206)
     mini_portile2 (2.8.5)
-    mysql2 (0.5.5)
+    mysql2 (0.5.6)
     nenv (0.3.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -74,6 +75,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
+    paru (1.2.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -86,20 +88,20 @@ GEM
     regexp_parser (2.9.0)
     rexml (3.2.6)
     rouge (3.30.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.60.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -110,22 +112,25 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
+    rubocop-performance (1.18.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.26.1)
+    rubocop-rspec (2.27.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
-    rugged (1.7.1)
+    rugged (1.7.2)
     shellany (0.0.1)
-    thor (1.3.0)
+    thor (1.3.1)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
     unf (0.1.4)
@@ -145,6 +150,7 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-performance
   rubocop-rake
   rubocop-rspec
 

data/README.md

@@ -2,52 +2,72 @@
 
 [![Maintainability](https://api.codeclimate.com/v1/badges/7fe3ef34e09ba8133424/maintainability)](https://codeclimate.com/github/Dahie/caramelize/maintainability)
 
-Caramelize is a compact and flexible wiki content migration tool. It is intended for easily transfering content from otherwise rare supported legacy wikis. With caramelize you can create your own export configurations and migrate your data into a git-based [gollum](https://github.com/github/gollum)-wiki retaining all your history and gaining the most flexible access to your wiki content.
+Caramelize is a compact and flexible wiki migration tool. It is intended for easy transfer of content from legacy wikis. With caramelize you can create your own export configurations and migrate your page revisions into a git repository of markdown files. This retains all your history and you gain the most flexible access to your wiki content available for use with git-based wikis like [gollum](https://github.com/github/gollum), [Otter Wiki](https://github.com/redimp/otterwiki), [Wiki.js](https://js.wiki/) or [Obsidian](https://obsidian.md/).
+
+By default, it ships with configurations for [WikkaWiki](http://wikkawiki.org/) and [Redmine](http://www.redmine.org/).
 
-In the future more target wikis may be added. For the moment migration is supported for [WikkaWiki](http://wikkawiki.org/) and [Redmine](http://www.redmine.org/)-Wiki.
 
 ## Usage
 
 ### Installation
 
-    $ gem install caramelize
+```sh
+$ gem install caramelize
+```
 
 Install the latest release of caramelize using RubyGems.
+Requires pandoc to be installed.
 
 ### Use
 
-    $ caramelize create
+```sh
+$ caramelize create
+```
 
 Creates a template configuration file "caramel.rb". This includes documentation on how to use the preset Wiki-connectors and how to write addition customized connectors. More about this below.
 
-    $ caramelize run
+```sh
+$ caramelize run
+```
 
 Will start the wiki migration based on the configuration file. These are either found in predefined paths (./caramel.rb, ./config.rb, …), or passed as argument, as below.
 
-    $ caramelize doctor
+```sh
+$ caramelize doctor
+```
 
 Can be used to assess the quality of your wiki conversion. It'll help you see
 how many wiki links may be broken and how many pages were orphaned.
 
-    $ caramelize help
+```sh
+$ caramelize help
+```
 
 Returns help information.
 
-	$ caramelize version
+```sh
+$ caramelize version
+```
 
 Returns version and release information.
 
 ### Options
 
-    $ caramelize create --config my_caramel_configuration.rb
+```sh
+$ caramelize create --config my_caramel_configuration.rb
+```
 
 Creates an example configuration by the given name.
 
-    $ caramelize run --config my_caramel_configuration.rb
+```sh
+$ caramelize run --config my_caramel_configuration.rb
+```
 
 Executes the given configuration.
 
-    $ caramelize --verbose [command]
+```sh
+$ caramelize --verbose [command]
+```
 
 Displays more verbose output to the command line.
 
@@ -55,10 +75,11 @@ Displays more verbose output to the command line.
 
 ### Wiki support
 
-Caramelize comes with direct support for [WikkaWiki](http://wikkawiki.org/) and [Redmine](http://www.redmine.org/)-Wiki.
+Caramelize comes with direct support for [MediaWiki](https://www.mediawiki.org), [WikkaWiki](http://wikkawiki.org/) and [Redmine](http://www.redmine.org/)-Wiki.
 More custom wikis can be supported by creating a suitable configuration file.
 
-Any imported wiki exports into a [gollum](https://github.com/github/gollum) git-repository. This is a wiki based around a git-repository. This gives you the flexibility of having all wiki pages exported as physical files, while keeping the history and having an easy and wide-supported way of access by using the wiki server gollum features.
+The wiki is exported to markdown files in a git-repository. This can be directly used as source for [gollum](https://github.com/github/gollum) wiki, [Otter Wiki](https://github.com/redimp/otterwiki), or if you don't care about the history even [Obsidian](https://obsidian.md/). 
+This gives you the flexibility of having all wiki pages exported as physical files, while keeping the history and having an easy and wide-supported way of access.
 
 Since wiki software may have special features, that are not common among other wikis, content migration may always have a loss of style or information. Caramelize tries to support the most common features.
 
@@ -75,50 +96,54 @@ Since wiki software may have special features, that are not common among other w
 
 ### Configuration recipes
 
-The `caramel.rb` configuration contains the settings on how to import the data of the existing wiki and how to convert it into the format required by caramelize to export to gollum.
+The `lib/caramelize/caramel.rb` configuration contains the settings on how to import the data of the existing wiki and how to convert it into the format required by caramelize to export to gollum.
 You also find the predefined definitions for importing from WikkaWiki and Redmine and and example for a custom import.
 
 Custom import allows you to import data from wikis that are not natively supported by caramelize. Defining your own wiki import requires a bit of knowledge on Ruby and MySQL as you setup the access to your wiki database and need to define how the data is to be transformed. Depending on the database model of the wiki this can be one simple call for all revisions in the database, or it can get more complicated with multiple mysql-calls as the database becomes more complex.
 
 For a custom wiki you need to create a `wiki` instance object, that receives the necessary database creditials.
 
-    wiki = Caramelize::InputWiki::Wiki.new(host: "localhost",
-                                          username: "user",
-                                          database: "database_name",
-                                          password: 'monkey',
-                                          markup: :wikka})
+```ruby
+wiki = Caramelize::InputWiki::Wiki.new(host: "localhost",
+                                    username: "user",
+                                    database: "database_name",
+                                    password: 'monkey',
+                                    markup: :wikka})
+```
 
 This example ignores custom markup conversion and assumes WikkaWiki-markup.
 
 Once the object is established we need to hook in a method that defines how revisions are read from the database and how they are processed.
 
-    wiki.instance_eval do
-    	def read_pages
-      		sql = "SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;"
-      		revisions, titles = [], []
-      		results = database.query(sql)
-      		results.each do |row|
-        		titles << row["tag"]
-        		author = authors[row["user"]]
-		        page = Page.new({id: row["id"],
-                            title:   row["tag"],
-                            body:    row["body"],
-                            markup:  'wikka',
-                            latest:  row["latest"] == "Y",
-                            time:    row["time"],
-                            message: row["note"],
-                            author:  author})
-       		 revisions << page
-      	end
-      # titles is the list of all unique page titles contained in the wiki
-      titles.uniq!
-      # revisions is the list of all revisions ordered by date
-      revisions
+```ruby
+wiki.instance_eval do
+    def read_pages
+        sql = "SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;"
+        revisions, titles = [], []
+        results = database.query(sql)
+        results.each do |row|
+            titles << row["tag"]
+            author = authors[row["user"]]
+            page = Page.new({id: row["id"],
+                        title:   row["tag"],
+                        body:    row["body"],
+                        markup:  'wikka',
+                        latest:  row["latest"] == "Y",
+                        time:    row["time"],
+                        message: row["note"],
+                        author:  author})
+            revisions << page
     end
+    # titles is the list of all unique page titles contained in the wiki
+    titles.uniq!
+    # revisions is the list of all revisions ordered by date
+    revisions
+end
+```
 
 In the end the `wiki` instance needs the `titles` and `revisions` filled.
 
-Some wikis don't have all necessary metadata saved in the revision. In this case additional database queries are necessary. **The configuration recipe is pure ruby code, that is included on execution. This gives you alot of freedom in writing your configuration, but also a lot of power to break things for yourself. Be advised.**
+Some wikis don't have all necessary metadata saved in the revision. In this case additional database queries are necessary. **The configuration recipe is pure ruby code, that is included on execution. This gives you a lot of freedom in writing your configuration, but also a lot of power to break things. Be advised.**
 
 I'm happy to give support on your recipes and I'd also like to extend caramelize with more wiki modules, if you send in your configurations (minus database credentials of course).
 
@@ -126,33 +151,46 @@ I'm happy to give support on your recipes and I'd also like to extend caramelize
 
 This is how you can build caramelize, in case you'd like to develop it further. To get startered you'll need Bundler.
 
-    $ gem install bundler
+```sh
+$ gem install bundler
+```
 
 Clone or fork this repository and start building.
 
-    $ git clone git@github.com:Dahie/caramelize.git
-    $ gem build caramelize.gemspec
+```sh
+$ git clone git@github.com:Dahie/caramelize.git
+$ gem build caramelize.gemspec
+```
 
 Now to build and package the gem do
 
-    $ rake build
+```sh
+$ rake build
+```
 
 or
 
-    $ rake install
+```sh
+$ rake install
+```
 
 to install the new gem right to your system.
 
+Tests run with
+
+```sh
+$ rspec
+```
+
 ## Contributing to caramelize
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the latest main to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-
 ## Copyright
 
-Copyright (c) 2011-2015 Daniel Senff. See LICENSE.md for further details.
+Copyright (c) 2011-2024 Daniel Senff. See LICENSE.md for further details.

data/caramelize.gemspec

@@ -22,16 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency('commander')
   spec.add_dependency('gollum-lib')
   spec.add_dependency('mysql2')
+  spec.add_dependency('paru')
   spec.add_dependency('ruby-progressbar')
 
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/caramelize/caramel.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'caramelize/input_wiki/wikkawiki'
+require 'caramelize/input_wiki/media_wiki'
 require 'caramelize/input_wiki/redmine_wiki'
+require 'caramelize/input_wiki/wikka_wiki'
 
 ## Example caramelize configuration file
 
@@ -53,6 +54,14 @@ def predefined_wiki
   #      password: "root",
   #      database: "wikka" }
   # return Caramelize::InputWiki::WikkaWiki.new(options)
+  #
+  # For connection to a MediaWiki-Database use this Connector
+  # By default it converts to markdown
+  # options = { host: "localhost",
+  #      username: "root",
+  #      password: "root",
+  #      database: "my_wiki" }
+  # return Caramelize::InputWiki::MediaWiki.new(options)
 
   # For connection to a Redmine-Database use this Connector
   # Additional options:

data/lib/caramelize/content_transferer.rb

@@ -5,10 +5,10 @@ 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
     attr_reader :input_wiki, :options
@@ -97,52 +97,62 @@ module Caramelize
     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
 
     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
+        commit_page(page, index)
       end
     end
 
-    def migrate_markup_of_revision(revision)
+    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
+
+    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)
+    end
+
+    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
 
-      # commit as latest page revision
-      output_wiki.commit_revision(build_revision_metadata(revision, body_new, message), options[:markup])
+    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, message)
+    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