spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/Gemfile

@@ -2,13 +2,19 @@ source :rubygems
 
 gemspec
 
-# gem "cutaneous", :path => "/Users/garry/Dropbox/Development/spontaneous3/cutaneous"
-gem 'xapian-full', "~> 1.2.3"
-gem 'xapian-fu', "~> 1.3"
-
 group :development do
   gem 'shoulda', '~> 2.11.3', :git => 'https://github.com/dasch/shoulda.git', :branch => 'minitest'
   gem 'selenium-client', '~> 1.2.18', :platforms => [:mri_18]
   # gem 'Selenium', '~> 1.1.14'
 end
 
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'jdbc-postgres'
+  gem 'jdbc-mysql'
+end
+
+platforms :mri do
+  gem 'xapian-ruby', "~> 1.2.12"
+  gem 'xapian-fu', "~> 1.3"
+end

data/Readme.markdown

@@ -8,7 +8,7 @@ This is version 2 of an existing (closed source) CMS that has been in active pro
 
 Spontaneous uses a powerful hierarchical system to organise your information. This breaks out of the bonds of the traditional "title, slug, text" model of CMS content and instead allows content authors to build complex, highly styled pages out of simple, easily editable blocks.
 
-- Ruby 1.9
+- Ruby 1.9.3
 - Using classes instead of db for metadata
   - Versioning of metadata
   - Keeps the developer in the text editor

data/application/css/definitions.css.scss

@@ -85,6 +85,11 @@ $target-name-size: 14px;
   -moz-border-radius: 0 $radius $radius 0;
   border-radius: 0 $radius $radius 0; }
 
+@mixin rounded-left($radius: $corner-radius) {
+  -webkit-border-radius: $radius 0 0 $radius;
+  -moz-border-radius: $radius 0 0 $radius;
+  border-radius: $radius 0 0 $radius; }
+
 .shadow {
   -webkit-box-shadow: 0px 3px 30px #cccccc;
   -moz-box-shadow: 0px 3px 30px #cccccc; }

data/application/css/dialogue.css.scss

@@ -123,6 +123,7 @@ $dialogue-title-height: 32px;
 		border: solid 1px #f2f2f2;
 		margin: $unit;
 		margin-top: 0;
+		color: #333333;
 		&:hover {
 			background-color: #666;
 			color: #fff;
@@ -369,6 +370,67 @@ $dialogue-title-height: 32px;
 	}
 	.change-set.selected {
 	}
+	.change-set.locked {
+		.pages {
+			position: relative;
+		}
+		.info {
+			@include rounded-left;
+			position: absolute;
+			overflow: hidden;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 0;
+			background-color: rgba(33, 33, 33, 0.9);
+			color: #aaaaaa;
+			font-size: 0.7em;
+			.lock-state {
+				overflow: auto;
+				padding: $unit/2;
+			}
+			.locks {
+				strong {
+					margin-right: $unit/2;
+					&:after {
+						content: ":";
+					}
+				}
+				p {
+					margin: 0 0 $unit/2 0;
+				}
+			}
+			h3 {
+				font-size: 1em;
+				font-weight: normal;
+				margin: 0;
+				color: #fafafa;
+				margin: 0;
+				margin-bottom: $unit/2;
+			}
+		}
+		.page-title {
+			color: #999;
+		}
+		.add {
+			span {
+				&:before {
+					@include awesome-icon("\f023");
+				}
+			}
+		}
+	}
+	&.first-publish {
+		#changes {
+			display: none;
+		}
+		#to-publish {
+			position: absolute;
+			left: 0;
+			right: 0;
+			width: auto;
+		}
+	}
 }
 
 #root-menu {

data/application/js/content.js

@@ -101,7 +101,7 @@ Spontaneous.Content = (function($, S) {
 							"type:", "'"+type.title+"'",
 							"field_name:", f.name
 						);
-						type_class = Spontaneous.FieldTypes.StringField;
+						type_class = Spontaneous.Field.String;
 					}
 					var field = new type_class(this, f);
 					// field.watch('value', this.field_updated.bind(this, field));

