caramelize 0.2.0 → 0.3.0

data/lib/caramelize/page.rb

@@ -1,28 +1,41 @@
 module Caramelize
   class Page
-  
+
     attr_accessor :title, :body, :id, :markup, :latest, :time, :message, :author, :author_name
-  
+
     def initialize page={}
       @id =      page[:id]
-      @title =   page[:title] ? page[:title] : ""
-      @body =    page[:body] ? page[:body] : ""
+      @title =   page[:title] || ""
+      @body =    page[:body] || ""
       @syntax =  page[:markup]
-      @latest =  page[:latest] ? page[:latest] : false
-      @time =    page[:time] ? page[:time] : Time.now
-      @message = page[:message] ? page[:message] : ""
+      @latest =  page[:latest] || false
+      @time =    page[:time] || Time.now
+      @message = page[:message] || ""
       @author =  page[:author]
       @author_name =  page[:author_name]
     end
-    
+
+    def author_email
+      author.email
+    end
+
+    def author_name
+      author.name
+    end
+
+    def author
+      @author ||= OpenStruct.new(name: @author_name || "Caramelize",
+                             email: "mail@example.com")
+    end
+
     def latest?
       @latest
     end
-    
+
     def set_latest
       @latest = true
     end
-    
+
     def to_s
       @title
     end

data/lib/caramelize/version.rb

@@ -1,3 +1,3 @@
 module Caramelize
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/caramelize/wiki/redmine_wiki.rb

@@ -1,30 +1,26 @@
-#Encoding: UTF-8
+require 'caramelize/wiki/wiki'
+require 'caramelize/filters/swap_wiki_links'
+require 'caramelize/filters/remove_table_tab_line_endings'
 module Caramelize
-  autoload :DatabaseConnector, 'caramelize/database_connector'
-  autoload :SwapWikiLinks, 'caramelize/filters/swap_wiki_links'
-  
+
   class RedmineWiki < Wiki
     include DatabaseConnector
-    
+
     def initialize options={}
       super(options)
       @options[:markup] = :textile
-      @options[:create_namespace_home] = true unless @options[:create_namespace_home]
-      @options[:swap_interwiki_links] = true
       @options[:filters] << Caramelize::SwapWikiLinks.new
+      @options[:filters] << Caramelize::RemoveTableTabLineEndings.new
+      @options[:create_namespace_overview] = true
     end
-    
-    # after calling this action, I expect the @titles and @revisions to be filled
-    def read_pages
-      @revisions = []
-      @titles = []
-      @latest_revisions = {}
 
+    # 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 << {:identifier => row_project["identifier"], :name => row_project["name"]}
+        namespaces << OpenStruct.new(identifier: row_project["identifier"], name: row_project["name"])
       end
 
       # get all wikis
@@ -52,10 +48,11 @@ module Caramelize
         project_identifier = project_row ? project_row["identifier"] + '/' : ""
 
         title = project_identifier + row_page["title"]
-        @titles << title
-        
+        titles << title
+
+        @latest_revisions = {}
         results_contents.each do |row_content|
-          author = @authors[row_content["author_id"]] ? @authors[row_content["author_id"]] : nil
+          author = authors[row_content["author_id"]] ? @authors[row_content["author_id"]] : nil
           page = Page.new({:id => row_content["id"],
                             :title => title,
                             :body => row_content["data"],
@@ -65,31 +62,27 @@ module Caramelize
                             :message => row_content["comments"],
                             :author => author,
                             :author_name => author.name})
-          @revisions << page
+          revisions << page
           @latest_revisions[title] = page
         end
       end
-      @titles.uniq!
+      titles.uniq!
       @latest_revisions.each { |rev| rev[1].set_latest }
-      @revisions.sort! { |a,b| a.time <=> b.time }
+      revisions.sort! { |a,b| a.time <=> b.time }
 
       # TODO find latest revision for each limit
-      
-      @revisions
+
+      revisions
     end
