spud_cms 0.8.17 → 0.9.0

data/README.markdown

@@ -2,37 +2,34 @@ Spud CMS
 ========
 
 Spud CMS is a CMS Engine designed to be robust, easy to use, and light weight.
-NOTE: This project is still in its early infancy.
+
 
 Installation/Usage
 ------------------
 
 1. In your Gemfile add the following
 
-		gem 'spud_core', :git => "git://github.com/davydotcom/spud_core_admin.git"
-		gem 'spud_cms', :git => "git://github.com/davydotcom/spud_cms.git"
+		gem 'spud_cms'
 
 2. Run bundle install
 3. Copy in database migrations to your new rails project
 
-		bundle exec rake spud_core:install:migrations
-		bundle exec rake spud_cms:install:migrations
+		bundle exec rake railties:install:migrations
 		rake db:migrate
 4. Change ApplicationController to inherit from Spud::ApplicationController instead of ActionController::Base
 
 		class ApplicationController < Spud::ApplicationController
-		
+
 5. run a rails server instance and point your browser to /spud/admin
 
 Routing to the CMS Engine
 --------------------------
 Routing your home page to the CMS engine is fairly straight forward.
-in your applications environment.rb file add a configure block as such
+in your applications application.rb file add a configure block as such
 
 
 		Spud::Cms.configure do |config|
 			config.menus_enabled = true
-			config.templates_enabled = false
 			config.root_page_name = "home"
 		end
 
@@ -42,15 +39,35 @@ Where "home" is the page name you wish to use.
 
 Pages will default render to the 'application' layout of your application. You can change this by using templates to specify base layouts.
 
+Defining Templates / Layouts
+----------------------------
+Spud CMS has recently changed its template structure. The admin templates area is no longer with us. In Spud CMS templates are defined similar to how an asset pipeline manifest is defined. At the top of your layout files a series of comments can be used to define the name of the template, and the content_for blocks that are editable by the user.
+
+Example:
+
+    <%
+    #template_name: 2 Column Page
+    #html: Left
+    #html: Right
+    %>
+
+Optionally a description can be passed as well as a `site_name: default` for multisite mode.
+
+
+Using Liquid Template Engine
+----------------------------
+Spud CMS utilizes the liquid template syntax engine created by Shopify. This allows you to easily inject variables into your pages in the page editor. Example:
+
+    <h2>{{page.name}}</h2>
+
 Using Menus
 -----------
 A lot of cms engines allow you to render your navigation links in a ul block by using your page tree structure. In a lot of cases this is insufficient as some sites have urls that redirect to pages outside of your cms. This is where menus come in. They can be built in the spud admin control panel.
 In your application layout file or any erb template you can render a ul block like so
-		
-		<%=sp_list_menu({:id => "navigation",:name => "Main"})%>
-		
-This will output a <ul id="navigation"></ul> block for the menu you created in admin named "Main"
 
+    <%=sp_list_menu({:id => "navigation",:name => "Main"})%>
+
+This will output a <ul id="navigation"></ul> block for the menu you created in admin named "Main"
 
 Adding Your Own Engines
 -----------------------
@@ -75,7 +92,7 @@ Testing
 Spud uses RSpec for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
-   
+
         rake db:create
         rake db:migrate
 

data/app/assets/javascripts/spud/admin/cms/application.js

