spontaneous 0.2.0.beta4 → 0.2.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcffa3a2465a357c8da162aa93e300adc675e0dc
-  data.tar.gz: 097ea8f7351a8dee830bb7226b9cc408f8b8b730
+  metadata.gz: 57a258edab5fa2cbbe405529dfbecb2b0686eaa5
+  data.tar.gz: 7577532aa63cbc2c496a8aeed4537ef57b300d03
 SHA512:
-  metadata.gz: dfda80067874f9daae5d505b7d06b579f5e775b40e1c42c5d40043edea73d249049a8bb83dc2290f59ff9836c2f2676e46b98609270b932cabf992436f2b8499
-  data.tar.gz: f35b32a7e205fbc4148c65d0add2b08766d51489415b1f37ba709a8ba5be10591aaa5fea739fd0b47be6ee63257c278238ace7e9df219e2eab8629ee4f7ac213
+  metadata.gz: e9cda0cf3e496fbe754fe02179c13522ab37c605450ec10c3aae79bb5f6fcfd0b0f4386e6a8bb255b7f4016cb0f96c593d3471efbba878bd306292b0af7cc3e8
+  data.tar.gz: cb41c2287c5fb0e718d17faa99a347811cc39f87b92abdf63c10444d1b1dc4e089f2fe339265b500ad253edadb2537ecde393488c9e600c4e0c33362e29f35b6

data/CHANGELOG.md

@@ -0,0 +1,39 @@
+
+## 0.2.0.beta5, released 2014-03-18
+
+#### New Features
+
+- Rendering output now goes to a 'output store' class rather than directly to the filesystem.
+  The default output store mimics the existing functionality but it can be overridden by
+  any Moneta compatible key-value store (e.g. Redis, Memcache). Another step closer to
+  Heroku compatibility
+- Individual fields can now be hidden in the list view by specifying `list: false` in the
+  field definition options
+- The navigation helper now accepts options for filtering the list of pages to include
+- Page controllers are now full Sinatra instances
+- The UI allows for images to be cleared
+- Deleting a schema entry now raises a modification error & prompts for confirmation.
+  Before this a typo or other error could end up deleting db content
+- Modifying the schema will now automatically delete any stray, unmapped, instances from
+  the db on deploy
+- You can specify the name that a type will appear as in the add list, this enables the same
+  basic type to fill many roles without having to subclass it
+
+#### Fixes
+
+- Add tests for & fix current issues with Thor's handling of namespaces
+- Fix equality tests for PagePiece's i.e. `PagePiece#target == PagePiece`
+- Force every content query to include a list of `schema_id`s so that content entries
+  with an invalid/unmapped schema class won't be returned
+
+#### Misc
+
+- Upgrade to Sequel 4.x
+- Use the `sequel_pg` gem for better performance with Sequel on Postgres
+- Change version specifiers in gemspec to a more liberal range (i.e. "~> 0.x.y" becomes "~> 0.x")
+- Improve layout of box tabs to handle cases with many boxes
+- `Site[:symbol]` now searches by UID
+- The 'back' stack now allows for insertion of Rack apps, rather than just Sinatra apps
+- Rename the `:text` fieldtype to `:markdown` to make this clearer
+- Rubinius 2 compatibility
+- Add a CHANGELOG

data/Gemfile

@@ -2,10 +2,10 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'selenium-client', '~> 1.2.18', :platforms => [:mri_18]
+gem 'selenium-client', '~> 1.2', :platforms => [:mri_18]
 gem 'mocha', :require => false
 
-gem 'therubyracer',    '~> 0.11.1'
+gem 'therubyracer',    '~> 0.11'
 
 # group :development do
 #   # gem 'Selenium', '~> 1.1.14'
@@ -17,8 +17,13 @@ platforms :jruby do
   gem 'jdbc-mysql'
 end
 
-platforms :mri do
-  gem 'mysql2',      '~> 0.3.11'
-  gem 'pg',          '~> 0.14.1'
-  gem 'xapian-ruby', '~> 1.2.12'
+platforms :mri, :rbx do
+  gem 'mysql2',      '~> 0.3'
+  gem 'sequel_pg',   '~> 1.6', require: 'sequel'
+  gem 'xapian-ruby', '~> 1.2'
 end
+
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end

data/Readme.markdown

@@ -2,47 +2,133 @@
 
 Spontaneous is a revolutionary new content management system that brings the best of Ruby and the best of HTML5 together in one elegant package.
 
