spud_cms 0.8.11 → 0.8.12

data/README.markdown

@@ -0,0 +1,90 @@
+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"
+
+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
+		rake db:migrate
+
+4. 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
+
+
+		Spud::Cms.configure do |config|
+			config.menus_enabled = true
+			config.templates_enabled = false
+			config.root_page_name = "home"
+		end
+
+
+
+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.
+
+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"
+
+
+Adding Your Own Engines
+-----------------------
+
+Creating a rails engine that ties into spud admin is fairly straight forward
+In your new engine add spud_admin as a dependency and create an initializer inside your engine class as such:
+
+		initializer :admin do
+			Spud::Core.configure do |config|
+			config.admin_applications += [{:name => "Pages",:thumbnail => "spud/admin/pages_thumb.png",:url => "/spud/admin/pages",:order => 0}]
+
+			end
+		end
+
+You can use the layouts provided with spud admin by using 'spud/admin/application' or 'spud/admin/detail' layouts
+
+When creating controllers for the admin panel create them in the Spud::Admin Namespace and have them extend Spud::Admin::ApplicationController for automatic user authentication restrictions.
+
+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
+
+2. Load the schema in to the test database:
+
+        rake app:db:test:prepare
+
+3. Run the tests with RSpec
+
+        rspec spec
+
+After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
+
+
+

data/Rakefile

@@ -20,21 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-# Rake::TestTask.new(:test) do |t|
-#   t.libs << 'lib'
-#   t.libs << 'test'
-#   t.pattern = 'test/**/*_test.rb'
-#   t.verbose = false
-# end
-
-
-task :default => [:spec]
+require 'rake'

data/app/controllers/pages_controller.rb

@@ -25,7 +25,7 @@ class PagesController < ApplicationController
 		# MultiSite Code Block
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			@page = @page.site(!site_config.blank? ? site_config[:site_id] : nil) 
+			@page = @page.site(!site_config.blank? ? site_config[:site_id] : nil)
 		end
 
 		@page = @page.first
@@ -42,12 +42,14 @@ 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
+			# flash[:error] = "Page not found"
+			# if !params[:id].blank?
+			# 	redirect_to root_url() and return
+			# else
+			# 	return
+			# end
+			Spud::Cms.template_404 ? render(Spud::Cms.template_404,:status => 404) : render(:text=>nil,:status => 404)
+			return
 		end
 		if @page.is_private?
 			if defined?(require_user) && require_user == false
@@ -63,7 +65,7 @@ class PagesController < ApplicationController
 		if Spud::Core.multisite_mode_enabled && !site_config.blank?
 			cms_config = Spud::Cms.site_config_for_short_name(site_config[:short_name])
 			layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
-		end		 
+		end
 
 
 		if !@page.spud_template.blank?
@@ -71,10 +73,10 @@ class PagesController < ApplicationController
 				layout = @page.spud_template.base_layout
 			end
 			@inline = @page.spud_template.content
-			
+
 		end
 		render :layout => layout
-		
+
 	end
 
 private

data/lib/spud_cms/configuration.rb

@@ -2,18 +2,19 @@ module Spud
   module Cms
     include ActiveSupport::Configurable
 
-    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching,:enable_action_caching,:multisite_config,:max_revisions
+    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching,:enable_action_caching,:multisite_config,:max_revisions,:template_404
 
     self.root_page_name = "home"
     self.menus_enabled = true
     self.templates_enabled = false
     self.default_page_layout = 'application'
     self.default_page_parts = ["Body"]
-  	self.yield_body_as_content_block = false    
+  	self.yield_body_as_content_block = false
     self.enable_full_page_caching = false
     self.enable_action_caching = false
     self.enable_sitemap = true
     self.max_revisions = 10
+    self.template_404 = nil
     self.multisite_config = []
     def self.site_config_for_short_name(short_name)
         configs = Spud::Cms.multisite_config.select{|p| p[:short_name].to_s == short_name.to_s}
@@ -25,4 +26,4 @@ module Spud
     end
 
   end
-end
+end

data/lib/spud_cms/page_route.rb

@@ -1,3 +1,5 @@
 Rails.application.routes.append do
-	match "*id", :controller => "pages",:action => "show", :as => "page"
-end
+	# constraints :path => /(?!assets)/ do
+		match "*id", :controller => "pages",:action => "show", :as => "page"
+	# end
+end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.8.11"
+		VERSION = "0.8.12"
 	end
 end

data/spec/controllers/spud/admin/cms_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Spud::Admin::CmsController do
+
+end

data/spec/controllers/spud/cms/sitemaps_controller_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Spud::Cms::SitemapsController do
+  describe :show do
+    it "should return the sitemap urls" do
+      
+      get :show, :format => :xml
+      
+      assigns(:pages).should == SpudPage.published_pages.public.order(:spud_page_id)
+    end
+    
+    it "should only respond to an XML format" do
+      get :show
+      response.response_code.should == 406
+    end
+  end
+end

