caramelize 0.0.3 → 0.1.0

data/Gemfile.lock

@@ -1,44 +1,47 @@
 PATH
   remote: .
   specs:
-    caramelize (0.0.1)
+    caramelize (0.0.4)
+      cmdparse
       gollum (>= 1.3.0)
       mysql2
-      treetop (>= 1.4.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
     albino (1.3.3)
       posix-spawn (>= 0.3.6)
-    diff-lcs (1.1.2)
-    github-markup (0.5.3)
-    gollum (1.3.0)
+    cmdparse (2.0.3)
+    diff-lcs (1.1.3)
+    github-markup (0.7.0)
+    gollum (1.3.1)
       albino (~> 1.3.2)
       github-markup (>= 0.4.0, < 1.0.0)
       grit (~> 2.4.1)
       mustache (>= 0.11.2, < 1.0.0)
       nokogiri (~> 1.4)
+      redcarpet
       sanitize (~> 2.0.0)
       sinatra (~> 1.0)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mustache (0.99.4)
-    mysql2 (0.3.2)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
+    mysql2 (0.3.11)
+    nokogiri (1.5.0)
     posix-spawn (0.3.6)
-    rack (1.3.0)
-    sanitize (2.0.2)
-      nokogiri (~> 1.4.4)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.3.2)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
+    redcarpet (2.0.1)
+    sanitize (2.0.3)
+      nokogiri (>= 1.4.4, < 1.6)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -8,8 +8,6 @@ In the future more target wiki system may be added. For the moment export is sup
 
 ### Building
 
-For the moment caramelize is not yet stable and not released to any gemsites.
-
 To try it you require bundler to build it.
 
     $ gem bundler install
@@ -31,21 +29,32 @@ to install the new gem right to the system.
 
 ### Use
 
-    $ caramelize create <directory> 
-
-Creates a template configuration file. This includes documentation on how to use the preset Wiki-connectors and how to write addition customized connectors.
+    $ 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.
 
     $ caramelize run 
     
 Will execute a wiki migration based on a found configuration file. These are found in predefined paths.
 
     $ caramelize help
+    
 Returns help information.
 
 	$ caramelize version
+	
 Returns version and release information.
 
+### Options
+
+$ caramelize create --config my_caramel_configuration.rb
+
+Creates an example config with the given name.
+
+$ caramelize run --config my_caramel_configuration.rb
+
+Executes the given configuration.
+
 ## 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

data/Rakefile

@@ -1,2 +1,9 @@
 require 'bundler'
+require 'rdoc/task'
+
 Bundler::GemHelper.install_tasks
+
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include( "lib/**/*.rb")
+end

data/lib/caramelize/caramel.rb

@@ -1,6 +1,8 @@
-require 'caramelize/wiki'
-require 'caramelize/wikkawiki'
-require 'caramelize/redmine_wiki'
+require 'caramelize/wiki/wiki'
+require 'caramelize/wiki/wikkawiki'
+require 'caramelize/wiki/redmine_wiki'
+
+## Example caramelize configuration file
 
 # Within this method you can define your own Wiki-Connectors to Wikis not supported by default in this software
 
@@ -9,7 +11,11 @@ def customized_wiki
   
   # This example is a reimplementation of the WikkaWiki-Connector. 
   # To connect to WikkaWiki, I suggest to use the predefined Connector below.
-  wiki = Caramelize::Wiki.new(:host => "localhost", :username => "user", :database => "database_name", :password => 'admin_gnihihihi', :syntax => :wikka)
+  wiki = Caramelize::Wiki.new({:host => "localhost", 
+                    :username => "user", 
+                    :database => "database_name", 
+                    :password => 'admin_gnihihihi', 
+                    :markup => :wikka})
   wiki.instance_eval do
     def read_pages
       sql = "SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;"
