tb_cms 1.0.3 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzcwZWNlNjg4MjE1YzNlMGNjZmIzOTQwYWU4YTBkNzY5NmUxMTlkOQ==
-  data.tar.gz: !binary |-
-    ZjA0MzBmNzlmYzYzM2VhODAzNjljNWQwNWQxM2MyZGI2MDliYjY2YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    M2RkYWIzMTlmNGFjMzhjMTRlZTZjNDUxZjcxOTY0OWFlN2U1ZjkzNzhlNGUx
-    M2E0MDczZjZhNzlhNjE0ZjFiMjJiNWIxZGE4MGE1ODU4NDEzMDAwNzk2Nzc4
-    N2ZiN2FkZTUyNjY1Y2RkMGYxOGE0OWViNGVlNjFjMDJlYzQxYzc=
-  data.tar.gz: !binary |-
-    NmRlMzdiMDRkNTUzNDBkYmE3ZmNmZjFkMjY1YTg3MGQyZGZiNzg0NTRhZjc0
-    OTM0YTk3YzBlYmMyYzgyNTAzYTkzYzE3MmU0MTkzMDFiNmFmNjI0MDk3N2Nl
-    ZTdlNzhmNTlmZjc1NTk2YmNjZjU4YWM5ZTJiNDUwODBhNTllYTQ=
+SHA1:
+  metadata.gz: e6efebf0dfac267a54330cb74831bc7a283d46e8
+  data.tar.gz: b3ec8956a99c0c9804af05225f96bf58fdb241a4
+SHA512:
+  metadata.gz: 29c6bf42bdb2c0d4bb05fecfc9c5c4d5572c5a8c257ec980b1389e32472a6f00c54bf9a28a292cdbb1eaa51c834acd2685e3dc5e46465961b1a6faaa4ee986bd
+  data.tar.gz: c901815412d8c43e83ad3a37205808d3367a3ff2f8c37c075b93b9d80893fa672179b5b035446fb0ca46f25367df485a2be784416e83567223cf6fd761c31058

data/README.markdown

@@ -9,7 +9,7 @@ Installation/Usage
 
 1. In your Gemfile add the following
 
-		gem 'spud_cms'
+		gem 'tb_cms'
 
 2. Run bundle install
 3. Copy in database migrations to your new rails project

data/app/controllers/admin/menu_items_controller.rb

@@ -20,7 +20,7 @@ class Admin::MenuItemsController < Admin::ApplicationController
 	def create
 
 		add_breadcrumb "New", :new_admin_page_path
-		@menu_item = SpudMenuItem.new(params[:spud_menu_item])
+		@menu_item = SpudMenuItem.new(menu_item_params)
 		@menu_item.spud_menu_id = @menu.id
 		if params[:spud_menu_item][:parent_id].blank?
 			@menu_item.parent_id = @menu.id
@@ -61,7 +61,7 @@ class Admin::MenuItemsController < Admin::ApplicationController
 		else
 			params[:spud_menu_item][:parent_type] = "SpudMenuItem"
 		end
-		@menu_item.attributes = params[:spud_menu_item]
+		@menu_item.attributes = menu_item_params()
 		@menu_item.spud_menu_id = @menu.id
 		flash[:notice] = "Menu saved successfully!" if @menu_item.save
 
@@ -107,8 +107,8 @@ private
 		end
 	end
 
-
-
-
+	def menu_item_params
+		params.require(:spud_menu_item).permit(:name, :parent_type, :parent_id, :item_type, :spud_page_id, :menu_order, :url, :classes)
+	end
 
 end

data/app/controllers/admin/menus_controller.rb

@@ -17,7 +17,7 @@ class Admin::MenusController < Admin::ApplicationController
 
 	def create
 		add_breadcrumb "New", :new_admin_menu_path
-		@menu = SpudMenu.new(params[:spud_menu])
+		@menu = SpudMenu.new(menu_params)
 		@menu.site_id = session[:admin_site]
 		flash[:notice] = "New menu created" if @menu.save
 		respond_with @menu,:location => @menu.id != nil ? admin_menu_menu_items_url(:menu_id => @menu.id) : admin_menus_url
@@ -31,7 +31,7 @@ class Admin::MenusController < Admin::ApplicationController
 	def update
 		add_breadcrumb "Edit #{@menu.name}", :edit_admin_menu_path
 
-		flash[:notice] = "Menu saved successfully" if @menu.update_attributes(params[:spud_menu])
+		flash[:notice] = "Menu saved successfully" if @menu.update_attributes(menu_params)
 		respond_with @menu,:location => admin_menu_menu_items_url(:menu_id => @menu.id)
 	end
 
@@ -41,6 +41,7 @@ class Admin::MenusController < Admin::ApplicationController
 	end
 
 private
+
 	def load_menu
 		@menu = SpudMenu.where(:id => params[:id]).first
 		if @menu.blank?
@@ -51,4 +52,9 @@ private
 			redirect_to admin_menus_url() and return false
 		end
 	end
+
+	def menu_params
+		params.require(:spud_menu).permit(:name)
+	end
+
 end

