spontaneous 0.2.0.beta9 → 0.2.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c521e3b9b35cfba180daf3fcc24894af352ca2eb
-  data.tar.gz: 5f3fb38da829759b10dd33a2b4224a7bae9dfbdc
+  metadata.gz: 75f4d83b1920a348269f6d51f4060015a6f567fd
+  data.tar.gz: ef4257ad7ada51eed31e316efb5f712ee77be7ba
 SHA512:
-  metadata.gz: c82fea8cd02838425f8f20eb2b21eab9ae3084414dcce39c1d72351e5292d7c9d09483729a9610e2e66cabedeb8bf7afb70570110b0582515ba87ae27e8b2d82
-  data.tar.gz: 2f1a515a14f373b3535c864084529894d12878d8601b5c2f86e99267342816a30989acf5b0dd479369c0301ee56134b7996eb286304029d509715876f93166fe
+  metadata.gz: d8874945d474270fd5c73d376f65d2b31385a0d14c33d386bb55c3f61ae6495e28ffd70d64fe9aaa366f94f17347f4be3dd713a293a213ef0aa1849111c88395
+  data.tar.gz: 7c58d0ef193f9f709563eb6c1c34e33dacbb3823169d9b377714386d7aacd9b943f9d6c0ce59f007e6f75ae3b843e23469e1f00e8f6e814b908e67395f1ddc38

data/CHANGELOG.md

