spontaneous 0.2.0.beta5 → 0.2.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57a258edab5fa2cbbe405529dfbecb2b0686eaa5
-  data.tar.gz: 7577532aa63cbc2c496a8aeed4537ef57b300d03
+  metadata.gz: 8ae971813ab8c480bfcb81a6c1ac9506fbe216e2
+  data.tar.gz: 1438feb3869d66da814c847ee79b77dd5456a9e3
 SHA512:
-  metadata.gz: e9cda0cf3e496fbe754fe02179c13522ab37c605450ec10c3aae79bb5f6fcfd0b0f4386e6a8bb255b7f4016cb0f96c593d3471efbba878bd306292b0af7cc3e8
-  data.tar.gz: cb41c2287c5fb0e718d17faa99a347811cc39f87b92abdf63c10444d1b1dc4e089f2fe339265b500ad253edadb2537ecde393488c9e600c4e0c33362e29f35b6
+  metadata.gz: 5b89b5fd062dfdc8706d4cd60a32da8caf4438d843d661bce99a3e68a203eae33feae7af2f05a5a879aa9049333624cc1f50a776414ec54b3cc9a6d2f41ae737
+  data.tar.gz: f75a631145becf1d8cead2d4b22df397e5382e0012c0ca90ed48a2745c6678548f7f5b4d951b9af605bf1a1c9f4553e7ecf4c0210763815cbbeacf958cb7deaa

data/.gitignore

@@ -22,3 +22,4 @@ pkg
 .ruby-gemset
 .ruby-version
 .tags
+.DS_Store

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## 0.2.0.beta6, released 2014-xx-xx
+
+#### New Features
+
+- Spontaneous now requires Ruby 2
+- SQLite 3 support added and set as default db for new sites
+- Startup now requires each file in the `config/initializers` directory after intializing and configuring the site instance. This allows for Rails-style extensions to the site state & functionality.
+- Publishing is now managed by a configurable pipeline declared in `config/initializers/publishing.rb`. This greatly clarifies the publishing process and also allows for the insertion of custom actions that will run on each publish.
+- The modification state of pages is now calculated using the actual state of the page's content, rather than just comparing the modification date with the date of the last publish. This means that making & then undoing a change won't result in the page appearing in the modified list.
+- UIDs have been replaced by the concept of 'singleton' classes which return a single instance based on the type name or a set of labels. This removes the last bit of developer-controlled content from the database & hence resolves issues around publishing pages purely for developer originated UID changes.
+- Page types can now be configured to render the content of another page as their own using the Page::renders method.
+- You can now add multiple aliases at once, selecting individually or by drag-selecting or shift-selecting ranges & groups of items.
+
+#### Misc
+
+- The site generator now takes the current user name as the default
+  database user for postgres installs. This will hopefully make installation easier.
+- Changed dependency from 'bcrypt-ruby' to 'bcrypt' (as instructed)
+- Made bundler version dependency more explicit (as instructed)
+- Removed warning about declaring task 'generate_site'
+- Add some documentation about templating into the generated layout
+- Replaced outdated flexible box CSS properties with new style ones (`display: box` => `display: flex`)
+- Add index to `content.target_id` to improve performance of searches for aliases
+- Content associations now use prepared statements which significantly speeds up page load & site render
+- Slug change propagation and modification tracking no longer rely on mystery instance variable flags
+- The editing interface now has some feedback/a loading animation when navigating between pages
+- Publishing re-uses compiled assets if they exist. Assets are compiled once per deploy rather than once per publish. This cuts a significant amount of time off the publishing step (especially for small sites)
+- The contents of boxes now render in batches as you scroll, rather than rendering every single entry at page load. This speeds up the display of pages with a lot of content.
+- Using Velocity.js for animation where possible for smoother transitions
+- Better support for private roots
+
+
+#### Fixes
+
+- Fix broken publish command
+- Piece aliases now link using the id of the owning page of the target, rather than the id of the target itself
+- Rendering a private root no longer crashes in the `navigation` helper
+- Directly rendering a page instance within a tenplate no longer results in a page-within-page situation (context instances now call a separate #render_inline method which passes the call onto a page's containing entry)
+- Previewing of private pages has been disabled (fixing issue #36)
 
 ## 0.2.0.beta5, released 2014-03-18
 

data/Gemfile

@@ -15,12 +15,14 @@ platforms :jruby do
   gem 'jruby-openssl'
   gem 'jdbc-postgres'
   gem 'jdbc-mysql'
+  gem 'jdbc-sqlite3'
 end
 
 platforms :mri, :rbx do
   gem 'mysql2',      '~> 0.3'
   gem 'sequel_pg',   '~> 1.6', require: 'sequel'
   gem 'xapian-ruby', '~> 1.2'
+  gem 'sqlite3',     '~> 1.3'
 end
 
 

data/Readme.markdown

@@ -223,16 +223,16 @@ This will generate the following interface for the site editors:
 
 Spontaneous needs ruby >= 1.9.3 and Ruby >= 2.0 is preferred
 
-		rvm install 2.1.1
+		rvm install 2.1.2
 
 **Install Spontaneous**
 
-		gem install spontaneous
+		gem install spontaneous --pre
 
 Now generate your site. Replace example.com with the domain of your site.
 
-		spot create example.com
-		cd example.com
+		spot generate example.com
+		cd example_com
 		bundle install
 		spot init
 		spot server

data/application/css/core.css.scss

@@ -35,13 +35,13 @@
 }
 
 
-img.missing {
-	width: 100%;
-	height: 50px;
-	background: url("/@spontaneous/static/missing-911ce6dbd9f4602e0f3fbcd7e78846a2.png") 50% 50% no-repeat;
-	border: none;
-	// display: none;
-}
+// img.missing {
+// 	width: 100%;
+// 	height: 50px;
+// 	// background: url("/@spontaneous/static/missing-911ce6dbd9f4602e0f3fbcd7e78846a2.png") 50% 50% no-repeat;
+// 	border: none;
+// 	display: none;
+// }
 
 .clear {
 	clear: both;
@@ -66,6 +66,24 @@ img.missing {
 		right: 0;
 		bottom: 0;
 		top: 0;
+		#content-loading {
+			@include header;
+			text-align: center;
+			display: none;
+			color: #888888;
+			position: relative;
+			top: 150px;
+		}
+		#content-loading:before {
+      @include awesome-icon("\f1ce");
+      @include animation(spin, 1s, infinite, linear);
+      display: inline-block;
+      position: relative;
+      left: -4px;
+		}
+		#content-loading:after {
+			content: "Loading…";
+		}
 	}
 	#data_pane,
   #preview_pane,
