olelo 0.9.3 → 0.9.4

data/plugins/filters/s5/main.rb

@@ -16,7 +16,7 @@ end
 
 class S5 < XSLT
   def configure(options)
-    super(options.merge(:stylesheet => 's5/s5.xsl'))
+    super(options.merge(stylesheet: 's5/s5.xsl'))
   end
 
   def params(context)

data/plugins/login/persistent.rb

@@ -23,7 +23,7 @@ class ::Olelo::Application
     if path == '/login'
       if User.logged_in? && params[:persistent]
         token = "#{sha256(User.current.name + Config['rack.session_secret'])}-#{User.current.name}"
-        response.set_cookie(TOKEN_NAME, :value => token, :expires => Time.now + TOKEN_LIFETIME)
+        response.set_cookie(TOKEN_NAME, value: token, expires: Time.now + TOKEN_LIFETIME)
       end
     elsif path == '/logout'
       response.delete_cookie(TOKEN_NAME)

data/plugins/misc/system.rb

@@ -44,6 +44,10 @@ ul.tabs
     tr
       td Memory usage:
       td #{@memory} MiB
+    - if defined?(Olelo::Worker)
+      tr
+        td Worker jobs
+        td= Olelo::Worker.jobs
 #tab-configuration.tab
   h2 Configuration
   table

data/plugins/misc/variables.rb

@@ -26,5 +26,5 @@ end
 Application.hook :head, 1 do
   vars = page ? params.merge(PLUGIN.exported_variables(page)) : params
   vars = vars.merge('user_logged_in' => !User.logged_in?, 'user_name' => User.current.name)
