spontaneous 0.2.0.alpha2 → 0.2.0.alpha3

data/application/js/views/box_view.js

@@ -105,10 +105,11 @@ Spontaneous.Views.BoxView = (function($, S) {
 			}
 		},
 		add_allowed_types_bar: function(position, insert_at) {
-			var allowed = this.box.allowed_types()
-			// var allowed_bar = $(dom.div, {'class':'slot-addable'});
-			, _box = this
+			var allowed = this.box.allowed_types();
+			if (allowed.length === 0) { return ""; }
+			var _box = this
 			, allowed_bar = dom.div('.slot-addable')
+			, inner = dom.div(".addable-inner")
 			, dropper = allowed_bar
 			, drop = function(event) {
 				dropper.removeClass('drop-active').addClass('uploading');
@@ -128,7 +129,6 @@ Spontaneous.Views.BoxView = (function($, S) {
 
 			, drag_enter = function(event) {
 				// var files = event.originalEvent.dataTransfer.files;
-				// console.log(event.originalEvent.dataTransfer, files)
 				$(this).addClass('drop-active');
 				event.stopPropagation();
 				event.preventDefault();
@@ -166,9 +166,10 @@ Spontaneous.Views.BoxView = (function($, S) {
 					}.bind(_box, type);
 				}
 				a.click(add_allowed);
-				allowed_bar.append(a)
+				inner.append(a)
 			});
-			allowed_bar.append(dom.span('.down'));
+			allowed_bar.data("allowed-count", allowed.length);
+			allowed_bar.append(inner, dom.span('.down'));
 
 			return allowed_bar;
 		},
@@ -296,11 +297,17 @@ Spontaneous.Views.BoxView = (function($, S) {
 				}
 			}
 			bar = this.add_allowed_types_bar('floating', position + 1);
-			entry_spacer.addClass('add-entry').append(bar.show());
+			if (bar && bar.data("allowed-count") > 0) {
+				entry_spacer.addClass('add-entry').append(bar.show());
+				if (!entry_spacer.data("auto-height")) {
+					entry_spacer.data("auto-height", entry_spacer.height());
+				}
+				entry_spacer.animate({height:bar.find('.addable-inner').outerHeight() + 12}, 200)
+			}
 		},
 		hide_add_after: function(entry, entry_spacer) {
 			entry_spacer.empty();
-			entry_spacer.removeClass('add-entry');
+			entry_spacer.removeClass('add-entry').animate({height: entry_spacer.data("auto-height")}, 200);
 		}
 	});
 

data/application/js/views/page_piece_view.js