data/app/controllers/admin/pages_controller.rb

@@ -37,8 +37,7 @@ class Admin::PagesController < Admin::ApplicationController
 	end
 
 	def create
-
-		@page = SpudPage.new(params[:spud_page])
+		@page = SpudPage.new(page_params)
 		@page.site_id = session[:admin_site]
 		if params[:preview] && params[:preview].to_i == 1
 			preview
@@ -69,8 +68,7 @@ class Admin::PagesController < Admin::ApplicationController
 	end
 
 	def update
-
-		@page.attributes = params[:spud_page]
+		@page.attributes = page_params
 		if params[:preview] && params[:preview].to_i == 1
 			preview
 			return
@@ -142,22 +140,8 @@ class Admin::PagesController < Admin::ApplicationController
   end
 
   def clear
-    Rails.cache.clear
-    SpudPage.site(session[:admin_site]).published_pages.all.each do |record|
-      if Spud::Cms.cache_mode == :full_page
-          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.cache_mode == :action
-          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
+    # noop
+    logger.debug("TODO: Clear Caches")
     redirect_to admin_pages_url
   end
 
@@ -176,6 +160,8 @@ private
 		return true
 	end
 
-
+  def page_params
+    params.require(:spud_page).permit(: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, :spud_page_partials_attributes => [:id,:name, :content, :format])
+  end
 
 end

data/app/controllers/admin/snippets_controller.rb

@@ -4,8 +4,6 @@ class Admin::SnippetsController < Admin::ApplicationController
 
   before_filter :load_snippet, :only => [:show, :edit, :update, :destroy]
 
-  cache_sweeper :snippet_sweeper, :only => [:update,:destroy,:create]
-
   def index
     @snippets = SpudSnippet.site(session[:admin_site]).order(:name).paginate :page => params[:page]
     respond_with @snippets
@@ -19,7 +17,7 @@ class Admin::SnippetsController < Admin::ApplicationController
 
   def create
     add_breadcrumb "New", :new_admin_snippet_url
-    @snippet = SpudSnippet.new(params[:spud_snippet])
+    @snippet = SpudSnippet.new(snippet_params)
     @snippet.site_id = session[:admin_site]
 
     @snippet.save
@@ -35,7 +33,7 @@ class Admin::SnippetsController < Admin::ApplicationController
 
   def update
     add_breadcrumb "Edit", :edit_admin_snippet_url
-    flash[:notice] = "Snippet saved successfully!" if @snippet.update_attributes(params[:spud_snippet])
+    flash[:notice] = "Snippet saved successfully!" if @snippet.update_attributes(snippet_params)
     respond_with @snippet, :location => admin_snippets_url
   end
 
@@ -56,4 +54,9 @@ private
       redirect_to admin_snippets_url and return false
     end
   end
+
+  def snippet_params
+    params.require(:spud_snippet).permit(:content, :content_processed, :format, :name)
+  end
+
 end

data/app/controllers/cms/sitemaps_controller.rb

@@ -1,13 +1,11 @@
 class Cms::SitemapsController < Spud::ApplicationController
 	respond_to :xml
-	caches_page :show,:expires_in => 1.day
 	def show
 		@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] : 0)
 		end
-		@pages = @pages.all
 		respond_with @pages
 	end
 end

data/app/controllers/pages_controller.rb

@@ -1,16 +1,8 @@
 class PagesController < ApplicationController
-	caches_action :show, :if => Proc.new { |c| Spud::Cms.cache_mode == :action }
 
 	respond_to :html
-
 	before_filter :set_default_content_type
 
-	after_filter({:only => [:show]}) do |c|
-		if Spud::Cms.cache_mode == :full_page && @page && @page.is_private? == false
-	    c.cache_page(nil, nil, false)
-		end
-  end
-
 	def show
 		# prevents 500 errors if a url like "/home.jpg" is hit
 		if request.format != :html
@@ -29,7 +21,7 @@ class PagesController < ApplicationController
 			end
 		end
 
-		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_page_partials])
+		@page = SpudPage.published_pages.where(:url_name => url_name)
 
 		# MultiSite Code Block
 		if Spud::Core.multisite_mode_enabled
@@ -51,7 +43,6 @@ 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
 
-
 			render_404
 			return
 		end

data/app/helpers/cms/application_helper.rb

@@ -1,23 +1,23 @@
 module Cms::ApplicationHelper
 	MENU_INDEX = {}
 
-	def sp_snippet(name,snippets=nil)
+	def sp_snippet(name, snippets=nil)
 		if name.blank?
 			return ''
 		end
-
 		if !snippets.blank?
 			snippet = snippets.select {|s| s.name == name}
 		else
 			snippet = SpudSnippet.where(:name => name).first
 		end
-
 		if !snippet.blank?
-			return snippet.content_processed.html_safe
+			# cache(snippet) do
+			# 	concat snippet.content_processed.html_safe
+			# end
+			snippet.content_processed.html_safe
 		else
 			return nil
 		end
-
 	end
 
 	def sp_list_pages(options = {})
