spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/application/js/views/piece_view.js

@@ -40,16 +40,19 @@ Spontaneous.Views.PieceView = (function($, S) {
 	});
 
 	var PieceView = new JS.Class(S.Views.View, {
-		initialize: function(content, container) {
+		initialize: function(content, container_view) {
 			this.callSuper(content);
-			this.container = container;
+			this.container_view = container_view;
 		},
 		panel: function() {
 			var wrapper = dom.div(['entry-wrap', this.depth_class(), this.visibility_class(), this.boxes_class()])
 			var contents = dom.div('.entry-contents');
 			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)
+			var outline = dom.div('.white-bg').
+				mouseover(this.mouseover.bind(this)).
+				mouseout(this.mouseout.bind(this)).
+				click(this.edit.bind(this));
+			inside.append(outline);
 			if (this.content.depth() < 4) {
 				inside.append(dom.div('.grey-bg'));
 			}
@@ -71,20 +74,37 @@ Spontaneous.Views.PieceView = (function($, S) {
 			inside.append(box_container.panel());
 			var preview_area = this.create_edit_wrapper(inside);
 			contents.append(preview_area);
-			wrapper.append(contents, dom.div('.entry-spacer'));
+
+			wrapper.append(contents, this.entry_spacer());
 			this.wrapper = wrapper;
 			this.outline = outline;
 			this.fields_preview = fields_panel;
 			return wrapper;
 		},
-
+		entry_spacer: function() {
+			var entry_spacer = dom.div('.entry-spacer').hover(function() {
+				this.container_view.show_add_after(this, entry_spacer);
+			}.bind(this), function() {
+				this.container_view.hide_add_after(this, entry_spacer);
+			}.bind(this));
+			return entry_spacer;
+		},
+		edit: function(focus_field) {
+			this.wrapper.addClass('editing')
+			this.callSuper(focus_field);
+		},
+		edit_closed: function() {
+			this.wrapper.removeClass('editing');
+			this.callSuper();
+		},
 		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().text(content.content.alias_title).click(click);
+			title = dom.a().html(content.content.alias_title).click(click);
 
+			if (!content.has_fields()) { wrap.addClass('no-fields'); }
 
 			if (icon) {
 				var img = new Spontaneous.Image(icon);
@@ -96,7 +116,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 		title_bar: 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 title_bar = dom.div('.title-bar')//.append(label);
 				var actions = dom.div('.actions', {'xstyle':'display: none'});
 				var destroy = dom.a('.delete');
 				var visibility = dom.a('.visibility');
@@ -170,6 +190,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 		destroyed: function() {
 			this.wrapper.disappear(function() {
 				this.wrapper.remove();
+				this.trigger('removed', this);
 			}.bind(this));
 		}
 	});

data/application/static/plus_alt.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!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="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#231F20" d="M16,0C7.165,0,0,7.164,0,16s7.165,16,16,16c8.837,0,16-7.164,16-16S24.837,0,16,0z M24,18h-6v6h-4v-6H8v-4h6
+	V8h4v6h6V18z"/>
+</svg>

data/application/views/{index.erubis → index.erb}

@@ -7,13 +7,13 @@
 		<title>Spontaneous: Loading...</title>
 		<link REL="SHORTCUT ICON" HREF="/@spontaneous/static/favicon.ico" />
 
-	<%- Spontaneous::Rack::Assets::CSS::EDITING_CSS.each do |css_file| %>
+	<% Spontaneous::Rack::Assets::CSS::EDITING_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| %>
+    <% 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| %>
+	<% 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" charset="utf-8">
@@ -24,14 +24,18 @@
 				development: <%= Spontaneous.development? %>,
 				asynchronous: false,
 				editor_protocol: 'mvim',
+				<% if Spontaneous.config.auto_login; %>
+				auto_login: 'garry',
+				user_key: '<%= env[Spontaneous::Rack::ACTIVE_KEY].key_id %>',
+				<% end %>
 				onload: function() {
 					jQuery.noConflict();
 				}
 			};
 		</script>
-	<%- Spontaneous::Rack::Assets::JavaScript::REQUIRE.each do |js_file| %>
+	<% Spontaneous::Rack::Assets::JavaScript::REQUIRE.each do |js_file| %>
 		<script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-	<% end -%>
+	<% end %>
 	</head>
 	<body id="spontaneous">
 		<script type="text/javascript" charset="utf-8">

data/application/views/{login.erubis → login.erb}

@@ -5,13 +5,13 @@
     <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" />
-    <%- Spontaneous::Rack::Assets::CSS::LOGIN_CSS.each do |css_file| %>
+    <% 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| %>
+    <% 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| %>
+    <% Spontaneous::Rack::Assets::JavaScript::COMPATIBILITY.each do |js_file| %>
       <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
     <% end %>
 
@@ -21,7 +21,7 @@
         site_id: '<%= Spontaneous::Site.config.site_id %>',
       };
     </script>
-    <%- Spontaneous::Rack::Assets::JavaScript::LOGIN_JS.each do |js_file| %>
+    <% 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">
@@ -35,7 +35,9 @@
           if (key) {
             $('#reauthenticate-key').val(key).parent('form')[0].submit();
           } else {
-            $('#outer').fadeIn();
+            $('#outer').fadeIn(function() {
+              $('#login-form input#user-login').focus();
+            });
           }
         });
       }(jQuery));
