olelo 0.9.3 → 0.9.4

data/lib/olelo/version.rb

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

data/olelo.gemspec

@@ -17,14 +17,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_runtime_dependency('tilt', ['~> 1.3.3'])
+  s.required_ruby_version = '>= 1.9.2'
+
+  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('nokogiri', ['~> 1.5.5'])
   s.add_runtime_dependency('mimemagic', ['~> 0.2.0'])
   s.add_runtime_dependency('rack', ['~> 1.4.1'])
-  s.add_runtime_dependency('redcarpet', ['~> 2.2.1'])
-  s.add_runtime_dependency('rugged', ['~> 0.17.0b6'])
+  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_development_dependency('rake', ['>= 0.8.7'])

data/plugins/aspects/changelog.rb

@@ -2,7 +2,7 @@
 description 'Changelog Aspect'
 require 'rss/maker'
 
-Aspect.create(:changelog, :cacheable => true, :hidden => true) do
+Aspect.create(:changelog, cacheable: true, hidden: true) do
   def call(context, page)
     format = context.params[:format]
 
@@ -32,14 +32,14 @@ end
 
 Application.hook :head do
   %{<link rel="alternate" type="application/atom+xml" title="Sitewide Atom Changelog"
-href="#{escape_html build_path('/', :aspect => 'changelog', :format => 'atom')}"/>
+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')}"/>}
+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"
-href="#{escape_html(build_path(page.path, :aspect => 'changelog', :format => 'atom'))}"/>
+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?
+href="#{escape_html(build_path(page.path, aspect: 'changelog', format: 'rss'))}"/>} if page && !page.new? && !page.root?
 end

data/plugins/aspects/documentbrowser.rb

@@ -1,7 +1,7 @@
 description 'Document browser aspect'
 dependencies 'utils/shell'
 
-Aspect.create(:documentbrowser, :priority => 1, :layout => true, :cacheable => true, :accepts => %r{^application/pdf$|postscript$}) do
+Aspect.create(:documentbrowser, priority: 1, layout: true, cacheable: true, accepts: %r{^application/pdf$|postscript$}) do
   def count_pages
     content = @page.content
     page_count = 0
@@ -25,10 +25,10 @@ end
 __END__
 
 @@ browser.slim
-= pagination(@page, @page_count, @page_nr, :aspect => 'documentbrowser')
+= pagination(@page, @page_count, @page_nr, aspect: 'documentbrowser')
 p
-  img src=build_path(@page, :aspect => 'image', :geometry => '480x>', :trim => 1, :page => @page_nr)
-= pagination(@page, @page_count, @page_nr, :aspect => 'documentbrowser')
+  img src=build_path(@page, aspect: 'image', geometry: '480x>', trim: 1, page: @page_nr)
+= pagination(@page, @page_count, @page_nr, aspect: 'documentbrowser')
 h3= :information.t
 table
   tbody
@@ -54,4 +54,4 @@ table
     tr
       td= :download.t
       td
-        a href=build_path(@page, :aspect => 'download') = :download.t
+        a href=build_path(@page, aspect: 'download') = :download.t

data/plugins/{gallery → aspects/gallery}/main.rb

@@ -2,7 +2,7 @@ description    'Gallery aspect'
 dependencies   'utils/assets', 'aspects'
 export_scripts '*.css'
 
-Aspects::Aspect.create(:gallery, :priority => 3, :layout => true, :hidden => true, :cacheable => true) do
+Aspects::Aspect.create(:gallery, priority: 3, layout: true, hidden: true, cacheable: true) do
   def accepts?(page); !page.children.empty?; end
   def call(context, page)
     @per_row = 4
@@ -18,13 +18,13 @@ end
 
 __END__
 @@ gallery.slim
-= pagination(@page, @page_count, @page_nr, :aspect => 'gallery')
+= pagination(@page, @page_count, @page_nr, aspect: 'gallery')
 table.gallery
   - @images.each_slice(@per_row) do |row|
     tr
       - row.each do |image|
         ruby:
-          thumb_path = build_path(image, :aspect => 'image', :geometry => '150x150>')
+          thumb_path = build_path(image, aspect: 'image', geometry: '150x150>')
           info_path  = build_path(image)
           description = image.attributes['description'] || image.attributes['title'] || \
             image.name.gsub(/([^\s])[_\-]/, '\1 ')

data/plugins/aspects/highlight.rb

@@ -1,7 +1,7 @@
 description  'Source code highlighting aspect'
 dependencies 'utils/pygments'
 
-Aspect.create(:highlight, :priority => 2, :layout => true, :cacheable => true) do
+Aspect.create(:highlight, priority: 2, layout: true, cacheable: true) do
   def accepts?(page); !page.content.empty? && Pygments.file_format(page.name); end
   def call(context, page); Pygments.pygmentize(page.content, Pygments.file_format(page.name)); end
 end

