olelo 0.9.9 → 0.9.10

data/lib/olelo/menu.rb

@@ -6,22 +6,21 @@ module Olelo
 
     def initialize(name)
       @name = name.to_sym
-      @items = []
-      @items_map = {}
+      @items = {}
     end
 
     def each(&block)
-      @items.each(&block)
+      @items.each_value(&block)
     end
 
     def [](name)
       path = path.to_s
       i = path.index('/')
       if i
-        item = @items_map[path[0...i]]
+        item = @items[path[0...i]]
         item[path[i+1..-1]] if item
       else
-        @items_map[name.to_sym]
+        @items[name.to_sym]
       end
     end
 
@@ -29,12 +28,15 @@ module Olelo
       self << MenuItem.new(name, options)
     end
 
+    def append(items)
+      items.each {|item| self << item }
+    end
+
     def <<(item)
       raise TypeError, "Only items allowed" unless MenuItem === item
-      raise "Item #{item.name} exists already in #{path.join('/')}" if @items_map.include?(item.name)
+      raise "Item #{item.name} exists already in #{path.join('/')}" if @items.include?(item.name)
       item.parent = self
-      @items << item
-      @items_map[item.name] = item
+      @items[item.name] = item
     end
 
     def empty?
@@ -43,23 +45,21 @@ module Olelo
 
     def clear
       @items.clear
-      @items_map.clear
     end
 
     def remove(name)
       path = name.to_s
       i = path.index('/')
       if i
-        item = @items_map[path[0...i]]
+        item = @items[path[0...i]]
         item.remove(path[i+1..-1]) if item
       else
-        item = @items_map.delete(name.to_sym)
-        @items.delete(item) if item
+        @items.delete(name.to_sym)
       end
     end
 
     def build_menu