-    
+
     def read_authors
-      sql = "SELECT id, login, mail FROM users;"
-      @authors = {}
-      results = database.query(sql)
+      results = database.query("SELECT id, login, mail FROM users;")
       results.each do |row|
-        author = Author.new
-        author.id    = row["id"]
-        author.name  = row["login"]
-        author.email = row["mail"]
-        @authors[author.id] = author
+        authors[row["id"]] = OpenStruct.new(id: row["id"],
+                                             name: row["login"],
+                                             email: row["mail"])
       end
-      @authors
+      authors
     end
   end
 end

data/lib/caramelize/wiki/wiki.rb

@@ -1,41 +1,54 @@
-#Encoding: UTF-8
 module Caramelize
-  autoload :DatabaseConnector, 'caramelize/database_connector'
   class Wiki
     include DatabaseConnector
+
     attr_accessor :revisions, :wiki_title, :titles, :description, :namespaces, :options
-    
+
     def initialize options={}
       @options = options
       @options[:filters] = []
       @namespaces = []
     end
-    
-    def revisions_by_title title
-      if @titles.index title
-        # new array only containing pages by this name sorted by time
-        # TODO this is probably bad for renamed pages if supported
-        return @revisions.reject { |revision| revision.title != title }.sort { |x,y| x.time <=> y.time }
-      end
+
+    def revisions_by_title(title)
+      # new array only containing pages by this name sorted by time asc
+      # TODO this is probably bad for renamed pages if supported
+      return revisions.select { |revision| revision.title == title }.sort { |x,y| x.time <=> y.time }
+      []
     end
-    
+
     # return an empty array in case this action was not overridden
     def read_authors
       return []
     end
 
-    
-    def convert_markup? to_markup
+    def namespaces
+      @namespaces ||= {}
+    end
+
+    def authors
+      @authors ||= {}
+    end
+
+    def revisions
+      @revisions ||= []
+    end
+
+    def titles
+      @titles ||= []
+    end
+
+    def convert_markup?(to_markup)
       markup != to_markup
     end
 
     def filters
       @options[:filters]
     end
-    
+
     def latest_revisions
       @latest_revisions = []
-      for title in @titles
+      titles.each do |title|
         # pick first revision by descending date
         @latest_revisions << revisions_by_title(title).last
       end

data/lib/caramelize/wiki/wikkawiki.rb

@@ -1,27 +1,24 @@
-#Encoding: UTF-8
 module Caramelize
-  autoload :DatabaseConnector, 'caramelize/database_connector'
-  autoload :Wikka2Markdown, 'caramelize/filters/wikka_to_markdown'
-  
+  require 'caramelize/wiki/wiki'
+  require 'caramelize/database_connector'
+  require 'caramelize/filters/wikka_to_markdown'
+
   class WikkaWiki < Wiki
     include DatabaseConnector
-    
+
     def initialize options={}
       super(options)
       @options[:markup] = :wikka
-      @options[:swap_interwiki_links] = false
       @options[:filters] << Caramelize::Wikka2Markdown.new
     end
 
-    # after calling this action, I expect the @titles and @revisions to be filled
+    # 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;"
-      @revisions = []
-      @titles = []
       results = database.query(sql)
       results.each do |row|
-        @titles << row["tag"]
-        author = @authors[row["user"]]
+        titles << row["tag"]
+        author = authors[row["user"]]
         page = Page.new({:id => row["id"],
                             :title =>   row["tag"],
                             :body =>    row["body"],
@@ -31,26 +28,21 @@ module Caramelize
                             :message => row["note"],
                             :author =>  author,
                             :author_name => row["user"]})
-        @revisions << page
+        revisions << page
       end
-      @titles.uniq!
-      #@revisions.sort! { |a,b| a.time <=> b.time }
-      
-      @revisions
+      titles.uniq!
+      #revisions.sort! { |a,b| a.time <=> b.time }
+
+      revisions
     end
