olelo 0.9.4 → 0.9.5

data/lib/olelo/page.rb

@@ -23,15 +23,19 @@ module Olelo
     # Pattern for valid paths
     # @api public
     PATH_PATTERN = '[^\s](?:.*[^\s]+)?'.freeze
+
     PATH_REGEXP = /^#{PATH_PATTERN}$/
+    private_constant :PATH_REGEXP
 
     # Mime type for empty page
     # @api public
     EMPTY_MIME = MimeMagic.new('inode/x-empty')
+    private_constant :EMPTY_MIME
 
     # Mime type for directory
     # @api public
     DIRECTORY_MIME = MimeMagic.new('inode/directory')
+    private_constant :DIRECTORY_MIME
 
     attr_reader :path, :tree_version
 
@@ -80,6 +84,10 @@ module Olelo
       path.empty?
     end
 
+    def editable?
+      mime.text? || mime == EMPTY_MIME || mime == DIRECTORY_MIME
+    end
+
     def next_version
       init_versions
       @next_version
@@ -95,7 +103,7 @@ module Olelo
       @version
     end
 
-    def history(skip = nil, limit = nil)
+    def history(skip, limit)
       raise 'Page is new' if new?
       repository.get_history(path, skip, limit)
     end

data/lib/olelo/plugin.rb

@@ -66,7 +66,7 @@ module Olelo
                 Olelo.logger.warn "Plugin #{path} could not be loaded due to: #{ex.message} (Missing gem?)"
               else
                 Olelo.logger.error "Plugin #{path} could not be loaded due to: #{ex.message}"
-                Olelo.logger.error ex
+                Olelo.logger.debug ex
               end
               @loaded.delete(path)
               false

data/lib/olelo/repository.rb

@@ -159,7 +159,7 @@ module Olelo
     # @param [Integer] Maximum number of versions to load
     # @return [Array<Version>]
     # @api public
-    def get_history(path, skip = nil, limit = nil)
+    def get_history(path, skip, limit)
       raise NotImplementedError
     end
 

data/lib/olelo/util.rb

@@ -93,6 +93,7 @@ module Olelo
     # Hash used by {#escape_javascript}
     # @api private
     JAVASCRIPT_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
+    private_constant :JAVASCRIPT_ESCAPE
 
     # Escape javascript code for embedding in html
     #
@@ -200,6 +201,8 @@ module Olelo
       (0x10000..0x10FFFF)
     ]
 
+    private_constant :VALID_XML_CHARS
+
     # Check if string contains only characters which are valid in XML
     #
     # @see http://www.w3.org/TR/REC-xml/#charsets XML charset

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/olelo.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('multi_json', ['~> 1.3.6'])
   s.add_runtime_dependency('slim', ['~> 1.3.3'])
-  s.add_runtime_dependency('creole', ['~> 0.4.2'])
+  s.add_runtime_dependency('creole', ['~> 0.5.0'])
   s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
   s.add_runtime_dependency('mimemagic', ['~> 0.2.0'])
   s.add_runtime_dependency('rack', ['~> 1.4.1'])

data/plugins/aspects/changelog.rb

@@ -9,19 +9,22 @@ Aspect.create(:changelog, cacheable: true, hidden: true) do
     url = context.request.base_url
     context.header['Content-Type'] = "application/#{format == 'rss' ? 'rss' : 'atom'}+xml; charset=utf-8"
 
+    per_page = 30
+    page_nr = [context.params[:page].to_i, 1].max
+    history = page.history((page_nr - 1) * per_page, per_page)
+
     content = RSS::Maker.make(format == 'rss' ? '2.0' : 'atom') do |feed|
       feed.channel.generator = 'Ōlelo'
       feed.channel.title = Config['title']
-      feed.channel.link = url + '/' + page.path
+      feed.channel.id = feed.channel.link = url + '/' + page.path
       feed.channel.description = Config['title'] + ' Changelog'
-      feed.channel.id = url + page.path
       feed.channel.updated = Time.now
       feed.channel.author = Config['title']
       feed.items.do_sort = true
-      page.history.each do |version|
+      history.each do |version|
         i = feed.items.new_item
         i.title = version.comment
-        i.link = url + '/changes'/version
+        i.link = "#{url}/changes/#{version}"
         i.date = version.date
         i.dc_creator = version.author.name
       end

data/plugins/aspects/locale.yml

@@ -1,65 +1,87 @@
-en:
-  attribute_aspect: 'Default Aspect'
-  download: 'Download'
+cs_CZ:
   aspect_documentbrowser: 'Document Browser'
