olelo 0.9.8 → 0.9.9

data/lib/olelo/plugin.rb

@@ -17,18 +17,6 @@ module Olelo
       # Get failed plugins
       attr_reader :failed
 
-      # Current plugin
-      def caller
-        last, stack = nil, []
-        Kernel.caller(1).each do |line|
-          if line =~ %r{^#{@dir}/(.+?)(?:\/main)?\.rb} && $1 != last
-            stack << @loaded[$1]
-            last = $1
-          end
-        end
-        stack
-      end
-
       # Get loaded plugins
       def loaded
         @loaded.values

data/lib/olelo/routing.rb

@@ -31,7 +31,7 @@ module Olelo
       @original_params.freeze
 
       catch(:forward) do
-        with_hooks(:request) { perform! }
+        perform!
         status, header, body = response.finish
         return [status, header, request.head? ? [] : body]
       end

data/lib/olelo/templates.rb

@@ -19,10 +19,9 @@ module Olelo
     def render(name, options = {}, &block)
       locals = options.delete(:locals) || {}
       name = "#{name}.slim"
-      path = Templates.loader.context.to_s/name
-      id = [path, options.to_a].flatten.join('-')
+      id = [name, options.to_a].flatten.join('-')
       template = Templates.with_caching(id) do
-        Slim::Template.new(path, options) { Templates.loader.load(name) }
+        Slim::Template.new(name, options) { Templates.loader.call(name) }
       end
       template.render(self, locals, &block).html_safe
     end

data/lib/olelo/util.rb

@@ -79,7 +79,7 @@ module Olelo
     # @param [String] s String
     # @return [String] Escaped string
     def escape_html(s)
-      CGI.escapeHTML(s.to_s)
+      CGI.escapeHTML(s.to_s).html_safe
     end
 
     # Unescape html entities in string

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.8'
+  VERSION = '0.9.9'
 end

data/{views → lib/olelo/views}/edit.slim

@@ -30,7 +30,7 @@ form action=build_path(page.new? ? nil : page.path) method='post'
       br
       label for='edit-comment' = :comment.t
       &text#edit-comment name='comment' value=params[:comment] size='50'
-      = render_block :edit_buttons do
+      = wrap_block :edit_buttons do
         button&submit name='action' value='edit' = :save.t
         button&submit name='action' value='edit-close' = :save_and_close.t
         button&reset = :reset.t
@@ -48,7 +48,7 @@ form action=build_path(page.new? ? nil : page.path) method='post' enctype='multi
     label for='upload-file' = :file.t
     &file#upload-file.observe name='file'
     br
-    = render_block :upload_buttons do
+    = wrap_block :upload_buttons do
       button&submit name='action' value='upload' = :save.t
       button&submit name='action' value='upload-close' = :save_and_close.t
       button&reset = :reset.t
@@ -64,7 +64,7 @@ form action=build_path(page.new? ? nil : page.path) method='post'
     - else
       &hidden name='version' value=page.version
     = page.attribute_editor
-    = render_block :attributes_buttons do
+    = wrap_block :attributes_buttons do
       .indent
         button&submit name='action' value='attributes' = :save.t
         button&submit name='action' value='attributes-close' = :save_and_close.t

data/{views → lib/olelo/views}/layout.slim

@@ -2,7 +2,7 @@ doctype 5
 html.no-js lang=Olelo::Config['locale'].sub('_', '-') class={page && !page.head? ? 'archive' : nil} xmlns='http://www.w3.org/1999/xhtml'
   head
     title= Olelo::Config['title'] + ' - ' + title
-    link rel='shortcut icon' href=build_path('static/images/favicon.png?1') type='image/png'
+    link rel='shortcut icon' href=build_path('static/favicon.png?1') type='image/png'
     = head
   body
     #header

data/{views → lib/olelo/views}/login.slim

@@ -12,7 +12,7 @@ form action=build_path(:login) method='post'
     &password#login-password name='password'
     br
     .indent
-      = render_block :login_buttons do
+      = wrap_block :login_buttons do
         button&submit= :login.t
     br
 - if signup_enabled

data/lib/olelo/views/show.slim

@@ -0,0 +1,8 @@
+- title page.title
+= define_block :version do
+  a.version href=build_path(page, version: page.version, force_version: true) title=page.version = page.version.short
+= footer do
+  == :version_by.t(version: render_block(:version), author: escape_html(page.version.author.name), date: date(page.version.date))
+- if !page.attributes['no_title']
+  h1= title
+== content

data/lib/olelo/virtualfs.rb

@@ -20,30 +20,6 @@ module Olelo
       read(name).bytesize
     end
 
-    class VirtualFile
-      attr_reader :fs, :name
-
-      def initialize(fs, name)
-        @fs, @name = fs, name
-      end
-
-      def read
-        fs.read(name)
-      end
-
-      def real_path
-        fs.real_path(name)
-      end
-
-      def mtime
-        @mtime ||= fs.mtime(name)
-      end
-
-      def size
-        @size ||= fs.size(name)
-      end
-    end
-
     class Native < VirtualFS
       def initialize(dir)
         @dir = dir
@@ -59,7 +35,7 @@ module Olelo
         names.map do |name|
           Dir[real_path(name)].select {|f| File.file?(f) }
         end.flatten.each do |f|
-          yield(VirtualFile.new(self, f[@dir.length+1..-1]))
+          yield(self, f[@dir.length+1..-1])
         end
       end
 
@@ -89,7 +65,7 @@ module Olelo
       def read(name)
         @cache[name] ||=
           begin
-            code, data = File.read(@file).split('__END__')
+            code, data = File.read(@file).split('__END__', 2)
             content = nil
             data.to_s.each_line do |line|
             if line =~ /^@@\s*([^\s]+)\s*/
@@ -108,10 +84,10 @@ module Olelo
 
       # @override
       def glob(*names)
-        code, data = File.read(@file).split('__END__')
+        code, data = File.read(@file).split('__END__', 2)
         data.to_s.each_line do |line|
-          if line =~ /^@@\s*([^\s]+)\s*/ && names.any? {|pattern| File.fnmatch(pattern, $1) }
-            yield(VirtualFile.new(self, $1))
+          if line =~ /^@@\ss*([^\s]+)\s*/ && names.any? {|pattern| File.fnmatch(pattern, $1) }
+            yield(self, $1)
           end
         end
       end

data/plugins/aspects/changelog.rb

@@ -34,15 +34,13 @@ Aspect.create(:changelog, cacheable: true, hidden: true) do
 end
 
 Application.hook :head do
-  %{<link rel="alternate" type="application/atom+xml" title="Sitewide Atom Changelog"
+  result = %{<link rel="alternate" type="application/atom+xml" title="Sitewide Atom Changelog"
 href="#{escape_html build_path('/', aspect: 'changelog', format: 'atom')}"/>
 <link rel="alternate" type="application/rss+xml" title="Sitewide RSS Changelog"
 href="#{escape_html build_path('/', aspect: 'changelog', format: 'rss')}"/>}
-end
-
-Application.hook :head do
-  %{<link rel="alternate" type="application/atom+xml" title="#{escape_html page.path} Atom Changelog"
+  result << %{<link rel="alternate" type="application/atom+xml" title="#{escape_html page.path} Atom Changelog"
 href="#{escape_html(build_path(page.path, aspect: 'changelog', format: 'atom'))}"/>
 <link rel="alternate" type="application/rss+xml" title="#{escape_html page.path} RSS Changelog"
 href="#{escape_html(build_path(page.path, aspect: 'changelog', format: 'rss'))}"/>} if page && !page.new? && !page.root?
+  result
 end

data/plugins/aspects/documentbrowser.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Document browser aspect'
 dependencies 'utils/shell'
 
@@ -18,13 +19,13 @@ Aspect.create(:documentbrowser, priority: 1, layout: true, cacheable: true, acce
     @page = page
     @page_nr = [context.params[:page].to_i, 1].max
     @page_count = count_pages
-    render :browser
+    render :documentbrowser
   end
 end
 
 __END__
 
-@@ browser.slim
+@@ documentbrowser.slim
 = pagination(@page, @page_count, @page_nr, aspect: 'documentbrowser')
 p
   img src=build_path(@page, aspect: 'image', geometry: '480x>', trim: 1, page: @page_nr)
@@ -55,3 +56,24 @@ table
       td= :download.t
       td
         a href=build_path(@page, aspect: 'download') = :download.t
+@@ locale.yml
+cs_CZ:
+  aspect_documentbrowser: 'Document Browser'
+  download: 'Stáhnout'
+  information: 'Informace'
+  type: 'Typ'
+de:
+  aspect_documentbrowser: 'Dokumentenbrowser'
+  download: 'Herunterladen'
+  information: 'Information'
+  type: 'Typ'
+en:
+  aspect_documentbrowser: 'Document Browser'
+  download: 'Download'
+  information: 'Information'
+  type: 'Type'
+fr:
+  aspect_documentbrowser: "Explorateur de fichier"
+  download: "Télécharger"
+  information: "Information"
+  type: "Type"

data/plugins/aspects/download.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Download aspect'
 
 Aspect.create(:download) do
@@ -9,3 +10,14 @@ Aspect.create(:download) do
     page.content
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_download: 'Stažení (neupraveno)'
+de:
+  aspect_download: 'Herunterladen'
+en:
+  aspect_download: 'Raw Download'
+fr:
+  aspect_download: "Téléchargement brut"

data/plugins/aspects/gallery/main.rb

@@ -32,3 +32,12 @@ table.gallery
           a.fancybox href=info_path rel="gallery" title=description
             img src=thumb_path alt=''
           a.title href=info_path = description
+@@ locale.yml
+cs_CZ:
+  aspect_gallery: 'Galerie'
+de:
+  aspect_gallery: 'Bildergalerie'
+en:
+  aspect_gallery: 'Image Gallery'
+fr:
+  aspect_gallery: "Galerie d'images"

data/plugins/aspects/highlight.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description  'Source code highlighting aspect'
 dependencies 'utils/pygments'
 
@@ -6,3 +7,13 @@ Aspect.create(:highlight, priority: 2, layout: true, cacheable: true) do
   def call(context, page); Pygments.pygmentize(page.content, Pygments.file_format(page.name)); end
 end
 
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_highlight: 'Zvýrazněný zdroj'
+de:
+  aspect_highlight: 'Quellcode mit Syntaxhighlighting'
+en:
+  aspect_highlight: 'Highlighted Source'
+fr:
+  aspect_highlight: "Source mise en valeur"

data/plugins/aspects/image.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Image aspect'
 dependencies 'utils/image_magick'
 
@@ -39,3 +40,14 @@ Aspect.create(:image, priority: 5, accepts: %r{^application/pdf$|postscript$|^im
     end
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_image: 'Stažení obrázku'
+de:
+  aspect_image: 'Bild'
+en:
+  aspect_image: 'Raw Image'
+fr:
+  aspect_image: "Image brute"

data/plugins/aspects/imageinfo.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Image information aspect'
 dependencies 'utils/image_magick'
 
@@ -8,12 +9,12 @@ Aspect.create(:imageinfo, priority: 1, layout: true, cacheable: true, accepts: %
     @type = identify[0]
     @geometry = "#{identify[1]}x#{identify[2]}"
     @exif = identify[3..-1].to_a.map {|line| line.sub(/^exif:/, '').split('=', 2) }
-    render :info
+    render :imageinfo
   end
 end
 
 __END__
-@@ info.slim
+@@ imageinfo.slim
 p
   a href=build_path(@page, aspect: 'image')
     img src=build_path(@page, aspect: 'image', geometry: '640x480>') alt=@page.title
@@ -54,3 +55,36 @@ table
         tr
           td= key
           td= value
+@@ locale.yml
+cs_CZ:
+  aspect_imageinfo: 'Informace o obrázku'
+  entry: 'Položka'
+  exif: 'Informace EXIF'
+  geometry: 'Geometrie'
+  information: 'Informace'
+  type: 'Typ'
+  value: 'Hodnota'
+de:
+  aspect_imageinfo: 'Bild-Information'
+  entry: 'Eintrag'
+  exif: 'EXIF-Information'
+  geometry: 'Geometrie'
+  information: 'Information'
+  type: 'Typ'
+  value: 'Wert'
+en:
+  aspect_imageinfo: 'Image Information'
+  entry: 'Entry'
+  exif: 'EXIF Information'
+  geometry: 'Geometry'
+  information: 'Information'
+  type: 'Type'
+  value: 'Value'
+fr:
+  aspect_imageinfo: "Information sur l'image"
+  entry: "Entrée"
+  exif: "Information EXIF"
+  geometry: "Geometrie"
+  information: "Information"
+  type: "Type"
+  value: "Valeur"

data/plugins/aspects/main.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Aspect subsystem'
 dependencies 'utils/cache'
 
@@ -175,7 +176,6 @@ class ::Olelo::Application
 
     self.response.header.merge!(header)
 
-    @menu_versions = true
     layout ? render(:show, locals: {content: content}) : content
   rescue Aspect::NotAvailable => ex
     cache_control no_cache: true
@@ -199,3 +199,18 @@ class ::Olelo::Application
     end
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_not_available: 'Vzhled %{aspect} není k dispozici pro stránku %{page} s typem %{type}.'
+  attribute_aspect: 'Přednastavený vzhled'
+de:
+  aspect_not_available: 'Aspekt %{aspect} für die Seite %{page} mit dem Typ %{type} ist nicht verfügbar.'
+  attribute_aspect: 'Standard-Ansicht'
+en:
+  aspect_not_available: 'Aspect %{aspect} is not available for page %{page} with type %{type}.'
+  attribute_aspect: 'Default Aspect'
+fr:
+  aspect_not_available: "L'aspect %{aspect} n'est pas disponible pour la page %{page} avec le type %{type}."
+  attribute_aspect: "Aspect par défaut"

data/plugins/aspects/pageinfo.rb

@@ -1,14 +1,15 @@
+# -*- coding: utf-8 -*-
 description 'Page information aspect'
 
 Aspect.create(:pageinfo, priority: 4, layout: true, cacheable: true) do
   def call(context, page)
     @page = page
-    render :info
+    render :pageinfo
   end
 end
 
 __END__
-@@ info.slim
+@@ pageinfo.slim
 table
   tbody
     tr
@@ -35,3 +36,20 @@ table
         td= :download.t
         td
           a href=build_path(@page, aspect: 'download') = :download.t
+@@ locale.yml
+cs_CZ:
+  aspect_pageinfo: 'Informace o stránce'
+  download: 'Stáhnout'
+  type: 'Typ'
+de:
+  aspect_pageinfo: 'Seiten-Information'
+  download: 'Herunterladen'
+  type: 'Typ'
+en:
+  aspect_pageinfo: 'Page Information'
+  download: 'Download'
+  type: 'Type'
+fr:
+  aspect_pageinfo: "Page d'information"
+  download: "Télécharger"
+  type: "Type"