spud_cms 0.9.21 → 1.0.0.RC1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGVhMTAwYWIxMjQyYTRjZWE3YjQzMDA2ZTIyNmE1ODIxN2NiMDNkNA==
-  data.tar.gz: !binary |-
-    Yzk0ZWRjZTY4YzI3NjM4OWE1OTAwMzEyODg2YTYwMzcwYTdiMDU1OQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWE1NjcwZjNhYzNlZTk4NzdlNDFhNWE1NzAxNTViYzdkZjU5Mjg5OWQ2Yjk3
-    YjA4ZDE2NGRkNWE1Y2Q3YjgwNjVlMTgxM2E5MTE3OWViZjY0MGNmYjg1NTUy
-    Y2NjMTFkYWVlMDRlZjljMTllMjVjNGY1MTE1MmI2M2Q4NmEyMWQ=
-  data.tar.gz: !binary |-
-    YzE5Zjc3YzhkZWY0MDQyZTg3YmM4YzQ2NzNkZGVhYmYzOWQwZDcwOTEyYWI4
-    MjllZDFhOGU3YTE0ZmNmMjUyZGFlMDRhZTFmNWZhODViOGZmNDE4YTNjN2Ji
-    YTg4NDM2NmU1NTRmNTEwZGU4Y2M5YmQzZjFiMTVjZWQ4MDg5MjU=
+SHA1:
+  metadata.gz: 54e9c4a61c4797b554e4ddffbf29a1efff29b835
+  data.tar.gz: 397642ca31be38f6ba49303a8cbc0bd622d43780
+SHA512:
+  metadata.gz: 6cc9210f9fed2f54a38078f17c740238d256491ee15e5441a93a54186f154af5db22755d3bf1dded796df564a7e8cf1c7d029ef281ceb76d128a80f693529464
+  data.tar.gz: 235e6abbcd19c6e08dc2b9bb1d5b62fe315a73cb6f7a1e7926689561abcc39a0764ababaccc0336262db624d27d82698fff3100f26881bb320f83e29f0dea3b5

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

