olelo 0.9.9 → 0.9.10

data/Rakefile

@@ -101,20 +101,21 @@ namespace :locale do
   task :check do
     require File.join(File.dirname(__FILE__), 'lib/olelo/virtualfs')
     require 'yaml'
-    files = {}
+    require 'set'
+
+    locales = {}
     Dir['**/*.rb'].each do |file|
       begin
-        files[file] = Olelo::VirtualFS::Embedded.new(file).read('locale.yml')
+        locales[file] = YAML.load(Olelo::VirtualFS::Embedded.new(file).read('locale.yml'))
       rescue
       end
     end
     Dir['**/locale.yml'].each do |file|
-      files[file] = File.read(file)
+      locales[file] = YAML.load_file(file)
     end
 
-    files.each do |file, content|
+    locales.each do |file, translations|
       puts "Checking #{file}"
-      translations = YAML.load(content)
       en = translations['en']
       raise 'en locale missing' unless en
       en_keys = en.keys
@@ -130,6 +131,41 @@ namespace :locale do
         end
       end
     end
+
+    locale_defined = {}
+    locales.each do |file,translations|
+      translations.each do |locale, hash|
+        hash.keys.each do |key|
+          (locale_defined[key] ||= Set.new) << file
+        end
+      end
+    end
+
+    locale_used = {}
+    Dir['**/*.rb', '**/*.slim'].each do |file|
+      File.read(file).scan(/:(\w+)\.t[^\w]/) do
+        (locale_used[$1] ||= Set.new) << file
+      end
+    end
+
+    locale_defined.each do |key,files|
+      unless locale_used[key]
+        puts "#{key} defined in #{files.to_a.join(', ')} is unused"
+      end
+    end
+
+    locale_used.each do |key, files|
+      unless locale_defined[key]
+        puts "#{key} used in #{files.to_a.join(', ')} is undefined"
+      end
+    end
+
+    (locale_defined.keys & locale_used.keys).sort.each do |key|
+      if locale_defined[key] != locale_used[key] &&
+          !(locale_defined[key].all? {|file| file =~ %r{^lib} } && locale_used[key].any? {|file| file =~ %r{^lib} })
+        puts "#{key} - defined in #{locale_defined[key].to_a.join(', ')} - used in #{locale_used[key].to_a.join(', ')}"
+      end
+    end
   end
 end
 

data/config.ru

@@ -8,7 +8,6 @@ Encoding.default_external = Encoding::UTF_8
 
 require 'fileutils'
 require 'rack/relative_redirect'
-require 'rack/static_cache'
 require 'olelo'
 require 'securerandom'
 
@@ -16,10 +15,11 @@ Olelo::Config.instance['app_path'] = app_path
 Olelo::Config.instance['config_path'] = ::File.join(app_path, 'config')
 Olelo::Config.instance['initializers_path'] = ::File.join(app_path, 'config', 'initializers')
 Olelo::Config.instance['plugins_path'] = ::File.join(app_path, 'plugins')
-Olelo::Config.instance['themes_path'] = ::File.join(app_path, 'static', 'themes')
 Olelo::Config.instance['rack.session_secret'] = SecureRandom.hex
 Olelo::Config.instance.load!(::File.join(app_path, 'config', 'config.yml.default'))
 
+puts 'WARNING: Environment variable $WIKI_CONFIG is deprecated, use $OLELO_CONFIG instead' if ENV['WIKI_CONFIG']
+
 config_file = ENV['OLELO_CONFIG'] || ENV['WIKI_CONFIG']
 unless config_file
   path = ::File.join(app_path, 'config', 'config.yml')
@@ -81,7 +81,9 @@ if Olelo::Config['rack.deflater']
   use Rack::Deflater
 end
 
-use Rack::StaticCache, urls: ['/static'], root: app_path
+use Olelo::Middleware::StaticCache
+use Rack::Static, urls: ['/static'], root: app_path
+
 use Rack::Session::Cookie, key: 'olelo.session', secret: Olelo::Config['rack.session_secret']
 
 #require 'rack/perftools_profiler'