@@ -11,17 +11,17 @@
 $(document).ready(function() {
 	// initWysiwym();
 	initTinyMCE();
-	$("#spud_page_template_id").bind('change', function() {
+	$("#spud_page_layout").bind('change', function() {
 		var $this = $(this);
 		$.get($this.attr("data-source"), { template: $this.val() }, function(data) {
-			$('.formtabs').tabs('destroy');
+			// $('.formtabs').tabs('destroy');
 
 
 			$('textarea.tinymce').each(function() {$(this).tinymce().execCommand('mceRemoveControl',false,this.id)});
 			$("#page_partials_form").replaceWith(data)
 			initFormTabs();
 			initTinyMCE();
-			// initWysiwym();
+
 		}, 'text').error(function(jqXHR) {
 			$('<p> Error: ' + jqXHR.responseText + '</p>').dialog();
 		});

data/app/controllers/pages_controller.rb

@@ -1,12 +1,10 @@
 class PagesController < ApplicationController
-	caches_action :show, :if => Proc.new { |c| Spud::Cms.enable_action_caching }
+	caches_action :show, :if => Proc.new { |c| Spud::Cms.cache_mode == :action }
 
 	respond_to :html
 
-	# caches_page :show, :if => Proc.new { |c| Spud::Cms.enable_full_page_caching }
 	after_filter({:only => [:show]}) do |c|
-		return if !Spud::Cms.enable_full_page_caching
-		if @page && @page.is_private? == false
+		if Spud::Cms.cache_mode == :full_page && @page && @page.is_private? == false
 	    c.cache_page(nil, nil, false)
 		end
   end
@@ -29,7 +27,7 @@ class PagesController < ApplicationController
 			end
 		end
 
-		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_template,:spud_page_partials])
+		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_page_partials])
 
 		# MultiSite Code Block
 		if Spud::Core.multisite_mode_enabled
@@ -51,25 +49,16 @@ class PagesController < ApplicationController
 				redirect_to @permalink.attachment.url_name == Spud::Cms.root_page_name ? root_url() : page_url(:id => @permalink.attachment.url_name) , :status => :moved_permanently and return
 			end
 
-			# flash[:error] = "Page not found"
-			# if !params[:id].blank?
-			# 	redirect_to root_url() and return
-			# else
-			# 	return
-			# end
+
 			render_404
 			return
 		end
 
 		if @page.is_private?
-			if defined?(require_user) && require_user == false
-				logger.debug("responds to require user!")
-				return
-			end
-			logger.debug("does not!")
+			return if defined?(require_user) && require_user == false
 		end
 
-		layout = Spud::Cms.default_page_layout
+		layout = @page.layout || Spud::Cms.default_page_layout
 
 		# MultiSite Code Block
 		if Spud::Core.multisite_mode_enabled && !site_config.blank?
@@ -77,12 +66,6 @@ class PagesController < ApplicationController
 			layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
 		end
 
-		if !@page.spud_template.blank?
-			if !@page.spud_template.base_layout.blank?
-				layout = @page.spud_template.base_layout
-			end
-			@inline = @page.spud_template.content
-		end
 
 		render :layout => layout
 

data/app/controllers/spud/admin/menu_items_controller.rb

@@ -1,19 +1,18 @@
 class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	add_breadcrumb "Menus", :spud_admin_menus_path
-	belongs_to_spud_app :menus
-	layout 'spud/admin/cms/detail'
+	belongs_to_spud_app :menus, :page_title => "Menu Items"
+	layout 'spud/admin/detail'
 	before_filter :load_menu
 	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy,:reorder]
-	cache_sweeper :page_sweeper,:only => [:create,:update,:destroy]
+
+
 	def index
-		@page_name = "Menu Items"
 		@menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items)
 		respond_with @menu_items
 	end
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_page_path
-		@page_name = "New Menu Item"
 
 		@menu_item = @menu.spud_menu_items.new
 		respond_with @menu_item
@@ -22,7 +21,6 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	def create
 
 		add_breadcrumb "New", :new_spud_admin_page_path
-		@page_name = "New Menu Item"
 		@menu_item = SpudMenuItem.new(params[:spud_menu_item])
 		@menu_item.spud_menu_id = @menu.id
 		if params[:spud_menu_item][:parent_id].blank?
@@ -49,7 +47,6 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 
 	def edit
 		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
-		@page_name = "Edit #{@menu_item.name}"
 		if @menu_item.parent_type == "SpudMenu"
 			@menu_item.parent_id = nil
 		end
