olelo 0.9.3 → 0.9.4

data/static/script/02-olelo.storage.js

@@ -0,0 +1,54 @@
+// Simple storage plugin
+// Written by Daniel Mendler
+(function($) {
+    var storage = {}, data = {};
+    try {
+	if (window.localStorage) {
+            storage = window.localStorage;
+	}
+	if (storage.oleloStorage) {
+	    data = JSON.parse(storage.oleloStorage);
+	}
+    } catch (e) {
+        // Firefox fails when touching localStorage/globalStorage and cookies are disabled
+    }
+
+    function checkKey(key) {
+	if (typeof(key) != 'string' && typeof(key) != 'number') {
+	    throw new TypeError('Key name must be string or numeric');
+	}
+    }
+
+    function save() {
+	try {
+	    storage.oleloStorage = JSON.stringify(data);
+	} catch (e) {
+            // probably cache is full, nothing is saved this way
+        }
+    }
+
+    $.storage = {
+	set: function(key, value){
+	    checkKey(key);
+	    data[key] = value;
+	    save();
+	    return value;
+	},
+	get: function(key, def){
+	    checkKey(key);
+	    if (key in data) {
+		return data[key];
+	    }
+	    return typeof(def) == 'undefined' ? null : def;
+	},
+	remove: function(key){
+	    checkKey(key);
+	    if (key in data){
+		delete data[key];
+		save();
+		return true;
+	    }
+	    return false;
+	}
+    };
+})(jQuery);

data/static/script/10-olelo.historytable.js

@@ -5,7 +5,7 @@
 	    var version = $(this).attr('id').substr(8);
 	    $(this).prepend('<td class="compare"><input type="checkbox" name="' + version + '"/></td>');
 	});
