spud_cms 0.3.0 → 0.3.1

data/README.markdown

@@ -9,7 +9,7 @@ Installation/Usage
 
 1. In your Gemfile add the following
 
-		gem 'spud_admin', :git => "git://github.com/davydotcom/spud_core_admin.git"
+		gem 'spud_core', :git => "git://github.com/davydotcom/spud_core_admin.git"
 		gem 'spud_cms', :git => "git://github.com/davydotcom/spud_cms.git"
 
 2. Run bundle install

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

@@ -17,6 +17,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 		@page_name = "New Menu Item"
 		
 		@menu_item = @menu.spud_menu_items.new
+		
 	end
 
 	def create

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

@@ -139,7 +139,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
 private
 	def load_page
-		@page = SpudPage.where(:id => params[:id]).includes(:spud_custom_fields,:spud_page_partials).first
+		@page = SpudPage.where(:id => params[:id]).includes(:spud_page_partials).first
 		if @page.blank?
 			flash[:error] = "Page not found!"
 			redirect_to spud_admin_pages_url() and return false

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

@@ -13,7 +13,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_template_path
-		@template = SpudTemplate.new(:base_layout => "application",:page_parts => "Body")
+		@template = SpudTemplate.new(:base_layout => Spud::Cms.default_page_layout,:page_parts => Spud::Cms.default_page_parts.join(","))
 		respond_with @template
 	end
 

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

@@ -1,6 +1,8 @@
 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)
+		respond_with @pages
 	end
 end

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

@@ -1,23 +1,31 @@
 module Spud::Cms::ApplicationHelper
 	def sp_list_pages(options = {})
-		pages = SpudPage.parent_pages
+		pages = SpudPage.public.published_pages
+		start_page = nil
 		if !options.blank?
 			if options.has_key?(:exclude)
 				
 				pages = pages.where(["name NOT IN (?)",options[:exclude]])
 			end
+			if options.has_key?(:start_page_id)
+				start_page = options[:start_page_id]
+			end
 			if options.has_key?(:id)
-				content = "<ul id='#{options.id}'>"
+				content = "<ul id='#{options[:id]}'>"
 			else
 				content = "<ul>"
 			end
 		else
 			content = "<ul>"
 		end
-		
-		pages.order(:page_order).each do |page|
+
+		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|
 			content += "<li><a href='#{page_path(:id => page.url_name)}'>#{page.name}</a>"
-			content += sp_list_page(page)
+			content += sp_list_page(page,pages)
 			content += "</li>"
 		end
 		content += "</ul>"
@@ -86,14 +94,14 @@ private
 		content += "</ul>"
 		return content.html_safe
 	end
-	def sp_list_page(page)
-		if page.spud_pages.count == 0
+	def sp_list_page(page,collection)
+		if collection[page.id].blank?
 			return ""
 		end
 		content = "<ul>"
-		page.spud_pages.order(:page_order).each do |page|
+		collection[page.id].sort_by{|p| p.page_order}.each do |page|
 			content += "<li><a href='#{page_path(:id => page.url_name)}'>#{page.name}</a>"
-			content += sp_list_page(page)
+			content += sp_list_page(page,collection)
 			content += "</li>"
 		end
 		content += "</ul>"

data/app/models/spud_menu_item.rb

@@ -21,17 +21,52 @@ class SpudMenuItem < ActiveRecord::Base
 	    end
 	    return options
 	end