@@ -51,19 +53,21 @@
           <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 %>" />
             <p>
-            <label><input type="text" id="user-login" name="user[login]" value="<%= locals[:login] %>" /><span>Username</span></label>
+            <label><input type="text" class="text" id="user-login" name="user[login]" value="<%= locals[:login] %>" /><span>Username</span></label>
             </p>
             <p>
-            <label><input type="password" name="user[password]" value="" /><span>Password</span></label>
+            <label><input type="password" class="text" name="user[password]" value="" /><span>Password</span></label>
             </p>
             <p class="submit"><button type="submit">Login</button></p>
           </div>
         </form>
-        <form action="/@spontaneous/reauthenticate" method="post" accept-charset="UTF-8">
-          <input type="hidden" id="reauthenticate-key" name="api_key" value="" />
-        </form>
       </div>
     </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 %>" />
+      </form>
   </body>
 </html>

data/application/views/schema_modification_error.html.erb

@@ -7,8 +7,18 @@
     <title>Spontaneous: Loading...</title>
 		<link REL="SHORTCUT ICON" HREF="/@spontaneous/static/favicon.ico" />
 
-    <link rel="stylesheet" href="/@spontaneous/css/schema_error.css" type="text/css" media="screen" charset="utf-8" />
-    <script type="text/javascript" charset="utf-8" src="/@spontaneous/js/vendor/jquery-1.5.1.min.js"></script>
+    <% Spontaneous::Rack::Assets::CSS::SCHEMA_MODIFICATION_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 %>
+    <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;
@@ -27,21 +37,23 @@
     <div id="container">
 
       <%
-          types = actions.map { |a| a.source.owner}.uniq
+          types = modification.actions.map { |a| a.source.owner}.uniq
       %>
 
     <h1>There are unresolved changes to <%= types.length > 1 ? "s" : "" %> <%= types.map { |o| "<strong>&lsquo;#{o}&rsquo;</strong>"}.join(', ')%></h1>
-    <p class="src"><a href="mvim://open?url=file://<%= actions[0].source.owner.__source_file %>"><%= actions[0].source.owner.__source_file %></a></p>
+    <% source_file = modification.actions[0].source.source_file %>
+    <p class="src"><a href="mvim://open?url=file://<%= source_file %>"><%= source_file %></a></p>
 
     <p>Please choose one of the following solutions:</p>
 
     <ul class="actions">
-      <% actions.each do |action|
-        id = "#{action.action}-#{action.source.name}#{action.dest ? "-#{action.dest.name}" : ""}"
+      <% modification.actions.each do |action|
+        id = "#{action.action}-#{action.source.name.to_s.gsub('::', '__')}#{action.dest ? "-#{action.dest.name.to_s.gsub('::', '__')}" : ""}"
       %>
     <li>
     <form action="/@spontaneous/schema/<%= action.action %>" method="post">
       <input type="hidden" name="origin" value="<%= env['SCRIPT_NAME'] %>" />
+      <input type="hidden" name="__key" value="<%= env[S::Rack::ACTIVE_KEY].key_id %>" />
       <input type="hidden" name="uid" value="<%= action.source.to_s %>" />
       <% if action.dest %>
         <input type="hidden" name="ref" value="<%= action.dest.schema_name %>" />

data/bin/spot

@@ -1,7 +1,20 @@
-#!/usr/bin/env ruby -U -KU
+#!/usr/bin/env ruby -KU
 
 require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
-require 'bundler/setup'
+require 'bundler'
+
+begin
+	Bundler.setup(:default)
+rescue Bundler::GemfileNotFound
+	# We're operating outside of a site dir, probably generating a site
+	# so load the Spontaneous gem Gemfile
+  ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+	retry
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end
 
 spot_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(spot_path) if File.directory?(spot_path) && !$:.include?(spot_path)

data/db/migrations/20100610142136_init.rb

@@ -3,7 +3,7 @@
 Sequel.migration do
   up do
     adapter_scheme =  self.adapter_scheme
