add images to wikkawiki conversion

Author: Dahie

lib/caramelize/filters/wikka_to_markdown.rb

@@ -35,7 +35,6 @@ def replace_formatting
       target_body.gsub!(%r{(//)(.*?)(//)}, '*\2*') # italic
       target_body.gsub!(/(__)(.*?)(__)/) { |_s| "<u>#{::Regexp.last_match(2)}</u>" } # underline
       target_body.gsub!(/(---)/, '  ') # forced linebreak
-      target_body.gsub!(/(^ )/, '    ') # preformatted line
     end
 
     def replace_lists
@@ -65,20 +64,15 @@ def replace_code_block
       target_body.gsub!(/^%%\s(.*?)%%\s?/m) { "```\n#{::Regexp.last_match(1)}```\n" }
     end
 
-      def replace_images
-        # {{image class="center" alt="DVD logo" title="An image link" url="images/dvdvideo.gif" link="RecentChanges"}}
-        target_body.gsub!(/{{image\s(.*)}}/) do |match|
-          puts match.inspect
-          url = match[1].match(/url="([^"]*)"/)
-          link = match[1].match(/link="([^"]*)"/)
-          alt = match[1].match(/alt="([^"]*)"/)
-
-          return "![#{alt}](#{url})" if link.nil? || link.empty?
-
-          "[[<img src=\"#{url}\" alt=\"#{alt}\">]]"
-        end
-
+    def replace_images
+      # {{image class="center" alt="DVD logo" title="An image link" url="images/dvdvideo.gif" link="RecentChanges"}}
+      target_body.gsub!(/{{image\s(.*)}}/) do |image_match|
+        url = image_match.match(/url="([^"]*)"/)[1]
+        link = image_match.match(/link="([^"]*)"/) && image_match.match(/link="([^"]*)"/)[1]
+        alt = image_match.match(/alt="([^"]*)"/) && image_match.match(/alt="([^"]*)"/)[1]
 
+        link.nil? ? "![#{alt}](#{url})" : "[[<img src=\"#{url}\" alt=\"#{alt}\">|#{link}]]"
+      end
     end
 
     def target_body

lib/caramelize/input_wiki/media_wiki.rb

@@ -59,7 +59,6 @@ def read_pages
 
       def read_authors
         database.query(authors_query).each do |row|
-          puts row.inspect
           name = row['user_real_name'].empty? ? row['user_name'] : 'Anonymous'
           email = row['user_email'].empty? ? nil : row['user_email']
           authors[row['user_id']] = { name:, email: }

spec/lib/caramelize/filters/wikka_to_markdown_spec.rb

@@ -71,37 +71,19 @@
     end
 
     context 'when unordered list entry' do
-      context 'with tab based' do
+      context 'with tabs' do
         let(:body) { "\t-unordered list entry" }
 
         it { is_expected.to eq '- unordered list entry' }
       end
 
-      context 'with tabs' do
+      context 'with tilde' do
         let(:body) { '~-unordered list entry' }
 
         it { is_expected.to eq '- unordered list entry' }
       end
 
       context 'with spaces' do
-        let(:body) { '    -unordered list entry' }
-
-        it { is_expected.to eq '- unordered list entry' }
-      end
-
-      context 'with tab based with space' do
-        let(:body) { "\t- unordered list entry" }
-
-        it { is_expected.to eq '- unordered list entry' }
-      end
-
-      context 'with another tab based with space' do
-        let(:body) { '~- unordered list entry' }
-
-        it { is_expected.to eq '- unordered list entry' }
-      end
-
-      context 'with space based with space' do
         let(:body) { '    - unordered list entry' }
 
         it { is_expected.to eq '- unordered list entry' }
@@ -129,7 +111,7 @@
         it { is_expected.to eq '[[LemmaLemma]]' }
       end
 
-      context 'with only url sklfs' do
+      context 'with only wikilink' do
         let(:body) { "\n        [[ComunitySiteIdeas]]        \n" }
 
         it { is_expected.to eq "\n        [[ComunitySiteIdeas]]        \n" }
@@ -266,13 +248,13 @@
       context 'with link' do
         let(:body) { '{{image class="center" alt="DVD logo" title="An image link" url="images/dvdvideo.gif" link="RecentChanges"}}' }
 
-        it { is_expected.to eq '[<img src="images/dvdvideo.gif" alt="DVD Logo">](RecentChanges]])' }
+        it { is_expected.to eq '[[<img src="images/dvdvideo.gif" alt="DVD logo">|RecentChanges]]' }
       end
 
       context 'with alt and with title' do
         let(:body) { '{{image class="center" alt="DVD logo" title="An image link" url="images/dvdvideo.gif"}}' }
 
-        it { is_expected.to eq '![DVD Logo](images/dvdvideo.gif)' }
+        it { is_expected.to eq '![DVD logo](images/dvdvideo.gif)' }
       end
 
       context 'without alt and with title' do
@@ -287,6 +269,5 @@
         it { is_expected.to eq '![](images/dvdvideo.gif)' }
       end
     end
-
   end
 end