data/lib/olelo.rb

@@ -35,3 +35,4 @@ require 'olelo/version'
 require 'olelo/middleware/degrade_mime_type'
 require 'olelo/middleware/ua_header'
 require 'olelo/middleware/force_encoding'
+require 'olelo/middleware/static_cache'

data/lib/olelo/application.rb

@@ -85,13 +85,14 @@ module Olelo
     end
 
     get '/login' do
+      session[:olelo_goto] ||= env['HTTP_REFERER']
       render :login
     end
 
     post '/login' do
       on_error :login
       User.current = User.authenticate(params[:user], params[:password])
-      redirect build_path(session.delete(:olelo_goto))
+      redirect(session.delete(:olelo_goto) || build_path('/'))
     end
 
     post '/signup' do
@@ -99,12 +100,12 @@ module Olelo
       raise 'Sign-up is disabled' if !Config['authentication.enable_signup']
       User.current = User.signup(params[:user], params[:password],
                                  params[:confirm], params[:email])
-      redirect build_path('/')
+      redirect(session.delete(:olelo_goto) || build_path('/'))
     end
 
     get '/logout' do
       User.current = User.anonymous(request)
-      redirect build_path('/')
+      redirect(env['HTTP_REFERER'] || build_path('/'))
     end
 
     get '/profile' do
@@ -149,13 +150,13 @@ module Olelo
       end
     end
 
-    get '/edit(/:path)' do
+    get '/edit(/(:path))' do
       @page = Page.find!(params[:path])
       flash.info!(:info_binary.t(page: page.title, type: "#{page.mime.comment} (#{page.mime})")) unless page.editable?
       render :edit
     end
 
-    get '/new(/:path)' do
+    get '/new(/(:path))' do
       @page = Page.new(params[:path])
       flash.error! :reserved_path.t if self.class.reserved_path?(page.path)
       params[:path] = !page.root? && Page.find(page.path) ? page.path + '/' : page.path
@@ -222,7 +223,7 @@ module Olelo
       end
     end
 
-    get '/version/:version(/:path)' do
+    get '/version/:version(/(:path))' do
       @page = Page.find!(params[:path], params[:version])
       cache_control etag: page.etag
       show_page

data/lib/olelo/helper.rb

@@ -316,15 +316,15 @@ module Olelo
       end
     end
 
+    def build_static_path(path)
+      file = File.join(Config['app_path'], 'static', path)
+      build_path "static-#{File.mtime(file).to_i}/#{path}"
+    end
+
     def head
-      @@js_css_links ||=
-        begin
-          file = File.join(Config['themes_path'], Config['theme'], 'style.css')
-          css_path = build_path "static/themes/#{Config['theme']}/style.css?#{File.mtime(file).to_i}"
-          js_path = build_path "static/script.js?#{File.mtime(File.join(Config['app_path'], 'static', 'script.js')).to_i}"
-          %{<link rel="stylesheet" href="#{escape_html css_path}" type="text/css"/>
-<script src="#{escape_html js_path}" type="text/javascript"></script>}
-        end
+      @@head_links ||= %{<link rel="shortcut icon" href="#{escape_html build_static_path('favicon.png')}" type="image/png"/>
+<link rel="stylesheet" href="#{escape_html build_static_path("themes/#{Config['theme']}/style.css")}" type="text/css"/>
+<script src="#{escape_html build_static_path("script.js")}" type="text/javascript"></script>}
       # Add base path to root page to fix links in history browsing and for wikis with base_path
       base_path = if page && page.root?
         url = request.base_url
@@ -332,7 +332,7 @@ module Olelo
         url << '/' << 'version'/page.tree_version if !page.head?
         %{<base href="#{escape_html url}/"/>}.html_safe
       end
-      [base_path, @@js_css_links, *invoke_hook(:head)].join.html_safe
+      [base_path, @@head_links, *invoke_hook(:head)].join.html_safe
     end
 
     def session

data/lib/olelo/initializer.rb

@@ -37,8 +37,9 @@ module Olelo
     def init_plugins
       # Load locale provided by plugin
       Plugin.after(:load) do
