olelo 0.9.9 → 0.9.10

data/plugins/aspects/main.rb

@@ -147,7 +147,7 @@ end
 # Plug-in the aspect subsystem
 module ::Olelo::PageHelper
   def render_page(page)
-    Cache.cache("include-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do |context|
+    cache("include-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do
       begin
         context = Context.new(page: page, params: {included: true})
         Aspect.find!(page, layout: true).call(context, page)
@@ -163,8 +163,7 @@ class ::Olelo::Application
   def show_page
     params[:aspect] ||= 'subpages' if params[:path].to_s.ends_with? '/'
     @selected_aspect, layout, header, content =
-    Cache.cache("aspect-#{page.path}-#{page.etag}-#{build_query(params)}",
-                update: no_cache?, defer: true) do |cache|
+    cache("aspect-#{page.path}-#{page.etag}-#{build_query(params)}", update: no_cache?, defer: true) do |cache|
       aspect = Aspect.find!(page, name: params[:aspect])
       cache.disable! if !aspect.cacheable?
       context = Context.new(page: page, params: params, request: request)
@@ -187,22 +186,35 @@ class ::Olelo::Application
 
   hook :menu do |menu|
     if menu.name == :actions && view_menu = menu[:view]
-      aspects = Aspect.find_all(page).select {|a| !a.hidden? || a.name == @selected_aspect || a.name == page.attributes['aspect'] }.map do |a|
-        [Locale.translate("aspect_#{a.name}", fallback: titlecase(a.name)), a]
-      end.sort_by(&:first)
-      aspects.select {|label, a| a.layout? }.each do |label, a|
-        view_menu << MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: a.name == @selected_aspect ? 'selected' : nil)
-      end
-      aspects.reject {|label, a| a.layout? }.each do |label, a|
-        view_menu << MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: 'download')
-      end
+      view_menu.append(cache("aspect-menu-#{page.path}-#{page.etag}-#{@selected_aspect}", update: no_cache?, defer: true) do
+        aspects = Aspect.find_all(page).select {|a| !a.hidden? || a.name == @selected_aspect || a.name == page.attributes['aspect'] }.map do |a|
+          [Locale.translate("aspect_#{a.name}", fallback: titlecase(a.name)), a]
+        end.sort_by(&:first)
+        aspects.select {|label, a| a.layout? }.map do |label, a|
+          MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: a.name == @selected_aspect ? 'selected' : nil)
+        end +
+        aspects.reject {|label, a| a.layout? }.map do |label, a|
+          MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: 'download')
+        end
+      end)
+    end
+  end
+
+  redefine_method :footer do |content = nil, &block|
+    # FIXME: Use block instead of block_given?, block_given? returns always false. Is this a ruby issue?
+    if block || content
+      super(content, &block)
+    elsif page
+      cache("footer-#{page.path}-#{page.etag}", update: no_cache?) { super() }
+    else
+      super()
     end
   end
 end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_not_available: 'Vzhled %{aspect} není k dispozici pro stránku %{page} s typem %{type}.'
   attribute_aspect: 'Přednastavený vzhled'
 de:

data/plugins/aspects/pageinfo.rb

@@ -16,10 +16,10 @@ table
       td= :name.t
       td= @page.name
     tr
-      td= :title.t
+      td= :attribute_title.t
       td= @page.title
     tr
-      td= :description.t
+      td= :attribute_description.t
       td= @page.attributes['description']
     - if @page.version
       tr
@@ -28,6 +28,12 @@ table
       tr
         td= :version.t
         td.version = @page.version
+      tr
+        td= :author.t
+        td= @page.version.author.name
+      tr
+        td= :comment.t
+        td= @page.version.comment
     tr
       td= :type.t
       td= @page.mime.comment.blank? ? @page.mime : "#{@page.mime.comment} (#{@page.mime})"
@@ -37,7 +43,7 @@ table
         td
           a href=build_path(@page, aspect: 'download') = :download.t
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_pageinfo: 'Informace o stránce'
   download: 'Stáhnout'
   type: 'Typ'

data/plugins/aspects/source.rb