@@ -1,6 +1,7 @@
 // console.log('Loading PageEntry...')
 
 Spontaneous.Views.PagePieceView = (function($, S) {
+	"use strict";
 	var dom = S.Dom;
 
 	var PagePieceView = new JS.Class(Spontaneous.Views.PieceView, {
@@ -11,7 +12,7 @@ Spontaneous.Views.PagePieceView = (function($, S) {
 			var inside = dom.div('.entry-inner');
 			var outline = dom.div('.white-bg').mouseover(this.mouseover.bind(this)).mouseout(this.mouseout.bind(this)).click(this.edit.bind(this))
 			inside.append(outline)
-			contents.append(this.title_bar(contents));
+			contents.append(this.action_buttons(contents));
 			if (this.content.type().is_alias()) {
 				contents.append(this.alias_target_panel());
 			}
@@ -31,13 +32,15 @@ Spontaneous.Views.PagePieceView = (function($, S) {
 			return wrapper;
 		},
 		page_title_panel: function() {
-			var wrapper = dom.div('.page-title'),
-			__content = this,
-			title = dom.a().html(this.content.title()).click(function() {
-				S.Location.load_id(__content.id());
-			});
-			this.content.title_field().watch('value', function(t) { title.text(t); }.bind(this));
-			wrapper.append(title);
+			var wrapper = dom.div('.page-title').click(function() {
+				S.Location.load_id(self.id());
+			}),
+			self = this,
+			content = self.content,
+			title = dom.a().html(this.content.title()),
+			type = dom.span(".content-type").text(content.type().display_title(content));
+			this.content.title_field().watch('value', function(t) { title.html(t); }.bind(this));
+			wrapper.append(title, type);
 			return wrapper;
 		}
 	});

data/application/js/views/page_view.js

@@ -8,6 +8,7 @@ Spontaneous.Views.PageView = (function($, S) {
 	};
 	FunctionBar.prototype = {
 		panel: function() {
+			var self = this;
 			this.panel = dom.div('#page-info');
 			this.title = $('<h1/>');
 			this.set_title();
@@ -23,8 +24,16 @@ Spontaneous.Views.PageView = (function($, S) {
 					this.open_url_editor();
 				}
 			}.bind(this));
+
 			path_wrap.append(path_text);
 
+			if (!self.page.is_root()) {
+				var resync = dom.a({ "title":"Sync the path to the page title"}).click(function() {
+					Spontaneous.Ajax.post(['/slug', self.page.id(), "titlesync"].join("/"), {}, self.save_complete.bind(self));
+				});
+				path_wrap.append( dom.h3('.titlesync').append(resync));
+			}
+
 
 			if (user.is_developer()) {
 				var uid_text = dom.h3('.developer.uid' + (!this.page.content.uid ? '.missing' : '')).text('#' + (this.page.content.uid || "----")).click(function() {
@@ -111,6 +120,7 @@ Spontaneous.Views.PageView = (function($, S) {
 		},
 		open_url_editor: function() {
 			this.unavailable = false;
+			this.url_editor_open = true;
 			Spontaneous.Ajax.get(['/slug', this.page.id(), 'unavailable'].join('/'), this.unavailable_loaded.bind(this));
 			this.panel.animate({'height': '+=14'}, 200, function() {
 				var view = $('h3', this.panel), edit = $('.edit', this.panel);
@@ -196,8 +206,9 @@ Spontaneous.Views.PageView = (function($, S) {
 			this.input.addClass('error');
 		},
 		hide_path_error: function(error_text) {
-			this.error.fadeOut(100);
-			if (this.input.hasClass('error')) { this.input.removeClass('error'); }
+			if (this.error) { this.error.fadeOut(100); }
+
+			if (this.input && this.input.hasClass('error')) { this.input.removeClass('error'); }
 		},
 		save: function(slug) {
 			Spontaneous.Ajax.post('/slug/'+this.page.id(), {'slug':slug}, this.save_complete.bind(this));
@@ -205,11 +216,14 @@ Spontaneous.Views.PageView = (function($, S) {
 
 		save_complete: function(response, status, xhr) {
 			if (status === 'success') {
+				if (this.url_editor_open) {
+
 				this.hide_path_error();
 				var view = $('h3.path', this.panel), edit = $('.edit', this.panel);
+				this.close();
+				}
 				this.page.set('path', response.path);
 				this.page.set('slug', response.slug);
-				this.close();
 				// HACK: see preview.js (Preview.display)
 				Spontaneous.Location.set('path', this.page.get('path'))
 			} else {
@@ -222,6 +236,7 @@ Spontaneous.Views.PageView = (function($, S) {
 			}
 		},
 		close: function() {
+			this.url_editor_open = false;
 			var view = $('h3', this.panel), edit = $('.edit', this.panel);
 			view.show();
 			edit.hide();
@@ -236,6 +251,9 @@ Spontaneous.Views.PageView = (function($, S) {
 
 		panel: function() {
 			this.panel = dom.div('#page-content');
+			if (this.page.hidden()) {
+				this.panel.addClass('hidden')
+			}
 			this.panel.append(new FunctionBar(this.page).panel());
 
 			var fields = dom.div('#page-fields')

data/application/js/views/piece_view.js

@@ -57,7 +57,10 @@ Spontaneous.Views.PieceView = (function($, S) {
 				inside.append(dom.div('.grey-bg'));
 			}
 
-			contents.append(this.title_bar(contents));
+			if (!this.content.type().is_alias()) {
+				wrapper.append(this.content_type_info());
+			}
+			contents.append( this.action_buttons(contents));
 			if (this.content.type().is_alias()) {
 				contents.append(this.alias_target_panel());
 			}
@@ -99,10 +102,11 @@ Spontaneous.Views.PieceView = (function($, S) {
 		},
 		alias_target_panel: function() {
 			var content = this.content,
-			wrap = dom.div('.alias-target'),
-			icon = content.alias_icon,
 			click = function() { S.Location.load_id(content.target().id); },
-			title = dom.a().html(content.content.alias_title).click(click);
+			wrap = dom.div('.alias-target').click(click),
+			icon = content.alias_icon,
+			type = dom.span(".content-type").text(content.type().display_title(content));
+			title = dom.a().html(content.content.alias_title);
 
 			if (!content.has_fields()) { wrap.addClass('no-fields'); }
 
@@ -111,18 +115,22 @@ Spontaneous.Views.PieceView = (function($, S) {
 				wrap.append(img.icon(60, 60).click(click))
 			}
 
-			return wrap.append(title)
+			return wrap.append(title, type)
+		},
+		content_type_info: function() {
+			var type = dom.div(".content-type.piece").text(this.content.type().display_title(this.content));
+			return type;
 		},
-		title_bar: function(wrapper) {
+		action_buttons: function(wrapper) {
 			if (!this._title_bar) {
 				var label = user.is_developer() ? dom.a('.developer.source').attr('href', this.content.developer_edit_url()).text(this.content.developer_description()) : (this.content.type().title);
-				var title_bar = dom.div('.title-bar')//.append(label);
+				var action_buttons = dom.div('.title-bar');//.append(label);
 				var actions = dom.div('.actions', {'xstyle':'display: none'});
 				var destroy = dom.a('.delete');
 				var visibility = dom.a('.visibility');
 				actions.append(destroy);
 				actions.append(visibility);
-				title_bar.append(actions);
+				action_buttons.append(actions);
 				var _hide_pause;
 				// wrapper.mouseenter(function() {
 				// 	if (_hide_pause) { window.clearTimeout(_hide_pause); }
@@ -133,9 +141,9 @@ Spontaneous.Views.PieceView = (function($, S) {
 				destroy.click(this.confirm_destroy.bind(this));
 				this.content.watch('hidden', this.visibility_changed.bind(this));
 				visibility.click(this.toggle_visibility.bind(this));
-				this._title_bar = title_bar;
+				this._action_buttons = action_buttons;
 			}
-			return this._title_bar;
+			return this._action_buttons;
 		},
 		reposition: function(position, callback) {
 			this.content.bind('repositioned', callback);
@@ -194,6 +202,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 			}.bind(this));
 		}
 	});
+	PieceView.ConfirmDeletePopup = ConfirmDeletePopup;
 	return PieceView;
 }(jQuery, Spontaneous));
 

data/application/js/views.js

@@ -37,6 +37,9 @@ Spontaneous.Views = (function($, S) {
 		text_fields: function() {
 			return this.content.text_fields();
 		},
+		string_fields: function() {
+			return this.content.string_fields();
+		},
 		file_fields: function() {
 			return this.content.file_fields();
 		},

data/application/static/loop_alt1-white-7894b458528e92216196cae26b4c2c96.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="24px" viewBox="0 0 32 24" enable-background="new 0 0 32 24" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M26,12l-6,6h4c0,1.102-0.896,2-2,2H10c-1.101,0-2-0.898-2-2v-2H4v2c0,3.309,2.691,6,6,6h12
+		c3.312,0,6-2.691,6-6h4L26,12z"/>
+	<path fill="#FFFFFF" d="M22,0H10C6.691,0,4,2.692,4,6v0.062H0L6,12l6-5.938H8V6c0-1.102,0.899-2,2-2h12c1.104,0,2,0.898,2,2v2h4V6
+		C28,2.692,25.312,0,22,0z"/>
+</g>
+</svg>

data/application/views/index.erb

@@ -22,10 +22,10 @@
 				site_id: '<%= Spontaneous::Site.config.site_id %>',
 				debug: <%= Spontaneous.development? %>,
 				development: <%= Spontaneous.development? %>,
-				asynchronous: false,
+				asynchronous: <%= Spontaneous.production? %>,
 				editor_protocol: 'mvim',
 				<% if Spontaneous.config.auto_login; %>
-				auto_login: 'garry',
+				auto_login: '<%= Spontaneous.config.auto_login %>',
 				user_key: '<%= env[Spontaneous::Rack::ACTIVE_KEY].key_id %>',
 				<% end %>
 				onload: function() {

data/application/views/login.erb

@@ -4,17 +4,13 @@
     <meta charset="utf-8" />
     <title><%= Spontaneous::Site.config.site_domain %>: Please Login</title>
     <link REL="SHORTCUT ICON" HREF="/@spontaneous/static/favicon.ico" />
-    <link rel="apple-touch-icon" href="/@spontaneous/static/spot.png" />
+    <link rel="apple-touch-icon" href="/@spontaneous/static/spot-71fab1d2f065034f5fc15e7bea2ad36c.png" />
     <% Spontaneous::Rack::Assets::CSS::LOGIN_CSS.each do |css_file| %>
       <link rel="stylesheet" href="<%= style_url(css_file) %>" type="text/css" media="screen" charset="utf-8" />
     <% end %>
     <% Spontaneous::Rack::Assets::JavaScript::JQUERY.each do |js_file| %>
       <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
     <% end %>
-    <% Spontaneous::Rack::Assets::JavaScript::COMPATIBILITY.each do |js_file| %>
-      <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-    <% end %>
-
     <script type="text/javascript">
       var Spontaneous = {
         site_domain: '<%= Spontaneous::Site.config.site_domain %>',
@@ -43,7 +39,7 @@
       }(jQuery));
     </script>
   </head>
-  <body id="spontaneous">
+  <body id="login">
     <div id="outer" style="display: none">
       <h1>Please Login</h1>
       <div id="login">
@@ -53,7 +49,7 @@
           <p id="error-message" class="error" <% unless locals[:failed] %>style="display: none"<% end %>><span id="failure-message">Login failed for &lsquo;<span id="failed-name"><%= locals[:login] %></span>&rsquo;</span></p>
 
           <div class="inputs">
-            <input type="hidden" name="origin" value="<%= request.path_info %>" />
+            <input type="hidden" name="origin" value="<%= locals[:origin] || request.path_info %>" />
             <p>
             <label><input type="text" class="text" id="user-login" name="user[login]" value="<%= locals[:login] %>" /><span>Username</span></label>
             </p>
@@ -67,7 +63,7 @@
     </div>
       <form action="/@spontaneous/reauthenticate" method="post" accept-charset="UTF-8">
         <input type="hidden" id="reauthenticate-key" name="api_key" value="" />
-        <input type="hidden" id="reauthenticate-origin" name="origin" value="<%= request.path_info %>" />
+        <input type="hidden" id="reauthenticate-origin" name="origin" value="<%= locals[:origin] || request.path_info %>" />
       </form>
   </body>
 </html>

data/application/views/schema_modification_error.html.erb

@@ -16,9 +16,6 @@
     <script type="text/javascript">
       var Spontaneous = {};
     </script>
-    <% Spontaneous::Rack::Assets::JavaScript::LOGIN_JS.each do |js_file| %>
-      <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-    <% end %>
     <script type="text/javascript">
       function _confirm(id) {
         var t = 200;
@@ -33,7 +30,7 @@
       }
     </script>
   </head>
-  <body id="spontaneous">
+  <body id="schema-error">
     <div id="container">
 
       <%

data/application/views/unsupported.erb

@@ -11,13 +11,15 @@
 	<div id="outer">
 	<h1>Sorry!</h1>
 	<h2>You are using an unsupported browser...</h2>
-	<p>In order to provide the best editing experience Spontaneous uses features found in the best, modern, browsers.</p>
-	<p>Please download and install one of the following browsers in order to use this CMS as well as enjoy the best of the internet.  You won&rsquo;t regret it...</p>
-	<ul>
-		<li><a href="http://www.google.com/chrome">Google Chrome</a></li>
-		<li><a href="http://www.mozilla.com/firefox/">Firefox 4</a></li>
-		<!-- <li><a href="http://www.mozilla.com/firefox/">Safari</a></li> -->
-	</ul>
+  <div class="error">
+    <p class="feature"><%= params[:msg] %></p>
+    <p class="user-agent">Browser: <%= params[:useragent] %></p>
+  </div>
+	<p>In order to provide the best editing experience Spontaneous uses features only found in the latest browsers.</p>
+	<p>Please download and install <a href="http://www.google.com/chrome">Google Chrome</a> or <a href="http://www.google.com/chromeframe">Chrome Frame</a> in order to use this CMS as well as enjoy the best of the internet.  You won&rsquo;t regret it...</p>
+  <p class="chrome"><a href="http://www.google.com/chrome">
+    <img src="/@spontaneous/static/chromelogo-200x52-45c7cbc93be080bea342df5fcda2ef8b.png" alt="" />
+  </a></p>
 	</div>
 </body>
 </html>

data/bin/spot

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -KU
+#!/usr/bin/env ruby
 
 require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
 require 'bundler'

data/db/migrations/20110209152710_users_and_groups.rb

@@ -3,7 +3,7 @@
 Sequel.migration do
   up do
     adapter_scheme =  self.adapter_scheme
-    create_table!(:spontaneous_users, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
+    create_table(:spontaneous_users, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       varchar     :name
       varchar     :login, :size => 32, :index => true, :unique => true
@@ -12,13 +12,13 @@ Sequel.migration do
       varchar     :crypted_password
       boolean     :disabled, :default => false
 
-      datetime    :last_login_at
-      datetime    :created_at
+      timestamp   :last_login_at, :default => nil, :null => true
+      timestamp   :created_at
 
       index       [:login, :disabled], :name => "enabled_login_index"
     end
 
-    create_table!(:spontaneous_groups, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
+    create_table(:spontaneous_groups, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       foreign_key :user_id, :spontaneous_users, :key => :id, :on_delete => :cascade # test for being a single user group is user_id.nil?
       index       :user_id
@@ -29,21 +29,21 @@ Sequel.migration do
     end
 
 
-    create_table!(:spontaneous_groups_users, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
+    create_table(:spontaneous_groups_users, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
-      foreign_key :user_id, :spontaneous_users, :key => :id
-      foreign_key :group_id, :spontaneous_groups, :key => :id
+      foreign_key :user_id, :spontaneous_users, :key => :id, :on_delete => :cascade
+      foreign_key :group_id, :spontaneous_groups, :key => :id, :on_delete => :cascade
     end
 
-    create_table!(:spontaneous_access_keys, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
+    create_table(:spontaneous_access_keys, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       foreign_key :user_id, :spontaneous_users, :key => :id, :on_delete => :cascade
       index       :user_id
       char        :key_id, :size => 44, :index => true, :unique => true
-      datetime    :last_access_at
+      timestamp   :last_access_at
       varchar     :last_access_ip
       varchar     :source_ip
-      datetime    :created_at
+      timestamp   :created_at
     end
   end
 

data/db/migrations/20120305112647_site_modification_time.rb

@@ -0,0 +1,11 @@
+# encoding: UTF-8
+
+Sequel.migration do
+  up do
+    add_column  :spontaneous_state, :modified_at, DateTime
+  end
+
+  down do
+    drop_column :spontaneous_state, :modified_at, DateTime
+  end
+end

data/db/migrations/20120418153903_add_ownership_of_content.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+Sequel.migration do
+  up do
+    alter_table :content do
+      add_foreign_key :created_by_id, :spontaneous_users, :key => :id, :on_delete => :set_null
+    end
+  end
+
+  down do
+    drop_column :content, :created_by_id
+  end
+end
+

data/db/migrations/20120423175416_add_pending_modifications.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+Sequel.migration do
+  up do
+    adapter_scheme =  self.adapter_scheme
+    alter_table(:content) do
+      case adapter_scheme
+      when :mysql, :mysql2
+        add_column  :serialized_modifications, 'mediumtext'
+      else
+        add_column  :serialized_modifications, :text
+      end
+    end
+  end
+
+  down do
+    alter_table(:content) do
+      drop_column :serialized_modifications
+    end
+  end
+end

data/db/migrations/20120525164947_add_field_versions.rb

@@ -0,0 +1,27 @@
+Sequel.migration do
+  up do
+    adapter_scheme =  self.adapter_scheme
+    create_table(:spontaneous_field_versions, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
+      primary_key :id
+
+      case adapter_scheme
+      when :mysql, :mysql2
+        column  :value, 'mediumtext'
+      else
+        text    :value
+      end
+
+      Integer  :content_id
+      String   :field_sid
+      DateTime :created_at
+      Integer  :version
+      Integer  :user_id
+
+      index [:content_id, :field_sid]
+    end
+  end
+
+  down do
+    drop_table :spontaneous_field_versions
+  end
+end

data/lib/sequel/plugins/scoped_table_name.rb

@@ -13,8 +13,16 @@ module Sequel::Plugins
         class_variable_get :"@@unscoped_table_name"
       end
 
+      def fast_instance_delete_sql
+        nil
+      end
+
+      def primary_key_lookup(pk)
+        dataset[primary_key_hash(pk)]
+      end
+
       def with_table(table_name, &block)
-        dataset.with_table(unscoped_table_name, table_name, &block)
+        @dataset.with_table(unscoped_table_name, table_name, &block)
       end
     end
 
@@ -25,6 +33,7 @@ module Sequel::Plugins
       def with_table(original_table_name, current_table_name)
         saved_table_name = table_mappings[original_table_name]
         table_mappings[original_table_name] = current_table_name.to_s
+
         yield if block_given?
       ensure
         table_mappings[original_table_name] = saved_table_name

data/lib/spontaneous/asset/file.rb

@@ -0,0 +1,25 @@
+require 'pathname'
+
+module Spontaneous::Asset
+  class File
+    def initialize(source, relative_path)
+      @source, @relative_path = source, relative_path
+    end
+
+    def load_path
+      [name, extensions.first].join(".")
+    end
+
+    def basename
+      @basename ||= ::File.basename(@relative_path)
+    end
+
+    def name
+      basename.split(".").first
+    end
+
+    def extensions
+      @extensions ||= basename.split(".")[1..-1]
+    end
+  end
+end

data/lib/spontaneous/asset/source.rb

@@ -0,0 +1,28 @@
+require 'pathname'
+
+module Spontaneous::Asset
+  class Source
+    def initialize(source_dir)
+      @source_dir = ::File.expand_path(source_dir)
+    end
+
+    def source_path
+      @source_path ||= Pathname.new(@source_dir)
+    end
+
+    def source_files
+      source_paths.map(&:to_s)
+    end
+
+    def source_paths
+      @source_files ||= find_source_paths
+    end
+
+    def find_source_paths
+      absolute_paths = Dir[@source_dir / "**/*.*"].map { |path| Pathname.new(path) }
+      source_path = self.source_path
+      absolute_paths.map { |path| path.relative_path_from(source_path) }
+    end
+  end
+end
+