documentation cleanup, force pandoc to use ATX style headings

Author: Dahie

README.md

@@ -2,60 +2,80 @@
 
 [![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 easi transfer of content from 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.
 
 ## Content migration
 
 ### 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.
 
 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/). 
@@ -76,7 +96,7 @@ 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.
@@ -123,41 +143,54 @@ 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).
 
 ### Building
 
 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-2024 Daniel Senff. See LICENSE.md for further details.

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:

lib/caramelize/filters/mediawiki_to_markdown.rb

@@ -11,7 +11,7 @@ def initialize(source_body)
     end
 
     def run
-      ::PandocRuby.convert(source_body.dup, from: :mediawiki, to: :markdown)
+      ::PandocRuby.convert(source_body.dup, { from: :mediawiki, to: :markdown }, '--markdown-headings=atx)
     end
   end
 end

samples/media_wiki.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Connecting to the MediaWiki Docker setup  at https://hub.docker.com/_/mediawiki/
+
+def input_wiki
+  options = {
+    host: '0.0.0.0',
+    username: 'wikiuser',
+    password: 'example',
+    database: 'my_wiki',
+    port: 63_645
+  }
+  Caramelize::InputWiki::MediaWiki.new(options)
+end