@@ -8,7 +8,7 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_source: 'Zdroj stránky'
 de:
   aspect_source: 'Quellcode'

data/plugins/aspects/subpages.rb

@@ -20,7 +20,7 @@ table#subpages
   thead
     tr
       th= :name.t
-      th= :description.t
+      th= :attribute_description.t
       th= :last_modified.t
       th= :author.t
       th= :comment.t
@@ -46,15 +46,19 @@ table#subpages
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
+  actions:         'Akce'
   aspect_subpages: 'Podstránky'
-  author:          'Autor'
+  history:         'Historie'
 de:
+  actions:         'Aktionen'
   aspect_subpages: 'Unterseiten'
-  author:          'Autor'
+  history:         'Historie'
 en:
+  actions:         'Actions'
   aspect_subpages: 'Subpages'
-  author:          'Author'
+  history:         'History'
 fr:
+  actions:         "Actions"
   aspect_subpages: "Sous-pages"
-  author:          "Auteur"
+  history:         "Historique"

data/plugins/aspects/text.rb

@@ -11,7 +11,7 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_text: 'Stažení textu'
 de:
   aspect_text: 'Quellcode herunterladen'

data/plugins/authentication/locale.yml

@@ -0,0 +1,16 @@
+cs:
+  user_already_exists:    'Uživatel %{name} již existuje'
+  wrong_password:         'Chybné heslo'
+  wrong_user_or_pw:       'Chybné jméno uživatele nebo heslo'
+de:
+  user_already_exists:    'Benutzer %{name} existiert bereits'
+  wrong_password:         'Falsches Passwort'
+  wrong_user_or_pw:       'Falscher Benutzername oder falsches Passwort'
+en:
+  user_already_exists:    'User %{name} already exists'
+  wrong_password:         'Wrong password'
+  wrong_user_or_pw:       'Wrong username or password'
+fr:
+  user_already_exists:    "L'utilisateur %{name} existe déjà"
+  wrong_password:         "Mot de passe incorect"
+  wrong_user_or_pw:       "Nom d'utilisateur ou mot de passe incorect"

data/plugins/blog/locale.yml

@@ -1,4 +1,4 @@
-cs_CZ:
+cs:
   full_article:   'Plný článek'
   no_articles:    'Žádné články nenalezeny'
   written_by:     'Napsal: %{author}'

data/plugins/blog/main.rb

@@ -10,7 +10,7 @@ end
 Tags::Tag.define 'menu', optional: 'path', description: 'Show blog menu', dynamic: true do |context, attrs, content|
   page = Page.find(attrs[:path]) rescue nil
   if page
-    Cache.cache("blog-#{page.path}-#{page.etag}", update: no_cache?(context.request.env), defer: true) do
+    cache("blog-#{page.path}-#{page.etag}", update: no_cache?(context.request.env), defer: true) do
       years = {}
       page.children.each do |child|
         (years[child.version.date.year] ||= [])[child.version.date.month] = true

data/plugins/editor/preview.rb

@@ -54,7 +54,7 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   changes: 'Změny'
   preview: 'Náhled'
 de:

data/plugins/editor/recaptcha.rb

@@ -61,7 +61,7 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   captcha_invalid: 'Neplatný captcha kód'
   captcha_valid: 'Platný captcha kód'
   enter_captcha: 'Vložte laskavě captcha kód.'

data/plugins/filters/editsection.rb

@@ -68,7 +68,7 @@ Filters::Filter.register :editsection, EditSection
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   attribute_no_editsection: 'Zablokovat editaci sekcí'
   edit_section: 'Edituj sekci "%{section}"'
   section_edited: 'Sekce "%{section}" editována'

data/plugins/filters/locale.yml

@@ -1,4 +1,4 @@
-cs_CZ:
+cs:
   aspect_latex: 'LaTeX'
   aspect_page: 'Stránce'
 de:

data/plugins/filters/toc.rb

@@ -52,7 +52,7 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   attribute_toc: 'Vytvořit obsah'
 de:
   attribute_toc: 'Inhaltsverzeichnis erzeugen'

data/plugins/history/locale.yml

