olelo 0.9.2 → 0.9.3

data/lib/olelo/locale.yml

@@ -7,7 +7,6 @@ en:
   attribute_title:        'Title'
   attributes:             'Attributes'
   attributes_edited:      'Attributes of #{page} edited'
-  auth_unsupported:       'Authentication service does not support #{name}'
   author:                 'Author'
   binary_file:            'Binary file'
   by:                     'by'
@@ -96,7 +95,6 @@ de:
   attribute_title:        'Titel'
   attributes:             'Attribute'
   attributes_edited:      'Attribute von #{page} bearbeitet'
-  auth_unsupported:       'Authentifikationsservice unterstützt #{name} nicht'
   author:                 'Autor'
   binary_file:            'Binärdatei'
   by:                     'von'
@@ -191,7 +189,6 @@ cs_CZ:
   attribute_title:        'Titulek'
   attributes:             'Atributy'
   attributes_edited:      'Atributy stránky #{page} editovány'
-  auth_unsupported:       'Autentizační služba nepodporuje #{name}'
   author:                 'Autor'
   binary_file:            'Binární soubor'
   by:                     'od'

data/lib/olelo/page.rb

@@ -132,7 +132,7 @@ module Olelo
 
     def name
       i = path.rindex('/')
-      name = i ? path[i+1..-1] : path
+      i ? path[i+1..-1] : path
     end
 
     def title

data/lib/olelo/plugin.rb

@@ -98,8 +98,8 @@ module Olelo
         if Module === obj
           names = obj.name.split('::')
           mod = Object
-          names.map {|name| mod = mod.const_get(name) }.reverse.each do |mod|
-            return mod if Plugin === mod
+          names.map {|name| mod = mod.const_get(name) }.reverse.each do |m|
+            return m if Plugin === m
           end
         elsif Proc === obj
           return obj.binding.eval('PLUGIN')
@@ -114,6 +114,7 @@ module Olelo
     attr_reader? :started
 
     def initialize(path, file)
+      @setup = nil
       @path, @file = path, file
       @started = false
       @dependencies = Set.new
@@ -129,11 +130,11 @@ module Olelo
 
         (0...names.length).inject(Plugin) do |mod, i|
           elem = names[i].split('_').map(&:capitalize).join
-          if mod.local_const_defined?(elem)
+          if mod.const_defined?(elem, false)
             mod.const_get(elem)
           else
             child = i == names.length - 1 ? self : Module.new
-            child.module_eval { include mod } if mod != Plugin
+            child.module_eval { include mod } if mod != Plugin # Include parent module
             mod.const_set(elem, child)
           end
         end

data/lib/olelo/routing.rb

@@ -94,23 +94,26 @@ module Olelo
         nil
       end
 
-      return if !result
-      if result.respond_to?(:to_str)
+      case result
+      when nil, false
+      when String
         response.body = [result]
-      elsif result.respond_to?(:to_ary)
-        result = result.to_ary
-        if result.length == 2 && Symbol === result.first
-          response.status = Rack::Utils.status_code(result.first)
-          response.body = result.last
+      when Fixnum, Symbol
+        response.status = Rack::Utils.status_code(result)
+      when Array
+        if Symbol === result.first || Fixnum === result.first
+          response.status = Rack::Utils.status_code(result.shift)
+          response.body = result.pop
+          response.headers.merge!(result.first) if result.first
         else
           response.body = result
         end
-      elsif result.respond_to?(:each)
-        response.body = result
-      elsif Symbol === result
-        response.status = Rack::Utils.status_code(result)
       else
-        raise TypeError, "#{result.inspect} not supported"
+        if result.respond_to?(:each)
+          response.body = result
+        else
+          raise TypeError, "#{result.inspect} not supported"
+        end
       end
     end
 

data/lib/olelo/user.rb

@@ -29,7 +29,7 @@ module Olelo
       User.service.change_password(self, oldpassword, password)
     end
 
-    def modify(&block)
+    def update(&block)
       copy = dup
       block.call(copy)
       validate
@@ -42,7 +42,7 @@ module Olelo
     def validate
       check do |errors|
         errors << :invalid_email.t if email !~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-        errors << :invalid_name.t  if name !~ /[\w\.\-\+_]+/
+        errors << :invalid_name.t  if name !~ /[\w\.\-\+]+/
       end
     end
 
@@ -50,12 +50,6 @@ module Olelo
       include Util
       extend Factory
 
-      class NotSupportedError < AuthenticationError
-        def initialize(name)
-          super(:auth_unsupported.t(:name => name))
-        end
-      end
-
       def find(name)
         raise NotImplementedError
       end
@@ -63,18 +57,6 @@ module Olelo
       def authenticate(name, password)
         raise NotImplementedError
       end
-
-      def create(user, password)
-        raise NotSupportedError('create')
-      end
-
-      def update(user)
-        raise NotSupportedError('update')
-      end
-
-      def change_password(user, oldpassword, password)
-        raise NotSupportedError('change_password')
-      end
     end
 
     class<< self
