olelo 0.9.3 → 0.9.4

data/views/move.slim

@@ -1,8 +1,8 @@
-- title :move_page.t(:page => page.title)
+- title :move_page.t(page: page.title)
 h1= title
-form action=build_path(page, :action => :move) method='post'
+= flash_messages
+form action=build_path(page, action: :move) method='post'
   .box
-    = flash_messages
     label for='destination' = :destination.t
     &text#destination name='destination' value={params[:destination] || page.path}
     br

data/views/profile.slim

@@ -1,8 +1,8 @@
-- title :profile_title.t(:user => Olelo::User.current.name)
+- title :profile_title.t(user: Olelo::User.current.name)
 h1= title
+= flash_messages
 form action=build_path(:profile) method='post'
   .fieldset
-    = flash_messages
     h2= :change_password.t
     label for='oldpassword' = :old_password.t
     &password name='oldpassword' id='oldpassword'

data/views/show.slim

@@ -1,7 +1,7 @@
 - title page.title
 = footer do
   ' #{:version.t}
-  a.version href=build_path(page, :version => page.version, :force_version => true) title=page.version = page.version.short
+  a.version href=build_path(page, version: page.version, force_version: true) title=page.version = page.version.short
   '  #{:by.t} #{page.version.author.name},
   = date page.version.date
 - if !page.attributes['no_title']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &8726980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *8726980
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8725520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *8725520
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8724680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+  version_requirements: *8724680
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8723740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
+  version_requirements: *8723740
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8722860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *8722860
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8722040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,47 +76,32 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.1
+  version_requirements: *8722040
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8721240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+  version_requirements: *8721240
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9145700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0b6
+        version: 0.17.0.b7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.17.0b6
+  version_requirements: *9145700
 - !ruby/object:Gem::Dependency
   name: evaluator
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9144960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +109,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.6
+  version_requirements: *9144960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9144460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  version_requirements: *9144460
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9143960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *9143960
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9143380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +142,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+  version_requirements: *9143380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9142860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,12 +153,7 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+  version_requirements: *9142860
 description: Olelo is a git-based wiki which supports many markup languages, tags,
   embedded TeX and much more. It can be extended through plugins.
 email:
@@ -230,6 +165,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.creole
@@ -272,6 +208,9 @@ files:
 - plugins/aspects/changelog.rb
 - plugins/aspects/documentbrowser.rb
 - plugins/aspects/download.rb
+- plugins/aspects/gallery/gallery.css
+- plugins/aspects/gallery/gallery.scss
+- plugins/aspects/gallery/main.rb
 - plugins/aspects/highlight.rb
 - plugins/aspects/image.rb
 - plugins/aspects/imageinfo.rb
@@ -302,6 +241,7 @@ files:
 - plugins/filters/disposition.rb
 - plugins/filters/editsection.rb
 - plugins/filters/fix_img_tag.rb
+- plugins/filters/html2xml.rb
 - plugins/filters/html_wrapper.rb
 - plugins/filters/interwiki.rb
 - plugins/filters/link_classifier.rb
@@ -310,6 +250,8 @@ files:
 - plugins/filters/markdown_nowiki.rb
 - plugins/filters/numbering.xsl
 - plugins/filters/orgmode.rb
+- plugins/filters/remind/main.rb
+- plugins/filters/remind/rem2html
 - plugins/filters/rubypants.rb
 - plugins/filters/s5/main.rb
 - plugins/filters/s5/s5.xsl
@@ -317,9 +259,6 @@ files:
 - plugins/filters/toc.rb
 - plugins/filters/xhtml2latex.xsl
 - plugins/filters/xslt.rb
-- plugins/gallery/gallery.css
-- plugins/gallery/gallery.scss
-- plugins/gallery/main.rb
 - plugins/login/basic_auth.rb
 - plugins/login/locale.yml
 - plugins/login/persistent.rb
@@ -399,8 +338,8 @@ files:
 - static/images/favicon.png
 - static/script.js
 - static/script/00-json2.js
-- static/script/01-jstorage.js
-- static/script/02-jquery.js
+- static/script/01-jquery.js
+- static/script/02-olelo.storage.js
 - static/script/03-jquery.ui.core.js
 - static/script/04-jquery.ui.widget.js
 - static/script/05-jquery.ui.position.js
@@ -516,7 +455,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -525,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Olelo is a git-based wiki.

data/static/script/01-jstorage.js

