spud_cms 0.8.17 → 0.9.0

data/app/helpers/spud/cms/application_helper.rb

@@ -1,8 +1,9 @@
 module Spud::Cms::ApplicationHelper
+	MENU_INDEX = {}
 	def sp_list_pages(options = {})
-		
+
 		pages = SpudPage.public.published_pages
-		
+
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)
 			pages = pages.site(site_config[:site_id]) if !site_config.blank?
@@ -12,7 +13,7 @@ module Spud::Cms::ApplicationHelper
 		active_class = "menu-active"
 		if !options.blank?
 			if options.has_key?(:exclude)
-				
+
 				pages = pages.where(["name NOT IN (?)",options[:exclude]])
 			end
 			if options.has_key?(:start_page_id)
@@ -29,14 +30,14 @@ module Spud::Cms::ApplicationHelper
 			if options.has_key?(:max_depth)
 				max_depth = options[:max_depth]
 			end
-			
+
 		else
 			content = "<ul>"
 		end
 
 		pages = pages.all.group_by(&:spud_page_id)
 		if pages[start_page].blank?
-			
+
 			return ""
 		end
 		pages[start_page].sort_by{|p| p.page_order}.each do |page|
@@ -55,7 +56,7 @@ module Spud::Cms::ApplicationHelper
 			content += "</li>"
 		end
 		content += "</ul>"
-		
+
 		return content.html_safe
 	end
 
@@ -64,18 +65,31 @@ module Spud::Cms::ApplicationHelper
 
 		max_depth = 0
 		menu = SpudMenu
+		menu_id = nil
+		menu_key = ""
 		start_menu_item = nil
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)
 			menu = menu.site(site_config[:site_id]) if !site_config.blank?
+			menu_key += "#{site_config[:site_id]}_"
 		end
 		if !options.blank?
 
 			if options.has_key?(:menu_id)
-				menu = menu.where(:id => options[:menu_id])
+				menu_id = options[:menu_id]
 			end
 			if  options.has_key?(:name)
+				menu_key +=  options[:name]
+
 				menu = menu.where(:name => options[:name])
+				menu_id = MENU_INDEX[menu_key]
+				if menu_id.blank?
+					menu = menu.first
+					if(!menu.blank?)
+						menu_id = menu.id
+						MENU_INDEX[menu_key] = menu.id
+					end
+				end
 			end
 			if options.has_key?(:start_menu_item_id)
 				start_menu_item = options[:start_menu_item_id]
@@ -85,7 +99,7 @@ module Spud::Cms::ApplicationHelper
 			else
 				content = "<ul #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
 			end
-			
+
 
 			if options.has_key?(:max_depth)
 				max_depth = options[:max_depth]
@@ -93,12 +107,11 @@ module Spud::Cms::ApplicationHelper
 		else
 			content = "<ul>"
 		end
-		menu = menu.first
-		if menu.blank?
-			
+
+		if menu_id.blank?
 			return ""
 		end
