spud_cms 0.3.7 → 0.4.0

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

@@ -8,15 +8,16 @@
 // All this logic will automatically be available in application.js.
 
 $(function() {
-	initWysiwym();
-
+	// initWysiwym();
+	initTinyMCE();
 	$("#spud_page_template_id").bind('change', function() {
 		var $this = $(this);
 		$.get($this.attr("data-source"), { template: $this.val() }, function(data) {
 			$('.formtabs').tabs('destroy');
 			$("#page_partials_form").replaceWith(data)
 			initFormTabs();
-			initWysiwym();
+			initTinyMCE();
+			// initWysiwym();
 		}, 'text').error(function(jqXHR) {
 			$('<p> Error: ' + jqXHR.responseText + '</p>').dialog();
 		});

data/app/controllers/pages_controller.rb

@@ -1,4 +1,5 @@
 class PagesController < ApplicationController
+	caches_page :show,:expires_in => Spud::Cms.page_cache_expires_in, :if => Proc.new { |c| Spud::Cms.enable_full_page_caching }
 	def show
 		url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
 		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_template,:spud_page_partials]).first

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

@@ -40,7 +40,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 			end
 		end
 		flash[:notice] = "Menu Created successfully!" if @menu_item.save
-		
+
 		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 
@@ -72,6 +72,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 	def destroy
 		
 		flash[:notice] = "Menu Item removed!" if @menu_item.destroy
+
 		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 private

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

@@ -30,6 +30,7 @@ class Spud::Admin::MenusController < Spud::Admin::ApplicationController
 
 	def update
 		add_breadcrumb "Edit #{@menu.name}", :edit_spud_admin_menu_path
+		
 		flash[:notice] = "Menu saved successfully" if @menu.update_attributes(params[:spud_menu])
 		respond_with @menu,:location => spud_admin_menu_menu_items_url(:menu_id => @menu.id)
 	end

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

@@ -72,6 +72,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 	end
 
 	def update
+		expire_page page_path(:id => @page.url_name)
 		if @page.update_attributes(params[:spud_page])
 			flash[:notice] = "Page updated successfully!"
 			redirect_to spud_admin_pages_url() and return
@@ -84,6 +85,8 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
 	def destroy
 		status = 500
+		expire_page page_path(:id => @page.url_name)
+
 		if @page.destroy
 			flash[:notice] = "Page removed successfully!"
 			status = 200

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

@@ -35,12 +35,14 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 	def update
 		add_breadcrumb "Edit #{@template.name}", :edit_spud_admin_template_path
 		flash[:notice] = "Template updated successfully" if @template.update_attributes(params[:spud_template])
+		
 		respond_with @template, :location => spud_admin_templates_url
 	end
 
 
 	def destroy
 		flash[:notice] = "Template removed" if @template.destroy
+		
 		respond_with @template, :location => spud_admin_templates_url
 	end
 

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

@@ -12,7 +12,7 @@
 	<%=f.fields_for :spud_page_partials do |b|%>
 		<div class="formtab">
 			<%=b.hidden_field :name,:class => "tab_name"%>
-			<%=b.text_area :content,:class => "wysiwym"%>
+			<%=b.text_area :content,:class => "wysiwym tinymce"%>
 		</div>
 	<%end%>
 </div>

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

@@ -5,7 +5,7 @@
 	<% spud_page_partials.each_with_index do |spud_page_partial, index| %>
 		<div class="formtab">
 			<input type="hidden" class="tab_name" name="spud_page[spud_page_partials_attributes][<%= index %>][name]" value="<%= spud_page_partial.name %>" />
-			<textarea class="wysiwym" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
+			<textarea class="wysiwym tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
 				<%= spud_page_partial.content %>
 			</textarea>
 		</div>

data/lib/spud_cms/configuration.rb

@@ -2,7 +2,7 @@ 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
+    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,:page_cache_expires_in
 
     self.root_page_name = "home"
     self.menus_enabled = true
@@ -10,6 +10,8 @@ module Spud
     self.default_page_layout = 'application'
     self.default_page_parts = ["Body"]
   	self.yield_body_as_content_block = false    
+    self.enable_full_page_caching = false
+    self.page_cache_expires_in = 10.minutes
     self.enable_sitemap = true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70335492794560 !ruby/object:Gem::Requirement
+  requirement: &70189195378020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335492794560
+  version_requirements: *70189195378020
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70335492794080 !ruby/object:Gem::Requirement
+  requirement: &70189195377540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335492794080
+  version_requirements: *70189195377540
 description: 
 email: destes@redwindsw.com
 executables: []