+	def self.grouped(menu)
+		return menu.spud_menu_items_combined.group_by(&:parent_type)
+	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)
+	# Returns an array of pages in order of heirarchy
+	# 	:fitler 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_item(menu,config={})
+		collection = config[:collection] || self.grouped(menu)
+		level 		 = config[:level] 		 || 0
+		parent_id  = config[:parent_id]  || nil
+		parent_type  = config[:parent_type]  || 'SpudMenu'
+		filter 		 = config[:filter] 		 || nil
+		value      = config[:value]			 || :id
+		list 			 = []
+		if parent_type == 'SpudMenu' && collection[parent_type]
+			item_collection = collection['SpudMenuItem'].group_by(&:parent_id) if collection['SpudMenuItem']
+			collection[parent_type].each do |c|
+				if filter.blank? || c.id != filter.id
+					list << [level.times.collect{ '- ' }.join('') + c.name, c[value]]
+					list += self.options_tree_for_item(menu,{:collection => item_collection, :parent_id => c.id, :level => level+1, :filter => filter,:parent_type => "SpudMenuItem"})
+				end
+			end
+		else
+			if collection[parent_id]
+				collection[parent_id].each do |c|
+					if filter.blank? || c.id != filter.id
+						list << [level.times.collect{ '- ' }.join('') + c.name, c[value]]
+						list += self.options_tree_for_item(menu,{:collection => collection, :parent_id => c.id, :level => level+1, :filter => filter,:parent_type => "SpudMenuItem"})
+					end
+				end
+			end
 		end
-		return options
+		
+		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

@@ -3,7 +3,6 @@ class SpudPage < ActiveRecord::Base
 	belongs_to :spud_template,:foreign_key => :template_id
 	has_many :spud_pages, :dependent => :nullify
 	has_many :spud_page_partials,:dependent => :destroy
-	has_many :spud_custom_fields,:as => :parent,:dependent => :destroy
 	belongs_to :created_by_user,:class_name => "SpudUser",:foreign_key => :created_by
 	belongs_to :updated_by_user,:class_name => "SpudUser",:foreign_key => :updated_by
 
@@ -11,43 +10,52 @@ class SpudPage < ActiveRecord::Base
 	validates :name,:presence => true
 	validates :url_name,:presence => true, :uniqueness => true
 
-	accepts_nested_attributes_for :spud_custom_fields
 	accepts_nested_attributes_for :spud_page_partials, :allow_destroy => true
 	scope :parent_pages,  where(:spud_page_id => nil)
 	scope :published_pages, where(:published => true)
 	scope :public, where(:visibility => 0)
 
-	def options_tree(options,depth,current_page = nil)
-		sub_pages = self.spud_pages
-		sub_pages = sub_pages.where(["id != ?",current_page.id]) if !current_page.blank? && !current_page.id.blank?
-	    if(sub_pages.blank?)
-	      return options
-	    end
-	    sub_pages.each do |page|
-	      options << ["#{'-'*depth} #{page.name}",page.id]
-	      options = page.options_tree(options,depth+1,current_page)
-	    end
-	    return options
-	end
 
-	def self.options_tree_for_page(page)
-		pages = SpudPage.parent_pages
-		pages = pages.where(["id != ?",page.id]) if !page.blank? && !page.id.blank?
-			
+	def self.grouped
+		return all.group_by(&:spud_page_id)
+	end
 
-		options = []
-		pages.each do |sub_page|
-		  options << ["#{sub_page.name}",sub_page.id]
-		  options = sub_page.options_tree(options,1,page)
+	# Returns an array of pages in order of heirarchy
+	# 	:fitler 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
+		level 		 = config[:level] 		 || 0
+		parent_id  = config[:parent_id]  || nil
+		filter 		 = config[:filter] 		 || nil
+		value      = config[:value]			 || :id
+		list 			 = []
+		if collection[parent_id]
+			collection[parent_id].each do |c|
+				if filter.blank? || c.id != filter.id
+					list << [level.times.collect{ '- ' }.join('') + c.name, c[value]]
+					list += self.options_tree_for_page({:collection => collection, :parent_id => c.id, :level => level+1, :filter => filter})
+				end
+			end
 		end
-		return options
+		return list
 	end
 
 
-
      def generate_url_name
+     	return false if self.name.blank?
      	if !self.use_custom_url_name || self.url_name.blank?
-          self.url_name = self.name.gsub(/[^a-zA-Z0-9\ ]/," ").gsub(/\ \ +/," ").gsub(/\ /,"-").downcase
+     	  
+     	  url_name = self.name.parameterize.downcase
+			if !self.use_custom_url_name
+				url_names = SpudPage.where("id != #{self.id}").all.collect{|p| p.url_name}
+				counter = 1
+				while url_names.include?(url_name) do
+		     	  	url_name = self.name.parameterize.downcase + "-#{counter}"
+		     	  	counter += 1
+				end
+	     	end
+          self.url_name = url_name
           self.use_custom_url_name = false
       	end
       	return true