@@ -1,3 +1,64 @@
+## 0.2.0.beta10, released 2015-03-20
+
+Is it wise to release a new version during a solar eclipse?
+
+#### New Features
+
+- Enabled previewing of private pages within the CMS. Previously this would
+  invoke some Inception-like preview-within-preview loop
+
+- Boxes can now define a `path_origin` function that returns a `Content::Page` instance or a string which sets the root path for all pages added to it. This allows for your content & path hierarchies to differ (e.g. having child pages of the `/bands` page, e.g. `/bands/the-beatles` appear publicly at the root of the site i.e. `/the-beatles`).
+
+- Page types can set a custom default slug root so that instead of being added as `page-YMD-HMS` they can be configured to default to `something-YMD-HMS` by overriding the value returned by `Content::Page#default_slug_root`.
+
+- You can now get a list of content ids for a box using the `Box#ids` method
+
+- The db connection can now be set using a `DATABASE_URL` env setting
+
+- File and Image fields now generate their URLs dynamically. In the case of cloud hosted media this means you can change the way you address the media without having to regenerate the values e.g. in the case that you move from a direct S3 bucket to a CDN. You can also use any object that responds to `#call(path)` to generate the URLs which opens the door to splitting your media across multiple asset hosts.
+
+- Pages can now declare 'wildcard' routes without namespaces which makes them more like standard controllers. E.g. declaring 
+    
+        controller do
+          get '/wibble/:id' do ... end
+        end
+
+    will allow a page mounted at `/womble` to accept requests to `/womble/wibble/23` etc.
+
+- The publish dialogue now has a `Rerender` button that allows developers to re-render the site without publishing any content in the case of a template/asset change. Great if you need to push a fix but don't want to wait for or force the editors to publish something.
+
+- You can now configure some default options for rendering image fields (and the default output for `${ image }` no longer includes the width & height by default (we’re responsive now, right?)).
+
+#### Misc
+
+- JSON de/en-coding is now handled by [Oj](https://github.com/ohler55/oj) not [Yajl](https://lloyd.github.io/yajl/) after some informal testing showed a ~50% speed improvement.
+- The site initialization has been re-written to improve clarity & reliability
+- Capistrano tasks can now be configured to use a custom binary for `rake` and `spot` commands
+- Boxes now have a `#clear!` method to remove all their contents
+- `Content#/` is an alias for `#get` by id
+- The db timezone is set to UTC which results in some improved performance
+- `Site#inspect` output is less mad
+- The asset serving in preview mode has been moved before the authentication checks so we aren't running hundreds of db calls just to return some JS and images.
+- The sprockets context has been given some Rails-compatible methods to help with using 3rd party sprockets plugins, e.g. `sprockets-less`.
+- Select fields can now have a default value set
+- Video fields now have an `aspect_ratio` method
+- `spot site rerender` is an alias for `spot site render`
+
+#### Fixes
+
+- Front server no longer needs restarting to pick up a new revision in development mode (https://github.com/SpontaneousCMS/spontaneous/issues/47)
+- Fixed entry deletion confirmation popup
+- `Array#render` now calls `render_inline` rather than `render` so that rendering an array of pages doesn’t do mad things.
+- The postgres database dumper/loader now works with custom hosts and ports and correctly authenticates itself when password authentication is in place
+- File & image fields `#blank?` methods now work correctly (and are aliased as `#empty?`)
+- Removed broken render context implementations of `#first?` and `#last?`
+- `spot site init` ensures that the `log` & `tmp` directories exist
+- Don't try to set encoding values when there's no content-type header returned
+- `asset-data-uri` is now correctly wrapping the result in a `url()` declaration.
+- Displaying exceptions in development preview now works
+- Second level boxes now correctly show an 'add' toolbar below the last entry
+- The 'no changes' message is now a more pleasing size & the spinner goes away
+
 ## 0.2.0.beta9, released 2014-10-30
 
 #### Fixes

data/LICENSE

@@ -1,20 +1,21 @@
-Copyright (c) 2011-2013 Garry Hill <garry@magnetised.net>
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2011-2014 Garry Richard Hill
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -28,7 +28,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.ruby_opts << '-rubygems'
-  test.pattern = 'test/{unit,functional,experimental}/test_*.rb'
+  test.pattern = 'test/{unit,functional,experimental}/**/test_*.rb'
   test.verbose = false
 end
 

data/application/css/core.css.scss

@@ -1203,7 +1203,7 @@
 				}
 				&:last-child  {
 					.entry-spacer {
-						display: none;
+						// display: none;
 					}
 					.content-type {
 						bottom: $content-type-offset;

data/application/css/dialogue.css.scss

@@ -84,7 +84,7 @@ $dialogue-title-height: 32px;
 						float: right;
 					}
 					.disabled, .disabled:hover {
-						background-color: #333333 !important;
+						@include button-color(#333, #333);
 						color: #6b6b6b !important;
 					}
 				}
@@ -142,6 +142,12 @@ $dialogue-title-height: 32px;
 #dialogue-wrap #dialogue-outer.publishing {
 	left: 5%;
 	right: 5%;
+	.dialogue-actions {
+		.button.rerender {
+			position: absolute;
+			left: 0;
+		}
+	}
 }
 
 #publishing-dialogue {
@@ -251,25 +257,7 @@ $dialogue-title-height: 32px;
 		font-size: 24px;
 		padding-top: 24px;
 		color: #fff;
-		// margin: $container-padding / 2;
-		// margin-top: 0;
-		// .publish-all {
-			// 	@include button(#666);
-			// 	@include interface;
-			// 	width: 128px;
-			// 	float: right;
-			// 	text-align: left;
-			// 	// background-color: #666666;
-			// 	input {
-				// 		margin: 1px 8px 0 8px;
-				// 		padding: 0;
-				// 		vertical-align: top;
-				// 		position: relative;
-			// 	}
-		// }
-		// .publish-all.checked {
-			// 	background-color: $action;
-		// }
+		max-height: 55px;
 	}
 	.change-set {
 		cursor: pointer;

data/application/js/preview.js

@@ -1,7 +1,7 @@
 // console.log('Loading Preview...');
 
 Spontaneous.Preview = (function($, S, $window) {
-	var dom = S.Dom, goto_id = 0;
+	var dom = S.Dom, goto_id = 0, Ajax = S.Ajax;
 	var click_param = function() {
 		return '?__click='+(++goto_id);
 	};
@@ -31,13 +31,16 @@ Spontaneous.Preview = (function($, S, $window) {
 				if (currentLocation !== location) {
 					location = currentLocation;
 					S.Preview.set({
-						'title': iframe.contentWindow.document.title,
-						'path': iframe.contentWindow.location.pathname
+						'title': icw.document.title,
+						'path': icw.location.pathname
 					});
 					$(icw).bind('unload', function(e) {
 						// trigger a progress indicator here
 					});
-					S.Location.load_path(iframe.contentWindow.location.pathname);
+					// don't load the page details into the top-bar if we're viewing a private page
+					if (preview.pathIsPublic(icw.location.pathname)) {
+						S.Location.load_path(icw.location.pathname);
+					}
 				}
 			};
 
@@ -48,18 +51,36 @@ Spontaneous.Preview = (function($, S, $window) {
 					preview.previewPathMonitor = $window.setInterval(monitor, monitorInterval);
 				}
 			});
-			this.goto_path(path);
+			this._goto_page(page, path)
+		},
+		pathIsPublic: function(path) {
+			return (path.indexOf([Ajax.namespace, 'private'].join('/')) === -1)
 		},
 		goto_path: function(path) {
 			if (path) {
 				// path += click_param();
-				this.iframe[0].contentWindow.location.href = path;
+				this.load_url(path);
+			}
+		},
+		goto_private: function(page) {
+			if (page) {
+				this.load_url([Ajax.namespace, 'private', page.id].join('/'));
 			}
 		},
+		load_url: function(url) {
+				this.iframe[0].contentWindow.location.href = url;
+		},
 		goto_page: function(page) {
 			var current = this.get('path');
 			if (!current || (page && (page.path !== current))) {
-				this.goto_path(page.path);
+				this._goto_page(page, page.path)
+			}
+		},
+		_goto_page: function(page, path) {
+			if (page && page.private) {
+				this.goto_private(page);
+			} else {
+				this.goto_path(path);
 			}
 		},
 		hide: function() {

data/application/js/publish.js

@@ -1,7 +1,7 @@
 // console.log('Loading Publishing...')
 
 Spontaneous.Publishing = (function($, S) {
-	var dom = S.Dom, Dialogue = Spontaneous.Dialogue;
+	var dom = S.Dom, Dialogue = Spontaneous.Dialogue, User = S.User;
 
 	var PublishingDialogue = new JS.Class(Dialogue, {
 		initialize: function(content) {
@@ -50,6 +50,9 @@ Spontaneous.Publishing = (function($, S) {
 		},
 		buttons: function() {
 			btns = {};
+			if (User.is_developer()) {
+				btns['Rerender'] = this.rerender.bind(this);
+			}
 			btns['Publish'] = this.publish.bind(this);
 			return btns;
 		},
@@ -64,6 +67,9 @@ Spontaneous.Publishing = (function($, S) {
 			}
 		},
 
+		rerender: function() {
+			Spontaneous.Ajax.post('/changes/rerender', {}, this.publish_requested.bind(this));
+		},
 
 		publish_requested: function() {
 			Spontaneous.TopBar.publishing_started();
@@ -78,7 +84,12 @@ Spontaneous.Publishing = (function($, S) {
 			, publish_wrap = dom.div('#to-publish.change-list').css('opacity', 0)
 			, must_publish_all = outstanding.first_publish || outstanding.must_publish_all
 			, spinner = this.spinner
-			, append_to;
+			, spinnerWrap = this.spinnerWrap
+			, append_to
+			, stop_spinner = function() {
+				spinner.stop();
+				spinnerWrap.remove();
+			};
 			if (must_publish_all) {
 				w.addClass('first-publish');
 			}
@@ -86,6 +97,7 @@ Spontaneous.Publishing = (function($, S) {
 				var summary = dom.p('.publish-up-to-date').text('The site is up to date');
 				w.append(summary);
 				self.disable_button('Publish');
+				stop_spinner();
 			} else {
 				var publish_all = dom.a('.button').text('Publish All').click(function() {
 					self.set_publish_all(true);
@@ -114,8 +126,7 @@ Spontaneous.Publishing = (function($, S) {
 				if (!must_publish_all) {
 					publish_entries.append(dom.div('.instructions').text('Add pages to publish from the list on the left'));
 				}
-				spinner.stop();
-				this.spinnerWrap.remove();
+				stop_spinner();
 				w.empty();
 				w.append(changed_wrap, publish_wrap);
 				changed_wrap.add(publish_wrap).velocity({opacity: 1});

data/application/js/top_bar.js

@@ -468,22 +468,6 @@ Spontaneous.TopBar = (function($, S) {
 			var children_node = new ChildrenNode(location);
 			self.location.append(children_node.element());
 			self.children_node = children_node;
-			self.updateModeCompatibility(location);
-		},
-		updateModeCompatibility: function(location) {
-			var self = this;
-			if (location.private) {
-				self.previewModeDisabled = true;
-				self.mode_switch.addClass('disabled');
-			} else {
-				self.previewModeDisabled = false;
-				self.mode_switch.removeClass('disabled');
-			}
-			if (self.previewModeDisabled) {
-				this.topBar.set_mode('edit');
-			} else {
-
-			}
 		},
 		page_loaded: function(page) {
 			var self = this, children_node = self.children_node;

data/application/js/views/piece_view.js

@@ -181,7 +181,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 				this.fields_preview.removeClass('hover');
 			}
 		},
-		confirm_destroy: function() {
+		confirm_destroy: function(event) {
 			if (this._dialogue && !this._dialogue.is_open) { this.close_destroy_dialogue(); }
 			if (!this._dialogue) {
 				this._dialogue = Spontaneous.Popover.open(event, new ConfirmDeletePopup(this));

data/lib/spontaneous/asset/environment.rb

@@ -38,12 +38,23 @@ module Spontaneous::Asset
 
     module SassFunctions
       def asset_data_uri(path)
-        Sass::Script::String.new(sprockets_context.asset_data_uri(path.value))
+        uri = sprockets_context.asset_data_uri(path.value)
+        Sass::Script::String.new("url(#{uri})")
       end
     end
 
     ::Sass::Script::Functions.send :include, SassFunctions
 
+    module RailsCompatibilityShim
+      # actually more a sprockets-less compatibility shim
+      def compute_public_path(path, root = nil)
+        asset_path(path)
+      end
+
+      def asset_paths
+        self
+      end
+    end
 
     class Preview
       attr_reader :environment, :site
@@ -83,6 +94,8 @@ module Spontaneous::Asset
             Spontaneous::Asset::Environment.join_asset_path(make_absolute(asset.logical_path), query, fragment)
           end
 
+          include RailsCompatibilityShim
+
           def make_absolute(logical)
             "/" << self.class.asset_mount_point << "/" << logical
           end
@@ -294,6 +307,8 @@ module Spontaneous::Asset
             Spontaneous::Asset::Environment.join_asset_path(make_absolute(asset), query, fragment)
           end
 
+          include RailsCompatibilityShim
+
           def make_absolute(logical)
             "/" << self.class.asset_mount_point << "/" << logical
           end

data/lib/spontaneous/box.rb

@@ -223,6 +223,8 @@ module Spontaneous
       resolve_style(self)
     end
 
+    # Container represents the object one level up from us,
+    # which in this case is the parent Content instance.
     def container
       owner
     end
@@ -231,10 +233,62 @@ module Spontaneous
       owner
     end
 
+    # A pointer to the containing page. This may not be the same as the
+    # `owner` of the box in the case where the box is owned by a Piece.
     def page
       owner.page
     end
 
+    # A convenience method to return the root of the page tree
+    def root
+      page.root
+    end
+
+    def site
+      owner.site
+    end
+
+    # Used to determine the page to use to define the path of any
+    # contained pages.
+    #
+    # Overwrite this to set up custom paths for pages.
+    #
+    # It can either return a page instance (in which case
+    # child pages will be based on the #path of the returned
+    # instance) or a string (which will form the root of the
+    # generated paths:
+    #
+    #     Page.box :sections
+    #
+    #     Page.box :custom do
+    #       def path_origin
+    #         root
+    #       end
+    #     end
+    #
+    #     home = Page.create # set up a new site homepage
+    #     section = Page.create(slug: 'a-section')
+    #     home.sections << section # add section page to the root
+    #     section.custom.path_origin.path #=> "/"
+    #
+    #     child = Page.create(slug: 'child')
+    #     section.custom << child
+    #     child.path #=> "/child" # this would normally be "/a-section/child"
+    #
+    def path_origin
+      page
+    end
+
+    # This is used by new pages to generate the path component of the container.
+    def path!
+      case (origin = path_origin)
+      when @owner.content_model
+        origin.path!
+      else
+        origin.to_s
+      end
+    end
+
     alias_method :to_page, :page
 
     def depth
@@ -275,6 +329,14 @@ module Spontaneous
       @modified
     end
 
+    # Returns a list of the ids of the content within the box
+    #
+    # This is designed to be fast by not requiring the actual
+    # loading of the box contents.
+    def ids
+      owner.contents.ids(self)
+    end
+
     def contents
       owner.contents.for_box(self)
     end
@@ -297,6 +359,12 @@ module Spontaneous
       end
     end
 
+    def clear!
+      contents.dup.each do |entry|
+        entry.destroy
+      end
+    end
+
     def empty?
       contents.count == 0
     end