lib/caramelize/input_wiki/redmine_wiki.rb in caramelize-0.4.0 vs lib/caramelize/input_wiki/redmine_wiki.rb in caramelize-1.0.0

@@ -5,60 +5,24 @@
 module Caramelize
   module InputWiki
     class RedmineWiki < Wiki
       include DatabaseConnector
 
-      def initialize options={}
+      def initialize(options = {})
         super(options)
         @options[:markup] = :textile
-        @options[:filters] << Caramelize::SwapWikiLinks.new
-        @options[:filters] << Caramelize::RemoveTableTabLineEndings.new
+        @options[:filters] << Caramelize::SwapWikiLinks
+        @options[:filters] << Caramelize::RemoveTableTabLineEndings
         @options[:create_namespace_overview] = true
       end
 
       # after calling this action, I expect the titles and revisions to be filled
       def read_pages
-        # get all projects
-        results_projects = database.query("SELECT id, identifier, name FROM projects;")
-        results_projects.each do |row_project|
-          #collect all namespaces
-          namespaces << OpenStruct.new(identifier: row_project["identifier"], name: row_project["name"])
-        end
+        add_projects_as_namespaces
 
-        # get all wikis
-        results_wikis = database.query("SELECT id, project_id FROM wikis;")
-
-        # get all lemmas
-        results_pages = database.query("SELECT id, title, wiki_id FROM wiki_pages;")
-        results_pages.each do |row_page|
-          results_contents = database.query("SELECT * FROM wiki_content_versions WHERE page_id='#{row_page["id"]}' ORDER BY updated_on;")
-
-          # get wiki for page
-          wiki_row = nil
-          project_row = nil
-          results_wikis.each do |wiki|
-            wiki_row = wiki if wiki["id"] == row_page["wiki_id"]
-          end
-
-          if wiki_row
-            # get project from wiki-id
-            results_projects.each do |project|
-              project_row = project if project["id"] == wiki_row["project_id"]
-            end
-          end
-
-          project_identifier = project_row ? project_row["identifier"] + '/' : ""
-
-          title = project_identifier + row_page["title"]
-          titles << title
-
-          @latest_revisions = {}
-          results_contents.each do |row_content|
-            page = Page.new(build_properties(title, row_content))
-            revisions << page
-            @latest_revisions[title] = page
-          end
+        pages.each do |row_page|
+          build_page(row_page)
         end
         titles.uniq!
         @latest_revisions.each { |rev| rev[1].set_latest }
         revisions.sort! { |a,b| a.time <=> b.time }
 
@@ -66,29 +30,73 @@
 
         revisions
       end
 
       def read_authors
-        results = database.query("SELECT id, login, mail FROM users;")
+        results = database.query('SELECT id, login, mail FROM users;')
         results.each do |row|
           authors[row["id"]] = OpenStruct.new(id: row["id"],
                                               name: row["login"],
                                               email: row["mail"])
         end
         authors
       end
 
       private
 
+      def build_page(row_page)
+        results_contents = database.query("SELECT * FROM wiki_content_versions WHERE page_id='#{row_page["id"]}' ORDER BY updated_on;")
+
+        wiki = wikis.select{ |row| row['id'] == row_page['wiki_id'] }.first
+
+        project_identifier = ''
+
+        if wiki
+          project = projects.select{ |row| row['id'] == wiki['project_id'] }.first
+          project_identifier = project['identifier'] + '/'
+        end
+
+        title = project_identifier + row_page['title']
+        titles << title
+
+        @latest_revisions = {}
+        results_contents.each do |row_content|
+          page = Page.new(build_properties(title, row_content))
+          revisions << page
+          @latest_revisions[title] = page
+        end
+      end
+
+      def add_projects_as_namespaces
+        projects.each do |row_project|
+          namespace = OpenStruct.new(identifier: row_project['identifier'],
+                                     name: row_project['name'])
+          namespaces << namespace
+        end
+      end
+
+      def pages
+        @pages ||= database.query('SELECT id, title, wiki_id FROM wiki_pages;')
+      end
+
+      def projects
+        @projects ||= database.query('SELECT id, identifier, name FROM projects;')
+      end
+
+      def wikis
+        @wikis ||= database.query('SELECT id, project_id FROM wikis;')
+      end
+
       def build_properties(title, row_content)
         author = authors[row_content["author_id"]] ? authors[row_content["author_id"]] : nil
-        { id: row_content["id"],
+        {
+          id: row_content['id'],
           title: title,
-          body: row_content["data"],
+          body: row_content['data'],
           markup: :textile,
           latest: false,
-          time: row_content["updated_on"],
-          message: row_content["comments"],
+          time: row_content['updated_on'],
+          message: row_content['comments'],
           author: author,
           author_name: author.name
         }
       end
     end