@@ -1,4 +1,4 @@
-cs_CZ:
+cs:
   author:                 'Autor'
   changes:                'Změny'
   changes_of:             'Změny stránky %{page}'

data/plugins/history/main.rb

@@ -1,9 +1,9 @@
 description 'History menu'
-dependencies 'utils/assets'
+dependencies 'utils/assets', 'utils/cache'
 export_scripts '*.js'
 
 class ::Olelo::Application
-  get '/compare/:versions(/:path)', versions: '(?:\w+)\.{2,3}(?:\w+)' do
+  get '/compare/:versions(/(:path))', versions: '(?:\w+)\.{2,3}(?:\w+)' do
     @page = Page.find!(params[:path])
     versions = params[:versions].split(/\.{2,3}/)
     begin
@@ -15,12 +15,12 @@ class ::Olelo::Application
     render :compare
   end
 
-  get '/compare(/:path)' do
+  get '/compare(/(:path))' do
     versions = params[:versions] || []
     redirect build_path(params[:path], action: versions.size < 2 ? :history : "compare/#{versions.first}...#{versions.last}")
   end
 
-  get '/changes/:version(/:path)' do
+  get '/changes/:version(/(:path))' do
     @page = Page.find!(params[:path])
     begin
       @diff = page.diff(nil, params[:version])
@@ -33,7 +33,7 @@ class ::Olelo::Application
     render :changes
   end
 
-  get '/history(/:path)' do
+  get '/history(/(:path))' do
     per_page = 30
     @page = Page.find!(params[:path])
     @page_nr = [params[:page].to_i, 1].max
@@ -45,7 +45,7 @@ class ::Olelo::Application
   end
 
   before :action do |method, path|
-    @history_versions_menu = method == :get && (path == '/version/:version(/:path)' || path == '/(:path)')
+    @history_versions_menu = method == :get && (path == '/version/:version(/(:path))' || path == '/(:path)')
   end
 
   hook :menu do |menu|
@@ -53,14 +53,18 @@ class ::Olelo::Application
       history_menu = menu.item(:history, href: build_path(page, action: :history), accesskey: 'h')
 
       if @history_versions_menu
