Adds a setting to cache textile rendering (off by default).

* it uses ActionController cache store which is MemoryStore by default and can be configured with config.action_controller.cache_store
* macro processing was moved out of textile rendering so that it doesn't get cached
* no noticeable improvement is expected for small portions of text, so only texts larger than 2KB are cached

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3372 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/application_helper.rb

@@ -396,13 +396,14 @@ module ApplicationHelper
       text = args.shift
     when 2
       obj = args.shift
-      text = obj.send(args.shift).to_s
+      attr = args.shift
+      text = obj.send(attr).to_s
     else
       raise ArgumentError, 'invalid arguments to textilizable'
     end
     return '' if text.blank?
 
-    text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text) { |macro, args| exec_macro(macro, obj, args) }
+    text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr) { |macro, args| exec_macro(macro, obj, args) }
     
     only_path = options.delete(:only_path) == false ? false : true
 

app/views/settings/_general.rhtml

@@ -20,6 +20,8 @@
 
 <p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
 
+<p><%= setting_check_box :cache_formatted_text %></p>
+
 <p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
 
 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>

config/environment.rb

@@ -32,7 +32,7 @@ Rails::Initializer.run do |config|
 
   # Enable page/fragment caching by setting a file-based store
   # (remember to create the caching directory and make it readable to the application)
-  # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
+  # config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
   
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector

config/locales/bg.yml

@@ -879,3 +879,4 @@ bg:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/bs.yml

@@ -903,3 +903,4 @@ bs:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/ca.yml

@@ -882,3 +882,4 @@ ca:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/cs.yml

@@ -885,3 +885,4 @@ cs:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/da.yml

@@ -905,3 +905,4 @@ da:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/de.yml

@@ -905,3 +905,4 @@ de:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/el.yml

@@ -885,3 +885,4 @@ el:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/en.yml

@@ -329,6 +329,7 @@ en:
   setting_issue_done_ratio_issue_status: Use the issue status
   setting_start_of_week: Start calendars on
   setting_rest_api_enabled: Enable REST web service
+  setting_cache_formatted_text: Cache formatted text
   
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects

config/locales/es.yml

@@ -929,3 +929,4 @@ es:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/eu.yml

@@ -889,3 +889,4 @@ eu:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/fi.yml

@@ -915,3 +915,4 @@ fi:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/fr.yml

@@ -352,6 +352,7 @@ fr:
   setting_rest_api_enabled: Activer l'API REST
   setting_gravatar_default: Image Gravatar par défaut
   setting_start_of_week: Jour de début des calendriers
+  setting_cache_formatted_text: Mettre en cache le texte formaté
   
   permission_add_project: Créer un projet
   permission_add_subprojects: Créer des sous-projets

config/locales/gl.yml

@@ -905,3 +905,4 @@ gl:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/he.yml

@@ -889,3 +889,4 @@ he:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/hr.yml

@@ -892,3 +892,4 @@ hr:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/hu.yml

@@ -910,3 +910,4 @@
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text

config/locales/id.yml

@@ -897,3 +897,4 @@ id:
   label_board_sticky: Sticky
   label_board_locked: Locked
   permission_export_wiki_pages: Export wiki pages
+  setting_cache_formatted_text: Cache formatted text