-        locale = virtual_fs.read('locale.yml') rescue nil
-        Locale.add(YAML.load(locale)) if locale
+        virtual_fs.glob('locale.yml') do |fs, name|
+          Locale.add(YAML.load(fs.read(name)))
+        end
       end
 
       # Configure plugin system

data/lib/olelo/locale.rb

@@ -33,9 +33,7 @@ module Olelo
       # @return [String] translated string
       #
       def translate(key, args = {})
-        if !key.to_s.ends_with?('_plural') && args[:count] && args[:count] != 1
-          translate("#{key}_plural", args)
-        elsif @translations[key]
+        if @translations[key]
           @translations[key] % args
         else
           args[:fallback] || "##{key}"

data/lib/olelo/locale.yml

@@ -1,6 +1,5 @@
-cs_CZ:
+cs:
   access_denied:          'Přístup odepřen'
-  actions:                'Akce'
   already_exists:         'Stránka %{page} již existuje'
   attribute_mime:         'Mime-Type'
   attribute_no_title:     'Skrýt titulek'
@@ -14,11 +13,10 @@ cs_CZ:
   comment:                'Komentář'
   confirm_password:       'Potvrdit heslo'
   create_page:            'Vytvořit stránku %{page}'
-  create_redirect:        'Vytvořit přesměrování'
   delete:                 'Smazat'
   delete_page:            'Smazat stránku %{page}'
   deleted:                'Smazáno'
-  description:            'Popis'
+  attribute_description:  'Popis'
   destination:            'Cíl'
   edit:                   'Editovat'
   edit_page:              'Editace stránky %{page}'
@@ -28,14 +26,11 @@ cs_CZ:
   error_occurred:         'Ouvej! Vyskytla se chyba.'
   file:                   'Soubor'
   groups:                 'Skupiny'
-  head:                   'Nejnovější'
-  history:                'Historie'
   info_binary:            'Stránka %{page} je binární typ %{type} a nemůže být editována jako textový soubor.'
   invalid_email:          'e-mail je neplatný'
   invalid_mime_type:      'mime-type je neplatný'
   invalid_name:           'Jméno je neplatné'
   invalid_path:           'Neplatná cesta'
-  last_modified:          'Poslední modifikace'
   login:                  'Přihlášení'
   logout:                 'Odhlášení'
   menu_actions_edit:      'Editovat'
@@ -45,12 +40,10 @@ cs_CZ:
   menu_actions_view:      'Zobrazit'
   move:                   'Přesunout'
   move_page:              'Přesunout stránku %{page}'
-  name:                   'Jméno'
   new_page:               'Nová stránka'
   no_changes:             'Žádné změny'
   not_found_text:         'Pardon, stránka, kterou hledáte, nebyla nalezena.'
   old_password:           'Staré heslo'
-  page:                   'Stránka'
   page_deleted:           'Stránka %{page} smazána.'
   page_edited:            'Stránka %{page} editována'#
   not_found_title:        '404 Not found'
@@ -71,23 +64,15 @@ cs_CZ:
   settings:               'Nastavení'
   signup:                 'Registrovat se'
   summary:                'Souhrn'
-  text:                   'Text'
-  title:                  'Titulek'
-  tree:                   'Strom'
   type_select:            'Vybrat hodnotu'
   type_stringlist:        'Řetězce oddělené čárkou'
   upload:                 'Nahrát'
   upload_file:            'Nahrát soubor'
   user:                   'Uživatel'
-  user_already_exists:    'Uživatel %{name} již existuje'
-  version:                'Verze'
   version_by:             'Verze %{version} od %{author}, %{date}'
   version_conflict:       'Detekován konflikt verzí'
-  wrong_password:         'Chybné heslo'
-  wrong_user_or_pw:       'Chybné jméno uživatele nebo heslo'
 de:
   access_denied:          'Zugriff verweigert'
-  actions:                'Aktionen'
   already_exists:         '%{page} existiert bereits'
   attribute_mime:         'Mime-Typ'
   attribute_no_title:     'Titel deaktivieren'