-  %{<script type="text/javascript">Olelo = #{escape_javascript(vars.to_json)};</script>}
+  %{<script type="text/javascript">Olelo = #{escape_javascript MultiJson.dump(vars)};</script>}
 end

data/plugins/misc/webdav.rb

@@ -7,7 +7,7 @@ class ::Olelo::Application
       raise :reserved_path.t if self.class.reserved_path?(page.path)
       page.content = request.body
       page.save
-      Page.commit(:page_uploaded.t(:page => page.title))
+      Page.commit(:page_uploaded.t(page: page.title))
       :created
     end
   rescue NotFound => ex
@@ -18,7 +18,7 @@ class ::Olelo::Application
     :bad_request
   end
 
-  put '/(:path)', :tail => true do
+  put '/(:path)', tail: true do
     if request.form_data?
       :not_implemented
     else
@@ -26,7 +26,7 @@ class ::Olelo::Application
     end
   end
 
-  post '/(:path)', :tail => true do
+  post '/(:path)', tail: true do
     if request.form_data?
       super()
     else
@@ -35,11 +35,11 @@ class ::Olelo::Application
   end
 
   # TODO: Implement more methods if needed
-  add_route('PROPFIND', '/(:path)', :tail => true)  { :not_found }
-  add_route('PROPPATCH', '/(:path)', :tail => true) { :not_implemented }
-  add_route('MKCOL', '/(:path)', :tail => true)     { :not_implemented }
-  add_route('COPY', '/(:path)', :tail => true)      { :not_implemented }
-  add_route('MOVE', '/(:path)', :tail => true)      { :not_implemented }
-  add_route('LOCK', '/(:path)', :tail => true)      { :not_implemented }
-  add_route('UNLOCK', '/(:path)', :tail => true)    { :not_implemented }
+  add_route('PROPFIND', '/(:path)', tail: true)  { :not_found }
+  add_route('PROPPATCH', '/(:path)', tail: true) { :not_implemented }
+  add_route('MKCOL', '/(:path)', tail: true)     { :not_implemented }
+  add_route('COPY', '/(:path)', tail: true)      { :not_implemented }
+  add_route('MOVE', '/(:path)', tail: true)      { :not_implemented }
+  add_route('LOCK', '/(:path)', tail: true)      { :not_implemented }
+  add_route('UNLOCK', '/(:path)', tail: true)    { :not_implemented }
 end

data/plugins/repositories/git_grep.rb

@@ -58,9 +58,9 @@ end
 
 __END__
 @@ grep.slim
-- title :search_results.t(:pattern => params[:pattern])
+- title :search_results.t(pattern: params[:pattern])
 h1= title
-p= :match.t(:count => @matches.length)
+p= :match.t(count: @matches.length)
 .search
   - @matches.each do |path, content|
     .match

data/plugins/repositories/gitrb_repository.rb

@@ -7,8 +7,8 @@ class GitrbRepository < Repository
 
   def initialize(config)
     Olelo.logger.info "Opening git repository: #{config[:path]}"
-    @git = Gitrb::Repository.new(:path => config[:path], :create => true,
-                                 :bare => config[:bare], :logger => Olelo.logger)
+    @git = Gitrb::Repository.new(path: config[:path], create: true,
+                                 bare: config[:bare], logger: Olelo.logger)
   end
 
   # @override
@@ -36,15 +36,15 @@ 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|
+    @git.log(max_count:  limit, skip: skip,
+            path: [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT]).map do |c|
       commit_to_version(c)
     end
   end
 
   # @override
   def get_path_version(path, version)
-    commits = @git.log(:max_count => 2, :start => version, :path => [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT])
+    commits = @git.log(max_count:  2, start: version, path: [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT])
 
     succ = nil
     @git.git_rev_list('--reverse', '--remove-empty', "#{commits[0]}..", '--', path, path + ATTRIBUTE_EXT, path + CONTENT_EXT) do |io|
@@ -94,11 +94,11 @@ class GitrbRepository < Repository
       if content.blank?
         @git.root.delete(path + CONTENT_EXT)
       else
-        @git.root[path + CONTENT_EXT] = Gitrb::Blob.new(:data => content)
+        @git.root[path + CONTENT_EXT] = Gitrb::Blob.new(data: content)
       end
       collapse_empty_tree(path)
     else
-      @git.root[path] = Gitrb::Blob.new(:data => content)
+      @git.root[path] = Gitrb::Blob.new(data: content)
     end
   end
 
@@ -108,7 +108,7 @@ class GitrbRepository < Repository
     attributes = attributes.blank? ? nil : YAML.dump(attributes).sub(/\A\-\-\-\s*\n/s, '')
     expand_tree(path)
     if attributes
-      @git.root[path + ATTRIBUTE_EXT] = Gitrb::Blob.new(:data => attributes)
+      @git.root[path + ATTRIBUTE_EXT] = Gitrb::Blob.new(data: attributes)
     else
       @git.root.delete(path + ATTRIBUTE_EXT)
     end
@@ -133,8 +133,8 @@ class GitrbRepository < Repository
 
   # @override
   def diff(path, from, to)
-    diff = @git.diff(:from => from && from.to_s, :to => to.to_s,
-                    :path => [path, path + CONTENT_EXT, path + ATTRIBUTE_EXT], :detect_renames => true)
+    diff = @git.diff(from: from && from.to_s, to: to.to_s,
+                    path: [path, path + CONTENT_EXT, path + ATTRIBUTE_EXT], detect_renames:  true)
     Diff.new(commit_to_version(diff.from), commit_to_version(diff.to), diff.patch)
   end
 

data/plugins/repositories/rugged_repository.rb

@@ -132,7 +132,7 @@ class RuggedRepository < Repository
       return @oid if @oid
       builder = Rugged::Tree::Builder.new
       @entries.each do |name, entry|
-        builder << { :type => entry.type, :filemode => entry.filemode, :oid => entry.save, :name => name }
+        builder << { type: entry.type, filemode: entry.filemode, oid: entry.save, name: name }
       end
       builder.write(@git)
     end
@@ -151,13 +151,13 @@ class RuggedRepository < Repository
       raise 'Concurrent transactions' if @head != current_head
 
       user = User.current
-      author = {:email => user.email, :name => user.name, :time => Time.now }
+      author = {email: user.email, name: user.name, time: Time.now }
       commit = Rugged::Commit.create(@git,
-                                     :author => author,
-                                     :message => comment,
-                                     :committer => author,
-                                     :parents => [@head],
-                                     :tree => @tree.save)
+                                     author: author,
+                                     message: comment,
+                                     committer: author,
+                                     parents: [@head],
+                                     tree: @tree.save)
 
       raise 'Concurrent transactions' if @head != current_head
       if current_head

data/plugins/tags/code.rb

@@ -1,6 +1,6 @@
 description  'Code tag with syntax highlighting'
 dependencies 'utils/pygments'
 
-Tag.define :code, :requires => 'lang' do |context, attrs, content|
+Tag.define :code, requires: 'lang' do |context, attrs, content|
   Pygments.pygmentize(content, attrs['lang'])
 end

data/plugins/tags/footnotes.rb

@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 description  'Footnote support'
 
-Tag.define :ref, :optional => 'name', :description => 'Create footnote' do |context, attrs, content|
+Tag.define :ref, optional: 'name', description: 'Create footnote' do |context, attrs, content|
   footnotes = context[:footnotes] ||= []
   hash = context[:footnotes_hash] ||= {}
   name = attrs['name']
@@ -19,9 +20,9 @@ Tag.define :ref, :optional => 'name', :description => 'Create footnote' do |cont
   %{<a class="ref" id="ref#{ref_id}" href="#note#{note_id}">[#{note_id}]</a>}
 end
 
-Tag.define :references, :description => 'Print all footnotes' do |context, attrs|
+Tag.define :references, description: 'Print all footnotes' do |context, attrs|
   footnotes = context[:footnotes]
-  render :footnotes, :locals => {:footnotes => footnotes} if footnotes
+  render :footnotes, locals: {footnotes: footnotes} if footnotes
 end
 
 __END__

data/plugins/tags/gist.rb

@@ -2,10 +2,10 @@ description    'Tag to embed github gist'
 export_scripts 'gist-embed.css'
 require 'open-uri'
 
-Tag.define :gist, :requires => 'id' do |context, attrs|
+Tag.define :gist, requires: 'id' do |context, attrs|
   if attrs['id'] =~ /^\d+$/
     body = open("https://gist.github.com/#{attrs['id']}.json").read
-    gist = JSON.parse(body)
+    gist = MultiJson.load(body)
     gist['div'].gsub(' ', ' ')
   else
     raise ArgumentError, 'Invalid gist id'

data/plugins/tags/html.rb

@@ -1,16 +1,16 @@
 description 'Safe html tags'
 
 HTML_TAGS = [
-  [:a, {:optional => %w(href title)}],
-  [:img, {:autoclose => true, :optional => %w(src alt title)}],
-  [:br, {:autoclose => true}],
+  [:a, {optional: %w(href title)}],
+  [:img, {autoclose: true, optional: %w(src alt title)}],
+  [:br, {autoclose: true}],
   [:i],
   [:u],
   [:b],
   [:pre],
   [:kbd],
   # provided by syntax highlighter
-  # [:code, :optional => %w(lang)]
+  # [:code, optional: %w(lang)]
   [:cite],
   [:strong],
   [:em],
@@ -20,9 +20,9 @@ HTML_TAGS = [
   [:del],
   [:table],
   [:tr],
-  [:td, {:optional => %w(colspan rowspan)}],
+  [:td, {optional: %w(colspan rowspan)}],
   [:th],
-  [:ol, {:optional => %w(start)}],
+  [:ol, {optional: %w(start)}],
   [:ul],
   [:li],
   [:p],
@@ -32,11 +32,11 @@ HTML_TAGS = [
   [:h4],
   [:h5],
   [:h6],
-  [:blockquote, {:optional => %w(cite)}],
-  [:div, {:optional => %w(style)}],
-  [:span, {:optional => %w(style)}],
-  [:video, {:optional => %w(autoplay controls height width loop preload src poster)}],
-  [:audio, {:optional => %w(autoplay controls loop preload src)}]
+  [:blockquote, {optional: %w(cite)}],
+  [:div, {optional: %w(style)}],
+  [:span, {optional: %w(style)}],
+  [:video, {optional: %w(autoplay controls height width loop preload src poster)}],
+  [:audio, {optional: %w(autoplay controls loop preload src)}]
 ]
 
 HTML_TAGS.each do |name, options|

data/plugins/tags/include.rb

@@ -1,20 +1,20 @@
 description 'Include tags'
 
-Tag.define :include, :optional => '*', :requires => 'page', :limit => 10, :description => 'Include page' do |context, attrs|
+Tag.define :include, optional: '*', requires: 'page', limit: 10, description: 'Include page' do |context, attrs|
   path = attrs['page']
   path = context.page.path/'..'/path if !path.starts_with? '/'
   if page = Page.find(path, context.page.tree_version)
-    Aspects::Aspect.find!(page, :name => attrs['aspect'], :layout => true).
-      call(context.subcontext(:params => attrs.merge(:included => true), :page => page), page)
+    Aspects::Aspect.find!(page, name: attrs['aspect'], layout: true).
+      call(context.subcontext(params: attrs.merge(included: true), page: page), page)
   else
-    %{<a href="#{escape_html build_path(path, :action => :new)}">#{escape_html :create_page.t(:page => path)}</a>}
+    %{<a href="#{escape_html build_path(path, action: :new)}">#{escape_html :create_page.t(page: path)}</a>}
   end
 end
 
-Tag.define :includeonly, :immediate => true, :description => 'Text which is shown only if included' do |context, attrs, content|
+Tag.define :includeonly, immediate: true, description: 'Text which is shown only if included' do |context, attrs, content|
   nested_tags(context.subcontext, content) if context.params[:included]
 end
 
-Tag.define :noinclude, :immediate => true, :description => 'Text which is not included' do |context, attrs, content|
+Tag.define :noinclude, immediate: true, description: 'Text which is not included' do |context, attrs, content|
   nested_tags(context.subcontext, content) if !context.params[:included]
 end

data/plugins/tags/main.rb

@@ -157,9 +157,9 @@ class Tag < Filters::NestingFilter
     raise 'Tag must take two or three arguments' if block.arity != 2 && block.arity != 3
     # Find the plugin which provided this tag.
     plugin = Plugin.for(block)
-    options.merge!(:name => name.to_s, :plugin => plugin, :autoclose => block.arity == 2,
-                   :optional => Set.new([*options[:optional]].compact.flatten),
-                   :requires => Set.new([*options[:requires]].compact.flatten))
+    options.merge!(name: name.to_s, plugin: plugin, autoclose: block.arity == 2,
+                   optional: Set.new([*options[:optional]].compact.flatten),
+                   requires: Set.new([*options[:requires]].compact.flatten))
     options[:description] ||= plugin.description
     options[:namespace] ||= plugin.path.split('/').last
     tag = TagInfo.new(options)
@@ -184,7 +184,7 @@ class Tag < Filters::NestingFilter
   #   * :static  - Execute dynamic tags only once
   #
   # Examples:
-  #   :enable => %w(html:* include) Enables all tags in the html namespace and the include tag.
+  #   enable: %w(html:* include) Enables all tags in the html namespace and the include tag.
   def configure(options)
     super
     list = @options[:enable] ? tag_list(*@options[:enable]) : @@tags.keys
@@ -288,7 +288,7 @@ class Tag < Filters::NestingFilter
       "#{@protection_prefix}#{@protected_tags.length-1}#{@protection_suffix}"
     end
   rescue Exception => ex
-    Olelo.logger.error ex.message
+    Olelo.logger.warn ex.message
     "#{name} - #{ex.message}"
   end
 
@@ -322,7 +322,7 @@ Application.hook :render, 2000 do |name, xml, layout|
       name, attrs, content = Marshal.load(decode64($1))
       raise 'Invalid dynamic tag' unless Hash === attrs && Tag.tags[name] && Tag.tags[name].dynamic
       begin
-        context = Aspects::Context.new(:page => page, :params => params, :request => request, :response => response)
+        context = Aspects::Context.new(page: page, params: params, request: request, response: response)
         if content
           raise 'Invalid dynamic tag' unless String === content
           Tag.tags[name].dynamic.new.call(context, attrs, content).to_s
@@ -338,16 +338,16 @@ Application.hook :render, 2000 do |name, xml, layout|
       ''
     end
   end
-  cache_control(:no_cache => true) if no_cache
+  cache_control(no_cache: true) if no_cache
 end
 
-Filters::Filter.register :tag, Tag, :description => 'Process extension tags'
+Filters::Filter.register :tag, Tag, description: 'Process extension tags'
 
-Tag.define :nowiki, :description => 'Disable tag and wikitext filtering' do |context, attrs, content|
+Tag.define :nowiki, description: 'Disable tag and wikitext filtering' do |context, attrs, content|
   escape_html(content)
 end
 
-Tag.define :notags, :description => 'Disable tag processing', :immediate => true do |context, attrs, content|
+Tag.define :notags, description: 'Disable tag processing', immediate: true do |context, attrs, content|
   content
 end
 

data/plugins/tags/math.rb

@@ -92,7 +92,7 @@ class LaTeXRenderer < MathRenderer
   register 'mathjax', LaTeXRenderer
 end
 
-Tag.define :math, :optional => 'display' do |context, attrs, code|
+Tag.define :math, optional: 'display' do |context, attrs, code|
   raise('Limits exceeded') if code.size > 10240
   MathRenderer.instance.render(code, attrs['display'] == 'block' ? 'block' : 'inline')
 end
@@ -104,7 +104,7 @@ class ::Olelo::Application
     end
   end
 
-  get '/_/blahtex/:name', :name => /\w+\.\w+/ do
+  get '/_/blahtex/:name', name: /\w+\.\w+/ do
     begin
       file = Rack::File.new(nil)
       file.path = File.join(Config['blahtex_directory'], params[:name])

data/plugins/tags/redirect.rb

@@ -3,19 +3,19 @@ description    'Tag to redirect to other pages'
 Application.hook :render do |name, xml, layout|
   if params[:redirect] && layout
     links = [params[:redirect]].flatten.map do |link|
-      %{<a href="#{escape_html build_path(link, :action => :edit)}">#{escape_html link}</a>}
+      %{<a href="#{escape_html build_path(link, action: :edit)}">#{escape_html link}</a>}
     end.join(' &#8594; ')
     xml.sub!(/<div id="menu">.*?<\/ul>/m, "\\0Redirected from #{links} &#8594; &#9678; ")
   end
 end
 
-Tag.define :redirect, :requires => 'to', :dynamic => true do |context, attrs|
+Tag.define :redirect, requires: 'to', dynamic: true do |context, attrs|
   list = context.params[:redirect] || []
   to = attrs['to']
   if list.include?(to)
     raise "Invalid redirect to #{to}"
   else
     list << context.page.path
-    throw :redirect, build_path(to, 'redirect[]' => list, :version => !context.page.head? && context.page)
+    throw :redirect, build_path(to, 'redirect[]' => list, version: !context.page.head? && context.page)
   end
 end

data/plugins/tags/scripting.rb

@@ -1,12 +1,12 @@
 description  'Wiki syntax tags for scripting'
 require 'evaluator'
 
-Tag.define :value, :requires => 'of', :immediate => true, :description => 'Print value' do |context, attrs|
+Tag.define :value, requires: 'of', immediate: true, description: 'Print value' do |context, attrs|
   Evaluator.eval(attrs['of'], context.params)
 end
 
-Tag.define :def, :optional => %w(value args), :requires => 'name',
-                 :immediate => true, :description => 'Define variable' do |context, attrs, content|
+Tag.define :def, optional: %w(value args), requires: 'name',
+                 immediate: true, description: 'Define variable' do |context, attrs, content|
   name = attrs['name'].downcase
   if attrs['value']
     context.params[name] = Evaluator.eval(attrs['value'], context.params)
@@ -17,7 +17,7 @@ Tag.define :def, :optional => %w(value args), :requires => 'name',
   nil
 end
 
-Tag.define :call, :optional => '*', :requires => 'name', :immediate => true, :description => 'Call function' do |context, attrs|
+Tag.define :call, optional: '*', requires: 'name', immediate: true, description: 'Call function' do |context, attrs|
   name = attrs['name'].downcase
   functions = context[:functions]
   raise NameError, "Function #{name} not found" if !functions || !functions[name]
@@ -27,7 +27,7 @@ Tag.define :call, :optional => '*', :requires => 'name', :immediate => true, :de
     hash[arg] = Evaluator.eval(attrs[arg], context.params)
     hash
   end
-  result = nested_tags(context.subcontext(:params => args), content)
+  result = nested_tags(context.subcontext(params: args), content)
   if attrs['result']
     context.params[attrs['result']] = result
     nil
@@ -36,28 +36,28 @@ Tag.define :call, :optional => '*', :requires => 'name', :immediate => true, :de
   end
 end
 
-Tag.define :for, :optional => 'counter', :requires => %w(from to),
-                 :immediate => true, :limit => 50, :description => 'For loop' do |context, attrs, content|
+Tag.define :for, optional: 'counter', requires: %w(from to),
+                 immediate: true, limit: 50, description: 'For loop' do |context, attrs, content|
   to = attrs['to'].to_i
   from = attrs['from'].to_i
   raise 'Limits exceeded' if to - from > 10
   (from..to).map do |i|
     params = attrs['counter'] ? {attrs['counter'] => i} : {}
-    nested_tags(context.subcontext(:params => params), content)
+    nested_tags(context.subcontext(params: params), content)
   end.join
 end
 
-Tag.define :repeat, :optional => 'counter', :requires => 'times',
-           :immediate => true, :limit => 50, :description => 'Repeat loop' do |context, attrs, content|
+Tag.define :repeat, optional: 'counter', requires: 'times',
+           immediate: true, limit: 50, description: 'Repeat loop' do |context, attrs, content|
   n = attrs['times'].to_i
   raise 'Limits exceeded' if n > 10
   (1..n).map do |i|
     params = attrs['counter'] ? {attrs['counter'] => i} : {}
-    nested_tags(context.subcontext(:params => params), content)
+    nested_tags(context.subcontext(params: params), content)
   end.join
 end
 
-Tag.define :if, :requires => 'test', :immediate => true, :description => 'If statement' do |context, attrs, content|
+Tag.define :if, requires: 'test', immediate: true, description: 'If statement' do |context, attrs, content|
   if Evaluator.eval(attrs['test'], context.params)
     nested_tags(context.subcontext, content)
   end