@@ -103,8 +85,8 @@ module Olelo
 
       def anonymous(request)
         ip = request.ip || 'unknown-ip'
-        name = request.remote_host ? "#{request.remote_host} (#{ip})" : ip
-        new(name, "anonymous@#{ip}")
+        host = request.ip && Socket.gethostbyaddr(request.ip.split('.').map(&:to_i).pack('C*')).first rescue nil
+        new(host ? "#{host} (#{ip})" : ip, "anonymous@#{ip}")
       end
 
       def find!(name)
@@ -119,11 +101,15 @@ module Olelo
         service.authenticate(name, password).tap {|user| user.groups << 'user' }
       end
 
-      def create(name, password, confirm, email)
+      def supports?(method)
+        service.respond_to?(method)
+      end
+
+      def signup(name, password, confirm, email)
         validate_password(password, confirm)
         user = new(name, email, %w(user))
         user.validate
-        service.create(user, password)
+        service.signup(user, password)
         user
       end
     end

data/lib/olelo/util.rb

@@ -33,17 +33,6 @@ module Olelo
     end
   end
 
-  class BlockFile < ::File
-    alias to_path path
-
-    def each
-      rewind
-      while part = read(8192)
-        yield part
-      end
-    end
-  end
-
   module Util
     def self.included(base)
       base.extend(Util)
@@ -51,6 +40,10 @@ module Olelo
 
     extend self
 
+    def no_cache?(env = @env)
+      env['HTTP_PRAGMA'] == 'no-cache' || env['HTTP_CACHE_CONTROL'].to_s.include?('no-cache')
+    end
+
     def check
       errors = []
       yield(errors)

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/olelo/virtualfs.rb

@@ -12,18 +12,14 @@ module Olelo
       raise NotImplementedError
     end
 
-    def open(name)
-      [read(name)]
+    def real_path(name)
+      nil
     end
 
     def size(name)
       read(name).bytesize
     end
 
-    def mime(name)
-      MimeMagic.by_path(name) || MimeMagic.new('application/octet-stream')
-    end
-
     class VirtualFile
       attr_reader :fs, :name
 
@@ -35,8 +31,8 @@ module Olelo
         fs.read(name)
       end
 
-      def open
-        fs.open(name)
+      def real_path
+        fs.real_path(name)
       end
 
       def mtime
@@ -46,10 +42,6 @@ module Olelo
       def size
         @size ||= fs.size(name)
       end
-
-      def mime
-        @fs.mime(name)
-      end
     end
 
     class Native < VirtualFS
@@ -59,31 +51,31 @@ module Olelo
 
       # @override
       def read(name)
-        File.read(File.join(@dir, name))
+        File.read(real_path(name))
       end
 
       # @override
       def glob(*names)
         names.map do |name|
-          Dir[File.join(@dir, name)].select {|f| File.file?(f) }
+          Dir[real_path(name)].select {|f| File.file?(f) }
         end.flatten.each do |f|
           yield(VirtualFile.new(self, f[@dir.length+1..-1]))
         end
       end
 
       # @override
-      def open(name)
-        BlockFile.open(File.join(@dir, name), 'rb')
+      def real_path(name)
+        File.join(@dir, name)
       end
 
       # @override
       def mtime(name)
-        File.mtime(File.join(@dir, name))
+        File.mtime(real_path(name))
       end
 
       # @override
       def size(name)
-        File.stat(File.join(@dir, name)).size
+        File.stat(real_path(name)).size
       end
     end
 
@@ -140,7 +132,7 @@ module Olelo
         @fs.each {|fs| fs.glob(*names, &block) }
       end
 