@@ -101,11 +86,10 @@ de:
   comment:                'Kommentar'
   confirm_password:       'Bestätige Passwort'
   create_page:            'Neue %{page}'
-  create_redirect:        'Weiterleitung'
   delete:                 'Löschen'
   delete_page:            'Lösche %{page}'
   deleted:                'Gelöscht'
-  description:            'Beschreibung'
+  attribute_description:  'Beschreibung'
   destination:            'Ziel'
   edit:                   'Bearbeiten'
   edit_page:              'Bearbeite %{page}'
@@ -115,14 +99,11 @@ de:
   error_occurred:         'Hoppla! Es ist ein Fehler aufgetreten.'
   file:                   'Datei'
   groups:                 'Gruppen'
-  head:                   'Kopf'
-  history:                'Historie'
   info_binary:            '%{page} ist eine Datei mit dem Typ %{type} und kann nicht wie eine Textdatei bearbeitet werden.'
   invalid_email:          'E-Mail ist ungültig'
   invalid_mime_type:      'Mime-Typ ist ungültig'
   invalid_name:           'Name ist ungültig'
   invalid_path:           'Ungültiger Pfad'
-  last_modified:          'Letzte Änderung'
   login:                  'Anmelden'
   logout:                 'Abmelden'
   menu_actions_edit:      'Bearbeiten'
@@ -132,13 +113,11 @@ de:
   menu_actions_view:      'Ansicht'
   move:                   'Verschieben'
   move_page:              'Verschiebe %{page}'
-  name:                   'Name'
   new_page:               'Neue Seite'
   no_changes:             'Keine Änderungen'
   not_found_text:         'Die Seite wurde leider nicht gefunden.'
   not_found_title:        '404 Nicht gefunden'
   old_password:           'Altes Passwort'
-  page:                   'Seite'
   page_deleted:           '%{page} gelöscht.'
   page_edited:            '%{page} bearbeitet'
   page_moved:             '%{page} verschoben nach %{destination}.'
@@ -158,23 +137,15 @@ de:
   settings:               'Einstellungen'
   signup:                 'Konto anlegen'
   summary:                'Zusammenfassung'
-  text:                   'Text'
-  title:                  'Titel'
-  tree:                   'Baum'
   type_select:            'Wert auswählen'
   type_stringlist:        'Durch Komma getrennte Strings'
   upload:                 'Hochladen'
   upload_file:            'Datei hochladen'
   user:                   'Benutzer'
-  user_already_exists:    'Benutzer %{name} existiert bereits'
-  version:                'Version'
   version_by:             'Version %{version} von %{author}, %{date}'
   version_conflict:       'Versionskonflikt aufgetreten'
-  wrong_password:         'Falsches Passwort'
-  wrong_user_or_pw:       'Falscher Benutzername oder falsches Passwort'
 en:
   access_denied:          'Access denied'
-  actions:                'Actions'
   already_exists:         '%{page} exists already'
   attribute_mime:         'Mime-Type'
   attribute_no_title:     'Disable title'
@@ -188,11 +159,10 @@ en:
   comment:                'Comment'
   confirm_password:       'Confirm password'
   create_page:            'Create %{page}'
-  create_redirect:        'Create redirect'
   delete:                 'Delete'
   delete_page:            'Delete %{page}'
   deleted:                'Deleted'
-  description:            'Description'
+  attribute_description:  'Description'
   destination:            'Destination'
   edit:                   'Edit'
   edit_page:              'Editing %{page}'
@@ -202,26 +172,21 @@ en:
   error_occurred:         'Oh snap! An error occurred.'
   file:                   'File'
   groups:                 'Groups'
-  head:                   'Head'
-  history:                'History'
   info_binary:            '%{page} is a binary %{type} and cannot be edited like a text file.'
   invalid_email:          'E-Mail is invalid'
   invalid_mime_type:      'Invalid mime type'
   invalid_name:           'Name is invalid'
   invalid_path:           'Invalid path'