@@ -59,7 +56,6 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	def update
 
 		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
-		@page_name = "Edit #{@menu_item.name}"
 		if params[:spud_menu_item][:parent_id].blank?
 			params[:spud_menu_item][:parent_type] = "SpudMenu"
 			params[:spud_menu_item][:parent_id] = @menu.id
@@ -92,7 +88,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 private
 	def load_menu
 
-		@menu = SpudMenu.find(params[:menu_id])
+		@menu = SpudMenu.where(:id => params[:menu_id]).first
 
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
@@ -105,7 +101,7 @@ private
 	end
 
 	def load_menu_item
-		@menu_item = SpudMenuItem.find(params[:id])
+		@menu_item = SpudMenuItem.where(:id =>params[:id]).first
 		if @menu_item.blank?
 			flash[:error] = "Menu Item not found!"
 			redirect_to spud_admin_menu_menu_items_url() and return false

data/app/controllers/spud/admin/menus_controller.rb

@@ -43,7 +43,7 @@ class Spud::Admin::MenusController < Spud::Admin::CmsController
 
 private
 	def load_menu
-		@menu = SpudMenu.site(session[:admin_site]).where(:id => params[:id]).first
+		@menu = SpudMenu.where(:id => params[:id]).first
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to spud_admin_menus_url() and return false

data/app/controllers/spud/admin/pages_controller.rb

@@ -1,41 +1,36 @@
 class Spud::Admin::PagesController < Spud::Admin::CmsController
-	layout 'spud/admin/cms/detail'
+	layout 'spud/admin/detail'
 	add_breadcrumb "Pages", :spud_admin_pages_path
 	belongs_to_spud_app :pages
 	before_filter :load_page,:only => [:edit,:update,:show,:destroy]
-	cache_sweeper :page_sweeper,:only => [:update,:destroy]
+
 	def index
 
 		@pages = SpudPage.site(session[:admin_site]).where(:spud_page_id => nil).order(:page_order).includes(:spud_pages).paginate :page => params[:page]
+
+    home_page = SpudPage.where(:url_name => Spud::Cms.root_page_name).first
+    if home_page.blank?
+      flash.now[:warning] = "You have not setup your default CMS page. This page will be your homepage. To do so, create a page with the name '#{Spud::Cms.root_page_name.titlecase}'"
+    end
+
 		respond_with @pages
 	end
 
 	def show
-		layout = Spud::Cms.default_page_layout
+		layout = @page.layout || Spud::Cms.default_page_layout
+
 
-		if !@page.spud_template.blank?
-			if !@page.spud_template.base_layout.blank?
-				layout = @page.spud_template.base_layout
-			end
-			@inline = @page.spud_template.content
-		end
 		render :layout => layout
 	end
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_page_path
 
+    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
+    layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
+		@page = SpudPage.new(:layout => layout)
+		parts = layout_info[:partials]
 
-		@templates = SpudTemplate.all
-		@page = SpudPage.new
-		parts = Spud::Cms.default_page_parts
-		if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
-			site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
-			if !site_config.blank?
-				cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
-				parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
-			end
-		end
 		parts.each do |part|
 			@page.spud_page_partials.new(:name => part.strip)
 		end
@@ -58,28 +53,20 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 		add_breadcrumb "#{@page.name}", :spud_admin_page_path
 		add_breadcrumb "Edit", :edit_spud_admin_page_path
 