-      %w(read mtime open size mime).each do |method|
+      %w(read mtime real_path size).each do |method|
         class_eval %{
           def #{method}(*args)
             result = nil

data/olelo.gemspec

@@ -21,11 +21,14 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('slim', ['~> 1.3.3'])
   s.add_runtime_dependency('creole', ['~> 0.4.2'])
   s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
-  s.add_runtime_dependency('mimemagic', ['~> 0.1.9'])
+  s.add_runtime_dependency('mimemagic', ['~> 0.2.0'])
   s.add_runtime_dependency('rack', ['~> 1.4.1'])
-  s.add_runtime_dependency('redcarpet', ['~> 2.1.1'])
+  s.add_runtime_dependency('redcarpet', ['~> 2.2.1'])
   s.add_runtime_dependency('rugged', ['~> 0.17.0b6'])
+  s.add_runtime_dependency('evaluator', ['~> 0.1.6'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])
   s.add_development_dependency('sass', ['>= 3.1.0'])
+  s.add_development_dependency('bacon', ['~> 1.1.0'])
+  s.add_development_dependency('rack-test', ['~> 0.6.2'])
 end

data/plugins/aspects/locale.yml

@@ -11,6 +11,8 @@ en:
   aspect_subpages: 'Subpages'
   aspect_text: 'Text Download'
   aspect_gallery: 'Image Gallery'
+  aspect_s5: 'S5 Presentation'
+  aspect_latex: 'LaTeX'
   aspect_not_available: 'Aspect #{aspect} is not available for page #{page} with type #{type}.'
   entry: 'Entry'
   exif: 'EXIF Information'
@@ -31,6 +33,8 @@ de:
   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.'
   entry: 'Eintrag'
   exif: 'EXIF-Information'
@@ -51,6 +55,7 @@ cs_CZ:
   aspect_subpages: 'Podstránky'
   aspect_text: 'Stažení textu'
   aspect_gallery: 'Galerie'
+  aspect_latex: 'LaTeX'
   aspect_not_available: 'Vzhled #{aspect} není k dispozici pro stránku #{page} s typem #{type}.'
   entry: 'Položka'
   exif: 'Informace EXIF'

data/plugins/aspects/main.rb

@@ -60,6 +60,10 @@ class Aspect
       super(:aspect_not_available.t(:aspect => name, :page => page.path,
                                     :type => "#{page.mime.comment} (#{page.mime})"))
     end
+
+    def status
+      :bad_request
+    end
   end
 
   # Constructor for aspect
@@ -142,7 +146,7 @@ end
 # Plug-in the aspect subsystem
 module ::Olelo::PageHelper
   def render_page(page)
-    Cache.cache("include-#{page.path}-#{page.version.cache_id}", :update => request.no_cache?, :defer => true) do |context|
+    Cache.cache("include-#{page.path}-#{page.version.cache_id}", :update => no_cache?, :defer => true) do |context|
       begin
         context = Context.new(:page => page, :params => {:included => true})
         Aspect.find!(page, :layout => true).call(context, page)
@@ -159,7 +163,7 @@ class ::Olelo::Application
     params[:aspect] ||= 'subpages' if params[:path].to_s.ends_with? '/'
     @selected_aspect, layout, header, content =
     Cache.cache("aspect-#{page.path}-#{page.version.cache_id}-#{build_query(params)}",
-                :update => request.no_cache?, :defer => true) do |cache|
+                :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)
@@ -171,7 +175,7 @@ class ::Olelo::Application
     self.response.header.merge!(header)
 
     @menu_versions = true
-    halt(layout ? render(:show, :locals => {:content => content}) : content)
+    layout ? render(:show, :locals => {:content => content}) : content
   rescue Aspect::NotAvailable => ex
     cache_control :no_cache => true
     redirect build_path(page.path) if params[:path].to_s.ends_with? '/'
@@ -183,7 +187,7 @@ class ::Olelo::Application
   hook :menu do |menu|
     if menu.name == :actions && view_menu = menu[:view]
       Cache.cache("aspect-menu-#{page.path}-#{page.version.cache_id}-#{@selected_aspect}",
-                              :update => request.no_cache?, :defer => true) do
+                              :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)

data/plugins/authentication/yamlfile.rb

@@ -25,7 +25,7 @@ class YamlfileService < User::Service
   end
 
   # @override
-  def create(user, password)
+  def signup(user, password)
     @store.transaction do |store|
       raise :user_already_exists.t(:name => user.name) if store[user.name]
       store[user.name] = {

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.version.cache_id}", :update => context.request.no_cache?, :defer => true) do
+    Cache.cache("blog-#{page.path}-#{page.version.cache_id}", :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
@@ -36,10 +36,10 @@ Aspects::Aspect.create(:blog, :priority => 3, :layout => true, :cacheable => tru
     @page_count = articles.size / per_page + 1
     articles = articles[((@page_nr - 1) * per_page) ... (@page_nr * per_page)].to_a
 
-    @articles = articles.map do |page|
+    @articles = articles.map do |article|
       begin
-        subctx = context.subcontext(:page => page, :params => {:included => true})
-        content = Aspects::Aspect.find!(page, :layout => true).call(subctx, page)
+        subctx = context.subcontext(:page => article, :params => {:included => true})
+        content = Aspects::Aspect.find!(article, :layout => true).call(subctx, article)
         if !context.params[:full]
           paragraphs = XML::Fragment(content).xpath('p')
           content = ''
@@ -51,7 +51,7 @@ Aspects::Aspect.create(:blog, :priority => 3, :layout => true, :cacheable => tru
       rescue Aspects::Aspect::NotAvailable => ex
         %{<span class="error">#{escape_html ex.message}</span>}
       end
-      [page, content]
+      [article, content]
     end
     render :blog, :locals => {:full => context.params[:full]}
   end

data/plugins/editor/ace/init.js

@@ -0,0 +1,17 @@
+$(function() {
+    var textarea = $('#edit-content');
+    if (textarea.length == 1) {
+	textarea.hide().before('<div id="ace-editor" style="position:relative; width:100%; height: 40em"/>');
+	var editor = ace.edit('ace-editor');
+	var modes = {
+	    'text/x-markdown': 'markdown',
+	    'text/x-textile': 'textile'
+	};
+	if (window.Olelo && modes[Olelo.page_mime])
+	    editor.getSession().setMode('ace/mode/' + modes[Olelo.page_mime]);
+	editor.getSession().setValue(textarea.val());
+	$('form').submit(function() {
+	    textarea.val(editor.getSession().getValue());
+	});
+    }
+});