lib/caramelize/content_transferer.rb in caramelize-0.1.2 vs lib/caramelize/content_transferer.rb in caramelize-0.2.0

@@ -1,8 +1,8 @@
 #Encoding: UTF-8
 
-require 'gollum'
+require 'gollum-lib'
 require 'grit'
 require 'ruby-progressbar'
 
 module Caramelize
   autoload :Wiki, 'caramelize/wiki/wiki'
@@ -15,21 +15,22 @@
   # Controller for the content migration
   class ContentTransferer
     
     # Execute the content migration
     def self.execute(original_wiki, options={})
-      
-      options[:markup] = :markdown            if !options[:markup]
       options[:default_author] = "Caramelize" if !options[:default_author]
 
       # read page revisions from wiki
       # store page revisions
       original_wiki.read_authors
       @revisions = original_wiki.read_pages
       # initiate new wiki
       output_wiki = GollumOutput.new('wiki.git') # TODO make wiki_path an option
       
+      # see if original wiki markup is among any gollum supported markups
+      options[:markup] = output_wiki.supported_markup.index(original_wiki.markup) ? original_wiki.markup : :markdown
+
       # setup progressbar
       progress_revisions = ProgressBar.create(:title => "Revisions", :total => @revisions.count, :format => '%a %B %p%% %t')
 
       # TODO ask if we should replace existing paths
 
@@ -40,40 +41,57 @@
         else
           progress_revisions.increment
         end
       end
 
+
+      # TODO reorder interwiki links: https://github.com/gollum/gollum/wiki#bracket-tags
+
+      # init list of filters to perform on the latest wiki pages
+      filters = []
+
+      original_wiki.filters.each do |filter|
+        filters << filter
+      end
+
       # if wiki needs to convert syntax, do so
       puts "From markup: " + original_wiki.markup.to_s if options[:verbosity] == :verbose
       puts "To markup: " + options[:markup].to_s if options[:verbosity] == :verbose
       if original_wiki.convert_markup? options[:markup] # is wiki in target markup
+
+
+      end # end convert_markup?
+
+      puts "Latest revisions:" if options[:verbosity] == :verbose
+
+      #setup progress for markup conversion
+        progress_markup = ProgressBar.create(:title => "Markup filters", :total => original_wiki.latest_revisions.count, :format => '%a %B %p%% %t')
+
+      # take each latest revision
+      for rev in original_wiki.latest_revisions
+        puts "Filter source: #{rev.title} #{rev.time}"  if options[:verbosity] == :verbose
+        progress_markup.increment
         
-        #setup progress for markup conversion
-        progress_markup = ProgressBar.create(:title => "Markup", :total => original_wiki.latest_revisions.count, :format => '%a %B %p%% %t')
+        # run filters
+        body_new = rev.body
+        filters.each do |filter|
+          body_new = filter.run body_new
+        end
 
-        puts "Latest revisions:" if options[:verbosity] == :verbose
-        # take each latest revision
-        for rev in original_wiki.latest_revisions
-          puts "Updated syntax: #{rev.title} #{rev.time}"  if options[:verbosity] == :verbose
-          progress_markup.increment
+        unless body_new.eql? rev.body
+          rev.body = body_new
+          rev.author_name = options[:markup]
+          rev.time = Time.now
+          rev.author = nil
           
-          # parse markup & convert to new syntax
-          if options[:markup] == :markdown
-            body_new = original_wiki.to_markdown rev.body
-          else
-            body_new = original_wiki.to_textile rev.body
-          end
-
-          unless body_new.eql? rev.body
-            rev.body = body_new
-            rev.author_name = options[:markup]
-            rev.time = Time.now
-            rev.author = nil
-            
-            # commit as latest page revision
-            output_wiki.commit_revision rev, options[:markup]
-          end
+          # commit as latest page revision
+          output_wiki.commit_revision rev, options[:markup]
         end
+      end
+      
+
+      if options[:create_namespace_home]
+        output_wiki.create_namespace_home(original_wiki.namespaces)
       end
     end # end execute
   end
 end
\ No newline at end of file