@@ -82,6 +100,15 @@ img.missing {
 	}
 }
 
+#content-outer.loading {
+	#content {
+		#content-loading {
+			display: block;
+		}
+	}
+
+}
+
 #page-content {
 	#page-info {
 		@extend .container-padding;
@@ -129,6 +156,8 @@ img.missing {
 			@include display-box;
 			position: absolute;
 			bottom: 10px;
+			left: $container-padding;
+			right: $container-padding;
 		}
     .path .titlesync {
       margin-left: $unit;
@@ -149,10 +178,13 @@ img.missing {
           opacity: 1.0;
         }
       }
+    }
+    .path .path-spacer {
+    	@include box-flex(1);
     }
 		.path .edit {
 			@include display-box;
-			@include box-orient(horizontal);
+			@include box-orient(row);
 			@include box-align(center);
 			.input-error {
 				display: block;
@@ -293,9 +325,9 @@ img.missing {
 	@extend .clearfix;
 	@include box-sizing;
 	@include display-box;
-	@include box-orient(horizontal);
+	@include box-orient(row);
 	@include box-align(stretch);
-	@include box-pack(top);
+	@include box-pack(flex-start);
 	background-color: #fff;
 	// border: solid 3px transparent;
 	cursor: pointer;
@@ -327,9 +359,9 @@ img.missing {
 	margin-right: 16px;
 	li {
 		@include display-box;
-		@include box-orient(horizontal);
+		@include box-orient(row);
 		@include box-align(stretch);
-		@include box-pack(top);
+		@include box-pack(flex-start);
 		@extend .clearfix;
 		border-bottom: solid 1px $entry-background-colour;
 		padding-top: 3px;
@@ -360,6 +392,7 @@ img.missing {
 	.value {
 		@extend .preview-value;
 		@include box-flex;
+		max-width: $field-text-preview-width - 100px;
 		a {
 			color: $highlight;
 		}
@@ -408,8 +441,8 @@ img.missing {
 		margin-right: 4px;
 		margin-bottom: 4px;
 		position: relative;
-		width: 49%;
-		max-width: 150px;
+		width: 100%;
+		max-width: 200px;
 		min-width: 90px;
 		// size restrictions are mostly to stop the images getting too tall
 		// so for landscape images we can increase the size bounds a bit
@@ -433,7 +466,7 @@ img.missing {
 			@include rounded;
 			background-color: #efefef;
 			// max-height: 90px;
-			min-height: 45px;
+			min-height: 65px;
 			min-width: 90px;
 			cursor: pointer;
 			text-align: center;
@@ -499,6 +532,7 @@ img.missing {
 				width: 90px;
 				max-width: 90px;
 				max-height: 90px;
+				display: none;
 			}
 			img:hover {
 
@@ -562,7 +596,7 @@ img.missing {
 	.filename {
 		@include box-flex(2);
 		word-wrap: break-word;
-		font-style: italic;
+		// font-style: italic;
 		// max-width: 90%;
 		overflow: auto;
 		height: auto;
@@ -625,24 +659,26 @@ img.missing {
 	height: 100%;
 
 	.slot-tabs {
-		@extend .clearfix;
 		min-height: 32px;
 		vertical-align: top;
 		@include vertical-gradient(#666666, #4d4d4d);
 		padding-left: $container-padding;
 		padding-right: $container-padding;
+		display: flex;
+		flex-direction: row;
 		li {
 			@include box-sizing;
 			@include interface;
+			flex: 1 1 auto;
 			font-size: 11px;
 			color: #dddddd;
 			display: block;
-			float: left;
+			// float: left;
 			height: 32px;
 			padding-left: 16px;
 			padding-right: 16px;
 			min-width: 130px;
-			max-width: 160px;
+			// max-width: 160px;
 			padding-top: 9px;
 			cursor: pointer;
 			border-left: solid 1px transparent;
@@ -684,6 +720,24 @@ img.missing {
 			left: -$container-padding - 1;
 			top: 0;
 		}
+		li:last-child {
+			border-right: none;
+			&:hover, &.active {
+				// border-right: none;
+				&:after {
+				@include vertical-gradient($highlight + #111111, $highlight);
+				background-color: $highlight;
+				content: "";
+				position: absolute;
+				width: $container-padding;
+				height: 32px;
+				// outline: solid 1px red;
+				right: -$container-padding;
+				top: 0;
+
+				}
+			}
+		}
 		li.active + li:hover {
 			border-left-color: $highlight - #151515;
 		}
@@ -814,7 +868,7 @@ img.missing {
 
 #page-slots.slots .slot-entries {
 	padding-top: 32px;
-	padding-bottom: 50%;
+	padding-bottom: 25%;
 	position: relative;
 	.fields-preview {
 		@include rounded;
@@ -831,6 +885,7 @@ img.missing {
 			@include rounded;
 			background-color: $entry-background-colour;
 			padding: 2px;
+			position: relative;
 			// padding-top: $title-bar-height + 4px;
 		}
 		.entry-spacer {
@@ -845,10 +900,17 @@ img.missing {
 		.entry-inner {
 			@extend .clearfix;
 			@include rounded;
+			// @include box-sizing;
 			// background-color: gray;
 			// padding: $unit;
 			position: relative;
       padding-bottom: $unit;
+			min-height: $container-padding;
+		}
+		&.alias {
+			.entry-inner {
+				min-height: $container-padding / 2;
+			}
 		}
 		.title-bar {
 			// @include vertical-gradient(gray + #111111, gray);
@@ -877,30 +939,48 @@ img.missing {
 			height: auto;
 			.actions {
 				@include display-box;
-				@include box-orient(vertical);
+				@include box-orient(column);
 				@include rounded-bottom;
-				top: $unit/2;
+				position: relative;
+				top: $unit/4;
+				$action-button-size: $container-padding / 2;
 				a {
 					display: inline-block;
           position: absolute;
-					width: 15px;
-					height: 15px;
+					width: $action-button-size;
+					height: $action-button-size;
 					position: relative;
 					cursor: pointer;
-          color: $entry-background-colour - #111;
-          font-size: 14px;
+					// border-width: 1px 1px 1px 1px;
+					// border-radius: $radius $radius 0 0;
+     //      border-color: #111; //$entry-background-colour - #111;
+		      border: solid 1px $entry-background-colour;
+		      border-width: 1px 1px 1px 0;
+          color: #aaa;
+          font-size: 16px;
+          line-height: $action-button-size;
+          // outline: solid 1px red;
 				}
         a:before {
-          @include awesome-icon("\f057");
+          @include awesome-icon("\f00d");
           position: absolute;
-          left: 3px;
-          top: 2px;
+          text-align: center;
+          left: 0px;
+          right: 1px;
+          top: 0px;
         }
         a:hover {
           color: $highlight;
         }
-				.delete:before {
+        a + a {
+        	border-top-width: 0;
+        }
+				.delete {
           font-size: 18px;
+          border-top-right-radius: $radius;
+				}
+				.visibility {
+          border-bottom-right-radius: $radius;
 				}
 				// .delete:hover {
 					// background-position: -61px -20px;
@@ -1030,7 +1110,8 @@ img.missing {
 					color: #666666;
 					// color: #f2f2f2;
 				}
-				li:first-child:before {
+				li:first-child:before,
+				li:last-child:after {
 					// @include rounded-top-left;
 					// padding-left: 0;
 					display: none;
@@ -1075,8 +1156,8 @@ img.missing {
 				a {
 					@include button(#6b6b6b);
 					// background-color: #6b6b6b;
-					padding-left: 16px;
-					padding-right: 8px;
+					padding-left: 2*$unit;
+					padding-right: $unit;
 					& + a {
 						margin-left: $unit;
 					}
@@ -1092,14 +1173,14 @@ img.missing {
 				}
 			}
 			.slot-entries {
-				padding-top: 8px;
-				padding-bottom: 8px;
+				padding-top: $unit;
+				padding-bottom: $unit;
 			}
 			.entry-wrap.depth-2 {
 				// padding-top: $title-bar-height + ($unit/2);
 				margin-left: $unit;
-				margin-right: 20px;
-				margin-bottom: $unit;
+				margin-right: $container-padding / 2;
+				margin-bottom: 0;
 				.white-bg {
 					@include rounded($radius - 1);
 					width: auto;
@@ -1113,11 +1194,20 @@ img.missing {
 					padding: 0;
 				}
 				.entry-spacer {
-					height: $unit;
+					height: $unit * 2;
 				}
-				&:last-child .entry-spacer {
-					outline: solid 1px red;
-					display: none;
+				$content-type-offset: 12px;
+				.content-type {
+					bottom: $content-type-offset;
+					font-size: 8px;
+				}
+				&:last-child  {
+					.entry-spacer {
+						display: none;
+					}
+					.content-type {
+						bottom: $content-type-offset;
+					}
 				}
 				.entry {
 					@include rounded;
@@ -1156,9 +1246,11 @@ img.missing {
 			@include rounded-top;
       position: relative;
 			padding: $unit/2;
+			padding-right: 100px;
 			background-color: #444;
 			color: white;
 			font-size: $target-name-size;
+			line-height: 18px;
 			font-style: italic;
       cursor: pointer;
 			&.no-fields {
@@ -1173,6 +1265,7 @@ img.missing {
         right: $unit;
         top: 5px;
         font-style: normal;
+        line-height: 18px;
         color: rgba(255, 255, 255, 0.4);
         &:hover {
           color: rgba(255, 255, 255, 0.8);
@@ -1239,13 +1332,15 @@ img.missing {
 			background-color: #444;
 			padding: $unit/2;
       cursor: pointer;
+      padding-right: 100px;
+
 			a {
 				cursor: pointer;
 				font-family: $headline-font-family;
 				font-weight: 100;
 				color: #fff;
 				font-size: 16px;
-				line-height: normal;
+				line-height: 20px;
 			}
       &:hover a, a:hover {
         color: $highlight;
@@ -1562,7 +1657,7 @@ img.missing {
   overflow: visible;
   position: absolute;
   top: auto;
-  bottom: $entry-gap + ($unit * 2);
+  bottom: ($unit * 2);
   right: $unit;
   left: auto;
   color: rgba(0, 0, 0, 0.3);
@@ -1572,6 +1667,11 @@ img.missing {
   }
 }
 
+@media all and (max-width: 1000px) {
+  .fields-preview-text li {
+	  flex-direction: column;
+  }
+}
 @import "top.css.scss";
 @import "dialogue.css.scss";
 @import "popover.css.scss";
@@ -1581,3 +1681,4 @@ img.missing {
 @import "meta.css.scss";
 @import "jquery-ui-1.8.21.custom/ui-lightness.css.scss";
 
+