-    
+
     def read_authors
       sql = "SELECT name, email FROM wikka_users;"
-      @authors = {}
       results = database.query(sql)
       results.each do |row|
-        author = Author.new
-        #author.id    = row["id"]
-        author.name  = row["name"]
-        author.email = row["email"]
-        @authors[author.name] = author
+        authors[row["name"]] = OpenStruct.new(name:  row["name"],
+                                              email: row["email"] )
       end
-      @authors
     end
   end
 end

data/spec/fixtures/markup/swap-links-input.textile

@@ -0,0 +1,57 @@
+h1. Wiki
+
+h2. The 1994 Formula One Season
+
+*[[statistics|Driver & Team Statistics]]*
+*[[race-by-race|Race by Race]]*
+*[[technical-regulations|Technical Regulations]]*
+*[[technical-rules|Technical Rule Changes]]*
+*[[HD-rear-wings|HD Rear Wing Configurations]]*
+*[[helmets|Helmet variants]]*
+
+h2. Development
+
+*[[Review Process F1 1994]]*
+*[[Credits]]*
+
+h2. Season data
+
+h3. Drivers
+
+Early season package
+Driver list from Brazil: "Discussion here":http://forum.ctdp.net/viewtopic.php?f=214&t=62989
+
+|_.Nr|_.Driver       |_.Team|
+|0|Damon Hill        |/2.[[Williams|Williams-Renault]]|
+|2|Ayrton Senna      |
+|3|Ukyo Katayama     |/2.[[Tyrrell|Tyrrell-Yamaha]]|
+|4|Mark Blundell     |
+|5|Michael Schumacher|/2.[[Benetton|Benetton-Ford]]|
+|6|Jos Verstappen    |
+|7|Mika Häkkinen     |/2.[[McLaren|McLaren-Peugeot]]|
+|8|Martin Brundle    |
+|9|Christian Fittipaldi|/2.[[Footwork|Footwork-Ford]]|
+|10|Gianni Morbidelli|
+|11|Pedro Lamy       |/2.[[Lotus|Lotus-Mugen-Honda]]|
+|12|Johnny Herbert   |
+|14|Rubens Barrichello|/2.[[Jordan|Jordan-Hart]]|
+|15|Eddie Irvine     |
+|19|Olivier Beretta  |/2.[[Larrousse|Larrousse-Ford]]|
+|20|Érik Comas       |
+|23|Pierluigi Martini|/2.[[Minardi|Minardi-Ford]]|
+|24|Michele Alboreto |
+|25|Éric Bernard     |/2.[[Ligier|Ligier-Renault]]|
+|26|Olivier Panis    |
+|27|Jean Alesi       |/2.[[Ferrari|Ferrari]]|
+|28|Gerhard Berger   |
+|29|Karl Wendlinger  |/2.[[Sauber|Sauber-Mercedes]]|
+|30|Heinz-Harald Frentzen|
+|31|David Brabham    |/2.[[Simtek|Simtek-Ford]]|
+|32|Roland Ratzenberger|
+|33|Paul Belmondo    |/2.[[Pacific|Pacific-Ilmor]]|
+|34|Bertrand Gachot  |
+
+
+[[Getting new people]]
+
+[[Contact form]]

data/spec/fixtures/markup/swap-links-output.textile