-  aspect_download: 'Raw Download'
-  aspect_pageinfo: 'Page Information'
-  aspect_highlight: 'Highlighted Source'
-  aspect_imageinfo: 'Image Information'
-  aspect_image: 'Raw Image'
-  aspect_source: 'Page Source'
-  aspect_subpages: 'Subpages'
-  aspect_text: 'Text Download'
-  aspect_gallery: 'Image Gallery'
-  aspect_s5: 'S5 Presentation'
+  aspect_download: 'Stažení (neupraveno)'
+  aspect_gallery: 'Galerie'
+  aspect_highlight: 'Zvýrazněný zdroj'
+  aspect_image: 'Stažení obrázku'
+  aspect_imageinfo: 'Informace o obrázku'
   aspect_latex: 'LaTeX'
-  aspect_not_available: 'Aspect #{aspect} is not available for page #{page} with type #{type}.'
-  entry: 'Entry'
-  exif: 'EXIF Information'
-  geometry: 'Geometry'
-  information: 'Information'
-  type: 'Type'
-  value: 'Value'
+  aspect_not_available: 'Vzhled %{aspect} není k dispozici pro stránku %{page} s typem %{type}.'
+  aspect_pageinfo: 'Informace o stránce'
+  aspect_source: 'Zdroj stránky'
+  aspect_subpages: 'Podstránky'
+  aspect_text: 'Stažení textu'
+  attribute_aspect: 'Přednastavený vzhled'
+  download: 'Stáhnout'
+  entry: 'Položka'
+  exif: 'Informace EXIF'
+  geometry: 'Geometrie'
+  information: 'Informace'
+  type: 'Typ'
+  value: 'Hodnota'
 de:
-  attribute_aspect: 'Standard-Ansicht'
-  download: 'Herunterladen'
   aspect_documentbrowser: 'Dokumentenbrowser'
   aspect_download: 'Herunterladen'
-  aspect_pageinfo: 'Seiten-Information'
+  aspect_gallery: 'Bildergalerie'
   aspect_highlight: 'Quellcode mit Syntaxhighlighting'
-  aspect_imageinfo: 'Bild-Information'
   aspect_image: 'Bild'
+  aspect_imageinfo: 'Bild-Information'
+  aspect_latex: 'LaTeX'
+  aspect_not_available: 'Aspekt %{aspect} für die Seite %{page} mit dem Typ %{type} ist nicht verfügbar.'
+  aspect_pageinfo: 'Seiten-Information'
+  aspect_s5: 'S5 Präsentation'
   aspect_source: 'Quellcode'
   aspect_subpages: 'Unterseiten'
   aspect_text: 'Quellcode herunterladen'
-  aspect_gallery: 'Bildergalerie'
-  aspect_s5: 'S5 Präsentation'
-  aspect_latex: 'LaTeX'
-  aspect_not_available: 'Aspekt #{aspect} für die Seite #{page} mit dem Typ #{type} ist nicht verfügbar.'
+  attribute_aspect: 'Standard-Ansicht'
+  download: 'Herunterladen'
   entry: 'Eintrag'
   exif: 'EXIF-Information'
   geometry: 'Geometrie'
   information: 'Information'
   type: 'Typ'
   value: 'Wert'
-cs_CZ:
-  attribute_aspect: 'Přednastavený vzhled'
-  download: 'Stáhnout'
+en:
   aspect_documentbrowser: 'Document Browser'
-  aspect_download: 'Stažení (neupraveno)'
-  aspect_pageinfo: 'Informace o stránce'
-  aspect_highlight: 'Zvýrazněný zdroj'
-  aspect_imageinfo: 'Informace o obrázku'
-  aspect_image: 'Stažení obrázku'
-  aspect_source: 'Zdroj stránky'
-  aspect_subpages: 'Podstránky'
-  aspect_text: 'Stažení textu'
-  aspect_gallery: 'Galerie'
+  aspect_download: 'Raw Download'
+  aspect_gallery: 'Image Gallery'
+  aspect_highlight: 'Highlighted Source'
+  aspect_image: 'Raw Image'
+  aspect_imageinfo: 'Image Information'
   aspect_latex: 'LaTeX'