-		@templates = SpudTemplate.all
-		if @page.spud_page_partials.blank?
-			parts = Spud::Cms.default_page_parts
-			if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
-				site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
-				if !site_config.blank?
-					cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
-					parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
-				end
-			end
-			parts.each do |part|
-				@page.spud_page_partials.new(:name => part.strip)
-			end
-		end
-		if !@page.spud_template.blank?
-			@page.spud_template.page_parts.split(",").each do |part|
-				partial = @page.spud_page_partials.select{|p| p.name == part.strip}
-				if partial.blank?
-					@page.spud_page_partials.new(:name => part.strip)
-				end
-			end
+    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
+    layout, layout_info = layouts.select{|k,v| k == @page.layout}.flatten  if @page.layout.blank? == false
+    if layout.blank?
+      layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
+    end
+		@page.layout = layout
+
+		layout_info[:partials].each do |part|
+			partial = @page.spud_page_partials.select{|p| p.name == part.strip}
+      if partial.blank?
+        @page.spud_page_partials.new(:name => part.strip)
+      end
 		end
+
 	end
 
 	def update
@@ -100,19 +87,8 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	end
 
 	def preview
-		# @page = SpudPage.new(params[:spud_page])
-		# @page.site_id = session[:admin_site]
-		layout = 'application'
-
-
-		if !@page.spud_template.blank?
-			if !@page.spud_template.base_layout.blank?
-				layout = @page.spud_template.base_layout
-			end
-			@inline = @page.spud_template.content
-		end
+    layout = @page.layout || Spud::Cms.default_page_layout
 		render :action => :show,:layout => layout
-
 	end
 
 	def destroy
@@ -131,32 +107,28 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	end
 
   def page_parts
-    template =  params[:template] && !params[:template].blank? ? SpudTemplate.where(:id => params[:template]).first : nil
+    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
+    template =  params[:template] && !params[:template].blank? ? layouts[params[:template]] : nil
     page = SpudPage.where(:id => params[:page]).includes(:spud_page_partials).first
     page = SpudPage.new if page.blank?
     old_page_partials = Array.new(page.spud_page_partials)
     new_page_partials = []
-    if !template.blank? && !template.page_parts.blank?
-      template.page_parts.split(',').each do |page_part|
+    if !template.blank?
+      template[:partials].each do |page_part|
         new_page_partials << page.spud_page_partials.build(:name => page_part.strip)
       end
     else
-    	parts = Spud::Cms.default_page_parts
-			if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
-				site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
-				if !site_config.blank?
-					cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
-					parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
-				end
-			end
-    	parts.each do |part|
-			new_page_partials << page.spud_page_partials.build(:name => part)
-		end
-
+      layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
+      page.layout = layout
+    	layout_info[:partials].each do |part|
+  			new_page_partials << page.spud_page_partials.build(:name => part)
+  		end
     end
     new_page_partials.each do |partial|
       old_partial = old_page_partials.select {|pp| partial.name.strip.downcase == pp.name.strip.downcase }
+      logger.debug "testing content swap"
       partial.content = old_partial[0].content if !old_partial.blank?
+      logger.debug partial.content
     end
 
     respond_to do |format|
@@ -170,25 +142,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
     end
   end
 
-  def clear
-  	Rails.cache.clear
-	SpudPage.site(session[:admin_site]).published_pages.all.each do |record|
-		if Spud::Cms.enable_full_page_caching
-    		if record.url_name == Spud::Cms.root_page_name
-	        	expire_page root_path
-		    else
-  				expire_page page_path(:id => record.url_name)
-  			end
-    	elsif Spud::Cms.enable_action_caching
-    		if record.url_name == Spud::Cms.root_page_name
-	        	expire_action root_path
-		    else
-				expire_action page_path(:id => record.url_name)
-			end
-		end
-	end
-	redirect_to spud_admin_pages_url
-  end
+
 
 private
 	def load_page

data/app/controllers/spud/cms/sitemaps_controller.rb

@@ -5,7 +5,7 @@ class Spud::Cms::SitemapsController < Spud::ApplicationController
 		@pages = SpudPage.published_pages.public.order(:spud_page_id)
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			@pages = @pages.site(!site_config.blank? ? site_config[:site_id] : nil) 
+			@pages = @pages.site(!site_config.blank? ? site_config[:site_id] : 0)
 		end
 		@pages = @pages.all
 		respond_with @pages