@@ -1,217 +0,0 @@
-/**
- * ----------------------------- JSTORAGE -------------------------------------
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.reinman@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires JSON.parse and JSON.stringify. These
- * methods are provided by the browser or by
- * http://www.json.org/json2.js.
- *
- * Methods:
- *
- * -set(key, value)
- * jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = jStorage.get(key [, default]) ->
- *    retrieves value if key exists, or default if it doesn't
- *
- * -remove(key)
- * jStorage.remove(key) -> removes a key from the storage
- *
- * -flush()
- * jStorage.flush() -> clears the cache
- *
- * <value> can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function() {
-	var
-                // This is the object, that holds the cached values
-		storage = {},
-
-		// Actual browser storage (localStorage or globalStorage['domain']) */
-		storageService = null,
-
-		// DOM element for older IE versions, holds userData behavior */
-                storageElement = null;
-
-	////////////////////////// PRIVATE METHODS ////////////////////////
-
-	/**
-	 * Initialization function. Detects if the browser supports DOM Storage
-	 * or userData behavior and behaves accordingly.
-	 * @returns undefined
-	 */
-	function init() {
-                try {
-                        if (window.localStorage)
-                                storageService = window.localStorage;
-                        else if (window.globalStorage)
-                                storageService = window.globalStorage[window.location.hostname];
-                } catch (e) {
-                        // Firefox fails when touching localStorage/globalStorage and cookies are disabled
-                }
-
-		// Check if browser supports userData behavior
-                if (!storageService) {
-			storageElement = document.createElement('link');
-			if (storageElement.addBehavior) {
-
-				// Use a DOM element to act as userData storage
-				storageElement.style.behavior = 'url(#default#userData)';
-
-				// userData element needs to be inserted into the DOM!
-				document.getElementsByTagName('head')[0].appendChild(storageElement);
-
-				storageElement.load('jStorage');
-				var data = '{}';
-				try{
-					data = storageElement.getAttribute('jStorage');
-				} catch (e) {
-                                }
-				storageService.jStorage = data;
-			} else {
-				storageElement = null;
-				return;
-			}
-		}
-
-                if (!storageService)
-                        storageService = { jStorage: '{}' };
-
-		// if jStorage string is retrieved, then decode it
-		if (storageService.jStorage) {
-			try {
-				storage = JSON.parse(storageService.jStorage);
-			} catch (e) {
-                                storageService.jStorage = '{}';
-                        }
-		} else {
-			storageService.jStorage = '{}';
-		}
-	}
-
-	/**
-	 * This functions provides the "save" mechanism to store the jStorage object
-	 * @returns undefined
-	 */
-	function save() {
-		try {
-			storageService.jStorage = JSON.stringify(storage);
-			// If userData is used as the storage engine, additional
-			if (storageElement) {
-				storageElement.setAttribute('jStorage',storageService.jStorage);
-				storageElement.save('jStorage');
-			}
-		} catch (e) {
-                        // probably cache is full, nothing is saved this way
-                }
-	}
-
-	/**
-	 * Function checks if a key is set and is string or numberic
-	 */
-	function checkKey(key) {
-		if (typeof key != 'string' && typeof key != 'number')
-			throw new TypeError('Key name must be string or numeric');
-	}
-
-	////////////////////////// PUBLIC INTERFACE /////////////////////////
-
-	var jStorage = {
-		/**
-		 * Sets a key's value.
-		 *
-		 * @param {String} key - Key to set. If this value is not set or not
-		 *				a string an exception is raised.
-		 * @param value - Value to set. This can be any value that is JSON
-		 *				compatible (Numbers, Strings, Objects etc.).
-		 * @returns the used value
-		 */
-		set: function(key, value){
-			checkKey(key);
-			storage[key] = value;
-			save();
-			return value;
-		},
-
-		/**
-		 * Looks up a key in cache
-		 *
-		 * @param {String} key - Key to look up.
-		 * @param {mixed} def - Default value to return, if key didn't exist.
-		 * @returns the key value, default value or <null>
-		 */
-		get: function(key, def){
-			checkKey(key);
-			if (key in storage)
-				return storage[key];
-			return typeof(def) == 'undefined' ? null : def;
-		},
-
-		/**
-		 * Removes a key from cache.
-		 *
-		 * @param {String} key - Key to remove.
-		 * @returns true if key existed or false if it didn't
-		 */
-		remove: function(key){
-			checkKey(key);
-			if (key in storage){
-				delete storage[key];
-				save();
-				return true;
-			}
-			return false;
-		},
-
-		/**
-		 * Deletes everything in cache.
-		 */
-		flush: function(){
-			storage = {};
-			save();
-			/*
-			 * Just to be sure - andris9/jStorage#3
-			 */
-			if (window.localStorage){
-				try {
-					localStorage.clear();
-				} catch (e) {
-                                }
-			}
-		}
-	};
-
-	// Initialize jStorage
-	init();
-
-        // Expose api
-        window.jStorage = jStorage;
-})();