data/spec/dummy/db/migrate/20120610123555_add_time_zone_to_spud_user.spud_core.rb

@@ -0,0 +1,7 @@
+# This migration comes from spud_core (originally 20120327124229)
+class AddTimeZoneToSpudUser < ActiveRecord::Migration
+  def change
+    add_column :spud_users, :time_zone, :string
+
+  end
+end

data/spec/dummy/db/migrate/20120610123556_add_scope_to_spud_admin_permissions.spud_core.rb

@@ -0,0 +1,7 @@
+# This migration comes from spud_core (originally 20120328235431)
+class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
+  def change
+    add_column :spud_admin_permissions, :scope, :string
+
+  end
+end

data/spec/dummy/db/migrate/20120610123557_create_spud_user_settings.spud_core.rb

@@ -0,0 +1,12 @@
+# This migration comes from spud_core (originally 20120329174000)
+class CreateSpudUserSettings < ActiveRecord::Migration
+  def change
+    create_table :spud_user_settings do |t|
+      t.integer :spud_user_id
+      t.string :key
+      t.string :value
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20120610123615_add_site_id_to_spud_permalinks.spud_permalinks.rb

@@ -0,0 +1,7 @@
+# This migration comes from spud_permalinks (originally 20120329135522)
+class AddSiteIdToSpudPermalinks < ActiveRecord::Migration
+  def change
+    add_column :spud_permalinks, :site_id, :integer
+    add_index :spud_permalinks,:site_id
+  end
+end

data/{test → spec}/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120307003559) do
+ActiveRecord::Schema.define(:version => 20120610123615) do
 
   create_table "spud_admin_permissions", :force => true do |t|
     t.integer  "user_id"
@@ -19,6 +19,7 @@ ActiveRecord::Schema.define(:version => 20120307003559) do
     t.boolean  "access"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.string   "scope"
   end
 
   create_table "spud_menu_items", :force => true do |t|
@@ -44,8 +45,22 @@ ActiveRecord::Schema.define(:version => 20120307003559) do
     t.text     "description"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.integer  "site_id"
   end
 
+  add_index "spud_menus", ["site_id"], :name => "index_spud_menus_on_site_id"
+
+  create_table "spud_page_partial_revisions", :force => true do |t|
+    t.string   "name"
+    t.text     "content"
+    t.string   "format"
+    t.integer  "spud_page_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  add_index "spud_page_partial_revisions", ["spud_page_id", "name"], :name => "revision_idx"
+
   create_table "spud_page_partials", :force => true do |t|
     t.integer  "spud_page_id"
     t.string   "name"
@@ -75,17 +90,22 @@ ActiveRecord::Schema.define(:version => 20120307003559) do
     t.boolean  "published",           :default => true
     t.boolean  "use_custom_url_name", :default => false
     t.text     "notes"
+    t.integer  "site_id"
   end
 
+  add_index "spud_pages", ["site_id"], :name => "index_spud_pages_on_site_id"
+
   create_table "spud_permalinks", :force => true do |t|
     t.string   "url_name"
     t.string   "attachment_type"
     t.integer  "attachment_id"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
+    t.integer  "site_id"
   end
 
   add_index "spud_permalinks", ["attachment_type", "attachment_id"], :name => "index_spud_permalinks_on_attachment_type_and_attachment_id"
+  add_index "spud_permalinks", ["site_id"], :name => "index_spud_permalinks_on_site_id"
 
   create_table "spud_templates", :force => true do |t|
     t.string   "name"
@@ -94,6 +114,17 @@ ActiveRecord::Schema.define(:version => 20120307003559) do
     t.text     "page_parts"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.integer  "site_id"
+  end
+
+  add_index "spud_templates", ["site_id"], :name => "index_spud_templates_on_site_id"
+
+  create_table "spud_user_settings", :force => true do |t|
+    t.integer  "spud_user_id"
+    t.string   "key"
+    t.string   "value"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "spud_users", :force => true do |t|
@@ -116,6 +147,7 @@ ActiveRecord::Schema.define(:version => 20120307003559) do
     t.string   "last_login_ip"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
+    t.string   "time_zone"
   end
 
   add_index "spud_users", ["email"], :name => "index_spud_users_on_email"

data/spec/dummy/log/development.log

