olelo 0.9.3 → 0.9.4

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.3
+  - ruby-head
+  - rbx-19mode

data/Rakefile

@@ -1,4 +1,4 @@
-task :default => %w(test:spec)
+task default: %w(test:spec)
 
 def shrink_js(t)
   #sh "cat #{t.prerequisites.sort.join(' ')} > #{t.name}"
@@ -36,10 +36,10 @@ file('plugins/editor/markup/script.js' => Dir.glob('plugins/editor/markup/script
 
 namespace :gen do
   desc('Shrink JS files')
-  task :js => %w(static/script.js plugins/treeview/script.js plugins/misc/fancybox/script.js plugins/editor/markup/script.js)
+  task js: %w(static/script.js plugins/treeview/script.js plugins/misc/fancybox/script.js plugins/editor/markup/script.js)
 
   desc('Compile CSS files')
-  task :css => %w(static/themes/atlantis/style.css
+  task css: %w(static/themes/atlantis/style.css
                   plugins/treeview/treeview.css
                   plugins/utils/pygments.css
                   plugins/gallery/gallery.css
@@ -49,12 +49,12 @@ end
 
 namespace :test do
   desc 'Run tests with bacon'
-  task :spec => FileList['test/*_test.rb'] do |t|
+  task spec: FileList['test/*_test.rb'] do |t|
     sh "bacon -q -Ilib:test #{t.prerequisites.join(' ')}"
   end
 
   desc 'Generate test coverage report'
-  task :rcov => FileList['test/*_test.rb'] do |t|
+  task rcov: FileList['test/*_test.rb'] do |t|
     sh "rcov -Ilib:test #{t.prerequisites.join(' ')}"
   end
 end
@@ -64,15 +64,9 @@ task :clean do |t|
   FileUtils.rm_rf 'doc/api'
   FileUtils.rm_rf 'coverage'
   FileUtils.rm_rf '.wiki/cache'
-  FileUtils.rm_rf '.wiki/blahtex'
   FileUtils.rm_rf '.wiki/log'
 end
 
-desc 'Remove wiki folder'
-task 'clean:all' => :clean do |t|
-  FileUtils.rm_rf '.wiki'
-end
-
 desc 'Generate documentation'
 namespace :doc do
   task :gen    do; system("yard doc -o doc/api 'lib/**/*.rb' 'plugins/**/*.rb'"); end
@@ -89,4 +83,4 @@ namespace :notes do
 end
 
 desc 'Show annotations'
-task :notes => %w(notes:todo notes:fixme notes:hack notes:warning notes:important)
+task notes: %w(notes:todo notes:fixme notes:hack notes:warning notes:important)

data/bin/olelo

@@ -11,8 +11,8 @@ Options:
 }
 
 options = {
-  :port => 8080,
-  :host => '0.0.0.0'
+  port: 8080,
+  host: '0.0.0.0'
 }
 
 app_path = File.expand_path(File.join(__FILE__, '..', '..'))
@@ -20,15 +20,19 @@ app_path = File.expand_path(File.join(__FILE__, '..', '..'))
 opts = OptionParser.new do |opts|
   opts.banner = help
 
-  opts.on('-p', '--port [PORT]', 'Bind port (default 8080).') do |port|
+  opts.on('-p', '--port PORT', 'Bind port (default 8080).') do |port|
     options[:port] = port.to_i
   end
 
-  opts.on('-o', '--host [HOST]', 'Hostname or IP address to listen on (default 0.0.0.0).') do |host|
+  opts.on('-o', '--host HOST', 'Hostname or IP address to listen on (default 0.0.0.0).') do |host|
     options[:host] = host
   end
 
-  opts.on('-c', '--config [CONFIG]', 'Path to the Olelo configuration, sets the $OLELO_CONFIG environment variable.') do |config|
+  opts.on('-s', '--server SERVER', 'serve using SERVER (webrick/mongrel)') do |server|
+    options[:server] = server
+  end
+
+  opts.on('-c', '--config CONFIG', 'Path to the Olelo configuration, sets the $OLELO_CONFIG environment variable.') do |config|
     ENV['OLELO_CONFIG'] = File.expand_path(config)
   end
 
@@ -53,6 +57,7 @@ elsif ARGV.size > 1
   exit
 end
 
-Rack::Server.start(:Port => options[:port],
-                   :Host => options[:host],
-                   :config => File.join(app_path, 'config.ru'))
+Rack::Server.start(Port: options[:port],
+                   Host: options[:host],
+                   server: options[:server],
+                   config: File.join(app_path, 'config.ru'))

data/config.ru

@@ -24,28 +24,34 @@ Olelo::Config.instance['themes_path'] = ::File.join(app_path, 'static', 'themes'
 Olelo::Config.instance['rack.session_secret'] = SecureRandom.hex
 Olelo::Config.instance.load!(::File.join(app_path, 'config', 'config.yml.default'))
 
+config_file = ENV['OLELO_CONFIG'] || ENV['WIKI_CONFIG']
+unless config_file
+  path = ::File.join(app_path, 'config', 'config.yml')
+  config_file = path if File.exists?(path)
+end
+
 if Dir.pwd == app_path
   puts "Serving from Olelo application directory #{app_path}"
   data_path = File.join(app_path, '.wiki')
-  Olelo::Config.instance['repository.git'] = { :path => ::File.join(data_path, 'repository'), :bare => false }
-  Olelo::Config.instance['cache_store'] = { :type => 'file', 'file.root' => ::File.join(data_path, 'cache') }
+  Olelo::Config.instance['repository.git'] = { path: ::File.join(data_path, 'repository'), bare: false }
+  Olelo::Config.instance['cache_store'] = { type: 'file', 'file.root' => ::File.join(data_path, 'cache') }
   Olelo::Config.instance['authentication.yamlfile.store'] = ::File.join(data_path, 'users.yml')
   Olelo::Config.instance['log.file'] = ::File.join(data_path, 'log')
 elsif File.directory?(::File.join(Dir.pwd, '.git'))
   puts "Serving out of repository #{Dir.pwd}"
   data_path = File.join(Dir.pwd, '.wiki')
-  Olelo::Config.instance['repository.git'] = { :path => Dir.pwd, :bare => false }
-  Olelo::Config.instance['cache_store'] = { :type => 'file', 'file.root' => ::File.join(data_path, 'cache') }
+  Olelo::Config.instance['repository.git'] = { path: Dir.pwd, bare: false }
+  Olelo::Config.instance['cache_store'] = { type: 'file', 'file.root' => ::File.join(data_path, 'cache') }
   Olelo::Config.instance['authentication.yamlfile.store'] = ::File.join(data_path, 'users.yml')
   Olelo::Config.instance['log.file'] = ::File.join(data_path, 'log')
-else
-  puts 'No default data storage location defined, please create your own configuration!'
+elsif !config_file
+  puts 'No git repository found, please create your own configuration file!'
+  exit 1
 end
 
-if config = ENV['OLELO_CONFIG'] || ENV['WIKI_CONFIG']
-  Olelo::Config.instance.load!(config)
-else
-  Olelo::Config.instance.load(::File.join(app_path, 'config', 'config.yml'))
+if config_file
+  puts "Loading configuration from #{config_file}"
+  Olelo::Config.instance.load!(config_file)
 end
 
 Olelo::Config.instance.freeze
@@ -54,6 +60,8 @@ FileUtils.mkpath ::File.dirname(Olelo::Config['log.file'])
 logger = ::Logger.new(Olelo::Config['log.file'], :monthly, 10240000)
 logger.level = ::Logger.const_get(Olelo::Config['log.level'])
 
+Olelo::Initializer.initialize(logger)
+
 # Doesn't work currently, rack issue #241
 # if !Olelo::Config['production']
 #   # Rack::Lint injector
@@ -77,8 +85,8 @@ if Olelo::Config['rack.deflater']
   use Rack::Deflater
 end
 
-use Rack::StaticCache, :urls => ['/static'], :root => app_path
-use Rack::Session::Cookie, :key => 'olelo.session', :secret => Olelo::Config['rack.session_secret']
+use Rack::StaticCache, urls: ['/static'], root: app_path
+use Rack::Session::Cookie, key: 'olelo.session', secret: Olelo::Config['rack.session_secret']
 use Olelo::Middleware::DegradeMimeType
 
 class LoggerOutput
@@ -89,10 +97,8 @@ end
 use Rack::MethodOverride
 use Rack::CommonLogger, LoggerOutput.new(logger)
 use Olelo::Middleware::ForceEncoding
-use Olelo::Middleware::Flash, :set_accessors => %w(error warn info)
+use Olelo::Middleware::Flash, set_accessors: %w(error warn info)
 use Rack::RelativeRedirect
-
-Olelo::Initializer.initialize(logger)
 run Olelo::Application.new
 
 logger.info "Olelo started in #{Olelo::Config['production'] ? 'production' : 'development'} mode"

data/config/aspects.rb

@@ -47,9 +47,9 @@ regexp :mediawiki_nowiki,  /<nowiki>.*?<\/nowiki>/m,    '<notags>\0</notags>'
 # end
 #
 # tag filter options:
-#   tag(:enable => 'html:*') Enable only html tags
-#   tag(:disable => %w(html:* scripting:include)) Disable html tags and scripting:include
-#   tag(:disable => 'html:*') Disable only html tags
+#   tag(enable: 'html:*') Enable only html tags
+#   tag(disable: %w(html:* scripting:include)) Disable html tags and scripting:include
+#   tag(disable: 'html:*') Disable only html tags
 #
 ################################################################################
 
@@ -67,7 +67,7 @@ aspect :page do
       remove_comments.tag_shortcuts
       creole_nowiki.tag { creole!.rubypants }
     end
-    toc.interwiki(:map => interwiki_map).link_classifier
+    toc.interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -78,7 +78,7 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts
     creole_nowiki.tag { creole!.rubypants }
-    toc.interwiki(:map => interwiki_map).link_classifier
+    toc.interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -89,9 +89,9 @@ aspect :latex do
   mime 'text/plain; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts.creole_nowiki
-    tag(:static => true) { creole!.rubypants }
-    toc.interwiki(:map => interwiki_map)
-    html_wrapper!.xslt!(:stylesheet => 'xhtml2latex.xsl')
+    tag(static: true) { creole!.rubypants }
+    toc.interwiki(map: interwiki_map)
+    html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
 
@@ -107,7 +107,7 @@ aspect :page do
       remove_comments.tag_shortcuts
       mediawiki_nowiki.tag { mediawiki!.rubypants }
     end
-    toc.interwiki(:map => interwiki_map).link_classifier
+    toc.interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -118,7 +118,7 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts
     mediawiki_nowiki.tag { mediawiki!.rubypants }
-    toc.interwiki(:map => interwiki_map).link_classifier
+    toc.interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -129,9 +129,9 @@ aspect :latex do
   mime 'text/plain; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts.mediawiki_nowiki
-    tag(:static => true) { mediawiki!.rubypants }
-    toc.interwiki(:map => interwiki_map)
-    html_wrapper!.xslt!(:stylesheet => 'xhtml2latex.xsl')
+    tag(static: true) { mediawiki!.rubypants }
+    toc.interwiki(map: interwiki_map)
+    html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
 
@@ -144,9 +144,9 @@ aspect :page do
   accepts 'text/x-textile'
   filter do
     remove_comments.tag_shortcuts.textile_nowiki
-    tag(:disable => 'html:*') { textile!.rubypants }
+    tag(disable: 'html:*') { textile!.rubypants }
     fix_img_tag.toc
-    interwiki(:map => interwiki_map).link_classifier
+    interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -156,9 +156,9 @@ aspect :s5 do
   mime 'application/xhtml+xml; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts.textile_nowiki
-    tag(:disable => 'html:*') { textile!.rubypants }
+    tag(disable: 'html:*') { textile!.rubypants }
     fix_img_tag.toc
-    interwiki(:map => interwiki_map).link_classifier
+    interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -169,9 +169,9 @@ aspect :latex do
   mime 'text/plain; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts.textile_nowiki
-    tag(:static => true, :disable => 'html:*') { textile!.rubypants }
-    toc.interwiki(:map => interwiki_map)
-    html_wrapper!.xslt!(:stylesheet => 'xhtml2latex.xsl')
+    tag(static: true, disable: 'html:*') { textile!.rubypants }
+    toc.interwiki(map: interwiki_map)
+    html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
 
@@ -185,10 +185,10 @@ aspect :page do
   filter do
     editsection do
       remove_comments.tag_shortcuts.markdown_nowiki
-      tag(:disable => 'html:*') { markdown! }
+      tag(disable: 'html:*') { markdown! }
     end
     fix_img_tag.toc
-    interwiki(:map => interwiki_map).link_classifier
+    interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -198,9 +198,9 @@ aspect :s5 do
   mime 'application/xhtml+xml; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts.markdown_nowiki
-    tag(:disable => 'html:*') { markdown! }
+    tag(disable: 'html:*') { markdown! }
     fix_img_tag.toc
-    interwiki(:map => interwiki_map).link_classifier
+    interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -211,9 +211,9 @@ aspect :latex do
   mime 'text/plain; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts.markdown_nowiki
-    tag(:static => true, :disable => 'html:*') { markdown! }
-    toc.interwiki(:map => interwiki_map)
-    html_wrapper!.xslt!(:stylesheet => 'xhtml2latex.xsl')
+    tag(static: true, disable: 'html:*') { markdown! }
+    toc.interwiki(map: interwiki_map)
+    html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
 
@@ -228,7 +228,7 @@ aspect :page do
     remove_comments.tag_shortcuts
     tag { orgmode!.rubypants }
     fix_img_tag.toc
-    interwiki(:map => interwiki_map).link_classifier
+    interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -240,7 +240,7 @@ aspect :s5 do
     remove_comments.tag_shortcuts
     tag { orgmode!.rubypants }
     fix_img_tag.toc
-    interwiki(:map => interwiki_map).link_classifier
+    interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -251,8 +251,21 @@ aspect :latex do
   mime 'text/plain; charset=utf-8'
   filter do
     remove_comments.tag_shortcuts
-    tag(:static => true) { orgmode!.rubypants }
-    toc.interwiki(:map => interwiki_map)
-    html_wrapper!.xslt!(:stylesheet => 'xhtml2latex.xsl')
+    tag(static: true) { orgmode!.rubypants }
+    toc.interwiki(map: interwiki_map)
+    html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
+  end
+end
+
+################################################################################
+# Remind aspects configuration
+################################################################################
+
+aspect :calendar do
+  is_cacheable.needs_layout.has_priority(1)
+  accepts 'text/x-remind'
+  mime 'application/xhtml+xml; charset=utf-8'
+  filter do
+    remind!.html2xml!
   end
 end

data/config/config.yml.default

@@ -114,6 +114,7 @@ disabled_plugins:
   - security/private_wiki
   - editor/recaptcha
   - editor/ace
+  - filters/remind
 
 ##################################################
 # Rack middleware configurations

data/config/initializers/00-mime_types.rb

@@ -1,29 +1,34 @@
 # Register some mime types
 
-MimeMagic.add('application/x-empty', :comment => 'Empty file')
-MimeMagic.add('inode/directory',     :comment => 'Directory')
+MimeMagic.add('application/x-empty', comment: 'Empty file')
+MimeMagic.add('inode/directory',     comment: 'Directory')
 
 MimeMagic.add('text/x-creole',
-              :extensions => %w(creole text),
-              :parents => 'text/plain',
-              :comment => 'Creole Wiki Text File')
+              extensions: %w(creole text),
+              parents: 'text/plain',
+              comment: 'Creole Wiki Text File')
 
 MimeMagic.add('text/x-mediawiki',
-              :extensions => %w(mediawiki mw),
-              :parents => 'text/plain',
-              :comment => 'MediaWiki Text File')
+              extensions: %w(mediawiki mw),
+              parents: 'text/plain',
+              comment: 'MediaWiki Text File')
 
 MimeMagic.add('text/x-markdown',
-              :extensions => %w(markdown md mdown mkdn mdown),
-              :parents => 'text/plain',
-              :comment => 'Markdown Text File')
+              extensions: %w(markdown md mdown mkdn mdown),
+              parents: 'text/plain',
+              comment: 'Markdown Text File')
 
 MimeMagic.add('text/x-textile',
-              :extensions => 'textile',
-              :parents => 'text/plain',
-              :comment => 'Textile Text File')
+              extensions: 'textile',
+              parents: 'text/plain',
+              comment: 'Textile Text File')
 
 MimeMagic.add('text/x-orgmode',
-              :extensions => 'org',
-              :parents => 'text/plain',
-              :comment => 'Emacs Orgmode File')
+              extensions: 'org',
+              parents: 'text/plain',
+              comment: 'Emacs Orgmode File')
+
+MimeMagic.add('text/x-remind',
+              extensions: 'rem',
+              parents: 'text/plain',
+              comment: 'Remind Calendar File')

data/config/initializers/01-slim.rb

@@ -1,2 +1,2 @@
-Slim::Engine.set_default_options :format => :xhtml,
-                                 :shortcut => {'&' => 'input type', '#' => 'id', '.' => 'class'}
+Slim::Engine.set_default_options format: :xhtml,
+                                 shortcut: {'&' => 'input type', '#' => 'id', '.' => 'class'}

data/lib/olelo.rb

@@ -1,5 +1,3 @@
-raise "Your Ruby version is too old (1.9.2 is required)" if RUBY_VERSION < '1.9.2'
-
 require 'logger'
 require 'cgi'
 require 'digest/md5'
@@ -9,12 +7,7 @@ require 'set'
 require 'yaml'
 require 'mimemagic'
 require 'socket'
-
-begin
-  require 'yajl/json_gem'
-rescue LoadError
-  require 'json'
-end
+require 'multi_json'
 
 require 'olelo/html_safe'
 require 'slim'