@@ -2,9 +2,9 @@ spud.admin.cms.menu_items = {};
 
 (function() {
   var menu_items = spud.admin.cms.menu_items;
-
-  menu_items.init = function() {
-    return;
+  var menuId = 0;
+  menu_items.init = function(id) {
+    menuId = id;
     $('.sortable').sortable({
       connectWith:".connectedSortable",
       start: function(event,ui) {
@@ -16,6 +16,7 @@ spud.admin.cms.menu_items = {};
       items:'li',
       stop: function(event,ui) {
         $('#root_menu_list').removeClass('menu_edit');
+        menu_items.save.call(menu_items);
       },
       over: function(event,ui) {
 
@@ -32,4 +33,31 @@ spud.admin.cms.menu_items = {};
     }).disableSelection();
   };
 
+  menu_items.save = function() {
+    var menuItems = $('#root_menu_list > li > .menu-item-row');
+
+    var orderArray = []
+    menu_items.buildOrderArray(menuItems, orderArray);
+
+    // Post To Menu Items Save method
+    $.ajax({
+      url: "/spud/admin/menus/" + menuId + "/menu_items/sort",
+      type: 'post',
+      data: {menu_order: JSON.stringify(orderArray), _method: 'put'}
+    });
+
+  };
+
+  menu_items.buildOrderArray = function(menuItems,orderArray) {
+    for(var counter=0;counter < menuItems.length; counter++) {
+      var menuItem = $(menuItems[counter]);
+      var menuHash = {id: menuItem.attr('data-menu-item-id'), order: []}
+      var subItems = menuItem.parent().find(' > .menu_list > li > .menu-item-row');
+      if(subItems && subItems.length > 0) {
+        menu_items.buildOrderArray(subItems, menuHash.order)
+      }
+      orderArray.push(menuHash)
+    }
+  }
+
 })();

data/app/assets/stylesheets/spud/admin/cms/application.css

@@ -2,8 +2,12 @@
 //= require codemirror
 //= require codemirror/themes/night
 */
+#root_menu_list {
+	padding-bottom: 15px;
+}
 .menu_list {
   list-style-type:none;
+
 }
 .page_row {
   background:white;

data/app/controllers/pages_controller.rb

@@ -1,15 +1,13 @@
 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
+	# 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
@@ -57,7 +55,6 @@ class PagesController < ApplicationController
 		end
 
 		if @page.is_private?
-			@rendered_action_cache = true if Spud::Cms.cache_mode == :action
 			return if defined?(require_user) && require_user == false
 		end
 

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

@@ -21,7 +21,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	def create
 
 		add_breadcrumb "New", :new_spud_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
@@ -62,7 +62,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 		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
 
@@ -76,7 +76,12 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 
-	def reorder
+	def sort
+	  menu_orders = ActiveSupport::JSON.decode(params[:menu_order])
+	  sort_menu_items_to_parent(@menu, menu_orders)
+    render :nothing => true, :status => 200
+
+
 		#id param
 		#source position
 		#destination position
@@ -86,6 +91,23 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 
 	end
 private
+
+	def sort_menu_items_to_parent(parent,menu_orders)
+		sort_position = 0
+		menu_orders.each do |menu_meta|
+			menu_item = SpudMenuItem.find(menu_meta["id"])
+			if menu_item
+				menu_item.menu_order = sort_position
+				menu_item.parent = parent
+				menu_item.save!
+				if menu_meta["order"].nil? == false
+					sort_menu_items_to_parent(menu_item, menu_meta["order"])
+				end
+				sort_position += 1
+			end
+		end
+	end
+
 	def load_menu
 
 		@menu = SpudMenu.where(:id => params[:menu_id]).first
@@ -108,8 +130,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/spud/admin/menus_controller.rb

@@ -18,7 +18,7 @@ class Spud::Admin::MenusController < Spud::Admin::CmsController
 
 	def create
 		add_breadcrumb "New", :new_spud_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 ? spud_admin_menu_menu_items_url(:menu_id => @menu.id) : spud_admin_menus_url
@@ -32,7 +32,7 @@ class Spud::Admin::MenusController < Spud::Admin::CmsController
 	def update
 		add_breadcrumb "Edit #{@menu.name}", :edit_spud_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 => spud_admin_menu_menu_items_url(:menu_id => @menu.id)
 	end
 
@@ -52,4 +52,8 @@ private
 			redirect_to spud_admin_menus_url() and return false
 		end
 	end
+
+	def menu_params
+		params.require(:spud_menu).permit(:name, :description)
+	end
 end

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

@@ -8,10 +8,12 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 
 		@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
+		if Spud::Cms.root_page_name
+	    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
+	  end
 
 		respond_with @pages
 	end
@@ -39,7 +41,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 
 	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
@@ -71,7 +73,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 
 	def update
 
-		@page.attributes = params[:spud_page]
+		@page.attributes = page_params
 		if params[:preview] && params[:preview].to_i == 1
 			preview
 			return
@@ -178,5 +180,10 @@ private
 	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 => [:id,:name, :content, :format]},:use_custom_url_name,:published,:notes)
+  end
+
+
 
 end

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

@@ -5,7 +5,7 @@ class Spud::Admin::SnippetsController < Spud::Admin::ApplicationController
 
   before_filter :load_snippet, :only => [:show, :edit, :update, :destroy]
 
-  cache_sweeper :snippet_sweeper, :only => [:update,:destroy,:create]
+  # cache_sweeper :snippet_sweeper, :only => [:update,:destroy,:create]
 
   def index
     @snippets = SpudSnippet.site(session[:admin_site]).order(:name).paginate :page => params[:page]
@@ -21,7 +21,7 @@ class Spud::Admin::SnippetsController < Spud::Admin::ApplicationController
 
   def create
     add_breadcrumb "New", :new_spud_admin_snippet_url
-    @snippet = SpudSnippet.new(params[:spud_snippet])
+    @snippet = SpudSnippet.new(snippet_params)
     @snippet.site_id = session[:admin_site]
 
     @snippet.save
@@ -37,7 +37,7 @@ class Spud::Admin::SnippetsController < Spud::Admin::ApplicationController
 
   def update
     add_breadcrumb "Edit", :edit_spud_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 => spud_admin_snippets_url
   end
 
@@ -58,4 +58,8 @@ private
       redirect_to spud_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/spud/cms/sitemaps_controller.rb

@@ -1,13 +1,11 @@
 class Spud::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/helpers/spud/cms/application_helper.rb

@@ -13,7 +13,9 @@ module Spud::Cms::ApplicationHelper
 		end
 
 		if !snippet.blank?
-			return snippet.content_processed.html_safe
+			cache snippet do
+				return snippet.content_processed.html_safe
+			end
 		else
 			return nil
 		end
@@ -55,7 +57,7 @@ module Spud::Cms::ApplicationHelper
 			content = "<ul>"
 		end
 
-		pages = pages.all.group_by(&:spud_page_id)
+		pages = pages.load.group_by(&:spud_page_id)
 		if pages[start_page].blank?
 
 			return ""
@@ -136,7 +138,7 @@ module Spud::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)").load
 
 
 		grouped_items = menu_items.group_by(&:parent_type)