data/plugins/aspects/image.rb

@@ -1,7 +1,7 @@
 description 'Image aspect'
 dependencies 'utils/image_magick'
 
-Aspect.create(:image, :priority => 5, :accepts => %r{^application/pdf$|postscript$|^image/}, :cacheable => true) do
+Aspect.create(:image, priority: 5, accepts: %r{^application/pdf$|postscript$|^image/}, cacheable: true) do
   def call(context, page)
     geometry = context.params[:geometry]
     trim = context.params[:trim]

data/plugins/aspects/imageinfo.rb

@@ -1,7 +1,7 @@
 description 'Image information aspect'
 dependencies 'utils/image_magick'
 
-Aspect.create(:imageinfo, :priority => 1, :layout => true, :cacheable => true, :accepts => %r{^image/}) do
+Aspect.create(:imageinfo, priority: 1, layout: true, cacheable: true, accepts: %r{^image/}) do
   def call(context, page)
     @page = page
     identify = ImageMagick.identify('-format', "%m\n%h\n%w\n%[EXIF:*]", '-').run(page.content).split("\n")
@@ -15,8 +15,8 @@ end
 __END__
 @@ info.slim
 p
-  a href=build_path(@page, :aspect => 'image')
-    img src=build_path(@page, :aspect => 'image', :geometry => '640x480>') alt=@page.title
+  a href=build_path(@page, aspect: 'image')
+    img src=build_path(@page, aspect: 'image', geometry: '640x480>') alt=@page.title
 h3= :information.t
 table
   tbody

data/plugins/aspects/main.rb

@@ -4,7 +4,7 @@ dependencies 'utils/cache'
 Page.attributes do
   enum :aspect do
     Aspect.aspects.keys.inject({}) do |hash, name|
-      hash[name] = Locale.translate("aspect_#{name}", :fallback => titlecase(name))
+      hash[name] = Locale.translate("aspect_#{name}", fallback: titlecase(name))
       hash
     end
   end
@@ -39,11 +39,11 @@ class Context
   end
 
   def subcontext(options = {})
-    Context.new(:page    => options[:page] || page,
-                :private => private.merge(options[:private] || {}),
-                :params  => params.merge(options[:params] || {}),
-                :request => request,
-                :header  => header)
+    Context.new(page:    options[:page] || page,
+                private: private.merge(options[:private] || {}),
+                params:  params.merge(options[:params] || {}),
+                request: request,
+                header:  header)
   end
 end
 
@@ -57,8 +57,8 @@ class Aspect
 
   class NotAvailable < NameError
     def initialize(name, page)
-      super(:aspect_not_available.t(:aspect => name, :page => page.path,
-                                    :type => "#{page.mime.comment} (#{page.mime})"))
+      super(:aspect_not_available.t(aspect: name, page: page.path,
+                                    type: "#{page.mime.comment} (#{page.mime})"))
     end
 
     def status
@@ -146,10 +146,10 @@ end
 # Plug-in the aspect subsystem
 module ::Olelo::PageHelper
   def render_page(page)
-    Cache.cache("include-#{page.path}-#{page.version.cache_id}", :update => 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)
+        context = Context.new(page: page, params: {included: true})
+        Aspect.find!(page, layout: true).call(context, page)
       rescue Aspect::NotAvailable => ex
         %{<span class="error">#{escape_html ex.message}</span>}
       end
@@ -163,10 +163,10 @@ 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 => no_cache?, :defer => true) do |cache|
-      aspect = Aspect.find!(page, :name => params[:aspect])
+                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)
+      context = Context.new(page: page, params: params, request: request)
       result = aspect.call(context, page)
       context.header['Content-Type'] ||= aspect.mime.to_s if aspect.mime
       context.header['Content-Type'] ||= page.mime.to_s if !aspect.layout?
@@ -175,27 +175,27 @@ class ::Olelo::Application
     self.response.header.merge!(header)
 
     @menu_versions = true
-    layout ? render(:show, :locals => {:content => content}) : content
+    layout ? render(:show, locals: {content: content}) : content
   rescue Aspect::NotAvailable => ex
-    cache_control :no_cache => true
+    cache_control no_cache: true
     redirect build_path(page.path) if params[:path].to_s.ends_with? '/'
     raise if params[:aspect]
     flash.error ex.message
-    redirect build_path(page, :action => :edit)
+    redirect build_path(page, action: :edit)
   end
 
   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 => 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]
+          [Locale.translate("aspect_#{a.name}", fallback: titlecase(a.name)), a]
         end.sort_by(&:first)
         aspects.select {|label, a| a.layout? }.map do |label, a|