@@ -0,0 +1,57 @@
+h1. Wiki
+
+h2. The 1994 Formula One Season
+
+*[[Driver & Team Statistics|statistics]]*
+*[[Race by Race|race-by-race]]*
+*[[Technical Regulations|technical-regulations]]*
+*[[Technical Rule Changes|technical-rules]]*
+*[[HD Rear Wing Configurations|HD-rear-wings]]*
+*[[Helmet variants|helmets]]*
+
+h2. Development
+
+*[[Review Process F1 1994|Review_Process_F1_1994]]*
+*[[Credits|Credits]]*
+
+h2. Season data
+
+h3. Drivers
+
+Early season package
+Driver list from Brazil: "Discussion here":http://forum.ctdp.net/viewtopic.php?f=214&t=62989
+
+|_.Nr|_.Driver       |_.Team|
+|0|Damon Hill        |/2.[[Williams-Renault|Williams]]|
+|2|Ayrton Senna      |
+|3|Ukyo Katayama     |/2.[[Tyrrell-Yamaha|Tyrrell]]|
+|4|Mark Blundell     |
+|5|Michael Schumacher|/2.[[Benetton-Ford|Benetton]]|
+|6|Jos Verstappen    |
+|7|Mika Häkkinen     |/2.[[McLaren-Peugeot|McLaren]]|
+|8|Martin Brundle    |
+|9|Christian Fittipaldi|/2.[[Footwork-Ford|Footwork]]|
+|10|Gianni Morbidelli|
+|11|Pedro Lamy       |/2.[[Lotus-Mugen-Honda|Lotus]]|
+|12|Johnny Herbert   |
+|14|Rubens Barrichello|/2.[[Jordan-Hart|Jordan]]|
+|15|Eddie Irvine     |
+|19|Olivier Beretta  |/2.[[Larrousse-Ford|Larrousse]]|
+|20|Érik Comas       |
+|23|Pierluigi Martini|/2.[[Minardi-Ford|Minardi]]|
+|24|Michele Alboreto |
+|25|Éric Bernard     |/2.[[Ligier-Renault|Ligier]]|
+|26|Olivier Panis    |
+|27|Jean Alesi       |/2.[[Ferrari|Ferrari]]|
+|28|Gerhard Berger   |
+|29|Karl Wendlinger  |/2.[[Sauber-Mercedes|Sauber]]|
+|30|Heinz-Harald Frentzen|
+|31|David Brabham    |/2.[[Simtek-Ford|Simtek]]|
+|32|Roland Ratzenberger|
+|33|Paul Belmondo    |/2.[[Pacific-Ilmor|Pacific]]|
+|34|Bertrand Gachot  |
+
+
+[[Getting new people|Getting_new_people]]
+
+[[Contact form|Contact_form]]

data/spec/fixtures/markup/table-tab-line-endings-input.textile