@@ -21,7 +27,7 @@ def customized_wiki
         page = Page.new({:id => row["id"],
                             :title =>   row["tag"],
                             :body =>    row["body"],
-                            :syntax =>  'wikka',
+                            :markup =>  'wikka',
                             :latest =>  row["latest"] == "Y",
                             :time =>    row["time"],
                             :message => row["note"],
@@ -44,11 +50,17 @@ end
 def predefined_wiki
   
   # For connection to a WikkaWiki-Database use this Connector
-  #return Caramelize::WikkaWiki.new(:host => "localhost", :username => "root", :database => "wikka")
+  #return Caramelize::WikkaWiki.new(:host => "localhost", 
+  #      :username => "root",
+  #      :password => "root", 
+  #      :database => "wikka")
   
   
   # For connection to a Redmine-Database use this Connector
-  return Caramelize::RedmineWiki.new(:host => "localhost", :username => "root", :database => "redmine_development")
+  return Caramelize::RedmineWiki.new(:host => "localhost", 
+        :username => "root", 
+        :password => "root",
+        :database => "redmine_development")
 end
 
 

data/lib/caramelize/cli.rb

@@ -1,3 +1,4 @@
+#Encoding: UTF-8
 require 'cmdparse'
 require 'caramelize/version'
 
@@ -15,23 +16,18 @@ module Caramelize
     # arguments and executing the requested command.
     class CommandParser < CmdParse::CommandParser
 
-      # The website directory. Default: the current working directory.
-      attr_reader :directory
-
       # The verbosity level. Default: <tt>:normal</tt>
       attr_reader :verbosity
 
       # Create a new CommandParser class. T
       def initialize 
         super(true)
-        @directory = nil
         @verbosity = :normal
 
         self.program_name = "caramelize"
         self.program_version = Caramelize::VERSION
         self.options = CmdParse::OptionParserWrapper.new do |opts|
           opts.separator "Global options:"
-          opts.on("--config DIR", "-d", String, "The config file (default: caramel.rb)") {|p| @directory = p}
           opts.on("--verbose", "-v", "Print more output") { @verbosity = :verbose }
           opts.on("--quiet", "-q", "No output") { @verbosity = :quiet }
         end
@@ -44,24 +40,25 @@ module Caramelize
       # Finds the configuration file, if it exists in a known location.
       def detect_configuration_file(config_path = nil)
         possible_files = KNOWN_CONFIG_LOCATIONS
+        possible_files << config_path if config_path
         possible_files.detect{|f| File.exists?(f)}
       end
       
       # Utility method for sub-commands to transfer wiki contents
-      def transfer_content
-        
+      def transfer_content config_file = ""
         time_start = Time.now
         
-        file = detect_configuration_file
+        file = detect_configuration_file config_file
+        puts "Read config file: #{file}" if @verbosity == :verbose
         if file && File.exists?(file)
           instance_eval(File.read(file), file || '<eval>')
           original_wiki = input_wiki
           
-          ContentTransferer.execute original_wiki, {:verbosity => @verbosity}
+          ContentTransferer.execute(original_wiki, {:verbosity => @verbosity})
           
           time_end = Time.now
           
-          puts "Time required: #{time_end - time_start} s" if @verbosity
+          puts "Time required: #{time_end - time_start} s" if @verbosity == :verbose
         else
           puts "No config file found."
         end

data/lib/caramelize/cli/create_command.rb

@@ -1,5 +1,4 @@
 #Encoding: UTF-8
-
 require 'caramelize/cli'
 
 module Caramelize::CLI
@@ -7,48 +6,44 @@ module Caramelize::CLI
   # The CLI command for creating a caramelize config file.
   class CreateCommand < CmdParse::Command
 
+    # The website config-file. Default: the current working directory.
+    attr_reader :config_file
+
     def initialize #:nodoc:
       super('create', false)
-      #self.description = Utils.format("If the verbosity level is set to verbose, the created files are listed.")
+      self.description = "If the verbosity level is set to verbose, the created files are listed."
       self.short_desc = 'Create a default config file for caramelize'
       self.options = CmdParse::OptionParserWrapper.new do |opts|
         opts.separator "Arguments:"
-        opts.separator opts.summary_indent + "DIR: the directory in which the website should be created"
+        opts.on("--config <file>", "-f", String, "The config file (default: caramel.rb)") {|p| @config_file = p}
       end
     end
 
     def usage # :nodoc:
-      "Usage: #{commandparser.program_name} [global options] create [options] DIR"
+      "Usage: #{commandparser.program_name} [global options] create [options]"
     end
 
-    # Create a caramelize config file in the directory <tt>args[0]</tt>.
+    # Create a caramelize config file.
     def execute(args)
-      if args.length == 0
-        raise OptionParser::MissingArgument.new('DIR')
-      else
-        begin
-          
-          # TODO create dummy config file
-          
-          puts "Created new configuration file: caramelize.rb"
-          #puts args[0]
-          require 'fileutils'
-          
-          FileUtils.cp(File.dirname(__FILE__) +"/../caramel.rb", args[0])
-          
-          #File.open('caremelize.rb',"w+") do |f|
-          #  f << "query_data"
-          #end
-          
-        rescue
-          #require 'fileutils'
-          #FileUtils.rm_rf(args[0])
-          raise
-        end
-        if commandparser.verbosity == :verbose
-          puts "The following files were created in the directory #{args[0]}:"
-          #puts paths.sort.join("\n")
-        end
+      begin
+        
+        # create dummy config file
+        target_file = @config_file.nil? ? "caramel.rb" : @config_file 
+        
+        
+        #puts args[0]
+        require 'fileutils'
+        
+        FileUtils.cp(File.dirname(__FILE__) +"/../caramel.rb", target_file)
+        
+      rescue
+        #require 'fileutils'
+        #FileUtils.rm_rf(args[0])
+        raise
+      end
+      if commandparser.verbosity == :normal
+        puts "Created new configuration file: #{target_file}"
+        #puts paths.sort.join("\n")
       end
     end
     

data/lib/caramelize/cli/run_command.rb

@@ -1,5 +1,4 @@
 #Encoding: UTF-8
-
 require 'caramelize/cli'
 
 module Caramelize::CLI
@@ -7,14 +6,26 @@ module Caramelize::CLI
   # The CLI command for rendering a webgen website.
   class RunCommand < CmdParse::Command
 
+    # The website config-file. Default: the current working directory.
+    attr_reader :config_file
+
     def initialize # :nodoc:
       super('run', false)
       self.short_desc = 'Run the wiki content transfer based on the given config file'
+      self.options = CmdParse::OptionParserWrapper.new do |opts|
+        opts.separator "Arguments:"
+        #opts.separator opts.summary_indent + "DIR: the directory in which the website should be created"
+        opts.on("--config <file>", "-f", String, "The config file (default: caramel.rb)") {|p| @config_file = p}
+      end
+    end
+
+    def usage # :nodoc:
+      "Usage: #{commandparser.program_name} [global options] run [options]"
     end
 
     # Transfer Wiki contents
     def execute(args)
-      commandparser.transfer_content
+      commandparser.transfer_content @config_file
     end
 
   end

data/lib/caramelize/content_transferer.rb

@@ -4,11 +4,10 @@ require 'gollum'
 require 'grit'
 
 module Caramelize
-  autoload :Wiki, 'caramelize/wiki'
-  autoload :WikkaWiki, 'caramelize/wikkawiki'
-  autoload :RedmineWiki, 'caramelize/redmine_wiki'
+  autoload :Wiki, 'caramelize/wiki/wiki'
+  autoload :WikkaWiki, 'caramelize/wiki/wikkawiki'
+  autoload :RedmineWiki, 'caramelize/wiki/redmine_wiki'
   autoload :GollumOutput, 'caramelize/gollum_output'
-  autoload :Wikka2MarkdownConverter, 'wikka2markdown_converter'
   autoload :Author, 'caramelize/author'
   autoload :Page, 'caramelize/page'
   
@@ -16,7 +15,10 @@ module Caramelize
   class ContentTransferer
     
     # Execute the content migration
-    def self.execute original_wiki, options={}
+    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
@@ -25,32 +27,46 @@ module Caramelize
       @revisions = original_wiki.read_pages
       
       # initiate new wiki
+      output_wiki = GollumOutput.new('wiki.git') # TODO make wiki_path an option
       
-      output_wiki = GollumOutput.new('wiki.git')
-      
+      # TODO ask if we should replace existing paths
+
       # commit page revisions to new wiki
+      output_wiki.commit_history @revisions, options
       
-      output_wiki.commit_history @revisions
-      
-      # if wiki needs to convert sytax, do so
-      if original_wiki.convert_syntax?
-        puts "latest revisions:"
+      # 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
+        
+        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}"
+          puts "Updated syntax: #{rev.title} #{rev.time}"  if options[:verbosity] == :verbose
+          
           # parse markup & convert to new syntax
-          body_new = original_wiki.convert2markdown rev.body
-          unless body_new == rev.body
+          if options[:markup] == :markdown
+            body_new = original_wiki.to_markdown rev.body
+          else
+            body_new = original_wiki.to_textile rev.body
+          end
+          
+          if body_new.start_with?('Einige interessante')
+            puts rev.body
+            puts body_new
+          end
+
+          unless body_new.eql? rev.body
             rev.body = body_new
-            rev.author_name = "Caramelize"
+            rev.author_name = options[:markup]
             rev.time = Time.now
             rev.author = nil
             
             # commit as latest page revision
-            output_wiki.commit_revision rev  
+            output_wiki.commit_revision rev, options[:markup]
           end
         end  
       end
-    end
+    end # end execute
   end
 end

data/lib/caramelize/gollum_output.rb

@@ -3,6 +3,10 @@
 module Caramelize
   class GollumOutput
     
+    def supported_markup 
+      [:markdown, :textile]
+    end
+    
     # Initialize a new gollum-wiki-repository at the given path.
     def initialize wiki_path
       # TODO use sanitized name as wiki-repository-title
@@ -11,12 +15,12 @@ module Caramelize
     end
     
     # Commit the given page into the gollum-wiki-repository.
-    def commit_revision page
-      gollum_page = @gollum.page(page.title)
+    # Make sure the target markup is correct before calling this method.
+    def commit_revision(page, markup) 
       message = page.message.empty? ? "Edit in page #{page.title}" : page.message
-      
+        
       if page.author
-        author = page.author   
+        author = page.author
       else
         author = Author.new
         author.name = page.author_name
@@ -29,43 +33,26 @@ module Caramelize
                :authored_date => page.time,
                :committed_date => page.time
       }