-      empty? ? '' : %{<ul id="menu-#{html_id}">#{map {|item| item.build_menu }.join}</ul>}
+      empty? ? '' : %{<ul id="menu-#{html_id}">#{map(&:build_menu).join}</ul>}
     end
 
     def to_html

data/lib/olelo/middleware/static_cache.rb

@@ -0,0 +1,20 @@
+module Olelo
+  module Middleware
+    class StaticCache
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        # Add a cache-control header if asset is static with version string
+        if env['PATH_INFO'].sub!(%r{^/static-\w+/}, '/static/')
+          status, headers, body = @app.call(env)
+          headers['Cache-Control'] = 'public, max-age=31536000'
+          [status, headers, body]
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/olelo/page.rb

@@ -94,7 +94,7 @@ module Olelo
     def etag
       unless new?
         @etag ||= repository.path_etag(path, tree_version)
-        "#{head? ? 1 : 0}-#{@etag}"
+        "#{Olelo::VERSION}-#{head? ? 1 : 0}-#{@etag}"
       end
     end
 

data/lib/olelo/plugin.rb

@@ -32,40 +32,44 @@ module Olelo
         @loaded[path] = plugin
       end
 
-      # Load plugins by path
+      # Load plugin by path
       #
-      # @param list List of plugin paths to load
+      # @param [String] path Plugin path to load
       # @return [Boolean] true if every plugin was loaded
-      def load(*list)
-        files = list.map {|path| [File.join(@dir, path, 'main.rb'), File.join(@dir, "#{path}.rb")] }.flatten.select {|file| File.file?(file) }
+      def load(path)
+        path = path.sub(%r{/main$}, '')
+        files = [File.join(@dir, path, 'main.rb'), File.join(@dir, "#{path}.rb")].select {|file| File.file?(file) }
+        if files.size == 2
+          Olelo.logger.error "Duplicate plugin #{files.join(', ')}"
+          return false
+        end
         return false if files.empty?
-        files.inject(true) do |result,file|
-          path = File.basename(file) == 'main.rb' ? file[(@dir.size+1)..-9] : file[(@dir.size+1)..-4]
-          if @loaded.include?(path)
-	    result
-	  elsif @failed.include?(path) || !enabled?(path)
-	    false
-	  else
-            begin
-	      new(path, file)
-            rescue Exception => ex
-              @failed << path
-              if LoadError === ex
-                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.debug ex
-              end
-              @loaded.delete(path)
-              false
+
+        if @loaded.include?(path)
+          true
+        elsif @failed.include?(path) || !enabled?(path)
+          false
+        else
+          begin
+            new(path, files.first)
+            true
+          rescue Exception => ex
+            @failed << path
+            if LoadError === ex
+              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.debug ex
             end
+            @loaded.delete(path)
+            false
 	  end
         end
       end
 
       # Load all plugins
       def load_all
-        load(*Dir[File.join(@dir, '**', '*.rb')].map {|file| file[(@dir.size+1)..-4] })
+        Dir[File.join(@dir, '**', '*.rb')].inject(true) {|result,file| load(file[(@dir.size+1)..-4]) && result }
       end
 
       # Check if plugin is enabled

data/lib/olelo/version.rb

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

data/lib/olelo/views/layout.slim

@@ -2,7 +2,6 @@ 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/favicon.png?1') type='image/png'
     = head
   body
     #header

data/olelo.gemspec

@@ -19,18 +19,19 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_runtime_dependency('multi_json', ['~> 1.3.7'])
-  s.add_runtime_dependency('slim', ['~> 1.3.3'])
+  s.add_runtime_dependency('RedCloth', ['~> 4.2.9'])
   s.add_runtime_dependency('creole', ['~> 0.5.0'])
-  s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
+  s.add_runtime_dependency('evaluator', ['~> 0.1.6'])
   s.add_runtime_dependency('mimemagic', ['~> 0.2.0'])
+  s.add_runtime_dependency('multi_json', ['~> 1.3.7'])
+  s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
   s.add_runtime_dependency('rack', ['~> 1.4.1'])
   s.add_runtime_dependency('redcarpet', ['~> 2.2.2'])
   s.add_runtime_dependency('rugged', ['~> 0.17.0.b7'])
-  s.add_runtime_dependency('evaluator', ['~> 0.1.6'])
+  s.add_runtime_dependency('slim', ['~> 1.3.3'])
 
-  s.add_development_dependency('rake', ['>= 0.8.7'])
-  s.add_development_dependency('sass', ['~> 3.2.3'])
   s.add_development_dependency('bacon', ['~> 1.1.0'])
   s.add_development_dependency('rack-test', ['~> 0.6.2'])
+  s.add_development_dependency('rake', ['>= 0.8.7'])
+  s.add_development_dependency('sass', ['~> 3.2.3'])
 end

data/plugins/aspects/documentbrowser.rb

@@ -37,10 +37,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
@@ -57,7 +57,7 @@ table
       td
         a href=build_path(@page, aspect: 'download') = :download.t
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_documentbrowser: 'Document Browser'
   download: 'Stáhnout'
   information: 'Informace'

data/plugins/aspects/download.rb

@@ -13,11 +13,11 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_download: 'Stažení (neupraveno)'
 de:
   aspect_download: 'Herunterladen'
 en:
-  aspect_download: 'Raw Download'
+  aspect_download: 'Download'
 fr:
-  aspect_download: "Téléchargement brut"
+  aspect_download: "Téléchargement"

data/plugins/aspects/feed.rb

@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+description 'Newsfeed Aspect'
+require 'time'
+
+Aspect.create(:feed, cacheable: true, hidden: true) do
+  def call(context, page)
+    format = context.params[:format]
+
+    url = context.request.base_url
+    context.header['Content-Type'] = "application/#{format == 'atom' ? 'atom' : 'rss'}+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)
+
+    title = page.root? ? Config['Title'] : page.title
+    feed = {
+      self_link: url + build_path(page, {aspect: 'feed', format: format}.reject{ |k,v| v.blank? }),
+      generator: 'Ōlelo',
+      title: title,
+      description: :feed_description.t(title: title),
+      link: url + '/' + page.path,
+      date: Time.now,
+      author: Config['title'],
+      items: []
+    }
+    history.each do |version|
+      feed[:items] << {
+        title: version.comment,
+        link: "#{url}/changes/#{version}",
+        date: version.date,
+        author: version.author.name
+      }
+    end
+
+    render(format == 'atom' ? :feed_atom : :feed_rss, locals: {feed: feed})
+  end
+end
+
+Application.hook :head do
+  render_partial :feed_header
+end
+
+__END__
+@@ feed_header.slim
+link rel="alternate" type="application/atom+xml" title=:sitewide_atom_feed.t href=build_path('/', aspect: 'feed', format: 'atom')
+link rel="alternate" type="application/rss+xml" title=:sitewide_rss_feed.t href=build_path('/', aspect: 'feed', format: 'rss')
+- if page && !page.new? && !page.root?
+  link rel="alternate" type="application/atom+xml" title=:page_atom_feed.t(page: page.path) href=build_path(page.path, aspect: 'feed', format: 'atom')
+  link rel="alternate" type="application/rss+xml" title=:page_rss_feed.t(page: page.path) href=build_path(page.path, aspect: 'feed', format: 'rss')
+@@ feed_atom.slim
+doctype xml
+feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"
+  author
+    name = feed[:title]
+  generator = feed[:generator]
+  id = feed[:link]
+  link href=feed[:link] /
+  link href=feed[:self_link] rel="self" type="application/atom+xml"/
+  subtitle = feed[:description]
+  title = feed[:title]
+  updated = feed[:date].iso8601()
+  - feed[:items].each do |item|
+    entry
+      id = item[:link]
+      link href=item[:link] /
+      title = item[:title]
+      updated = item[:date].iso8601()
+      dc:creator = item[:author]
+      dc:date = item[:date].iso8601()
+@@ feed_rss.slim
+doctype xml
+rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"
+  channel
+    title = feed[:title]
+    link = feed[:link]
+    description = feed[:description]
+    pubDate = feed[:date].rfc822()
+    atom:link href=feed[:self_link] rel="self" type="application/rss+xml"/
+    - feed[:items].each do |item|
+      item
+        title = item[:title]
+        guid = item[:link]
+        link = item[:link]
+        pubDate = item[:date].rfc822()
+        dc:creator = item[:author]
+@@ locale.yml
+de:
+  feed_description:   'Newsfeed für %{title}'
+  sitewide_rss_feed:  'RSS-Newsfeed für die ganze Seite'
+  sitewide_atom_feed: 'Atom-Newsfeed für die ganze Seite'
+  sitewide_rss_feed:  'RSS-Newsfeed für die ganze Seite'
+  page_atom_feed:     '%{page} Atom-Newsfeed'
+  page_rss_feed:      '%{page} RSS-Newsfeed'
+en:
+  feed_description:   '%{title} Newsfeed'
+  sitewide_atom_feed: 'Sitewide Atom Feed'
+  sitewide_rss_feed:  'Sitewide RSS Feed'
+  page_atom_feed:     '%{page} Atom Feed'
+  page_rss_feed:      '%{page} RSS Feed'

data/plugins/aspects/gallery/main.rb

@@ -33,7 +33,7 @@ table.gallery
             img src=thumb_path alt=''
           a.title href=info_path = description
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_gallery: 'Galerie'
 de:
   aspect_gallery: 'Bildergalerie'

data/plugins/aspects/highlight.rb

@@ -9,7 +9,7 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_highlight: 'Zvýrazněný zdroj'
 de:
   aspect_highlight: 'Quellcode mit Syntaxhighlighting'

data/plugins/aspects/image.rb

@@ -43,11 +43,11 @@ end
 
 __END__
 @@ locale.yml
-cs_CZ:
-  aspect_image: 'Stažení obrázku'
+cs:
+  aspect_image: 'Stažení'
 de:
   aspect_image: 'Bild'
 en:
-  aspect_image: 'Raw Image'
+  aspect_image: 'Image'
 fr:
-  aspect_image: "Image brute"
+  aspect_image: "Image"

data/plugins/aspects/imageinfo.rb

@@ -25,10 +25,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']
     tr
       td= :type.t
@@ -43,6 +43,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
 - unless @exif.empty?
   h3= :exif.t
   table
@@ -56,7 +62,7 @@ table
           td= key
           td= value
 @@ locale.yml
-cs_CZ:
+cs:
   aspect_imageinfo: 'Informace o obrázku'
   entry: 'Položka'
   exif: 'Informace EXIF'

data/plugins/aspects/locale.yml

@@ -0,0 +1,20 @@
+cs:
+  author:          'Autor'
+  last_modified:   'Poslední modifikace'
+  name:            'Jméno'
+  version:         'Verze'
+de:
+  author:          'Autor'
+  last_modified:   'Letzte Änderung'
+  name:            'Name'
+  version:         'Version'
+en:
+  author:          'Author'
+  last_modified:   'Last modified'
+  name:            'Name'
+  version:         'Version'
+fr:
+  author:          "Auteur"
+  last_modified:   "Dernière modification"
+  name:            "Nom"
+  version:         "Version"