-  aspect_not_available: 'Vzhled #{aspect} není k dispozici pro stránku #{page} s typem #{type}.'
-  entry: 'Položka'
-  exif: 'Informace EXIF'
-  geometry: 'Geometrie'
-  information: 'Informace'
-  type: 'Typ'
-  value: 'Hodnota'
+  aspect_not_available: 'Aspect %{aspect} is not available for page %{page} with type %{type}.'
+  aspect_pageinfo: 'Page Information'
+  aspect_s5: 'S5 Presentation'
+  aspect_source: 'Page Source'
+  aspect_subpages: 'Subpages'
+  aspect_text: 'Text Download'
+  attribute_aspect: 'Default Aspect'
+  download: 'Download'
+  entry: 'Entry'
+  exif: 'EXIF Information'
+  geometry: 'Geometry'
+  information: 'Information'
+  type: 'Type'
+  value: 'Value'
+fr:
+  aspect_documentbrowser: "Explorateur de fichier"
+  aspect_download: "Téléchargement brut"
+  aspect_gallery: "Galerie d'images"
+  aspect_highlight: "Source mise en valeur"
+  aspect_image: "Image brute"
+  aspect_imageinfo: "Information sur l'image"
+  aspect_latex: "LaTeX"
+  aspect_not_available: "L'aspect %{aspect} n'est pas disponible pour la page %{page} avec le type %{type}."
+  aspect_pageinfo: "Page d'information"
+  aspect_s5: "Presentation S5 "
+  aspect_source: "Source de la page"
+  aspect_subpages: "Sous-pages"
+  aspect_text: "Téléchargement en texte"
+  attribute_aspect: "Aspect par défaut"
+  download: "Télécharger"
+  entry: "Entrée"
+  exif: "Information EXIF"
+  geometry: "Geometrie"
+  information: "Information"
+  type: "Type"
+  value: "Valeur"

data/plugins/blog/locale.yml

@@ -1,12 +1,16 @@
-en:
-  full_article:   'Full Article'
-  written_by:     'written by #{author}'
-  no_articles:    'No articles found'
-de:
-  full_article:   'Ganzer Artikel'
-  written_by:     'verfasst von #{author}'
-  no_articles:    'Keine Artikel gefunden'
 cs_CZ:
   full_article:   'Plný článek'
-  written_by:     'Napsal: #{author}'
   no_articles:    'Žádné články nenalezeny'
+  written_by:     'Napsal: %{author}'
+de:
+  full_article:   'Ganzer Artikel'
+  no_articles:    'Keine Artikel gefunden'
+  written_by:     'verfasst von %{author}'
+en:
+  full_article:   'Full Article'
+  no_articles:    'No articles found'
+  written_by:     'written by %{author}'
+fr:
+  full_article:   "Article complet"
+  no_articles:    "Aucun article trouvé"
+  written_by:     "écrit par %{author}"

data/plugins/editor/locale.yml

@@ -1,15 +1,20 @@
-en:
-  enter_captcha: 'Please enter the captcha.'
-  captcha_invalid: Invalid captcha
-  captcha_valid: Valid captcha
-  preview: Preview
-de:
-  enter_captcha: 'Bitte geben Sie ein Captcha ein.'
-  captcha_invalid: 'Ungültiges Captcha'
-  captcha_valid: 'Gültiges Captcha'
-  preview: Vorschau
 cs_CZ:
-  enter_captcha: 'Vložte laskavě captcha kód.'
   captcha_invalid: 'Neplatný captcha kód'
   captcha_valid: 'Platný captcha kód'
+  enter_captcha: 'Vložte laskavě captcha kód.'
   preview: 'Náhled'
+de:
+  captcha_invalid: 'Ungültiges Captcha'
+  captcha_valid: 'Gültiges Captcha'
+  enter_captcha: 'Bitte geben Sie ein Captcha ein.'
+  preview: Vorschau
+en:
+  captcha_invalid: Invalid captcha
+  captcha_valid: Valid captcha
+  enter_captcha: 'Please enter the captcha.'
+  preview: Preview
+fr:
+  captcha_invalid: "Captcha invalide"
+  captcha_valid: "Captcha valide"
+  enter_captcha: "Veuillez entrer le captcha."
+  preview: "Prévisualisez"

data/plugins/filters/creole.rb

@@ -18,16 +18,13 @@ class OleloCreole < ::Creole::Parser
     end
     image_path = escape_html(image_path)
     path = escape_html(path)
-    nolink = args.delete('nolink')
     box = args.delete('box')
     alt = escape_html(args[0] ? args[0] : path)