+      
+      gollum_page = @gollum.page(page.title)
       if gollum_page
         @gollum.update_page(gollum_page, gollum_page.name, gollum_page.format, page.body, commit)
       else
-        # OPTIMIZE support not just markdown
-        @gollum.write_page(page.title, :markdown, page.body, commit)
+        @gollum.write_page(page.title, markup, page.body, commit)
       end
     end
     
     # Commit all revisions of the given history into this gollum-wiki-repository.
-    def commit_history revisions
+    def commit_history(revisions, options={})
+      options[:markup] = :markdown if options[:markup].nil? # target markup
       revisions.each_with_index do |page, index|
-        puts "(#{index+1}/#{revisions.count}) #{page.time}  #{page.title}" 
-        
-        gollum_page = @gollum.page(page.title)
-        message = page.message.empty? ? "Edit in page #{page.title}" : page.message
-        
-        if page.author
-          author = page.author   
-        else
-          author = Author.new
-          author.name = page.author_name
-          author.email = "mail@example.com"
+        if options[:verbosity] == :normal || options[:verbosity] == :verbose
+          puts "(#{index+1}/#{revisions.count}) #{page.time}  #{page.title}" 
         end
         
-        commit = {:message => message,
-                 :name => author.name,
-                 :email => author.email,
-                 :authored_date => page.time,
-                 :committed_date => page.time
-        }
-        if gollum_page
-          @gollum.update_page(gollum_page, gollum_page.name, gollum_page.format, page.body, commit)
-        else
-          # OPTIMIZE support not just markdown
-          @gollum.write_page(page.title, :markdown, page.body, commit)
-        end
+        commit_revision(page, options[:markup])
       end
     end