-    create_table(:content) do
+    create_table(:content, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       varchar :type_id, :index => true
       text    :instance_code
@@ -50,7 +50,7 @@ Sequel.migration do
 
     end
 
-    create_table(:sites) do
+    create_table(:sites, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       integer :revision, :default => 1
       integer :published_revision, :default => 0

data/db/migrations/20101130104334_timestamps.rb

@@ -13,14 +13,14 @@ Sequel.migration do
     add_column :content, :first_published_revision,  Integer
 
     # keeps track of publication dates
-    create_table(:revisions) do
+    create_table(:revisions, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       integer     :revision
       timestamp   :published_at
     end
 
     # keeps track of all pages changed by a set of actions
-    create_table(:changes) do
+    create_table(:changes, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
       varchar     :title
       timestamp   :created_at

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) 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
@@ -18,9 +18,9 @@ Sequel.migration do
       index       [:login, :disabled], :name => "enabled_login_index"
     end
 
-    create_table!(:spontaneous_groups) do
+    create_table!(:spontaneous_groups, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
-      foreign_key :user_id, :spontaneous_users, :on_delete => :cascade # test for being a single user group is user_id.nil?
+      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
       varchar     :name
       varchar     :level_name, :default => 'none'
@@ -29,15 +29,15 @@ Sequel.migration do
     end
 
 
-    create_table!(:spontaneous_groups_users) do
+    create_table!(:spontaneous_groups_users, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
-      foreign_key :user_id, :spontaneous_users
-      foreign_key :group_id, :spontaneous_groups
+      foreign_key :user_id, :spontaneous_users, :key => :id
+      foreign_key :group_id, :spontaneous_groups, :key => :id
     end
 
-    create_table!(:spontaneous_access_keys) do
+    create_table!(:spontaneous_access_keys, :engine => "INNODB", :charset => "UTF8", :collate => "utf8_general_ci") do
       primary_key :id
-      foreign_key :user_id, :spontaneous_users, :on_delete => :cascade
+      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
@@ -48,10 +48,10 @@ Sequel.migration do
   end
 
   down do
-    drop_table :spontaneous_users
-    drop_table :spontaneous_groups
-    drop_table :spontaneous_groups_users
     drop_table :spontaneous_access_keys
+    drop_table :spontaneous_groups_users
+    drop_table :spontaneous_groups
+    drop_table :spontaneous_users
   end
 end
 

data/db/migrations/20120106171423_visibility_path.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+Sequel.migration do
+  up do
+    alter_table(:content) do
+      drop_index :content_path
+      rename_column :content_path, :visibility_path
+      add_index :visibility_path
+    end
+  end
+
+  down do
+    alter_table(:content) do
+      drop_index :visibility_path
+      rename_column :visibility_path, :content_path
+      add_index :content_path
+    end
+  end
+end

data/db/migrations/20120107124541_owner_id.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+Sequel.migration do
+  up do
+    alter_table(:content) do
+      drop_index :container_id
+      rename_column :container_id, :owner_id
+      add_index :owner_id
+    end
+  end
+
+  down do
+    alter_table(:content) do
+      drop_index :owner_id
+      rename_column :owner_id, :container_id
+      add_index :container_id
+    end
+  end
+end

data/lib/cutaneous.rb

@@ -1,4 +1,3 @@
-require "tenjin"
 
 module Cutaneous
   def self.template_path(filename, format)
@@ -19,15 +18,15 @@ module Cutaneous
   end
 
   def self.publishing_renderer
-    FirstPassRenderer
+    PublishRenderer
   end
 
   def self.request_renderer
-    SecondPassRenderer
+    RequestRenderer
   end
 
   def self.is_dynamic?(render)
-    SecondPassParser::STMT_PATTERN === render || SecondPassParser::EXPR_PATTERN === render
+    RequestTokenParser.is_dynamic?(render)
   end
 
 
@@ -37,11 +36,13 @@ module Cutaneous
   autoload :RequestContext, "cutaneous/request_context"
 
   autoload :Renderer, "cutaneous/renderer"
-  autoload :ParserCore, "cutaneous/parser_core"
-  autoload :FirstPassParser, "cutaneous/first_pass_parser"
-  autoload :FirstPassRenderer, "cutaneous/first_pass_renderer"
-  autoload :SecondPassParser, "cutaneous/second_pass_parser"
-  autoload :SecondPassRenderer, "cutaneous/second_pass_renderer"
+  autoload :PublishRenderer, "cutaneous/publish_renderer"
+  autoload :RequestRenderer, "cutaneous/request_renderer"
   autoload :PreviewRenderer, "cutaneous/preview_renderer"
-end
 
+  autoload :TokenParser, "cutaneous/token_parser"
+  autoload :PublishTokenParser, "cutaneous/publish_token_parser"
+  autoload :RequestTokenParser, "cutaneous/request_token_parser"
+  autoload :PublishTemplate, "cutaneous/publish_template"
+  autoload :RequestTemplate, "cutaneous/request_template"
+end