-    if nolink
-      %{<img src="#{image_path}" alt="#{alt}"/>}
-    elsif box
+    if box
       caption = args[0] ? %{<span class="caption">#{escape_html args[0]}</span>} : ''
-      %{<span class="img"><a href="#{path}"><img src="#{image_path}" alt="#{alt}"/>#{caption}</a></span>}
+      %{<span class="img"><img src="#{image_path}" alt="#{alt}"/>#{caption}</span>}
     else
-      %{<a href="#{path}" class="img"><img src="#{image_path}" alt="#{alt}"/></a>}
+      %{<img src="#{image_path}" alt="#{alt}"/>}
     end
   end
 end

data/plugins/filters/fix_image_links.rb

@@ -0,0 +1,20 @@
+description 'Add query parameter "aspect" to images'
+dependencies 'utils/xml'
+
+Filter.create :fix_image_links do |context, content|
+  doc = XML::Fragment(content)
+  linked_images = doc.css('a img')
+  doc.css('img').each do |image|
+    path = image['src']
+    unless path =~ %r{^w+://} || path.starts_with?(build_path('_')) ||
+        (path.starts_with?('/') && !path.starts_with?(build_path('')))
+      unless path.include?('aspect=')
+        image['src'] = path + (path.include?('?') ? '&' : '?') + 'aspect=image'
+      end
+      unless linked_images.include?(image)
+        image.swap("<a href=\"#{escape_html path.sub(/\?.*/, '')}\">#{image.to_xhtml}</a>")
+      end
+    end
+  end
+  doc.to_xhtml
+end

data/plugins/filters/locale.yml

@@ -1,15 +1,20 @@
-en:
-  attribute_toc: 'Generate Table of Contents'
-  attribute_no_editsection: 'Disable Section Editing'
-  edit_section: 'Edit section "#{section}"'
-  section_edited: 'Section "#{section}" edited'
-de:
-  attribute_toc: 'Inhaltsverzeichnis erzeugen'
-  attribute_no_editsection: 'Bearbeiten von Bereichen deaktivieren'
-  edit_section: 'Bearbeite Bereich "#{section}"'
-  section_edited: 'Bereich "#{section}" bearbeitet'
 cs_CZ:
-  attribute_toc: 'Vytvořit obsah'
   attribute_no_editsection: 'Zablokovat editaci sekcí'
-  edit_section: 'Edituj sekci "#{section}"'
-  section_edited: 'Sekce "#{section}" editována'
+  attribute_toc: 'Vytvořit obsah'
+  edit_section: 'Edituj sekci "%{section}"'
+  section_edited: 'Sekce "%{section}" editována'
+de:
+  attribute_no_editsection: 'Bearbeiten von Bereichen deaktivieren'
+  attribute_toc: 'Inhaltsverzeichnis erzeugen'
+  edit_section: 'Bearbeite Bereich "%{section}"'
+  section_edited: 'Bereich "%{section}" bearbeitet'
+en:
+  attribute_no_editsection: 'Disable Section Editing'
+  attribute_toc: 'Generate Table of Contents'
+  edit_section: 'Edit section "%{section}"'
+  section_edited: 'Section "%{section}" edited'
+fr:
+  attribute_no_editsection: "Désactiver l'édition"
+  attribute_toc: "Générer Table des Matières"
+  edit_section: "Éditer la section \"%{section}\""
+  section_edited: "Section \"%{section}\" éditée"

data/plugins/filters/s5/main.rb

@@ -2,6 +2,8 @@ description  'XSLT filter which transforms a html page to a S5 presentation'
 dependencies 'filters/xslt', 'utils/assets'
 export_assets 'ui/**/*', 'ui/default/*'
 
+raise 'Diascope not found' unless File.exists?(File.join(File.dirname(__FILE__), 'ui'))
+
 Page.attributes do
   group :s5 do
     string :presdate

data/plugins/login/locale.yml

@@ -1,6 +1,8 @@
-en:
-  persistent_login:     'Persistent login'
-de:
-  persistent_login:     'Dauerhaft anmelden'
 cs_CZ:
   persistent_login:     'Trvalé přihlášení'
+de:
+  persistent_login:     'Dauerhaft anmelden'
+en:
+  persistent_login:     'Persistent login'
+fr:
+  persistent_login:     'Connexion persistente'

data/plugins/repositories/gitrb_repository.rb

@@ -37,7 +37,7 @@ class GitrbRepository < Repository
   # @override
   def get_history(path, skip, limit)
     @git.log(max_count:  limit, skip: skip,
-            path: [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT]).map do |c|
+             path: [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT]).map do |c|
       commit_to_version(c)
     end
   end

data/plugins/repositories/locale.yml

@@ -1,12 +1,16 @@
-en:
-  search_results: 'Search results for #{pattern}'
-  match:          'One match'
-  match_plural:   '#{count} matches'
-de:
-  search_results: 'Suchergebnisse für #{pattern}'
-  match:          'Ein Treffer'
-  match_plural:   '#{count} Treffer'
 cs_CZ:
-  search_results: 'Výsledky hledání pro #{pattern}'
   match:          'Jeden výsledek'
-  match_plural:   '#{count} výsledků' 
+  match_plural:   '%{count} výsledků'
+  search_results: 'Výsledky hledání pro %{pattern}'
+de:
+  match:          'Ein Treffer'
+  match_plural:   '%{count} Treffer'
+  search_results: 'Suchergebnisse für %{pattern}'
+en:
+  match:          'One match'
+  match_plural:   '%{count} matches'
+  search_results: 'Search results for %{pattern}'
+fr:
+  match:          "Une correspondance"
+  match_plural:   "%{count} correspondaces"
+  search_results: "Chercher les résultats pour %{pattern}"