-		menu_items = menu.spud_menu_items_combined.select("
+		menu_items = SpudMenuItem.where(:spud_menu_id => menu_id).select("
 			#{SpudMenuItem.table_name}.id as id,
 			#{SpudMenuItem.table_name}.url as url,
 			#{SpudMenuItem.table_name}.classes as classes,
@@ -107,17 +120,16 @@ module Spud::Cms::ApplicationHelper
 			#{SpudMenuItem.table_name}.parent_id as parent_id,
 			#{SpudMenuItem.table_name}.name as name,
 			#{SpudPage.table_name}.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").all
-		
-		
+
 
 		grouped_items = menu_items.group_by(&:parent_type)
 
 		if grouped_items["SpudMenu"].blank?
-			
+
 			return ""
 		end
 		child_items = grouped_items["SpudMenuItem"].blank? ? [] : grouped_items["SpudMenuItem"].group_by(&:parent_id)
-		
+
 		parent_items = grouped_items["SpudMenu"]
 		if start_menu_item != nil
 			parent_items = child_items[start_menu_item]
@@ -140,14 +152,14 @@ module Spud::Cms::ApplicationHelper
 			end
 			content += "</li>"
 		end
-		
+
 		content += "</ul>"
-		
+
 		return content.html_safe
 	end
 
 	def sp_menu_with_seperator(options={})
-		
+
 		seperator = "&nbsp;|&nbsp;".html_safe
 		if(options.has_key?(:seperator))
 			seperator = options[:seperator]
@@ -159,6 +171,9 @@ module Spud::Cms::ApplicationHelper
 			menu = menu.site(site_config[:site_id]) if !site_config.blank?
 		end
 		menu = menu.first
+		if(menu.blank?)
+			return ""
+		end
 		menu_items = menu.spud_menu_items_combined.select("
 			#{SpudMenuItem.table_name}.id as id,
 			#{SpudMenuItem.table_name}.url as url,
@@ -168,12 +183,12 @@ module Spud::Cms::ApplicationHelper
 			#{SpudMenuItem.table_name}.parent_id as parent_id,
 			#{SpudMenuItem.table_name}.name as name,
 			#{SpudPage.table_name}.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").all
-		
-		menu_tags = []		
+
+		menu_tags = []
 		menu_items.sort_by{|p| p.menu_order}.each do |item|
 			menu_tags += ["<a #{"class='#{item.classes}' " if !item.classes.blank?}href='#{!item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name)) : item.url}'>#{item.name}</a>"]
 		end
-		
+
 		return menu_tags.join(seperator).html_safe
 	end
 private
@@ -184,7 +199,7 @@ private
 			return ""
 		end
 		content = "<ul>"
-		
+
 		spud_menu_items.sort_by{|p| p.menu_order}.each do |item|
 			active = false
 			if !item.url_name.blank?
@@ -233,8 +248,17 @@ private
 		content += "</ul>"
 		return content.html_safe
 	end
-	
 
-	
-	
+
+	def layout_options
+		layouts = Spud::Cms::Engine.template_parser.layouts
+		layout_options = []
+		layouts.each_pair do |key,value|
+			layout_options << [value[:template_name],key]
+		end
+		return layout_options
+	end
+
+
+
 end

data/app/models/spud_menu_item.rb

@@ -5,12 +5,20 @@ class SpudMenuItem < ActiveRecord::Base
 	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
 
 	validates :name,:presence => true
+	validates :spud_menu_id,:presence => true
 	validates :parent_type,:presence => true
 	validates :parent_id,:presence => true
 
 
-	attr_accessible :name,:parent_type,:parent_id,:item_type,:spud_page_id,:menu_order,:url,:classes 
+	attr_accessible :name,:parent_type,:parent_id,:item_type,:spud_page_id,:menu_order,:url,:classes
 
+	def get_url
+		if !self.spud_page.blank?
+			return self.spud_page.url_name
+		else
+			return url
+		end
+	end
 
 	def options_tree(options,depth,current = nil)
 		sub_items = self.spud_menu_items
@@ -57,19 +65,8 @@ class SpudMenuItem < ActiveRecord::Base
 				end
 			end
 		end
-		
+
 		return list
 	end
-	# def self.options_tree_for_item(item,menu)
-	# 	items = menu.spud_menu_items
-	# 	items = items.where(["id != ?",item.id]) if !item.blank? && !item.id.blank?
-			
 
-	# 	options = []
-	# 	items.each do |item|
-	# 	  options << ["#{item.name}",item.id]
-	# 	  options = item.options_tree(options,1,item)
-	# 	end
-	# 	return options
-	# end
 end

data/app/models/spud_page.rb

@@ -2,7 +2,6 @@ class SpudPage < ActiveRecord::Base
 	searchable
 	belongs_to :spud_page
 	has_many :spud_page_partial_revisions
-	belongs_to :spud_template,:foreign_key => :template_id
 	has_many :spud_pages, :dependent => :nullify
 	has_many :spud_page_partials,:dependent => :destroy
 	has_many :spud_permalinks,:as => :attachment, :dependent => :destroy
@@ -10,7 +9,7 @@ class SpudPage < ActiveRecord::Base
 	belongs_to :updated_by_user,:class_name => "SpudUser",:foreign_key => :updated_by
 
 
-	attr_accessible :name,:url_name,:created_by,:updated_by,:template_id,:visibility,:spud_page_id,:publish_at,:format,:meta_description,:meta_keywords,:page_order,:spud_page_partials_attributes,:use_custom_url_name,:published,:notes
+	attr_accessible :name,:url_name,:created_by,:updated_by,:layout,:visibility,:spud_page_id,:publish_at,:format,:meta_description,:meta_keywords,:page_order,:spud_page_partials_attributes,:use_custom_url_name,:published,:notes
 
 	before_validation :generate_url_name
 	validates :name,:presence => true
@@ -25,8 +24,17 @@ class SpudPage < ActiveRecord::Base
 	scope :public, where(:visibility => 0)
 
 
-	def self.grouped(site_id=nil)
-		return site(site_id).all.group_by(&:spud_page_id)
+	def self.grouped(site_id=0)
+
+		if(Spud::Core.multisite_mode_enabled)
+			return site(site_id).all.group_by(&:spud_page_id)
+		else
+			return all.group_by(&:spud_page_id)
+		end
+	end
+
+	def to_liquid
+		return {'name' => self.name, 'url_name' => self.url_name}
 	end
 
 	# Returns an array of pages in order of heirarchy

data/app/models/spud_page_liquid_tag.rb

@@ -0,0 +1,4 @@
+class SpudPageLiquidTag < ActiveRecord::Base
+  attr_accessible :spud_page_partial_id, :tag_name, :value
+  belongs_to :spud_page_partial
+end

data/app/models/spud_page_partial.rb

@@ -1,8 +1,47 @@
 class SpudPagePartial < ActiveRecord::Base
 	belongs_to :spud_page
-	attr_accessible :name,:spud_page_id,:content,:format
+	has_many :spud_page_liquid_tags, :dependent => :destroy
+	validates :name,:presence => true
+	attr_accessible :name, :spud_page_id, :content, :format, :content_processed
 	before_save :maintain_revisions
+	before_save :update_symbol_name
+	before_save :postprocess_content
 
+	def update_symbol_name
+		self.symbol_name = self.name.parameterize.underscore
+	end
+
+	def symbol_name
+		return @symbol_name || self.name.parameterize.underscore
+	end
+
+	def postprocess_content
+		template = Liquid::Template.parse(self.content) # Parses and compiles the template
+		update_taglist(template)
+		self.content_processed = template.render('page' => self.spud_page)
+	end
+
+	def update_taglist(template)
+		self.spud_page_liquid_tags.all.each do |tag|
+			tag.destroy
+		end
+		template.root.nodelist.each do |node|
+			if !node.is_a?(String) && defined?(node.tag_name) && defined?(node.tag_value)
+				self.spud_page_liquid_tags.create(:tag_name => node.tag_name,:value => node.tag_value)
+			end
+		end
+	end
+
+	def content_processed=(content)
+		write_attribute(:content_processed,content)
+	end
+
+	def content_processed
+		if read_attribute(:content_processed).blank?
+			self.update_column(:content_processed, postprocess_content)
+		end
+		return read_attribute(:content_processed)
+	end
 
 	def maintain_revisions
 		if !self.changed.include?('content')

data/app/observers/page_sweeper.rb

@@ -0,0 +1,48 @@
+class PageSweeper < ActionController::Caching::Sweeper
+  observe :spud_page,:spud_menu_item
+
+  def before_save(record)
+    if record.is_a?(SpudPage) && record.url_name_was != record.url_name
+      if Spud::Cms.cache_mode == :full_page
+        expire_page cache_path_for_page(record.url_name_was)
+      elsif Spud::Cms.cache_mode == :action
+        expire_action cache_path_for_page(record.url_name_was)
+      end
+    end
+  end
+
+  def after_save(record)
+    expire_cache_for(record)
+    expire_page spud_cms_sitemap_path(:format => :xml)
+    expire_page spud_sitemap_path(:format => :xml)
+  end
+
+  def after_destroy(record)
+    expire_cache_for(record)
+    expire_page spud_cms_sitemap_path
+    expire_page spud_sitemap_path
+  end
+
+private
+  def expire_cache_for(record)
+    if record.is_a?(SpudPage)
+      if Spud::Cms.cache_mode == :full_page
+        expire_page cache_path_for_page(record.url_name)
+      elsif Spud::Cms.cache_mode == :action
+        expire_action cache_path_for_page(record.url_name)
+      end
+    else
+      Rails.cache.clear
+      SpudPage.site(session[:admin_site]).published_pages.all.each {|page| expire_cache_for(page)}
+    end
+  end
+
+  def cache_path_for_page(url_name)
+    if url_name == Spud::Cms.root_page_name
+      root_path
+    else
+      page_path(:id => url_name)
+    end
+  end
+
+end

data/app/views/pages/show.html.erb

@@ -5,23 +5,21 @@
 	<%if !@page.meta_description.blank?%>
 		<meta name="description" content="<%=@page.meta_description%>" />
 	<%end%>
-	<%if !@page.meta_keywords.blank?%>
+
 		<meta name="keywords" content="<%=@page.meta_keywords%>" />
-	<%end%>
+
 <%end%>
 
 <%if !@inline.blank?%>
-	<%=render :inline => @inline%> 
-<%else%>
-	<h2><%=@page.name%></h2>
+	<%=render :inline => @inline%>
 <%end%>
 <%@page.spud_page_partials.each do |page_partial|%>
-	
-	<%if(page_partial.name.downcase == 'body' && Spud::Cms.yield_body_as_content_block == false)%>
-		<%=page_partial.content.html_safe%>
+
+	<%if(page_partial.name.match(/^body$/i) && Spud::Cms.yield_body_as_content_block == false)%>
+		<%=page_partial.content_processed.html_safe%>
 	<%else%>
-		<%=content_for page_partial.name.parameterize.underscore.to_sym do%>
-			<%=page_partial.content.html_safe%>
+		<%=content_for page_partial.symbol_name.to_sym do%>
+			<%=page_partial.content_processed.html_safe%>
 		<%end%>
 	<%end%>
-<%end%>
+<%end%>

data/app/views/spud/admin/pages/_form.html.erb

@@ -3,16 +3,16 @@
   <div class="control-group">
   <legend>Page Title</legend>
     	<%=f.label :name, :required=>true,:style =>"display:none;", :class=>"control-label"%>
-      
+
         <%=f.text_field :name, :class => "full-width"%>
-      
+
   </div>
 </fieldset>
-<div id="page_partials_form" class="formtabs">
-	<ul class="formtab_buttons">
+<div id="page_partials_form" class="formtabs tab-content">
+	<ul class="formtab_buttons nav nav-tabs">
 	</ul>
 	<%=f.fields_for :spud_page_partials do |b|%>
-		<div class="formtab">
+		<div class="formtab tab-pane">
 			<%=b.hidden_field :name,:class => "tab_name"%>
 			<%=b.text_area :content,:class => "tinymce"%>
 		</div>
@@ -21,19 +21,18 @@
 <br />
 <fieldset>
   <legend>Advanced Settings (optional)</legend>
-  
-     <%if Spud::Cms.templates_enabled%>
+
     	<div class="control-group">
-      	
-      	<%=f.label :template_id, "Template", :class=>"control-label"%>
+
+      	<%=f.label :layout, "Template", :class=>"control-label"%>
         <div class="controls">
-        	<%=f.select :template_id, options_for_select(SpudTemplate.site(session[:admin_site]).all.collect{|tp| [tp.name,tp.id]},@page.template_id), {:include_blank => 'Default'},{:title => "", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
+        	<%=f.select :layout, options_for_select(layout_options,@page.layout),{},{:title => "", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
           <span class="help-inline">Use this to control the layout template to be used for this page if they are available.</span>
         </div>
   	  </div>
-      <%end%>
+
     <div class="control-group">
-      
+
       <%=f.label :spud_page_id, "Parent Page", :class=>"control-label"%>
       <div class="controls">
         <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page,:site_id => session[:admin_site]),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
@@ -41,7 +40,7 @@
       </div>
     </div>
     <div class="control-group">
-      
+
       <%=f.label :url_name, "Perma Link",:disabled => true, :class=>"control-label"%>
       <div class="controls">
         <%=root_url%><%=f.text_field :url_name,:title => "",:size=>20%>
@@ -51,19 +50,19 @@
         </label>
       </div>
     </div>
-  
+
 </fieldset>
 <fieldset>
   <legend>Meta Information (optional)</legend>
   <p>These fields are used to notify search engines about important keywords and the appropriate description to display in a search result.</p>
-  
+
     <div class="control-group">
       <%=f.label :meta_keywords,"Keywords", :class=>"control-label"%>
       <div class="controls">
         <%=f.text_field :meta_keywords,:title => "",:style=>"width:600px;" %>
         <span class="help-inline">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
       </div>
-      
+
     </div>
     <div class="control-group">
       <%=f.label :meta_description,"Description", :class=>"control-label"%>