-          MenuItem.new(a.name, :label => label, :href => build_path(page, :aspect => a.name), :class => a.name == @selected_aspect ? 'selected' : nil)
+          MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: a.name == @selected_aspect ? 'selected' : nil)
         end +
         aspects.reject {|label, a| a.layout? }.map do |label, a|
-          MenuItem.new(a.name, :label => label, :href => build_path(page, :aspect => a.name), :class => 'download')
+          MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: 'download')
         end
       end.each {|item| view_menu << item }
     end

data/plugins/aspects/pageinfo.rb

@@ -1,6 +1,6 @@
 description 'Page information aspect'
 
-Aspect.create(:pageinfo, :priority => 4, :layout => true, :cacheable => true) do
+Aspect.create(:pageinfo, priority: 4, layout: true, cacheable: true) do
   def call(context, page)
     @page = page
     render :info
@@ -34,4 +34,4 @@ table
       tr
         td= :download.t
         td
-          a href=build_path(@page, :aspect => 'download') = :download.t
+          a href=build_path(@page, aspect: 'download') = :download.t

data/plugins/aspects/source.rb

@@ -1,6 +1,6 @@
 description 'Source aspect'
 
-Aspect.create(:source, :priority => 3, :layout => true, :cacheable => true) do
+Aspect.create(:source, priority: 3, layout: true, cacheable: true) do
   def accepts?(page); page.mime.text?; end
   def call(context, page); "<pre>#{escape_html page.content}</pre>"; end
 end

data/plugins/aspects/subpages.rb

@@ -1,6 +1,6 @@
 description 'Subpages aspect'
 
-Aspect.create(:subpages, :priority => 2, :layout => true, :cacheable => true) do
+Aspect.create(:subpages, priority: 2, layout: true, cacheable: true) do
   def accepts?(page); !page.children.empty?; end
   def call(context, page)
     @page_nr = [context.params[:page].to_i, 1].max
@@ -14,7 +14,7 @@ end
 
 __END__
 @@ subpages.slim
-= pagination(@page, @page_count, @page_nr, :aspect => 'subpages')
+= pagination(@page, @page_count, @page_nr, aspect: 'subpages')
 table#subpages-table
   thead
     tr
@@ -37,8 +37,8 @@ table#subpages-table
         td= truncate(child.version.author.name, 30)
         td= truncate(child.version.comment, 30)
         td.actions
-          a.action-edit href=build_path(child, :action => :edit) title=:edit.t = :edit.t
-          a.action-history href=build_path(child, :action => :history) title=:history.t = :history.t
-          a.action-move href=build_path(child, :action => :move) title=:move.t = :move.t
-          a.action-delete href=build_path(child, :action => :delete) title=:delete.t = :delete.t
-= pagination(@page, @page_count, @page_nr, :aspect => 'subpages')
+          a.action-edit href=build_path(child, action: :edit) title=:edit.t = :edit.t
+          a.action-history href=build_path(child, action: :history) title=:history.t = :history.t
+          a.action-move href=build_path(child, action: :move) title=:move.t = :move.t
+          a.action-delete href=build_path(child, action: :delete) title=:delete.t = :delete.t
+= pagination(@page, @page_count, @page_nr, aspect: 'subpages')

data/plugins/aspects/text.rb

@@ -1,6 +1,6 @@
 description 'Text aspect'
 
-Aspect.create(:text, :mime => 'text/plain; charset=utf-8') do
+Aspect.create(:text, mime: 'text/plain; charset=utf-8') do
   def accepts?(page); page.mime.text?; end
   def call(context, page)
     context.header['Content-Length'] = page.content.bytesize.to_s

data/plugins/authentication/portal.rb

@@ -10,8 +10,8 @@ class PortalService < User::Service
   # @override
   def authenticate(name, password)
     xml = open(@url,
-               :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE,
-               :http_basic_authentication => [name, password]).read
+               ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
+               http_basic_authentication: [name, password]).read
     # User data is exposed via REST/XML-API
     doc = Nokogiri::XML(xml)
     email = (doc/'person/email').text

data/plugins/authentication/yamlfile.rb

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

data/plugins/blog/main.rb

@@ -2,25 +2,25 @@ description    'Blog aspect'
 dependencies   'tags', 'utils/assets', 'utils/xml'
 export_scripts '*.css'
 
-Application.get '(/:path)/:year(/:month)', :year => '20\d{2}', :month => '(?:0[1-9])|(?:1[1-2])' do
+Application.get '(/:path)/:year(/:month)', year: '20\d{2}', month: '(?:0[1-9])|(?:1[1-2])' do
   params[:aspect] = 'blog'
   send('GET /')
 end
 