-	var versions = jStorage.get('historyTable');
+	var versions = $.storage.get('historyTable');
 	if (versions) {
 	    for (var i = 0; i < versions.length; ++i)
 		$('input[name=' + versions[i] + ']').attr('checked', 'checked');
@@ -25,7 +25,7 @@
 	var button = $('th button', this);
 	button.click(function() {
 	    var versions = getSelectedVersions();
-	    jStorage.set('historyTable', versions);
+	    $.storage.set('historyTable', versions);
             location.href = location.pathname.replace('/history', '/compare/' + versions[versions.length-1] + '...' + versions[0]);
 	});
 

data/static/script/13-olelo.tabwidget.js

@@ -19,14 +19,14 @@
 	    selected.data('tab').show();
 	    selected.parent().addClass('selected');
 	    if (store) {
-		jStorage.set(store, selected.data('tab').attr('id'));
+		$.storage.set(store, selected.data('tab').attr('id'));
 	    }
 	    return false;
 	});
 
         // Get selected tab from store
 	if (store) {
-	    var name = jStorage.get(store);
+	    var name = $.storage.get(store);
 	    if (name) {
                 selected = $("> a[href='#" + name + "']", this);
 	    }

data/test/helper.rb

@@ -1,4 +1,3 @@
-require 'rack/olelo_patches'
 require 'olelo'
 require 'bacon'
 require 'rack/test'
@@ -11,16 +10,18 @@ module TestHelper
   end
 
   def create_repository
-    Olelo::Repository.instance = nil
+    Thread.current[:olelo_repository] = nil
+    Olelo::User.current = Olelo::User.new('anonymous', 'anonymous@localhost')
+    load_plugin('repositories/rugged_repository')
     Olelo::Config.instance['repository.type'] = 'git'
     Olelo::Config.instance['repository.git.path'] = File.expand_path(File.join(File.dirname(__FILE__), '.test'))
     Olelo::Config.instance['repository.git.bare'] = true
-    load_plugin('repositories/git')
   end
 
   def destroy_repository
-    Olelo::Repository.instance = nil
     FileUtils.rm_rf(Olelo::Config['repository.git.path'])
+    Thread.current[:olelo_repository] = nil
+    Olelo::User.current = nil
   end
 
   def create_page(name, content = 'content')

data/test/page_test.rb

@@ -122,7 +122,7 @@ describe 'Olelo::Page' do
     tree.previous_version.should.equal old_tree.tree_version
     old_tree.tree_version.should.equal old_tree.children[0].tree_version
     old_tree.tree_version.should.equal old_tree.children[1].tree_version
-    old_tree.tree_version.should.equal old_tree.children[2].tree_version
+    old_tree.children[2].should.equal nil
     old_tree.children[0].tree_version.should.not.be.head
   end
 

data/test/request_test.rb

@@ -1,10 +1,10 @@
 require 'helper'
 require 'olelo/middleware/flash'
 require 'olelo/middleware/force_encoding'
+require 'olelo/middleware/degrade_mime_type'
+require 'rack/relative_redirect'
 require 'rack/session/pool'
 
-Rack::MockRequest::DEFAULT_ENV['REMOTE_ADDR'] = 'localhorst'
-
 class Bacon::Context
   include Rack::Test::Methods
   include Olelo::Util
@@ -18,61 +18,65 @@ describe 'requests' do
     @app_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
     default_config = {
-      :title             => 'Olelo',
-      :app_path          => @app_path,
-      :plugins_path      => File.join(@app_path, 'plugins'),
-      :config_path       => File.join(@app_path, 'config'),
-      :initializers_path => File.join(@app_path, 'config', 'initializers'),
-      :views_path        => File.join(@app_path, 'views'),
-      :themes_path       => File.join(@app_path, 'static', 'themes'),
-      :theme             => 'atlantis',
-      :cache_store       => {
-        :type => 'file',
-        :file => {
-          :root => File.join(@test_path, 'cache')
+      title:             'Olelo',
+      app_path:          @app_path,
+      plugins_path:      File.join(@app_path, 'plugins'),
+      config_path:       File.join(@app_path, 'config'),
+      initializers_path: File.join(@app_path, 'config', 'initializers'),
+      views_path:        File.join(@app_path, 'views'),
+      themes_path:       File.join(@app_path, 'static', 'themes'),
+      theme:             'atlantis',
+      cache_store:       {
+        type: 'file',
+        file: {
+          root: File.join(@test_path, 'cache')
         }
       },
-      :base_path         => '/',
-      :production        => true,
-      :locale	         => 'en_US',
-      :sidebar_page      => 'Sidebar',
-      :authentication => {
-        :service  => :yamlfile,
-        :enable_signup => true,
-        :yamlfile => {
-          :store  => File.join(@test_path, 'users.yml'),
+      base_path:          '/',
+      production:         true,
+      locale:             'en_US',
+      sidebar_page:       'Sidebar',
+      authentication: {
+        service:   :yamlfile,
+        enable_signup: true,
+        yamlfile: {
+          store:   File.join(@test_path, 'users.yml'),
         },
       },
-      :mime => [
+      mime: [
                 'extension',
                 'content',
                 'text/x-creole',
                ],
-      :mime_suggestions => [],
-      :disabled_plugins => [
+      math_renderer: 'mathjax',
+      mime_suggestions: [],
+      disabled_plugins: [
                             'security/readonly_wiki',
 			    'security/private_wiki',
-                            'editor/antispam',
+                            'editor/recaptcha',
                            ],
-      :repository => {
-        :type  => 'git',
-        :git => {
-          :path => File.join(@test_path, 'repository'),
-          :bare => true,
+      repository: {
+        type:   'git',
+        git: {
+          path: File.join(@test_path, 'repository'),
+          bare: true,
         },
       }
     }
 
     Olelo::Config.instance.update(default_config)
-    Olelo::Repository.instance = nil
+    Thread.current[:olelo_repository] = nil
 
     logger = Logger.new(File.join(@app_path, 'test.log'))
+    Olelo::Initializer.initialize(logger)
 
     @app = Rack::Builder.new do
-      use Olelo::Middleware::ForceEncoding
       use Rack::Session::Pool
-      use Olelo::Middleware::Flash, :set_accessors => %w(error warn info)
-      Olelo::Initializer.initialize(logger)
+      use Rack::MethodOverride
+      use Olelo::Middleware::ForceEncoding
+      use Olelo::Middleware::DegradeMimeType
+      use Olelo::Middleware::Flash, set_accessors: %w(error warn info)
+      #use Rack::RelativeRedirect
       run Olelo::Application.new
     end
   end
@@ -90,8 +94,8 @@ describe 'requests' do
   it 'should show login page' do
     get '/login'
     last_response.should.be.ok
-    last_response.body.should.include '<form action="&#47;signup" method="post">'
-    last_response.body.should.include '<form action="&#47;login" method="post">'
+    last_response.body.should.include '<form action="/signup" method="post">'
+    last_response.body.should.include '<form action="/login" method="post">'
   end
 
   it 'should show to /new' do

data/test/string_extensions_test.rb

@@ -1,12 +1,6 @@
 require 'olelo/extensions'
 
 describe 'String extensions' do
-  it 'should have unindent' do
-    %{a
-      b
-      c}.unindent.should.equal "a\nb\nc"
-  end
-
   it 'should have #starts_with?' do
     '123456789'.starts_with?('12').should.equal true
     '123456789'.starts_with?('23').should.not.equal true

data/test/templates_test.rb

@@ -27,7 +27,7 @@ describe 'Olelo::Templates' do
   end
 
   it 'should have #render' do
-    render(:test, :locals => {:text => 'Hello, World!'}).should.equal "<h1>Hello, World!</h1>"
+    render(:test, locals: {text: 'Hello, World!'}).should.equal "<h1>Hello, World!</h1>"
     Olelo::Templates.cache.size.should.equal 1
   end
 end

data/test/util_test.rb

@@ -48,7 +48,7 @@ describe 'Olelo::Util' do
   end
 
   it 'should have #build_query' do
-    Olelo::Util.build_query(:a => 1, :b => [1, 2, 3]).should.equal 'a=1&b=1&b=2&b=3'
+    Olelo::Util.build_query(a: 1, b: [1, 2, 3]).should.equal 'a=1&b=1&b=2&b=3'
   end
 
   it 'should have #truncate' do

data/views/changes.slim

@@ -1,4 +1,4 @@
-- title :changes_of.t(:page => page.title)
+- title :changes_of.t(page: page.title)
 h1= title
 table
   tbody
@@ -18,5 +18,5 @@ table
       td= :parents.t
       td.version
         - @version.parents.each do |parent|
-          a href=build_path(parent, :action => :changes) = Olelo::Version.short(parent)
+          a href=build_path(parent, action: :changes) = Olelo::Version.short(parent)
 = format_diff(@diff)

data/views/compare.slim

@@ -1,8 +1,8 @@
-- title "#{:compare.t(:name => page.title)}: #{@diff.from.short} -> #{@diff.to.short}"
+- title "#{:compare.t(name: page.title)}: #{@diff.from.short} -> #{@diff.to.short}"
 h1
-  = :compare.t(:name => page.title)
+  = :compare.t(name: page.title)
   | :
-  a.version href=build_path(page, :version => @diff.from) = @diff.from.short
+  a.version href=build_path(page, version: @diff.from) = @diff.from.short
   | →
-  a.version href=build_path(page, :version => @diff.to) = @diff.to.short
+  a.version href=build_path(page, version: @diff.to) = @diff.to.short
 = format_diff(@diff)

data/views/delete.slim

@@ -1,8 +1,8 @@
-- title :delete_page.t(:page => page.title)
+- title :delete_page.t(page: page.title)
 h1= title
+= flash_messages
 form action=build_path(page.path) method='post'
   .box
-    = flash_messages
     &hidden name='_method' value='delete'
     label for='submit' = :really_delete.t
     button&submit#submit name='submit' accesskey='d' = :delete.t

data/views/deleted.slim

@@ -1,2 +1,2 @@
-- title :page_deleted.t(:page => page.title)
+- title :page_deleted.t(page: page.title)
 h1= title

data/views/edit.slim

@@ -1,33 +1,40 @@
 - if page.new?
   - title params[:path].blank? ? :new_page.t : "#{:new_page.t}: #{params[:path]}"
 - else
-  - title params[:pos] ? :edit_page_section.t(:page => page.title) : :edit_page.t(:page => page.title)
+  - title params[:pos] ? :edit_page_section.t(page: page.title) : :edit_page.t(page: page.title)
 h1= title
-= tabs :edit, :upload, :attributes
+= flash_messages
+= page.mime.text? ? tabs(:edit, :upload, :attributes) :  tabs(:upload, :attributes)
 form action=build_path(page.new? ? nil : page.path) method='post'
-  #tab-edit.tab
-    h2= :edit.t
-    = flash_messages if action?(:edit) || page.new?
-    - content = edit_content(page)
-    - if page.new?
-      label for='edit-path' = :path.t
-      &text#edit-path name='path' value=params[:path]
-      br
-      hr
-    - else
-      &hidden name='version' value=page.version
-      - if params[:pos]
-        &hidden name='pos' value=params[:pos]
-        &hidden name='len' value=content.size
-    textarea#edit-content.observe name='content' cols='100' rows='20' = content
-    br
-    label for='edit-comment' = :comment.t
-    &text#edit-comment name='comment' value=params[:comment] size='50'
-    = render_block :edit_buttons do
-      button&submit name='action' value='edit' = :save.t
-      button&submit name='action' value='edit-close' = :save_and_close.t
-      button&reset = :reset.t
+  - if page.mime.text?
+    #tab-edit.tab
+      h2= :edit.t
+      ruby:
+        content =
+          if params[:content]
+            params[:content]
+          else
+            params[:pos] ? page.content[params[:pos].to_i, params[:len].to_i].to_s : page.content
+          end
+      - if page.new?
+        label for='edit-path' = :path.t
+        &text#edit-path name='path' value=params[:path]
+        br
+        hr
+      - else
+        &hidden name='version' value=page.version
+        - if params[:pos]
+          &hidden name='pos' value=params[:pos]
+          &hidden name='len' value=content.size
+      textarea#edit-content.observe name='content' cols='100' rows='20' = content
       br
+      label for='edit-comment' = :comment.t
+      &text#edit-comment name='comment' value=params[:comment] size='50'
+      = render_block :edit_buttons do
+        button&submit name='action' value='edit' = :save.t
+        button&submit name='action' value='edit-close' = :save_and_close.t
+        button&reset = :reset.t
+        br
 form action=build_path(page.new? ? nil : page.path) method='post' enctype='multipart/form-data'
   #tab-upload.tab
     h2= :upload_file.t
@@ -38,7 +45,6 @@ form action=build_path(page.new? ? nil : page.path) method='post' enctype='multi
       hr
     - else
       &hidden name='version' value=page.version
-    = flash_messages :upload
     label for='upload-file' = :file.t
     &file#upload-file.observe name='file'
     br
@@ -57,7 +63,6 @@ form action=build_path(page.new? ? nil : page.path) method='post'
       hr
     - else
       &hidden name='version' value=page.version
-    = flash_messages :attributes
     = page.attribute_editor
     = render_block :attributes_buttons do
       .indent

data/views/history.slim

@@ -1,6 +1,6 @@
-- title :history_of.t(:page => page.title)
+- title :history_of.t(page: page.title)
 h1= title
-= pagination(page, @page_count, @page_nr, :action => :history)
+= pagination(page, @page_count, @page_nr, action: :history)
 table#history-table
   thead
     tr
@@ -11,10 +11,10 @@ table#history-table
     - @history.each do |version|
       tr id="version-#{version}"
         td
-          a href=build_path(page, :version => version) = truncate(version.comment, 50)
+          a href=build_path(page, version: version) = truncate(version.comment, 50)
           |  (
-          a href=build_path(page, :action => 'changes'/version) = :changes.t
+          a href=build_path(page, action: 'changes'/version) = :changes.t
           | )
         td= truncate(version.author.name, 30)
         td= date version.date
-= pagination(page, @page_count, @page_nr, :action => :history)
+= pagination(page, @page_count, @page_nr, action: :history)

data/views/layout.slim

@@ -32,4 +32,4 @@ html.no-js lang=Olelo::Config['locale'].sub('_', '-') class={page && !page.head?
       == footer
       .noprint.powered_by
         ' Powered by
-        a href='http://github.com/minad/olelo' Ōlelo
+        a href='https://github.com/minad/olelo' Ōlelo

data/views/login.slim

@@ -1,38 +1,36 @@
 - title :login.t
+= flash_messages
 - signup_enabled = Olelo::Config['authentication.enable_signup'] && Olelo::User.supports?(:signup)
-p
-  = signup_enabled ? tabs(:login, :signup) : tabs(:login)
-  form action=build_path(:login) method='post'
-    #tab-login.tab.fieldset
-      h2 Login
-      = flash_messages :login
-      label for='login-user' = :user.t
-      &text#login-user name='user'
+= signup_enabled ? tabs(:login, :signup) : tabs(:login)
+form action=build_path(:login) method='post'
+  #tab-login.tab.fieldset
+    h2 Login
+    label for='login-user' = :user.t
+    &text#login-user name='user'
+    br
+    label for='login-password' = :password.t
+    &password#login-password name='password'
+    br
+    .indent
+      = render_block :login_buttons do
+        button&submit= :login.t
+    br
+- if signup_enabled
+  form action=build_path(:signup) method='post'
+    #tab-signup.tab.fieldset
+      h2= :signup.t
+      label for='signup-user' = :user.t
+      &text#signup-user name='user'
       br
-      label for='login-password' = :password.t
-      &password#login-password name='password'
+      label for='signup-password' = :password.t
+      &password#signup-password name='password'
+      br
+      label for='signup-confirm' = :confirm_password.t
+      &password#signup-confirm name='confirm'
+      br
+      label for='signup-email' = :email.t
+      &text#signup-email name='email'
       br
       .indent
-        = render_block :login_buttons do
-          button&submit= :login.t
+        button&submit = :signup.t
       br
-  - if signup_enabled
-    form action=build_path(:signup) method='post'
-      #tab-signup.tab.fieldset
-        h2= :signup.t
-        = flash_messages :signup
-        label for='signup-user' = :user.t
-        &text#signup-user name='user'
-        br
-        label for='signup-password' = :password.t
-        &password#signup-password name='password'
-        br
-        label for='signup-confirm' = :confirm_password.t
-        &password#signup-confirm name='confirm'
-        br
-        label for='signup-email' = :email.t
-        &text#signup-email name='email'
-        br
-        .indent
-          button&submit = :signup.t
-        br