@@ -201,7 +203,7 @@ module Spud::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)").load
 
 		menu_tags = []
 		menu_items.sort_by{|p| p.menu_order}.each do |item|

data/app/models/concerns/spud/liquid_taggable.rb

@@ -0,0 +1,8 @@
+
+module Spud::LiquidTaggable
+  extend ActiveSupport::Concern
+  included do
+	  has_many :spud_page_liquid_tags, :as => :attachment, :dependent => :destroy
+
+  end
+end

data/app/models/spud_menu.rb

@@ -1,9 +1,9 @@
 class SpudMenu < ActiveRecord::Base
-	validates :name,:presence => true
-	validates_uniqueness_of :name, :scope => [:site_id]
+	validates :name,:presence => true, :uniqueness => [:site_id]
+
 	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
 	has_many :spud_menu_items_combined,:class_name => "SpudMenuItem",:foreign_key => :spud_menu_id,:dependent => :destroy
-	
-	attr_protected :site_id
+
+
 	scope :site, lambda {|sid| where(:site_id => sid)}
 end

data/app/models/spud_menu_item.rb

@@ -1,6 +1,6 @@
 class SpudMenuItem < ActiveRecord::Base
-	belongs_to :parent, :polymorphic=>true
-	belongs_to :spud_menu
+	belongs_to :parent, :polymorphic=>true, :touch => true
+	belongs_to :spud_menu, :touch => true
 	belongs_to :spud_page
 	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
 
@@ -9,9 +9,6 @@ class SpudMenuItem < ActiveRecord::Base
 	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
-
 	def get_url
 		if !self.spud_page.blank?
 			return self.spud_page.url_name

data/app/models/spud_page.rb

@@ -2,6 +2,7 @@ class SpudPage < ActiveRecord::Base
 	spud_searchable
 	belongs_to :spud_page
 	has_many :spud_page_partial_revisions
+	has_many :spud_menu_items
 	has_many :spud_pages, :dependent => :nullify
 	has_many :spud_page_partials,:dependent => :destroy
 	has_many :spud_permalinks,:as => :attachment, :dependent => :destroy
@@ -9,25 +10,21 @@ 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,: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
-	validates_uniqueness_of :name, :scope => [:site_id,:spud_page_id]
-	validates :url_name,:presence => true
-	validates_uniqueness_of :url_name, :scope => :site_id
+	validates :name,:presence => true, :uniqueness => {:scope => [:site_id, :spud_page_id]}
+	validates :url_name,:presence => true, :uniqueness => {:scope => :site_id}
 
 	accepts_nested_attributes_for :spud_page_partials, :allow_destroy => true
-	scope :parent_pages,  where(:spud_page_id => nil)
+	scope :parent_pages,  -> {where(:spud_page_id => nil)}
 	scope :site, lambda {|sid| where(:site_id => sid)}
-	scope :published_pages, where(:published => true)
-	scope :public, where(:visibility => 0)
+	scope :published_pages, -> { where(:published => true)}
+	scope :public, -> {where(:visibility => 0)}
 
 
 	def self.grouped(site_id=0)
 
 		if(Spud::Core.multisite_mode_enabled)
-			return site(site_id).all.group_by(&:spud_page_id)
+			return site(site_id).load.group_by(&:spud_page_id)
 		else
 			return all.group_by(&:spud_page_id)
 		end
@@ -38,7 +35,7 @@ class SpudPage < ActiveRecord::Base
 	end
 
 	# Returns an array of pages in order of heirarchy
-	# 	:fitler Filters out a page by ID, and all of its children
+	# 	:filter Filters out a page by ID, and all of its children
 	#   :value Pick an attribute to be used in the value field, defaults to ID
 	def self.options_tree_for_page(config={})
 		collection = config[:collection] || self.grouped(config[:site_id])
@@ -73,7 +70,7 @@ class SpudPage < ActiveRecord::Base
 				if !self.id.blank?
 					pages = pages.where("id != #{self.id}")
 				end
-				url_names = pages.site(self.site_id).all.collect{|p| p.url_name}
+				url_names = pages.site(self.site_id).collect{|p| p.url_name}
 
 				counter = 1
 				url_name_new = url_name