data/app/models/spud_template.rb

@@ -1,5 +1,5 @@
 class SpudTemplate < ActiveRecord::Base
-	has_many :spud_pages,:dependent => :nullify
+	has_many :spud_pages,:dependent => :nullify,:foreign_key => :template_id
 
 	validates :base_layout, :presence => true
 	validates :page_parts, :presence => true

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

@@ -9,7 +9,7 @@
   <%=error_message_on "menu_item","menu_order"%>
 </li>
 <li><%=f.label :spud_page_id, "Page"%>
-    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(nil),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
+    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
   <%=error_message_on "menu_item","spud_page_id"%>
 </li>
 
@@ -24,7 +24,7 @@
   <%=error_message_on "menu_item","classes"%>
 </li>
 <li><%=f.label :parent, "Parent Menu"%>
-  <%=f.select :parent_id,options_for_select(SpudMenuItem.options_tree_for_item(@menu_item,@menu),@menu_item.parent_id),{:include_blank => "#{@menu.name}"},{:title => ""}%>
+  <%=f.select :parent_id,options_for_select(SpudMenuItem.options_tree_for_item(@menu,:filter => @menu_item),@menu_item.parent_type == 'SpudMenuItem' ? @menu_item.parent_id : nil),{:include_blank => "#{@menu.name}"},{:title => ""}%>
   <%=error_message_on "menu_item","parent"%>
 </li>
 </ol>

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

@@ -30,7 +30,7 @@
     <li>
       <%=error_message_on "page","spud_page_id"%>
       <%=f.label :spud_page_id, "Parent Page"%>
-      <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(@page),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
+      <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
     </li>
     <li>
       <%=error_message_on "page","url_name"%>

data/lib/spud_cms.rb

@@ -2,6 +2,6 @@ module Spud
 	module Cms
 	   require 'spud_cms/configuration'
 	   require 'spud_cms/engine' if defined?(Rails)
-
+		require 'spud_cms/test_files' if ENV["RAILS_ENV"] == 'test'
     end
 end

data/lib/spud_cms/test_files.rb

@@ -0,0 +1,25 @@
+module Spud
+  module Cms
+    module TestFiles
+      class << self
+        def load_all
+          load_specs
+          load_factories
+          load_support
+        end
+        
+        def load_specs
+          Dir[File.join(File.expand_path('../../../', __FILE__), "spec/**/*_spec.rb")].each {|f| require f}
+        end
+          
+        def load_factories
+          Dir[File.join(File.expand_path('../../../', __FILE__), "factories/*")].each {|f| require f}
+        end
+        
+        def load_support
+          Dir[File.join(File.expand_path('../../../', __FILE__), "spec/support/**/*.rb")].each {|f| require f}
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70222010796980 !ruby/object:Gem::Requirement
+  requirement: &70366827584580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70222010796980
+  version_requirements: *70366827584580
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70222010782760 !ruby/object:Gem::Requirement
+  requirement: &70366831691500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70222010782760
+  version_requirements: *70366831691500
 description: 
 email: destes@redwindsw.com
 executables: []
@@ -69,7 +69,6 @@ files:
 - app/helpers/spud/cms/application_helper.rb
 - app/helpers/spud/cms/sitemaps_helper.rb
 - app/helpers/spud/user_sessions_helper.rb
-- app/models/spud_custom_field.rb
 - app/models/spud_menu.rb
 - app/models/spud_menu_item.rb
 - app/models/spud_page.rb
@@ -105,6 +104,7 @@ files:
 - lib/spud_cms.rb
 - lib/spud_cms/configuration.rb
 - lib/spud_cms/engine.rb
+- lib/spud_cms/test_files.rb
 - README.markdown
 homepage: 
 licenses: []

data/app/models/spud_custom_field.rb

@@ -1,7 +0,0 @@
-class SpudCustomField < ActiveRecord::Base
-	belongs_to :parent,:polymorphic => true
-	validates :name,:presence => true
-	validates :value,:presence => true
-	validates :parent_type,:presence => true
-	validates :parent_id,:presence => true
-end