-        head = !page.head? && (Olelo::Page.find(page.path) rescue nil)
-        if page.previous_version || head || page.next_version
-          history_menu.item(:older, href: build_path(page, original_params.merge(version: page.previous_version)),
-                            accesskey: 'o') if page.previous_version
-          history_menu.item(:head, href: build_path(page.path, original_params), accesskey: 'c') if head
-          history_menu.item(:newer, href: build_path(page, original_params.merge(version: page.next_version)),
-                            accesskey: 'n') if page.next_version
-        end
+        history_menu.append(cache("history-menu-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do
+          head = !page.head? && (Olelo::Page.find(page.path) rescue nil)
+          items = []
+          if page.previous_version || head || page.next_version
+            items << MenuItem.new(:older, href: build_path(page, original_params.merge(version: page.previous_version)),
+                                  accesskey: 'o') if page.previous_version
+            items << MenuItem.new(:head, href: build_path(page.path, original_params), accesskey: 'c') if head
+            items << MenuItem.new(:newer, href: build_path(page, original_params.merge(version: page.next_version)),
+                                  accesskey: 'n') if page.next_version
+          end
+          items
+        end)
       end
     end
   end

data/plugins/login/persistent.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description  'Persistent login'
 
 class ::Olelo::Application
@@ -14,11 +15,6 @@ class ::Olelo::Application
     end
   end
 
-  before :login_buttons do
-    %{<input type="checkbox" name="persistent" id="persistent" value="1"/>
-<label for="persistent">#{escape_html :persistent_login.t}</label><br/>}
-  end
-
   after :action do |method, path|
     if path == '/login'
       if User.logged_in? && params[:persistent]
@@ -29,11 +25,17 @@ class ::Olelo::Application
       response.delete_cookie(TOKEN_NAME)
     end
   end
+
+  before(:login_buttons) { render_partial :persistent_login }
 end
 
 __END__
+@@ persistent_login.slim
+&checkbox#persistent name="persistent" value="1"
+label for="persistent" = :persistent_login.t
+br
 @@ locale.yml
-cs_CZ:
+cs:
   persistent_login:     'Trvalé přihlášení'
 de:
   persistent_login:     'Dauerhaft anmelden'

data/plugins/misc/variables.rb

@@ -1,9 +1,15 @@
 description  'Export variables to context and javascript'
 dependencies 'aspects'
 
-def self.exported_variables(page)
+def self.exported_global_variables
   {
     'base_path'             => Config['base_path'],
+    'default_mime'          => Page.default_mime
+  }
+end
+
+def self.exported_page_variables(page)
+  {
     'page_name'             => page.name,
     'page_new'              => page.new?,
     'page_modified'         => page.modified?,
@@ -12,19 +18,24 @@ def self.exported_variables(page)
     'page_version'          => page.version.to_s,
     'page_next_version'     => page.next_version.to_s,
     'page_previous_version' => page.previous_version.to_s,
-    'page_mime'             => page.mime.to_s,
-    'default_mime'          => Page.default_mime
+    'page_mime'             => page.mime.to_s
   }
 end
 
 # Export variables to aspect context
 Aspects::Context.hook(:initialized) do
-  params.merge!(PLUGIN.exported_variables(page))
+  params.merge!(PLUGIN.exported_global_variables)
+  params.merge!(PLUGIN.exported_page_variables(page))
 end
 
 # Export variables to javascript for client extensions
 Application.hook :head, 1 do
-  vars = page ? params.merge(PLUGIN.exported_variables(page)) : params
+  vars = params.merge(PLUGIN.exported_global_variables)
+  if page
+    vars.merge!(cache("variables-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do
+      PLUGIN.exported_page_variables(page)
+    end)
+  end
   vars = vars.merge('user_name' => User.current.name) if User.logged_in?
   %{<script type="text/javascript">Olelo = #{escape_javascript MultiJson.dump(vars)};</script>}
 end

data/plugins/misc/webdav.rb

@@ -18,28 +18,30 @@ class ::Olelo::Application
     :bad_request
   end
 
-  put '/(:path)', tail: true do
-    if request.form_data?
-      :not_implemented
-    else
-      webdav_post
+  get '/webdav(/(:path))' do
+    begin
+      page = Page.find!(params[:path])
+      cache_control etag: page.etag
+      response['Content-Type'] = page.mime.to_s
+      page.content
+    rescue NotFound => ex
+      Olelo.logger.error ex
+      :not_found
+    rescue Exception => ex
+      Olelo.logger.error ex
+      :bad_request
     end
   end
 
-  post '/(:path)', tail: true do
-    if request.form_data?
-      super()
-    else
-      webdav_post
-    end
-  end
+  put('/webdav(/(:path))') { webdav_post }
+  post('/webdav(/(:path))') { webdav_post }
 
   # TODO: Implement more methods if needed
-  add_route('PROPFIND', '/(:path)', tail: true)  { :not_found }
-  add_route('PROPPATCH', '/(:path)', tail: true) { :not_implemented }
-  add_route('MKCOL', '/(:path)', tail: true)     { :not_implemented }
-  add_route('COPY', '/(:path)', tail: true)      { :not_implemented }
-  add_route('MOVE', '/(:path)', tail: true)      { :not_implemented }
-  add_route('LOCK', '/(:path)', tail: true)      { :not_implemented }
-  add_route('UNLOCK', '/(:path)', tail: true)    { :not_implemented }
+  add_route('PROPFIND', '/webdav(/(:path))')  { :not_found }
+  add_route('PROPPATCH', '/webdav(/(:path))') { :not_implemented }
+  add_route('MKCOL', '/webdav(/(:path))')     { :not_implemented }
+  add_route('COPY', '/webdav(/(:path))')      { :not_implemented }
+  add_route('MOVE', '/webdav(/(:path))')      { :not_implemented }
+  add_route('LOCK', '/webdav(/(:path))')      { :not_implemented }
+  add_route('UNLOCK', '/webdav(/(:path))')    { :not_implemented }
 end