-  last_modified:          'Last modified'
   login:                  'Login'
   logout:                 'Logout'
   menu_actions_edit_new:  'New Page'
   move:                   'Move'
   move_page:              'Move %{page}'
-  name:                   'Name'
   new_page:               'New Page'
   no_changes:             'No changes'
   not_found_text:         'Sorry, the page you were looking for was not found.'
   not_found_title:        '404 Not found'
   old_password:           'Old password'
-  page:                   'Page'
   page_deleted:           '%{page} deleted.'
   page_edited:            '%{page} edited'
   page_moved:             '%{page} moved to %{destination}.'
@@ -241,23 +206,15 @@ en:
   settings:               'Settings'
   signup:                 'Sign up'
   summary:                'Summary'
-  text:                   'Text'
-  title:                  'Title'
-  tree:                   'Tree'
   type_select:            'Select value'
   type_stringlist:        'Comma-separated strings'
   upload:                 'Upload'
   upload_file:            'Upload file'
   user:                   'User'
-  user_already_exists:    'User %{name} already exists'
-  version:                'Version'
   version_by:             'Version %{version} by %{author}, %{date}'
   version_conflict:       'Version conflict detected'
-  wrong_password:         'Wrong password'
-  wrong_user_or_pw:       'Wrong username or password'
 fr:
   access_denied:          "Accès refusé"
-  actions:                "Actions"
   already_exists:         "%{page} existe déjà"
   attribute_mime:         "Type MIME"
   attribute_no_title:     "Désactiver le titre"
@@ -271,11 +228,10 @@ fr:
   comment:                "Commentaire"
   confirm_password:       "Confirmer le mot de passe"
   create_page:            "Créer %{page}"
-  create_redirect:        "Créer une redirection"
   delete:                 "Effacer"
   delete_page:            "Effacer %{page}"
   deleted:                "Supprimé"
-  description:            "Description"
+  attribute_description:  "Description"
   destination:            "Destination"
   edit:                   "Éditer"
   edit_page:              "Modifier %{page}"
@@ -285,26 +241,21 @@ fr:
   error_occurred:         "Oops ! Une erreur est survenue."
   file:                   "Fichier"
   groups:                 "Groupes"
-  head:                   "Tête"
-  history:                "Historique"
   info_binary:            "%{page} est un binaire %{type} et ne peut pas être édité comme un fichier texte."
   invalid_email:          "Courriel invalide"
   invalid_mime_type:      "Type MIME invalide"
   invalid_name:           "Nom invalide"
   invalid_path:           "Chemin invalide"
-  last_modified:          "Dernière modification"
   login:                  "Connexion"
   logout:                 "Déconnexion"
   menu_actions_edit_new:  "Nouvelle page"
   move:                   "Déplacer"
   move_page:              "Déplacer %{page}"
-  name:                   "Nom"
   new_page:               "Nouvelle page"
   no_changes:             "Aucun changement"
   not_found_text:         "Désolé, la page que vous recherchez n'a pas été trouvée."
   not_found_title:        '404 Non trouvé'
   old_password:           "Ancien mot de passe"
-  page:                   "Page"
   page_deleted:           "%{page} supprimé."
   page_edited:            "%{page} éditée"
   page_moved:             "%{page} déplacer vers %{destination}."
@@ -324,17 +275,10 @@ fr:
   settings:               "Paramètres"
   signup:                 "S'enregistrer"
   summary:                "Sommaire"
-  text:                   "Texte"
-  title:                  "Titre"
-  tree:                   "Arbre"
   type_select:            "Sélectionnez une valeur"
   type_stringlist:        "Chaînes séparées par des virgules"
   upload:                 "Téléverser"
   upload_file:            "Téléverser un fichier"
   user:                   "Utilisateur"
-  user_already_exists:    "L'utilisateur %{name} existe déjà"
-  version:                "Version"
   version_by:             'Version %{version} par %{author}, %{date}'
   version_conflict:       "Conflit de version détecté"
-  wrong_password:         "Mot de passe incorect"
-  wrong_user_or_pw:       "Nom d'utilisateur ou mot de passe incorect"