@@ -31,6 +31,7 @@ module Cms::ApplicationHelper
 		start_page = nil
 		max_depth = 0
 		active_class = "menu-active"
+
 		if !options.blank?
 			if options.has_key?(:exclude)
 
@@ -55,7 +56,7 @@ module Cms::ApplicationHelper
 			content = "<ul>"
 		end
 
-		pages = pages.all.group_by(&:spud_page_id)
+		pages = pages.to_a.group_by(&:spud_page_id)
 		if pages[start_page].blank?
 
 			return ""
@@ -80,97 +81,88 @@ module Cms::ApplicationHelper
 		return content.html_safe
 	end
 
-
-	def sp_list_menu(options = {})
-
-		max_depth = 0
-		menu = SpudMenu
-		menu_id = nil
-		menu_key = ""
-		link_options = {}
-		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?
-
-			menu_id = options[:menu_id] if options.has_key?(:menu_id)
-			link_options = options[:link_options] if options.has_key?(:link_options)
-			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
-			start_menu_item = options[:start_menu_item_id] if options.has_key?(:start_menu_item_id)
-			if options.has_key?(:id)
-				content = "<ul id='#{options[:id]}' #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
-			else
-				content = "<ul #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
-			end
-			max_depth = options[:max_depth] if options.has_key?(:max_depth)
-		else
-			content = "<ul>"
-		end
-
-		if menu_id.blank?
-			return ""
-		end
-		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,
-			#{SpudMenuItem.table_name}.parent_type as parent_type,
-			#{SpudMenuItem.table_name}.menu_order as menu_order,
-			#{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]
-		end
-
-		parent_items.sort_by{|p| p.menu_order}.each do |item|
-			active = false
-			if !item.url_name.blank?
-				if current_page?(page_path(:id => item.url_name))
-					active = true
-				elsif item.url_name == Spud::Cms.root_page_name && current_page?(root_path)
-					active = true
-				end
-			elsif current_page?(item.url)
-				active = true
-			end
-			link_tag = link_to item.name, !item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name))  : item.url, {:class => "#{'menu-active' if active} #{item.classes if !item.classes.blank?}"}.merge(link_options)
-			content += "<li class='#{"menu-active" if active} #{item.classes if !item.classes.blank?}'>#{link_tag}"
-			if max_depth == 0 || max_depth > 1
-				content += sp_list_menu_item(child_items,item.id,2,max_depth,options)
-			end
-			content += "</li>"
-		end
-
-		content += "</ul>"
-
-		return content.html_safe
-	end
+  def sp_list_menu(options = {})
+
+    if !options.has_key?(:name)
+      logger.debug 'sp_list_menu require a :name option'
+      return ''
+    end
+
+    max_depth = 0
+    menu_id = nil
+    link_options = {}
+    start_menu_item = nil
+
+    if Spud::Core.multisite_mode_enabled
+      menu = SpudMenu.where(:name => options[:name], :site_id => current_site_id).first
+    else
+      menu = SpudMenu.where(:name => options[:name]).first
+    end
+
+    if menu.blank?
+      return ''
+    else
+      menu_id = menu.id  
+    end
+
+    cache(['sp_list_menu', menu, options]) do
+      link_options = options[:link_options] if options.has_key?(:link_options)
+
+      start_menu_item = options[:start_menu_item_id] if options.has_key?(:start_menu_item_id)
+      if options.has_key?(:id)
+        content = "<ul id='#{options[:id]}' #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
+      else
+        content = "<ul #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
+      end
+      max_depth = options[:max_depth] if options.has_key?(:max_depth)
+
+      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,
+        #{SpudMenuItem.table_name}.parent_type as parent_type,
+        #{SpudMenuItem.table_name}.menu_order as menu_order,
+        #{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)").to_a
+
+      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]
+      end
+
+      parent_items.sort_by{|p| p.menu_order}.each do |item|
+        active = false
+        if !item.url_name.blank?
+          if current_page?(page_path(:id => item.url_name))
+            active = true
+          elsif item.url_name == Spud::Cms.root_page_name && current_page?(root_path)
+            active = true
+          end
+        elsif current_page?(item.url)
+          active = true
+        end
+        link_tag = link_to item.name, !item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name))  : item.url, {:class => "#{'menu-active' if active} #{item.classes if !item.classes.blank?}"}.merge(link_options)
+        content += "<li class='#{"menu-active" if active} #{item.classes if !item.classes.blank?}'>#{link_tag}"
+        if max_depth == 0 || max_depth > 1
+          content += sp_list_menu_item(child_items,item.id,2,max_depth,options)
+        end
+        content += "</li>"
+      end
+
+      content += "</ul>"
+
+      concat content.html_safe
+    end
+  end
 
 	def sp_menu_with_seperator(options={})
 
@@ -196,7 +188,7 @@ module Cms::ApplicationHelper
 			#{SpudMenuItem.table_name}.menu_order as menu_order,
 			#{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
+			#{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)").to_a
 
 		menu_tags = []
 		menu_items.sort_by{|p| p.menu_order}.each do |item|