spud_cms 0.8.13 → 0.8.14

data/README.markdown

@@ -18,8 +18,11 @@ Installation/Usage
 		bundle exec rake spud_core:install:migrations
 		bundle exec rake spud_cms:install:migrations
 		rake db:migrate
+4. Change ApplicationController to inherit from Spud::ApplicationController instead of ActionController::Base
 
-4. run a rails server instance and point your browser to /spud/admin
+		class ApplicationController < Spud::ApplicationController
+		
+5. run a rails server instance and point your browser to /spud/admin
 
 Routing to the CMS Engine
 --------------------------

data/app/controllers/pages_controller.rb

@@ -5,10 +5,17 @@ class PagesController < ApplicationController
 	after_filter({:only => [:show]}) do |c|
 		return if !Spud::Cms.enable_full_page_caching
 		if @page && @page.is_private? == false
-		    c.cache_page(nil, nil, false)
+	    c.cache_page(nil, nil, false)
 		end
-  	end
+  end
+
 	def show
+		# prevents 500 errors if a url like "/home.jpg" is hit
+		if request.format != :html
+			render_404
+			return
+		end
+
 		url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
 
 		# MultiSite Code Block
@@ -48,9 +55,10 @@ class PagesController < ApplicationController
 			# else
 			# 	return
 			# end
-			Spud::Cms.template_404 ? render(Spud::Cms.template_404,:status => 404) : render(:text=>nil,:status => 404)
+			render_404
 			return
 		end
+
 		if @page.is_private?
 			if defined?(require_user) && require_user == false
 				logger.debug("responds to require user!")
@@ -67,18 +75,21 @@ class PagesController < ApplicationController
 			layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
 		end
 
-
 		if !@page.spud_template.blank?
 			if !@page.spud_template.base_layout.blank?
 				layout = @page.spud_template.base_layout
 			end
 			@inline = @page.spud_template.content
-
 		end
-		render :layout => layout
+
+		render :layout => layout, :content_type => :html
 
 	end
 
 private
 
+	def render_404
+		Spud::Cms.template_404 ? render(Spud::Cms.template_404,:status => 404) : render(:text=>nil,:status => 404)
+ 	end
+
 end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.8.13"
+		VERSION = "0.8.14"
 	end
 end

data/spec/dummy/log/development.log

@@ -75,3 +75,93 @@ Migrating to AddSiteIdToSpudPermalinks (20120610123615)
    (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')
+   (6.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.3ms)  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)
+   (67.0ms)  ALTER TABLE `spud_pages` ADD `site_id` int(11)
+   (21.2ms)  CREATE INDEX `index_spud_pages_on_site_id` ON `spud_pages` (`site_id`)
+   (1.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120329132314')
+Migrating to AddSiteIdToSpudTemplates (20120329132322)
+   (16.8ms)  ALTER TABLE `spud_templates` ADD `site_id` int(11)
+   (17.7ms)  CREATE INDEX `index_spud_templates_on_site_id` ON `spud_templates` (`site_id`)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120329132322')
+Migrating to AddSiteIdToSpudMenus (20120329132330)
+   (16.2ms)  ALTER TABLE `spud_menus` ADD `site_id` int(11)
+   (17.6ms)  CREATE INDEX `index_spud_menus_on_site_id` ON `spud_menus` (`site_id`)
+   (1.0ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120329132330')
+Migrating to CreateSpudPagePartialRevisions (20120510195151)
+   (13.0ms)  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
+   (16.6ms)  CREATE INDEX `revision_idx` ON `spud_page_partial_revisions` (`spud_page_id`, `name`)
+   (0.9ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120510195151')
+Migrating to AddTimeZoneToSpudUser (20120610123555)
+   (19.9ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
+   (2.0ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123555')
+Migrating to AddScopeToSpudAdminPermissions (20120610123556)
+   (21.5ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
+   (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123556')
+Migrating to CreateSpudUserSettings (20120610123557)
+   (10.5ms)  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.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123557')
+Migrating to AddSiteIdToSpudPermalinks (20120610123615)
+   (15.8ms)  ALTER TABLE `spud_permalinks` ADD `site_id` int(11)
+   (12.7ms)  CREATE INDEX `index_spud_permalinks_on_site_id` ON `spud_permalinks` (`site_id`)
+   (1.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610123615')
+   (0.5ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (4.6ms)  DROP DATABASE IF EXISTS `spud_cms_test`
+   (2.5ms)  CREATE DATABASE `spud_cms_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (12.8ms)  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
+   (14.6ms)  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
+   (15.8ms)  CREATE INDEX `index_spud_menu_items_on_menu_order` ON `spud_menu_items` (`menu_order`)
+   (15.0ms)  CREATE INDEX `index_spud_menu_items_on_parent_type_and_parent_id` ON `spud_menu_items` (`parent_type`, `parent_id`)
+   (16.6ms)  CREATE INDEX `index_spud_menu_items_on_spud_menu_id` ON `spud_menu_items` (`spud_menu_id`)
+   (14.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
+   (15.5ms)  CREATE INDEX `index_spud_menus_on_site_id` ON `spud_menus` (`site_id`)
+   (11.1ms)  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
+   (13.7ms)  CREATE INDEX `revision_idx` ON `spud_page_partial_revisions` (`spud_page_id`, `name`)
+   (9.4ms)  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
+   (15.4ms)  CREATE INDEX `index_spud_page_partials_on_spud_page_id` ON `spud_page_partials` (`spud_page_id`)
+   (11.2ms)  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
+   (15.6ms)  CREATE INDEX `index_spud_pages_on_site_id` ON `spud_pages` (`site_id`)
+   (11.4ms)  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
+   (12.6ms)  CREATE INDEX `index_spud_permalinks_on_attachment_type_and_attachment_id` ON `spud_permalinks` (`attachment_type`, `attachment_id`)
+   (15.6ms)  CREATE INDEX `index_spud_permalinks_on_site_id` ON `spud_permalinks` (`site_id`)
+   (12.4ms)  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
+   (14.7ms)  CREATE INDEX `index_spud_templates_on_site_id` ON `spud_templates` (`site_id`)
+   (8.4ms)  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
+   (12.7ms)  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
+   (16.4ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (11.1ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (11.1ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (14.4ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.2ms)  SELECT version FROM `schema_migrations`
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610123615')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120101192412')
+   (0.3ms)  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.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120107181337')
+   (0.8ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120111134754')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120118141852')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120126232428')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120128163601')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329132314')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329132322')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329132330')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120510195151')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,7 +332,6 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
-- spec/helpers/spud/admin/cms_helper_spec.rb
 - spec/models/spud_page_partial_revision_spec.rb
 - spec/models/spud_page_spec.rb
 - spec/models/spud_template_spec.rb
@@ -352,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1127340414212299381
+      hash: -1245758938193748243
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -361,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1127340414212299381
+      hash: -1245758938193748243
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -408,7 +407,6 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
-- spec/helpers/spud/admin/cms_helper_spec.rb
 - spec/models/spud_page_partial_revision_spec.rb
 - spec/models/spud_page_spec.rb
 - spec/models/spud_template_spec.rb

data/spec/helpers/spud/admin/cms_helper_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the Spud::Admin::CmsHelper. For example:
-#
-# describe Spud::Admin::CmsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe Spud::Admin::CmsHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end