caramel.rb in caramelize-0.4.0

- old
+ new

@@ -1,39 +1,41 @@
-require 'caramelize/wiki/wiki'
-require 'caramelize/wiki/wikkawiki'
-require 'caramelize/wiki/redmine_wiki'
+require 'caramelize/input_wiki/wikkawiki'
+require 'caramelize/input_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
+# 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',
-                    :markup => :wikka})
+  options = { host: "localhost",
+              username: "user",
+              database: "database_name",
+              password: 'Picard-Delta-5',
+              markup: :wikka}
+  wiki = Caramelize::InputWiki::Wiki.new(options)
   wiki.instance_eval do
     def read_pages
       sql = "SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;"
       results = database.query(sql)
       results.each do |row|
         titles << row["tag"]
         author = @authors[row["user"]]
-        page = Page.new({:id => row["id"],
-                            :title =>   row["tag"],
-                            :body =>    row["body"],
-                            :markup =>  'wikka',
-                            :latest =>  row["latest"] == "Y",
-                            :time =>    row["time"],
-                            :message => row["note"],
-                            :author =>  author,
-                            :author_name => row["user"]})
+        properties = { id: row["id"],
+                    title: row["tag"],
+                    body: row["body"],
+                    markup: 'wikka',
+                    latest: row["latest"] == "Y",
+                    time: row["time"],
+                    message: row["note"],
+                    author: author,
+                    author_name: row["user"]}
+        page = Page.new(properties)
         revisions << page
       end
       titles.uniq!
       revisions
     end
@@ -46,29 +48,31 @@
 # 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",
-  #      :password => "root",
-  #      :database => "wikka")
+  #options = { host: "localhost",
+  #      username: "root",
+  #      password: "root",
+  #      database: "wikka" }
+  #return Caramelize::InputWiki::WikkaWiki.new(options)
 
 
   # For connection to a Redmine-Database use this Connector
   # Additional options:
   # :create_namespace_overview => true/false (Default: true)  -  Creates a new wikipage at /home as root page for Gollum wiki
-  return Caramelize::RedmineWiki.new(:host => "localhost",
-        :username => "root",
-        :password => "root",
-        :database => "redmine_development")
+  options = { host: "localhost",
+              username: "root",
+              password: "root",
+              database: "redmine_development" }
+  return Caramelize::InputWiki::RedmineWiki.new(options)
 end
 
 
 def input_wiki
+  # comment and uncomment to easily switch between predefined and
+  # costumized Wiki-connectors.
 
-  # comment and uncomment to easily switch between predefined and costumized Wiki-connectors.
   #return customized_wiki
 
   return predefined_wiki
-
-end
\ No newline at end of file
+end