+    
   end
 end

data/lib/caramelize/page.rb

@@ -1,13 +1,13 @@
 module Caramelize
   class Page
   
-    attr_accessor :title, :body, :id, :syntax, :latest, :time, :message, :author, :author_name
+    attr_accessor :title, :body, :id, :markup, :latest, :time, :message, :author, :author_name
   
     def initialize page={}
       @id =      page[:id]
       @title =   page[:title]
       @body =    page[:body]
-      @syntax =  page[:syntax]
+      @syntax =  page[:markup]
       @latest =  page[:latest]
       @time =    page[:time]
       @message = page[:message]

data/lib/caramelize/version.rb

@@ -1,3 +1,3 @@
 module Caramelize
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/caramelize/{redmine_wiki.rb → wiki/redmine_wiki.rb}

@@ -1,7 +1,6 @@
 #Encoding: UTF-8
 module Caramelize
   autoload :DatabaseConnector, 'caramelize/database_connector'
-  autoload :Wikka2MarkdownConverter, 'caramelize/wikka2markdown_converter'
   
   class RedmineWiki < Wiki
     include DatabaseConnector
@@ -24,7 +23,7 @@ module Caramelize
           page = Page.new({:id => row_content["id"],
                             :title => title,
                             :body => row_content["data"],
-                            :syntax => 'textile',
+                            :markup => :textile,
                             :latest => false,
                             :time => row_content["updated_on"],
                             :message => row_content["comments"],
@@ -44,11 +43,6 @@ module Caramelize
       @revisions
     end
     
-      def convert_syntax?
-      # TODO
-      false
-    end
-    
     def read_authors
       sql = "SELECT id, login, mail FROM users;"
       @authors = {}

data/lib/caramelize/wiki/trac_converter.rb

@@ -0,0 +1,82 @@
+module Caramelize
+  module TracConverter
+    
+    # take an input stream and convert all wikka syntax to markdown syntax
+    # taken from 'trac_wiki_to_textile' at 
+    def to_textile str
+      body = body.dup
+      body.gsub!(/\r/, '')
+      body.gsub!(/\{\{\{([^\n]+?)\}\}\}/, '@\1@')
+      body.gsub!(/\{\{\{\n#!([^\n]+?)(.+?)\}\}\}/m, '<pre><code class="\1">\2</code></pre>')
+      body.gsub!(/\{\{\{(.+?)\}\}\}/m, '<pre>\1</pre>')
+      # macro
+      body.gsub!(/\[\[BR\]\]/, '')
+      body.gsub!(/\[\[PageOutline.*\]\]/, '{{toc}}')
+      body.gsub!(/\[\[Image\((.+?)\)\]\]/, '!\1!')
+      # header
+      body.gsub!(/=====\s(.+?)\s=====/, "h5. #{'\1'} \n\n")
+      body.gsub!(/====\s(.+?)\s====/,   "h4. #{'\1'} \n\n")
+      body.gsub!(/===\s(.+?)\s===/,     "h3. #{'\1'} \n\n")
+      body.gsub!(/==\s(.+?)\s==/,       "h2. #{'\1'} \n\n")
+      body.gsub!(/=\s(.+?)\s=[\s\n]*/,  "h1. #{'\1'} \n\n")
+      # table
+      body.gsub!(/\|\|/,  "|")
+    # link
+      body.gsub!(/\[(http[^\s\[\]]+)\s([^\[\]]+)\]/, ' "\2":\1' )
+      body.gsub!(/\[([^\s]+)\s(.+)\]/, ' [[\1 | \2]] ')
+      body.gsub!(/([^"\/\!])(([A-Z][a-z0-9]+){2,})/, ' \1[[\2]] ')
+      body.gsub!(/\!(([A-Z][a-z0-9]+){2,})/, '\1')
+    # text decoration
+      body.gsub!(/'''(.+)'''/, '*\1*')
+      body.gsub!(/''(.+)''/, '_\1_')
+      body.gsub!(/`(.+)`/, '@\1@')
+    # itemize
+      body.gsub!(/^\s\s\s\*/, '***')
+      body.gsub!(/^\s\s\*/, '**')
+      body.gsub!(/^\s\*/, '*')
+      body.gsub!(/^\s\s\s\d\./, '###')
+      body.gsub!(/^\s\s\d\./, '##')
+      body.gsub!(/^\s\d\./, '#')
+      body
+    end
+    
+    # TODO this is so far only copy of textile conversion
+    # not tested!
+    def to_markdown str
+      body = body.dup
+      body.gsub!(/\r/, '')
+      body.gsub!(/\{\{\{([^\n]+?)\}\}\}/, '@\1@')
+      body.gsub!(/\{\{\{\n#!([^\n]+?)(.+?)\}\}\}/m, '<pre><code class="\1">\2</code></pre>')
+      body.gsub!(/\{\{\{(.+?)\}\}\}/m, '<pre>\1</pre>')
+      # macro
+      body.gsub!(/\[\[BR\]\]/, '')
+      body.gsub!(/\[\[PageOutline.*\]\]/, '{{toc}}')
+      body.gsub!(/\[\[Image\((.+?)\)\]\]/, '!\1!')
+      # header
+      body.gsub!(/=====\s(.+?)\s=====/, "== #{'\1'} ==\n\n")
+      body.gsub!(/====\s(.+?)\s====/,   "=== #{'\1'} ===\n\n")
+      body.gsub!(/===\s(.+?)\s===/,     "==== #{'\1'} ====\n\n")
+      body.gsub!(/==\s(.+?)\s==/,       "===== #{'\1'} =====\n\n")
+      body.gsub!(/=\s(.+?)\s=[\s\n]*/,  "====== #{'\1'} ======\n\n")
+      # table
+      body.gsub!(/\|\|/,  "|")
+      # link
+      body.gsub!(/\[(http[^\s\[\]]+)\s([^\[\]]+)\]/, ' "\2":\1' )
+      body.gsub!(/\[([^\s]+)\s(.+)\]/, ' [[\1 | \2]] ')
+      body.gsub!(/([^"\/\!])(([A-Z][a-z0-9]+){2,})/, ' \1[[\2]] ')
+      body.gsub!(/\!(([A-Z][a-z0-9]+){2,})/, '\1')
+      # text decoration
+      body.gsub!(/'''(.+)'''/, '*\1*')
+      body.gsub!(/''(.+)''/, '_\1_')
+      body.gsub!(/`(.+)`/, '@\1@')
+      # itemize
+      body.gsub!(/^\s\s\s\*/, '***')
+      body.gsub!(/^\s\s\*/, '**')
+      body.gsub!(/^\s\*/, '*')
+      body.gsub!(/^\s\s\s\d\./, '###')
+      body.gsub!(/^\s\s\d\./, '##')
+      body.gsub!(/^\s\d\./, '#')
+      body
+    end
+  end
+end

data/lib/caramelize/{wiki.rb → wiki/wiki.rb}

@@ -21,8 +21,8 @@ module Caramelize
       return []
     end
     
-    def convert_syntax?
-      @options[:syntax] == :markdown
+    def convert_markup? to_markup
+      markup != to_markup
     end
     
     def latest_revisions
@@ -33,5 +33,9 @@ module Caramelize
       end
       @latest_revisions
     end
+
+    def markup
+      @options[:markup]
+    end
   end
 end

data/lib/caramelize/wiki/wikka_converter.rb

@@ -0,0 +1,32 @@
+module Caramelize
+  module WikkaConverter
+    
+    # take an input stream and convert all wikka syntax to markdown syntax
+    def to_markdown body
+      body = body.dup
+      body.gsub!(/(======)(.*?)(======)/ ) {|s| '# ' + $2 } #h1
+      body.gsub!(/(=====)(.*?)(=====)/) {|s| '## ' + $2 }   #h2
+      body.gsub!(/(====)(.*?)(====)/) {|s| '### ' + $2 }   #h3
+      body.gsub!(/(===)(.*?)(===)/) {|s| '#### ' + $2 }   #h4
+  
+      body.gsub!(/(\*\*)(.*?)(\*\*)/) {|s| '**' + $2 + '**' }   #bold
+      body.gsub!(/(\/\/)(.*?)(\/\/)/) {|s| '_' + $2 + '_' }   #italic
+      #str.gsub!(/(===)(.*?)(===)/) {|s| '`' + $2 + '`'}   #code
+      body.gsub!(/(__)(.*?)(__)/) {|s| '<u>' + $2 + '</u>'}   #underline
+      
+      body.gsub!(/(.*?)(\n\t-)(.*?)/) {|s| $1 + '\n' + $3 }   #list
+      
+      body.gsub!(/(\t-)(.*?)/) {|s| '*' + $2 }   #list
+      #str.gsub!(/(----)/) {|s| '~~~~'}   #seperator
+
+
+      body.gsub!(/(\[\[)(\w+)\s(.+?)(\]\])/, '[[\3|\2]]')
+      #body.gsub!(/\[\[(\w+)\s(.+)\]\]/, ' [[\1 | \2]] ')
+      
+      
+      # TODO more syntax conversion for links and images
+      
+      body
+    end
+  end
+end

data/lib/caramelize/{wikkawiki.rb → wiki/wikkawiki.rb}

@@ -1,12 +1,17 @@
 #Encoding: UTF-8
 module Caramelize
   autoload :DatabaseConnector, 'caramelize/database_connector'
-  autoload :Wikka2MarkdownConverter, 'caramelize/wikka2markdown_converter'
+  autoload :WikkaConverter, 'caramelize/wiki/wikka_converter'
   
   class WikkaWiki < Wiki
     include DatabaseConnector
-    include Wikka2MarkdownConverter
+    include WikkaConverter
     
+    def initialize options={}
+      super(options)
+      options[:markup] = :wikka
+    end
+
     # after calling this action, I expect the @titles and @revisions to be filled
     def read_pages
       sql = "SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;"
@@ -19,7 +24,7 @@ module Caramelize
         page = Page.new({:id => row["id"],
                             :title =>   row["tag"],
                             :body =>    row["body"],
-                            :syntax =>  'wikka',
+                            :markup =>  :wikka,
                             :latest =>  row["latest"] == "Y",
                             :time =>    row["time"],
                             :message => row["note"],
@@ -46,5 +51,5 @@ module Caramelize
       end
       @authors
     end
-  end    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caramelize
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2156326680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156326680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cmdparse
-  requirement: &2156326200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156326200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gollum
-  requirement: &2156325620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156325620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: By defining the access from the input to the output wiki you can migrate
   any wiki.
 email:
@@ -71,11 +86,12 @@ files:
 - lib/caramelize/ext.rb
 - lib/caramelize/gollum_output.rb
 - lib/caramelize/page.rb
-- lib/caramelize/redmine_wiki.rb
 - lib/caramelize/version.rb
-- lib/caramelize/wiki.rb
-- lib/caramelize/wikka2markdown_converter.rb
-- lib/caramelize/wikkawiki.rb
+- lib/caramelize/wiki/redmine_wiki.rb
+- lib/caramelize/wiki/trac_converter.rb
+- lib/caramelize/wiki/wiki.rb
+- lib/caramelize/wiki/wikka_converter.rb
+- lib/caramelize/wiki/wikkawiki.rb
 - test/helper.rb
 - test/test_caramelize.rb
 homepage: http://github.com/Dahie/caramelize
@@ -99,10 +115,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: caramelize
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Abstract wiki convert to migrate your data from one wiki software to another
 test_files:
 - test/helper.rb
 - test/test_caramelize.rb
+has_rdoc: 

data/lib/caramelize/wikka2markdown_converter.rb

@@ -1,27 +0,0 @@
-module Caramelize
-  module Wikka2MarkdownConverter
-    
-    # take an input stream and convert all wikka syntax to markdown syntax
-    def convert2markdown str
-      str.gsub!(/(======)(.*?)(======)/ ) {|s| '# ' + $2 } #h1
-      str.gsub!(/(=====)(.*?)(=====)/) {|s| '## ' + $2 }   #h2
-      str.gsub!(/(====)(.*?)(====)/) {|s| '### ' + $2 }   #h3
-      str.gsub!(/(===)(.*?)(===)/) {|s| '#### ' + $2 }   #h4
-  
-      str.gsub!(/(\*\*)(.*?)(\*\*)/) {|s| '**' + $2 + '**' }   #bold
-      str.gsub!(/(\/\/)(.*?)(\/\/)/) {|s| '_' + $2 + '_' }   #italic
-      #str.gsub!(/(===)(.*?)(===)/) {|s| '`' + $2 + '`'}   #code
-      str.gsub!(/(__)(.*?)(__)/) {|s| '<u>' + $2 + '</u>'}   #underline
-      
-      #str.gsub!(/(.*?)(\n\t-)(.*?)/) {|s| $1 + '\n' + $3 }   #list
-      
-      str.gsub!(/(\t-)(.*?)/) {|s| '*' + $2 }   #list
-      #str.gsub!(/(----)/) {|s| '~~~~'}   #seperator
-      
-      
-      # TODO more syntax conversion for links and images
-      
-      str
-    end
-  end
-end