-This is version 2 of an existing (closed source) CMS that has been in active production use for over 6 years. For more information about that, and to see the sites that it powers, please go to http://spontaneous.io
-
-## INTRODUCTION
-
-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.3
-- Using classes instead of db for metadata
-  - Versioning of metadata
-  - Keeps the developer in the text editor
-  - Simplifies the interface for the site editor
-  - Clear separation of content from schema - changing the site metadata
-  - Carefully thought out deployment/upgrade process
-  - Interaction between code and db content kept to a bare minimum and separated from normal site editing functions (a 'developer view')
-- Built to deliver fast sites
-  - Pages render to static HTML if possible
-  - Compression of JS & CSS assets
-- Proper workflow
-  - Save != publish
-  - Site editors can make sweeping changes and then make them live together
-- Multiple outputs
-  - Publish the same content to multiple formats (e.g. HTML, RSS, ATOM, JSON, PDF\*, EPUB\*)
-- Sophisticated user managment
-  - Customisable per-site roles to determine visibility & editabilty of site content
-  - Give specified users access to only specific parts of the site\*
-- HTML5 goodness
-  - Drag & drop
-  - Resumable uploads
-  - Responsive
-  - Attractive
-  - Simple
-- Powerful hierarchical data
-  - Layout is done by the templates not the editor
-  - Frees you up to do intricate designs
-  - Minimises the risk of breaking the site design (consistent branding)
-- Custom, page based, controllers
-  - Define custom actions on particular page types
-
-\* Features currently only sketched out awaiting full implementation
-
-### The Content Hierarchy
+**[http://spontaneous.io](http://spontaneous.io)**
+
+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.
+
+## Status
+
+[![Code Climate](https://codeclimate.com/github/SpontaneousCMS/spontaneous.png)](https://codeclimate.com/github/SpontaneousCMS/spontaneous)
+
+Spontaneous is very much a work-in-progress but is currently almost feature
+complete. It has been used with great success on multiple sites. However the
+gem release is still marked as 'alpha' because the APIs are in constant flux.
+
+
+### Features currently supported
+
+- Definition of complex content hierarchies using ORM model-like classes which:
+	- Allows for versioning of the metadata using standard CVS systems (i.e. git)
+	- Keeps the developer in the text editor
+	- Simplifies the interface for the site editor
+	- Creates a clear separation of content from schema - changing the site metadata
+	- Provides a carefully thought out deployment/upgrade process
+	- Keeps interaction between code and db content to a bare minimum and
+		separated from normal site editing functions (a 'developer view')
+- The schema model allows for 'Page' types which have a URL and 'Piece' types which
+	form the content of pages but have no URL
+- Each content model sub-class (or 'type') has its own set of defined fields and
+	boxes. Each defined box can be configured to allow the addition of any available
+	schema type
+- Each field has a type. The current field types include simple strings (`:string`),
+	long strings (`:text`), Markdown rich text (`:markdown`), images (`:image`, `:photo`),
+	web-video (supporting YouTube, Vimeo & Vine URLs), simple file uploads (`:file`),
+	date (`:date`), pulldowns (`:select` with static & dynamic options),
+	tag fields (`:tag`) and raw HTML code (`:html`)
+- Pure separation of content from presentation. Editors write, the CMS lays it out:
+  - Page content is split into discrete "pieces" of multiple types (and split into
+		multiple 'boxes'). Each of these pieces & boxes has a custom template
+	- This enables sophisticated layouts way beyond those possible when constrained
+		by WYSIWYG based systems
+	- Render content using generated Javascript rather than being limited to HTML
+- Sub-classes inherit their superclasses' fields & boxes so schema metadata can
+	be coded using DRY principles (and since it's just Ruby code, you can also
+	share functionality using Ruby modules)
+- An edit-publish cycle that separates saving changes from making them public
+- Intelligent publishing step that chooses the most effective method to deliver
+	pages, choosing to render & return static HTML pages if possible
+- Define multiple outputs (in multiple formats) on a type-by-type basis. Current supported
+	formats include HTML, XML, Javascript, PHP, JSON, text... in fact any text-based, template driven
+	format you might need
+- Powerful hierarchical structures
+	- Pages have fields & boxes
+	- Boxes have fields and can contain pieces
+	- Pieces can have fields and boxes
+	- Boxes can contain pages
+	- and so on with no depth limit
+- An intuitive, attractive & responsive HTML5 interface with
+	- Resumable, sharded uploads
+	- Upload queueing
+	- Drag & drop file uploads
+	- Accurate previewing
+	- Hierarchical site navigation
+	- Context aware markdown editor
+-	Use of a schema "map" to enable re-naming of any schema types without affecting the content currently in the database
+- Image fields can define any number of 'sizes' each of which is created via a custom ImageMagick
+	pipeline (constrcted using [skeptick](https://github.com/maxim/skeptick))
+- Template inheritance based on [Django's templating](https://docs.djangoproject.com/en/dev/topics/templates/)
+	using [Cutaneous](https://github.com/SpontaneousCMS/cutaneous)
+- Asset compilation & minimization through [Sprockets](https://github.com/sstephenson/sprockets)
+- Cloud based media storage using [Fog](http://fog.io)
+- Powerful fulltext searching powered by [Xapian](http://xapian.org/)
+	- Each site can have multiple indexes
+	- Each index can be configured to include any subset of the site content on a
+		type-by-type, field-by-field basis
+- A Rack powered public site including the ability to
+	- inject any custom middleware into the request pipeline
+	- define an action that will be run on any GET to a particular type (e.g. for
+		authenticated access to particular types)
+	- define a POST method for individual types
+	- define multiple mini-applications per type (e.g. to allow for commenting)
+- Powerful access control levels control who can do what
+- Embed custom admin applications into the CMS backend
+
+### Aims
+
+The ultimate aim of Spontaneous is to be a CMS system capable of adapting to and
+even leading the progress of the internet.
+
+Publishing HTML pages is not enough, which is why the concept of multiple outputs
+has been baked into the system right from the start.
+
+Eventually owners of a Spontaneous site will not only be able to publish their
+ideas to HTML pages but also use the same content to generate a EPUB & MOBI
+e-books, print quality PDFs to send to a printer and proprietry XML or JSON data
+for consumption by magazine applications running on tablets.
+
+### Roadmap
+
+#### v1
+
+- **Documentation**
+- Finish abstraction of rendering 'filesystem' to allow for rendering to distributed
+	key-value stores (WIP)
+- Separate the storage configuration from the media filesystem
+- Allow configuration of Sprockets to use the defined storage settings
+- Abstract the search interface to allow for use of other indexing systems apart
+	from Xapian (e.g. Elasticsearch, Lucene etc)
+- Support deployment to Heroku (removal of any persisent storage on the filesystem)
+- Asynchronous, long-running field processing including integration with external
+	web-services including callbacks (with transcoding of video through Zencoder
+	as an example usage)
+- Copy-paste to move pages & pieces around within the site
+- Undo
+- Archive not delete, including restoration of deleted content
+- Revert field to previous version
+- Revert page to published version
+- Scheduled publishing
+- Allow for per-type additions to the user interface
+
+#### Future
+
+- Re-write the UI using web-components and ES6
+- Back up the new UI with a full suite of integration tests
+
+
+## Example
 
 A Spontaneous site is composed of pages. Within those pages are zero or more 'Boxes'. Each of those Boxes can be configured to accept the addition of zero or more types of object. These object types can either be Pages -- creating a page hierarchy -- or Pieces that are displayed as the page's content.
 
@@ -125,43 +211,21 @@ This will generate the following interface for the site editors:
 
 <img src="https://github.com/SpontaneousCMS/spontaneous/raw/master/docs/recipe-interface-screenshot.png" alt="Spontaneous interface" width="800" height="577" />
 
-, meaning that as well as writing copy and selecting images
-the person writing the page also has to spend a lot of effort on the layout of
-the page.
-each of which will be laid out
-automatically into pre-defined templates, leaving the editor to concentra
-
-The only difference between a 'page' and a 'piece' is that pages are directly
-publicly accessible through a URL, whereas pieces are only visible within the
-context of a page.
-
-
-Each of the objects in the content hierarchy -- pages, boxes & pieces -- can
-have zero or more fields. These are where the actual content of the site, such
-as text or images, will be entered by the site editors.
-
-Each
-or 'piece' has zero or more 'boxes' defined. Each of those boxes can be
-configured to accept the addition of zero or more types of page or piece
-
-
-The creation of the various relationships is done using normal Ruby code. Every
-element in the content hierarchy has an associated Ruby class which has
-configuration information about the fields
-
 ## GETTING STARTED
 
-Install RVM
+**Install RVM**
 
 		curl -L get.rvm.io | bash -s stable
 		source ~/.rvm/scripts/'rvm'
 		rvm requirements
 
-Install Ruby
+**Install Ruby**
+
+Spontaneous needs ruby >= 1.9.3 and Ruby >= 2.0 is preferred
 
-		rvm install 1.9.3
+		rvm install 2.1.1
 
-Install Spontaneous
+**Install Spontaneous**
 
 		gem install spontaneous
 
@@ -173,3 +237,6 @@ Now generate your site. Replace example.com with the domain of your site.
 		spot init
 		spot server
 
+and get started hacking the schema for your site...
+
+

data/application/css/core.css.scss

@@ -626,9 +626,11 @@ img.missing {
 
 	.slot-tabs {
 		@extend .clearfix;
-		height: 32px;
+		min-height: 32px;
 		vertical-align: top;
 		@include vertical-gradient(#666666, #4d4d4d);
+		padding-left: $container-padding;
+		padding-right: $container-padding;
 		li {
 			@include box-sizing;
 			@include interface;
@@ -636,9 +638,11 @@ img.missing {
 			color: #dddddd;
 			display: block;
 			float: left;
-			height: 100%;
+			height: 32px;
 			padding-left: 16px;
-			width: 160px;
+			padding-right: 16px;
+			min-width: 130px;
+			max-width: 160px;
 			padding-top: 9px;
 			cursor: pointer;
 			border-left: solid 1px transparent;
@@ -660,14 +664,26 @@ img.missing {
 			}
 		}
 		li:first-child {
-			padding-left: $container-padding;
-			width: 160px + $container-padding;
+			padding-left: 0;
+			// width: 160px + $container-padding;
 			&.active {
 				.down {
 					padding-left: $container-padding;
 				}
 			}
 		}
+		li:hover:first-child:before,
+		li.active:first-child:before {
+			@include vertical-gradient($highlight + #111111, $highlight);
+			background-color: $highlight;
+			content: "";
+			position: absolute;
+			width: $container-padding;
+			height: 32px;
+			// outline: solid 1px red;
+			left: -$container-padding - 1;
+			top: 0;
+		}
 		li.active + li:hover {
 			border-left-color: $highlight - #151515;
 		}
@@ -997,6 +1013,8 @@ img.missing {
 				margin-right: 1px;
 				width: 100%;
 				background: none;
+				padding-left: 0;
+				padding-right: 0;
 				li {
 					@include box-sizing;
 					@include interface;
@@ -1012,8 +1030,10 @@ img.missing {
 					color: #666666;
 					// color: #f2f2f2;
 				}
-				li:first-child {
+				li:first-child:before {
 					// @include rounded-top-left;
+					// padding-left: 0;
+					display: none;
 				}
 				li:nth-child(4) {
 					// @include rounded-top-right;
@@ -1055,7 +1075,7 @@ img.missing {
 				a {
 					@include button(#6b6b6b);
 					// background-color: #6b6b6b;
-					padding-left: 8px;
+					padding-left: 16px;
 					padding-right: 8px;
 					& + a {
 						margin-left: $unit;

data/application/css/editing.css.scss

@@ -235,18 +235,14 @@ $text-edit-width: 621px;
         }
       }
 			.actions {
-				margin: 0px;
-				margin-left: 0;
-				position: absolute;
-				top: 0;
-				right: 0;
-				width: 60px;
+				margin: 8px 0 0 0;
 				.button {
 					display: block;
 				}
 				.button.clear {
-					color: #5b5b5b;
-					background-color: #d1d1d1;
+					@include button-color($highlight, $action);
+					// color: #5b5b5b;
+					// background-color: #d1d1d1;
 					width: 100%;
 				}
 			}
@@ -274,24 +270,6 @@ $text-edit-width: 621px;
 			.landscape {
 				img {
 					max-width: 200px;
-					// max-height: 100px;
-				}
-				.actions {
-					width: auto;
-					display: block;
-					margin: 8px 0 0 0;
-					position: relative;
-					.button {
-						display: inline-block;
-						width: 109px;
-					}
-					.button.clear {
-						position: static;
-					}
-					.button.change {
-						position: absolute;
-						right: 0;
-					}
 				}
 			}
 		}

data/application/css/schema_error.css.scss

@@ -1,4 +1,5 @@
 @import "definitions.css.scss";
+@import "font.css.scss";
 
 body#schema-error {
 	@extend .meta-background;
@@ -64,6 +65,21 @@ body#schema-error {
 				}
 			}
 
+			.warning {
+				font-size: 0.9em;
+				margin-bottom: 0.5em;
+				padding-bottom: 0;
+				color: #888;
+				position: relative;
+			}
+			.warning:before {
+				font-family: 'FontAwesome';
+				content: "\f071";
+				color: $highlight;
+				position: absolute;
+				left: -12px;
+				font-size: 1.1em;
+			}
 		}
 		li:last-child {
 			margin-bottom: 0;
@@ -87,4 +103,10 @@ body#schema-error {
 			}
 		}
 	}
+	code {
+		font-size: 0.9em;
+		background-color: rgba(255, 255, 255, 0.1);
+		padding-left: 4px;
+		padding-right: 4px;
+	}
 }