caramel.rb in caramelize-0.1.0

- old
+ new

@@ -1,17 +1,23 @@
-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
 
 # Note, if you want to activate this, you need to uncomment the line below.
 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;"
       @revisions, @titles = [], []
       results = database.query(sql)
@@ -19,11 +25,11 @@
         @titles << row["tag"]
         author = @authors[row["user"]]
         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"],
                             :author =>  author,
                             :author_name => row["user"]})
@@ -42,14 +48,20 @@
 # if you want to use one of the preset Wiki-Connectors uncomment the connector 
 # and edit the database logins accordingly.
 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
 
 
 def input_wiki
   
\ No newline at end of file