@@ -0,0 +1,77 @@
+   (0.5ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Migrating to CreateSpudPages (20120101192412)
+Migrating to CreateSpudMenus (20120101193138)
+Migrating to CreateSpudMenuItems (20120101193255)
+Migrating to CreateSpudTemplates (20120101194124)
+Migrating to CreateSpudPagePartials (20120103034659)
+Migrating to AddVisibilityToSpudPages (20120104194032)
+Migrating to AddMenuNameToSpudMenuItems (20120107181337)
+Migrating to AddUseCustomUrlNameToSpudPages (20120111134754)
+Migrating to AddNotesToSpudPages (20120118141852)
+Migrating to AddMenuIdToSpudMenuItems (20120126232428)
+Migrating to AddClassesToSpudMenuItems (20120128163601)
+Migrating to CreateSpudAdminPermissions (20120307002859)
+Migrating to CreateSpudUsers (20120307002860)
+Migrating to CreateSpudPermalinks (20120307003559)
+Migrating to AddSiteIdToSpudPages (20120329132314)
+Migrating to AddSiteIdToSpudTemplates (20120329132322)
+Migrating to AddSiteIdToSpudMenus (20120329132330)
+Migrating to CreateSpudPagePartialRevisions (20120510195151)
+Migrating to AddTimeZoneToSpudUser (20120610123555)
+   (776.3ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123555')
+Migrating to AddScopeToSpudAdminPermissions (20120610123556)
+   (144.2ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
+   (1.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123556')
+Migrating to CreateSpudUserSettings (20120610123557)
+   (344.0ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123557')
+Migrating to AddSiteIdToSpudPermalinks (20120610123615)
+   (321.7ms)  ALTER TABLE `spud_permalinks` ADD `site_id` int(11)
+   (206.7ms)  CREATE INDEX `index_spud_permalinks_on_site_id` ON `spud_permalinks` (`site_id`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123615')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (17.7ms)  DROP DATABASE IF EXISTS `spud_cms_test`
+   (0.3ms)  CREATE DATABASE `spud_cms_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (130.9ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
+   (254.0ms)  CREATE TABLE `spud_menu_items` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `parent_type` varchar(255), `parent_id` int(11), `item_type` int(11), `spud_page_id` int(11), `menu_order` int(11) DEFAULT 0, `url` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `name` varchar(255), `spud_menu_id` int(11), `classes` varchar(255)) ENGINE=InnoDB
+   (191.4ms)  CREATE INDEX `index_spud_menu_items_on_menu_order` ON `spud_menu_items` (`menu_order`)
+   (192.3ms)  CREATE INDEX `index_spud_menu_items_on_parent_type_and_parent_id` ON `spud_menu_items` (`parent_type`, `parent_id`)
+   (210.6ms)  CREATE INDEX `index_spud_menu_items_on_spud_menu_id` ON `spud_menu_items` (`spud_menu_id`)
+   (205.5ms)  CREATE TABLE `spud_menus` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `description` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `site_id` int(11)) ENGINE=InnoDB
+   (372.9ms)  CREATE INDEX `index_spud_menus_on_site_id` ON `spud_menus` (`site_id`)
+   (260.3ms)  CREATE TABLE `spud_page_partial_revisions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `content` text, `format` varchar(255), `spud_page_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (224.9ms)  CREATE INDEX `revision_idx` ON `spud_page_partial_revisions` (`spud_page_id`, `name`)
+   (235.5ms)  CREATE TABLE `spud_page_partials` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_page_id` int(11), `name` varchar(255), `content` text, `format` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (183.7ms)  CREATE INDEX `index_spud_page_partials_on_spud_page_id` ON `spud_page_partials` (`spud_page_id`)
+   (184.5ms)  CREATE TABLE `spud_pages` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `url_name` varchar(255), `publish_at` datetime, `created_by` int(11), `updated_by` int(11), `format` varchar(255) DEFAULT 'html', `spud_page_id` int(11), `meta_description` text, `meta_keywords` varchar(255), `page_order` int(11), `template_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `visibility` int(11) DEFAULT 0, `published` tinyint(1) DEFAULT 1, `use_custom_url_name` tinyint(1) DEFAULT 0, `notes` text, `site_id` int(11)) ENGINE=InnoDB
+   (214.5ms)  CREATE INDEX `index_spud_pages_on_site_id` ON `spud_pages` (`site_id`)
+   (184.7ms)  CREATE TABLE `spud_permalinks` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `url_name` varchar(255), `attachment_type` varchar(255), `attachment_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `site_id` int(11)) ENGINE=InnoDB
+   (203.0ms)  CREATE INDEX `index_spud_permalinks_on_attachment_type_and_attachment_id` ON `spud_permalinks` (`attachment_type`, `attachment_id`)
+   (178.1ms)  CREATE INDEX `index_spud_permalinks_on_site_id` ON `spud_permalinks` (`site_id`)
+   (194.8ms)  CREATE TABLE `spud_templates` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `base_layout` varchar(255), `content` text, `page_parts` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `site_id` int(11)) ENGINE=InnoDB
+   (235.4ms)  CREATE INDEX `index_spud_templates_on_site_id` ON `spud_templates` (`site_id`)
+   (186.6ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (241.1ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
+   (192.6ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (189.6ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (205.2ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (214.7ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.1ms)  SELECT version FROM `schema_migrations`
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610123615')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120101192412')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120101193138')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120101193255')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120101194124')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120103034659')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120104194032')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120107181337')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120111134754')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120118141852')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120126232428')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120128163601')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329132314')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329132322')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329132330')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120510195151')