-Tags::Tag.define 'menu', :optional => 'path', :description => 'Show blog menu', :dynamic => true do |context, attrs, content|
+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 => no_cache?(context.request.env), :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
       end
-      render :menu, :locals => {:years => years, :page => page}
+      render :menu, locals: {years: years, page: page}
     end
   end
 end
 
-Aspects::Aspect.create(:blog, :priority => 3, :layout => true, :cacheable => true, :hidden => true) do
+Aspects::Aspect.create(:blog, priority: 3, layout: true, cacheable: true, hidden: true) do
   def accepts?(page); !page.children.empty?; end
   def call(context, page)
     @page = page
@@ -38,8 +38,8 @@ Aspects::Aspect.create(:blog, :priority => 3, :layout => true, :cacheable => tru
 
     @articles = articles.map do |article|
       begin
-        subctx = context.subcontext(:page => article, :params => {:included => true})
-        content = Aspects::Aspect.find!(article, :layout => true).call(subctx, article)
+        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 = ''
@@ -53,7 +53,7 @@ Aspects::Aspect.create(:blog, :priority => 3, :layout => true, :cacheable => tru
       end
       [article, content]
     end
-    render :blog, :locals => {:full => context.params[:full]}
+    render :blog, locals: {full: context.params[:full]}
   end
 end
 
@@ -68,11 +68,11 @@ __END__
         h2
           a.name href=build_path(page) = page.name
         .date= date page.version.date
-        .author= :written_by.t(:author => page.version.author.name)
+        .author= :written_by.t(author: page.version.author.name)
         .content== content
         - if !full
           a.full href=build_path(page.path) = :full_article.t
-= pagination(@page, @page_count, @page_nr, :aspect => 'blog')
+= pagination(@page, @page_count, @page_nr, aspect: 'blog')
 @@ menu.slim
 table.blog-menu
   - years.keys.sort.each do |year|

data/plugins/editor/preview.rb

@@ -18,13 +18,13 @@ class ::Olelo::Application
     if page.new? || !params[:pos]
       # Whole page edited, assign new content before aspect search
       page.content = params[:content]
-      aspect = Aspects::Aspect.find(page, :layout => true)
+      aspect = Aspects::Aspect.find(page, layout: true)
     else
       # We assume that aspect stays the same if section is edited
-      aspect = Aspects::Aspect.find(page, :layout => true)
+      aspect = Aspects::Aspect.find(page, layout: true)
       page.content = params[:content]
     end
-    context = Aspects::Context.new(:page => page, :request => request, :private => {:preview => true})
+    context = Aspects::Context.new(page: page, request: request, private: {preview: true})
     preview = aspect && aspect.call(context, page)
     flash.now[:preview] = preview ? %{<hr/>#{preview}} : nil
     halt render(request.xhr? ? flash.now[:preview] : :edit)

data/plugins/filters/creole.rb

@@ -33,5 +33,5 @@ class OleloCreole < ::Creole::Parser
 end
 
 Filter.create :creole do |context, content|
-  OleloCreole.new(content, :extensions => true, :no_escape => true).to_html
+  OleloCreole.new(content, extensions: true, no_escape: true).to_html
 end

data/plugins/filters/editsection.rb

@@ -56,8 +56,8 @@ class EditSection < Filters::NestingFilter
       content.gsub!(/#{prefix}(\d+)/) do
         i = $1.to_i
         len = sections[i][1] - sections[i][0]
-        path = build_path(page, :action => :edit, :pos => sections[i][0], :len => len, :comment => :section_edited.t(:section => sections[i][3]))
-        %{<a class="editsection" href="#{escape_html path}" title="#{escape_html :edit_section.t(:section => sections[i][3])}">#{escape_html :edit.t}</a>}
+        path = build_path(page, action: :edit, pos: sections[i][0], len: len, comment: :section_edited.t(section: sections[i][3]))
+        %{<a class="editsection" href="#{escape_html path}" title="#{escape_html :edit_section.t(section: sections[i][3])}">#{escape_html :edit.t}</a>}
       end
       content
     end

data/plugins/filters/html2xml.rb

@@ -0,0 +1,6 @@
+description 'Filter which converts html to xml'
+dependencies 'utils/xml'
+
+Filter.create :html2xml do |context, content|
+  XML::Fragment(content).to_xhtml
+end

data/plugins/filters/main.rb

@@ -59,7 +59,7 @@ class Filter
 
   # Create regexp filter
   def self.regexp(name, *regexps)
-    create(name, :description => 'Regular expression filter') do |context, content|
+    create(name, description: 'Regular expression filter') do |context, content|
       regexps.each_slice(2) { |regexp, sub| content.gsub!(regexp, sub) }
       content
     end