@@ -0,0 +1,145 @@
+h1. Williams-Renault 1994
+
+"Williams FW16 Launch Press Conference on YouTube":http://www.youtube.com/watch?v=qJF5TYS9uX0
+"Williams FW16 Testing (Senna, Estoril) on YouTube":http://www.youtube.com/watch?v=smRQ2YnAfv0
+
+h2. Livery Changes
+
+|	|_.Mainsponsor	    |_.Mirrors|
+|*Brazil*	|/5.Rothmans|/2.white/elf|
+|Pacific|
+|San Marino	|/14.blue/elf|			
+|Monaco		|
+|Spain		|			
+|*Canada*		|Rothmans Ltd|
+|*France*	|Barcode|
+|*Great Britain*|/2.Racing|
+|Germany	|
+|Hungary	|/7.Rothmans|			
+|Belgium	|			
+|Italy		|		
+|Portugal	|			
+|Europe 	|			
+|Japan		|		
+|Australia |
+
+h2. Selected Technical Upgrades
+
+The upgrades we are going to do on the mod:
+* **A-Spec**
+** Frontwing
+*** High V1
+** Rearwing
+*** High V1
+*** Regular V1
+* **B-Spec**
+** Frontwing
+*** High V3
+*** High V2
+** Rearwing
+*** High V3
+*** Regular V3
+*** Low V3
+
+h2. Technical Upgrades
+
+_This is for keeping track of all upgrades. We will not implement everything in the actual mod!_
+
+|	        |_.Front wing	|_.Rear wing|_.Nose    |_.Barge boards|_.Airbox|
+|*Brazil*	|/2.High V1     |Regular V1|/2.with flipups |/4.none|/5. |
+|Pacific	|              High V1|
+|San Marino	|Low V1|Regular V1|/14. without flipups|
+|Monaco	        |/2.High V2    |High V1|      
+|Spain	        |??|/12.bargeboard|
+|Canada	        |/3.High V3|/2.High V1|/11.Airbox cutout|
+|France	        |
+|Great Britain  |Regular V1|
+|Germany	|Low V2 |Low|
+|Hungary	|High V3|High V3|
+|Belgium	|/2.Low V2|Regular V2|
+|Italy		|Low |
+|Portugal	|/4.High V3|??|
+|Europe 	|/3.Regular V3|
+|Japan		|
+|Australia      |
+
+h3. Front wing
+
+All frontwings from Spain onwards have new triangular endplates.
+
+*Low V2*: flat angle and large gurney flaps 
+*High V2*: added large gurney flaps 
+*High V3*: like v2, but with triangular sideplates 
+
+h3. Front wing
+
+*High V3*: adds one additional plane on the top and the wing additions inside the tires
+*Regular V2*: has different striped-down endplates
+*Regular V3*: has different endplates featuring the wing additions from the high-downforce variant
+
+
+
+h2. Technical Data (Autocourse 1994/95)
+
+!F1-1994_01_Williams.jpg!
+For comparison (from Histomobile):
+"FW16":http://www.histomobile.com/dvd_histomobile/usa/286/1994-Williams-FW16-.asp 515 kg, 2990 mm (wheelbase), 1669 mm (track front), 1598 mm (track rear)
+"FW16B":http://www.histomobile.com/dvd_histomobile/usa/286/1994-Williams-FW16B-.asp 595 kg, 2890 mm (wheelbase), 1669 mm (track front), 1598 mm (track rear)
+
+According to Autocourse 94/95, the FW16 started the season with the 67° V10 engine RS6 and got the RS6B for the Hockenheim GP as well as the RS6C for Monza. Both upgrades featured higher revs and improved top-end power. The RS6 delivered about 790 bhp / 589 KW @ 14300 rpm according to *"ultimatecarpage.com":http://www.ultimatecarpage.com/car/1054/Williams-FW16-Renault.html*.
+
+h2. Technical Data (Grand Prix 1994)
+
+!F1-1994_01_Williams_GP94.jpg!
+
+h2. Technical Upgrades
+
+The Ferrari car upgrades are listed below as reported in Autosport Magazine.
+
+h2. Pre-Season (Autosport 134(4), January 27)
+
+* Passive front suspension
+* New and simplified cockpit
+
+!Williams_000_AS-134_4_-1994-January-27.jpg!
+
+!Williams_010_AS-134_4_-1994-January-27.jpg!
+
+h3. Photos of the new cockpit and display (late season!)
+
+!Williams_010_cockpit1.jpg!
+!Williams_010_cockpit2.jpg!
+!Williams_010_cockpit3.jpg!
+
+h2. Pre-Season (Autosport 134(9), March 3)
+
+* General car design
+* Suspension
+* Rear wing
+
+!Williams_015_AS-134_9_-1994-March-3.jpg!
+!Williams_016_AS-134_9_-1994-March-3.jpg!
+!Williams_018_AS-134_9_-1994-March-3.jpg!
+
+h2. Brazilian GP, Interlagos (Autosport 134(11), March 17)
+
+* Re-designed ear end
+* Chassis (cockpit, fuel tank, ...)
+
+!Williams_020_AS-134_11_-1994-March-17.jpg!
+
+h2. Testing between Brazilian and Pacific GP (Autosport 134(14), April 7)
+
+!Williams_030_AS-134_14_-1994-April-7.jpg!
+
+h2. German GP, Hockenheim (Autosport 136(5), August 4)
+
+* Shortened sidepods
+* Revised (elongated) bargeboards
+* Revised cockpit edge (now rounded at the front)
+* New airbox vent in agreement with the new regulations
+* Rear suspension
+* Diffuser
+
+!Williams_040_AS-136_5_-1994-August-4.jpg!
+