data/application/js/dom.js

@@ -1,7 +1,7 @@
 // console.log('Loading DOM...');
 
 Spontaneous.Dom = (function($, S) {
-	var tags = 'div p iframe a span img select option label ul li dl dt dd table tr td h1 h2 h3 h4 header input button form textarea optgroup'.split(' ');
+	var tags = 'div p iframe a span strong img select option label ul li dl dt dd table tr td h1 h2 h3 h4 header input button form textarea optgroup'.split(' ');
 	var Dom = {
 		body: function() {
 			return $(document.body);

data/application/js/event_source.js

@@ -11,6 +11,9 @@ Spontaneous.EventSource = (function($, S) {
 
 		addEventListener: function(event, callback) {
 			this.eventSource().addEventListener(event, callback);
+		},
+		removeEventListener: function(event, callback) {
+			this.eventSource().removeEventListener(event, callback);
 		}
 	});
 	return EventSource;

data/application/js/{field_types/date_field.js → field/date.js}

@@ -1,7 +1,7 @@
 // console.log('Loading DateField...')
-Spontaneous.FieldTypes.DateField = (function($, S) {
+Spontaneous.Field.Date = (function($, S) {
 	var dom = S.Dom;
-	var DateField = new JS.Class(Spontaneous.FieldTypes.StringField, {
+	var DateField = new JS.Class(Spontaneous.Field.String, {
 		input: function() {
 			var input = this.callSuper();
 			input.datepicker({ "dateFormat": "DD, d MM yy" });

data/application/js/{field_types/file_field.js → field/file.js}

@@ -1,7 +1,7 @@
 // console.log('Loading FileField...')
-Spontaneous.FieldTypes.FileField = (function($, S) {
+Spontaneous.Field.File = (function($, S) {
 	var dom = S.Dom;
-	var FileField = new JS.Class(Spontaneous.FieldTypes.StringField, {
+	var FileField = new JS.Class(Spontaneous.Field.String, {
 		selected_files: false,
 
 		preview: function() {

data/application/js/{field_types/image_field.js → field/image.js}

@@ -1,7 +1,7 @@
 // console.log('Loading ImageField...')
-Spontaneous.FieldTypes.ImageField = (function($, S) {
+Spontaneous.Field.Image = (function($, S) {
 	var dom = S.Dom;
-	var ImageFieldConflictView = new JS.Class(S.FieldTypes.StringField.ConflictView, {
+	var ImageFieldConflictView = new JS.Class(S.Field.String.ConflictView, {
 
 		panel: function() {
 			var labels = dom.div('.image-field-conflict.labels.differences'),
@@ -29,7 +29,7 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 		}
 	});
 
-	var ImageField = new JS.Class(Spontaneous.FieldTypes.FileField, {
+	var ImageField = new JS.Class(Spontaneous.Field.File, {
 		is_image: function() {
 			return true;
 		},
@@ -57,10 +57,40 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 			this.callSuper();
 		},
 
+		currentValue: function() {
+			var v = this.get('value');
+			if ((pending = v['__pending__'])) {
+				return pending['value'];
+			}
+			return v['__ui__'] || v['original'];
+		},
+
+		/*
+		* HACK: The async nature of image updates means that the version setting
+		* may be out of date not because of the actions of another, but because
+		* the field version has been updated in the background.
+		* The right way to do this would be to use an event to update the field
+		* values at the point where the update is complete, but that's a big change.
+		*
+		* If I do that then I could use it to update all field values across all sessions
+		* and avoid most conflicts by keeping the field values up-to-date automatically
+		* but I'm not ready for that just yet...
+		*
+		* Instead hackily use the pending version and hope it's not going to cause
+		* weird problems with simultaneous updates.
+		*/
+		version: function() {
+			var value = this.get("value");
+			if ((pending = value["__pending__"])) {
+				return pending["version"];
+			}
+			return this.data.version;
+		},
+
 		preview: function(container) {
 			Spontaneous.UploadManager.register(this);
 			var self = this
-			, value = this.get('value').original
+			, value = this.currentValue()
 			, src = value.src
 			, img = null
 			, dim = 45
@@ -109,7 +139,7 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 				this.spinner().indeterminate();
 
 				if (files.length > 0) {
-					this.selected_files = files;
+					this.select_files(files);
 					var file = files[0],
 					url = window.URL.createObjectURL(file)
 					, image = this.image;
@@ -162,7 +192,7 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 			return outer;
 		},
 		conflicts_resolved: function(resolution_list) {
-			console.log('conflicts_resolved', resolution_list)
+			// console.log('conflicts_resolved', resolution_list)
 			var resolution = resolution_list[0];
 			this.set_edited_value(resolution.value);
 			this.set_version(resolution.version);
@@ -187,10 +217,10 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 			return this._spinner;
 		},
 		upload_complete: function(values) {
-
+			this.mark_unmodified();
 			this.callSuper(values)
 			if (values) {
-				var value = this.value().original;
+				var value = this.currentValue();
 				if (this.image) {
 					var img = new Image()
 					img.onload = function() {
@@ -202,20 +232,20 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 		},
 
 		width: function() {
-			if (this.data.values && this.data.values.original) {
-				return this.data.values.original.width;
+			if (this.data.values && this.currentValue()) {
+				return this.currentValue().width;
 			}
 			return 0;
 		},
 		height: function() {
-			if (this.data.values && this.data.values.original) {
-				return this.data.values.original.height;
+			if (this.data.values && this.currentValue()) {
+				return this.currentValue().height;
 			}
 			return 0;
 		},
 		edit: function() {
 			var wrap = dom.div({'style':'position:relative;'}),
-				value = this.value().original,
+				value = this.currentValue(),
 				src = value.src,
 				img = dom.img({'src':src}),
 				info, sizes, filename_info, filesize_info, dimensions_info;
@@ -255,12 +285,11 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 				if (files.length > 0) {
 					var file = files[0], url = window.URL.createObjectURL(file);
 					img.attr('src', url).removeClass('empty');
-					this.selected_files = files;
+					this.select_files(files);
 					img.attr('src', url)
 					this._edited_value = url;
 					this.image.attr('src', url)
 					window.URL.revokeObjectURL(url);
-					console.log(file)
 					set_info(File.filename(file), file.fileSize, null, null)
 				}
 			}.bind(this);
@@ -328,8 +357,16 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 			return wrap;
 		},
 
+		select_files: function(files) {
+			this.selected_files = files;
+			this.mark_modified();
+		},
+
+		is_modified: function() {
+			return this.get_modified_state();
+		},
+
 		get_input: function() {
-			console.log("FileField", "#get_input")
 			this.input = this.generate_input();
 			return this.input;
 		},
@@ -338,14 +375,11 @@ Spontaneous.FieldTypes.ImageField = (function($, S) {
 			return this.input.val();
 		},
 		cancel_edit: function() {
-			this.image.attr('src', this.original_value().src);
+			this.image.attr('src', this.currentValue().src);
 		},
 		conflict_view: function(dialogue, conflict) {
 			return new ImageFieldConflictView(dialogue, conflict);
 		},
-		original_value: function() {
-			return this.value().original;
-		},
 		edited_value: function() {
 			return this._edited_value;
 		},

data/application/js/{field_types/long_string_field.js → field/long_string.js}

@@ -1,7 +1,7 @@
 // console.log('Loading LongStringField...')
-Spontaneous.FieldTypes.LongStringField = (function($, S) {
+Spontaneous.Field.LongString = (function($, S) {
 	var dom = S.Dom;
-	var LongStringField = new JS.Class(Spontaneous.FieldTypes.StringField, {
+	var LongStringField = new JS.Class(Spontaneous.Field.String, {
 		generate_input: function() {
 			return dom.textarea(dom.id(this.css_id()), {'name':this.form_name(), 'rows':10, 'cols':30}).text(this.unprocessed_value());
 		}

data/application/js/{field_types/markdown_field.js → field/markdown.js}

@@ -1,6 +1,6 @@
 // console.log('Loading DiscountField...')
 
-Spontaneous.FieldTypes.MarkdownField = (function($, S) {
+Spontaneous.Field.Markdown = (function($, S) {
 	var dom = S.Dom;
 	var TextCommand = new JS.Class({
 		name: '',
@@ -594,7 +594,7 @@ Spontaneous.FieldTypes.MarkdownField = (function($, S) {
 	});
 
 
-	var MarkdownField = new JS.Class(Spontaneous.FieldTypes.StringField, {
+	var MarkdownField = new JS.Class(Spontaneous.Field.String, {
 		actions: [Bold, Italic, H1, H2, UL, OL, Link],
 		generate_input: function() {
 			var input = dom.textarea(dom.id(this.css_id()), {'name':this.form_name(), 'rows':10, 'cols':90}).val(this.unprocessed_value()), height = this.content.getFieldMetadata(this, 'height');

data/application/js/{field_types/select_field.js → field/select.js}

@@ -1,11 +1,11 @@
 
-Spontaneous.FieldTypes.SelectField = (function($, S) {
+Spontaneous.Field.Select = (function($, S) {
 	"use strict";
 
 	var dom = S.Dom
 	, ajax = S.Ajax;
 
-	var SelectField = new JS.Class(Spontaneous.FieldTypes.StringField, {
+	var SelectField = new JS.Class(Spontaneous.Field.String, {
 		edit: function() {
 			var self = this
 			, type = this.type

data/application/js/{field_types/string_field.js → field/string.js}

@@ -1,5 +1,5 @@
 // console.log('Loading StringField...')
-Spontaneous.FieldTypes.StringField = (function($, S) {
+Spontaneous.Field.String = (function($, S) {
 	var dom = S.Dom;
 	var StringFieldConflictView = new JS.Class({
 		initialize: function(dialogue, conflict) {
@@ -106,13 +106,15 @@ Spontaneous.FieldTypes.StringField = (function($, S) {
 			return 'field-'+this.name+'-'+this.id();
 		},
 		form_name: function() {
-			return this.input_name('unprocessed_value');
+			return this.input_name();
 		},
-		version_name: function() {
-			return this.input_name('version');
-		},
-		input_name: function(name) {
-			return 'field['+this.schema_id()+']['+name+']';
+		// version_name: function() {
+		// 	return this.input_name('version');
+		// },
+		input_name: function(param) {
+			var name = 'field['+this.schema_id()+']';
+			if (param) { n += '['+param+']'; }
+			return name;
 		},
 		schema_id: function() {
 			return this.type.schema_id;
@@ -145,6 +147,18 @@ Spontaneous.FieldTypes.StringField = (function($, S) {
 			// version in the case of a conflict
 			return true;
 		},
+		mark_modified: function() {
+			this.set_modified_state(true);
+		},
+		mark_unmodified: function() {
+			this.set_modified_state(false);
+		},
+		set_modified_state: function(state) {
+			this._is_modified = state;
+		},
+		get_modified_state: function() {
+			return this._is_modified;
+		},
 		original_value: function() {
 			return this.unprocessed_value();
 		},

data/application/js/{field_types/webvideo_field.js → field/webvideo.js}

@@ -1,7 +1,7 @@
 // console.log('Loading DateField...')
-Spontaneous.FieldTypes.WebVideoField = (function($, S) {
+Spontaneous.Field.WebVideo = (function($, S) {
 	var dom = S.Dom;
-	var WebVideoField = new JS.Class(Spontaneous.FieldTypes.StringField, {
+	var WebVideoField = new JS.Class(Spontaneous.Field.String, {
 		// get_input: function() {
 		// 	this.input = $(dom.textarea, {'id':this.css_id(), 'name':this.form_name(), 'rows':10, 'cols':30}).text(this.unprocessed_value());
 		// 	return this.input;

data/application/js/field.js

@@ -1,4 +1,4 @@
-// console.log('Loading FieldTypes...')
+// console.log('Loading Field...')
 
-Spontaneous.FieldTypes = {};
+Spontaneous.Field = {};
 

data/application/js/publish.js

@@ -6,6 +6,25 @@ Spontaneous.Publishing = (function($, S) {
 	var PublishingDialogue = new JS.Class(Dialogue, {
 		initialize: function(content) {
 			this.change_sets = [];
+			var callback = this.page_lock_removed.bind(this);
+			var page_lock_removed = function(event) {
+				callback($.parseJSON(event.data))
+			};
+			S.EventSource.addEventListener('page_lock_status', page_lock_removed);
+			this.page_lock_removed_listener = page_lock_removed;
+		},
+		page_lock_removed: function(page_ids) {
+			var changes = this.change_sets, toUnlock = [];
+			page_ids.forEach(function(id) {
+				toUnlock = toUnlock.concat(changes.filter(function(c) { return c.change.id == id }))
+			});
+
+			toUnlock.forEach(function(cs) {
+				cs.unlock();
+			});
+		},
+		cleanup: function() {
+			S.EventSource.removeEventListener('page_lock_status', this.page_lock_removed_listener);
 		},
 		width: function() {
 			return '90%';
@@ -44,35 +63,54 @@ Spontaneous.Publishing = (function($, S) {
 			this.close();
 		},
 
-		change_list_loaded: function(change_list) {
-			var w = this.wrapper, __dialogue = this;
+		change_list_loaded: function(outstanding) {
+			var change_list = outstanding.changes
+			, w = this.wrapper
+			, self = this
+			, changed_wrap = dom.div("#changes.change-list")
+			, publish_wrap = dom.div("#to-publish.change-list")
+			, first_publish = outstanding.first_publish
+			, append_to;
+			if (first_publish) {
+				w.addClass("first-publish");
+			}
 			w.empty();
-			var changed_wrap = dom.div("#changes.change-list"), publish_wrap = dom.div("#to-publish.change-list")
 			w.append(changed_wrap, publish_wrap)
 			if (change_list.length === 0) {
 				var summary = dom.p('.publish-up-to-date').text("The site is up to date");
 				w.append(summary);
-				this.disable_button('Publish');
+				self.disable_button('Publish');
 			} else {
 				var publish_all = dom.a('.button').text('Publish All').click(function() {
-					this.set_publish_all(true);
-				}.bind(this));
+					self.set_publish_all(true);
+				}.bind(self));
 				var clear_all = dom.a('.button').text('Clear All').click(function() {
-					this.set_publish_all(false);
-				}.bind(this));
+					self.set_publish_all(false);
+				}.bind(self));
+
 				var changed_toolbar = dom.div('.actions').append(dom.div().text("Modified pages")).append(publish_all);
-				var publish_toolbar = dom.div('.actions').append(dom.div().text("Publish pages")).append(clear_all);
+				var publish_toolbar = dom.div('.actions').append(dom.div().text("Publish pages"));
+				if (!first_publish) {
+					publish_toolbar.append(clear_all);
+				}
 				var changed_entries = dom.div('.change-sets'), publish_entries = dom.div('.change-sets')
 				changed_wrap.append(changed_toolbar, changed_entries);
 				publish_wrap.append(publish_toolbar, publish_entries);
+				append_to = changed_entries;
+				if (first_publish) {
+					append_to = publish_entries;
+				}
 				for (var i = 0, ii = change_list.length; i < ii; i++) {
-					var cs = new ChangeSet(i, this, change_list[i]);
-					this.change_sets.push(cs);
-					changed_entries.append(cs.panel())
+					var cs = new ChangeSet(i, self, change_list[i], first_publish);
+					self.change_sets.push(cs);
+					append_to.append(cs.panel())
 				}
-				publish_entries.append(dom.div('.instructions').text('Add pages to publish from the list on the left'));
-				this.changed_entries = changed_entries;
-				this.publish_entries = publish_entries;
+				if (!first_publish) {
+					publish_entries.append(dom.div('.instructions').text('Add pages to publish from the list on the left'));
+				}
+
+				self.changed_entries = changed_entries;
+				self.publish_entries = publish_entries;
 			}
 		},
 		set_publish_all: function(state) {
@@ -183,11 +221,23 @@ Spontaneous.Publishing = (function($, S) {
 		}
 	});
 	var ChangeSet = new JS.Class({
-		initialize: function(id, dialogue, change) {
+		initialize: function(id, dialogue, change, selected) {
 			this.id = id;
 			this.dialogue = dialogue;
 			this.change = change;
-			this.selected = false;
+			this.selected    = selected || false;
+			this.mustPublish = selected || false;
+		},
+		locks: function(){
+			return this.change.update_locks;
+		},
+		isLocked: function() {
+			return this.locks().length > 0;
+		},
+		unlock: function() {
+			var w = this.wrapper;
+			w.removeClass("locked").find(".lock-state").remove();
+			this.locks().length = 0;
 		},
 		page_ids: function() {
 			var ids = [this.change.id];
@@ -206,19 +256,48 @@ Spontaneous.Publishing = (function($, S) {
 			, page_list = dom.div('.pages')
 			, add = dom.div('.add').append(dom.span().text(''))
 			, page = this.page()
-			, pages = this.dependent_pages();
+			, pages = this.dependent_pages()
+			, locked = this.isLocked()
+			, info = dom.div(".info").hide();
 
 			if (page.isUnpublished()) {
 				w.addClass('unpublished');
 			}
+			if (locked) {
+				w.addClass('locked');
+				var lockState = dom.div(".lock-state")
+				, title = dom.h3().html("<strong>Cannot publish page</strong> until the following actions have completed:")
+				, details = dom.div(".locks")
+				, locks = this.locks();
+				locks.forEach(function(lock) {
+					var line = dom.p();
+					line.text(lock.description);
+					line.prepend(dom.strong().text(lock.location));
+					details.append(line);
+				});
+				lockState.append(title, details)
+				info.append(lockState);
+				page_list.append(info);
+				add.hover(function() {
+					info.show().animate({"width": "100%"}, 150);
+				}, function() {
+					info.hide().css("width", 0);
+				});
+			}
 			page_list.append(page.panel());
 			for (var i = 0, ii = pages.length; i < ii; i++) {
 				page_list.append(pages[i].panel());
 			}
+
 			add.click(function() {
 				this.select_toggle();
 			}.bind(this));
-			inner.append(page_list, add);
+
+			inner.append(page_list);
+
+			if (!this.mustPublish) {
+				inner.append(add);
+			}
 			w.append(inner);
 			return w;
 		},
@@ -229,6 +308,7 @@ Spontaneous.Publishing = (function($, S) {
 		},
 		select: function(state) {
 			var self = this;
+			if (this.isLocked()) { return ; }
 			if (state === self.selected) { return; }
 			if (!state && self.dependency_forces_publish()) {
 				return;

data/application/js/spontaneous.js

@@ -30,14 +30,14 @@
 //= require box
 //= require page
 //= require field
-//= require field_types/string_field
-//= require field_types/long_string_field
-//= require field_types/file_field
-//= require field_types/image_field
-//= require field_types/markdown_field
-//= require field_types/date_field
-//= require field_types/webvideo_field
-//= require field_types/select_field
+//= require field/string
+//= require field/long_string
+//= require field/file
+//= require field/image
+//= require field/markdown
+//= require field/date
+//= require field/webvideo
+//= require field/select
 //= require content_area
 //= require preview
 //= require editing

data/application/js/top_bar.js

@@ -144,7 +144,7 @@ Spontaneous.TopBar = (function($, S) {
 			} else {
 				this.select.show();
 			}
-			return '('+(count)+' pages)';
+			return '('+(count)+' page'+(count === 1 ? '' : 's')+')';
 		},
 		optgroup: function(boxname) {
 			return dom.optgroup().attr('label', boxname);
@@ -378,9 +378,11 @@ Spontaneous.TopBar = (function($, S) {
 				}
 			});
 
-			page.watch('slug', function(title) {
-				self.navigation_current.set_title(title);
-			});
+			if (!page.is_root()) {
+				page.watch('slug', function(title) {
+					self.navigation_current.set_title(title);
+				});
+			}
 
 			page.title_field().watch('value', function(title) {
 				Spontaneous.set_browser_title(title);