spud_blog 0.5.1 → 0.6.0

data/app/assets/javascripts/spud/admin/posts.js

@@ -11,7 +11,7 @@ Spud.Admin.Posts = new function(){
 	this.edit = function(){
 		$('input[type=submit],.close_dialog').button();
 		initDatePicker();
-		initWysiwym();
+		initTinyMCE();
 		$('#spud_post_new_category_form button').live('click', self.didSubmitCategory);
 	};
 

data/app/controllers/blog_controller.rb

@@ -1,9 +1,17 @@
 class BlogController < ApplicationController
 
-	respond_to :html, :xml, :json
-	before_filter :find_post, :only => [:show]
+
+	respond_to :html, :xml, :json,:rss
+
 	layout Spud::Blog.base_layout
 
+  caches_action :show, :index,
+    :layout => false,
+    :expires => Spud::Blog.config.caching_expires_in,
+    :if => Proc.new{ |c|
+      Spud::Blog.config.caching_enabled && !(c.params[:page] && c.params[:page].to_i > 1)
+    }
+
   def index
     @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page)
     respond_with @posts
@@ -42,6 +50,7 @@ class BlogController < ApplicationController
   end
 
   def show
+    find_post
     if @post.comments_enabled
       @comment = SpudPostComment.new(:spud_post_id => params[:id])
     end
@@ -56,7 +65,11 @@ class BlogController < ApplicationController
       redirect_to blog_path and return false
     end
     @comment = @post.comments.new(params[:spud_post_comment])
-    flash[:notice] = 'Your comment has been posted, however it will not appear until it is approved.' if @comment.save
+    @comment.approved = true
+    if @comment.save
+      flash[:notice] = 'Your comment has been posted, however it will not appear until it is approved.'
+      expire_action blog_post_url(@post.url_name)
+    end
     respond_with @comment do |format|
     	format.html { redirect_to blog_post_path(@post.url_name, :anchor => 'spud_post_comment_form') }
     end

data/app/controllers/news_controller.rb

@@ -1,8 +1,15 @@
 class NewsController < ApplicationController
 
-	respond_to :html, :xml, :json
+	respond_to :html, :xml, :json,:rss
 	layout Spud::Blog.news_layout
 
+  caches_action :show, :index,
+    :layout => false,
+    :expires => Spud::Blog.config.caching_expires_in,
+    :if => Proc.new{ |c|
+      Spud::Blog.config.caching_enabled && !(c.params[:page] && c.params[:page].to_i > 1)
+    }
+
   def index
     @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page)
     respond_with @posts

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

@@ -19,7 +19,10 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 
 	def update
 		@categories = SpudPostCategory.grouped
-    flash[:notice] = 'News Post was successfully updated.' if @post.update_attributes(params[:spud_post])
+		if @post.update_attributes(params[:spud_post])
+	    flash[:notice] = 'News Post was successfully updated.'
+			expire_news_actions(@post)
+	  end
     respond_with @post, :location => spud_admin_news_posts_path
 	end
 
@@ -32,12 +35,18 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 	def create
 		@categories = SpudPostCategory.grouped
 		@post = SpudPost.new(params[:spud_post])
-    flash[:notice] = 'News Post was successfully created.' if @post.save
+		if @post.save
+    	flash[:notice] = 'News Post was successfully created.'
+    	expire_news_actions
+	  end
     respond_with @post, :location => spud_admin_news_posts_path
 	end
 
 	def destroy
-    flash[:notice] = 'News Post was successfully deleted.' if @post.destroy
+		if @post.destroy
+	    flash[:notice] = 'News Post was successfully deleted.'
+	    expire_news_actions(@post)
+		end
     respond_with @post, :location => spud_admin_news_posts_path
 	end
 
@@ -51,4 +60,9 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 		end
 	end
 
+	def expire_news_actions
+		expire_action news_url
+		expire_action news_post_url(@post.url_name) unless @post.nil?
+	end
+
 end

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

@@ -17,7 +17,10 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		flash[:notice] = 'Post Category was successfully updated' if @post_category.update_attributes(params[:spud_post_category])
+		if @post_category.update_attributes(params[:spud_post_category])
+			flash[:notice] = 'Post Category was successfully updated' 
+			expire_post_actions
+		end
 		respond_with @post_category, :location => spud_admin_post_categories_path
 	end
 
@@ -28,12 +31,18 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 
 	def create
 		@post_category = SpudPostCategory.new(params[:spud_post_category])
-		flash[:notice] = 'Post Category was successfully created' if @post_category.save
+		if @post_category.save
+			flash[:notice] = 'Post Category was successfully created'
+			expire_post_actions
+		end
 		respond_with @post_category, :location => spud_admin_post_categories_path
 	end
 
 	def destroy
-		flash[:notice] = 'Post Category was successfully deleted' if @post_category.destroy
+		if @post_category.destroy
+			flash[:notice] = 'Post Category was successfully deleted'
+			expire_post_actions
+		end
 		respond_with @post_category, :location => spud_admin_post_categories_path
 	end
 
@@ -43,4 +52,9 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 		@post_category = SpudPostCategory.find(params[:id])
 	end
 
+	def expire_post_actions
+		expire_action news_url
+		expire_action blog_url
+	end
+
 end

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

@@ -8,7 +8,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	belongs_to_spud_app :blog_posts
 
 	def index
-		@posts = SpudPost.where(:is_news => false).order('published_at desc').includes(:comments).paginate(:page => params[:page], :per_page => 15)
+		@posts = SpudPost.where(:is_news => false).order('published_at desc').includes(:comments, :author).paginate(:page => params[:page], :per_page => 15)
 		respond_with @posts
 	end
 
@@ -19,7 +19,10 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 
 	def update
 		@categories = SpudPostCategory.grouped
-    flash[:notice] = 'Post was successfully updated.' if @post.update_attributes(params[:spud_post])
+		if @post.update_attributes(params[:spud_post])
+			flash[:notice] = 'Post was successfully updated.'
+			expire_blog_actions
+		end
     respond_with @post, :location => spud_admin_posts_path
 	end
 
@@ -32,12 +35,18 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	def create
 		@categories = SpudPostCategory.grouped
 		@post = SpudPost.new(params[:spud_post])
-    flash[:notice] = 'Post was successfully created.' if @post.save
+		if @post.save
+	    flash[:notice] = 'Post was successfully created.'
+	    expire_blog_actions
+		end
     respond_with @post, :location => spud_admin_posts_path
 	end
 
 	def destroy
-    flash[:notice] = 'Post was successfully deleted.' if @post.destroy
+		if @post.destroy
+	    flash[:notice] = 'Post was successfully deleted.' 
+	    expire_blog_actions
+   	end
     respond_with @post, :location => spud_admin_posts_path
 	end
 
@@ -51,4 +60,9 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 		end
 	end
 
+	def expire_blog_actions
+		expire_action blog_url
+		expire_action blog_post_url(@post.url_name) unless @post.nil?
+	end
+
 end

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

@@ -1,6 +1,6 @@
 class Spud::Blog::SitemapsController < Spud::ApplicationController
 	respond_to :xml
-	caches_page :show,:expires_in => 1.day
+	caches_action :show, :expires_in => 1.day
 	def show
 		@posts = SpudPost.publicly.all
 		respond_with @pages

data/app/views/blog/index.html.erb

@@ -1,3 +1,6 @@
+<%=content_for :head do%>
+<link rel="alternate" type="application/rss+xml" title="<%=Spud::Core.site_name%> Blog RSS" href="<%=blog_url()%>" />
+<%end%>
 <div id="spud_blog_filters">
 	<%= form_tag blog_path, :class => 'spud_blog_filter_form' do %>
 		<label>Category:</label>

data/app/views/blog/index.rss.builder

@@ -0,0 +1,18 @@
+xml.instruct! :xml, :version => "1.0" 
+xml.rss :version => "2.0" do
+  xml.channel do
+    xml.title "#{Spud::Core.site_name} Blog Articles"
+    xml.description "Blog articles for #{Spud::Core.site_name}"
+    xml.link news_url(:format => :rss)
+    
+    for article in @posts
+      xml.item do
+        xml.title article.title
+        xml.description article.content
+        xml.pubDate article.created_at.to_s(:rfc822)
+        xml.link news_post_url(article.url_name)
+        xml.guid news_post_url(article.url_name)
+      end
+    end
+  end
+end

data/app/views/news/index.html.erb

@@ -1,3 +1,6 @@
+<%=content_for :head do%>
+<link rel="alternate" type="application/rss+xml" title="<%=Spud::Core.site_name%> News RSS" href="<%=news_url()%>" />
+<%end%>
 <div id="spud_news_filters">
 	<%= form_tag news_path, :class => 'spud_blog_filter_form' do %>
 		<label>Category:</label>

data/app/views/news/index.rss.builder

@@ -0,0 +1,18 @@
+xml.instruct! :xml, :version => "1.0" 
+xml.rss :version => "2.0" do
+  xml.channel do
+    xml.title "#{Spud::Core.site_name} News"
+    xml.description "News articles for #{Spud::Core.site_name}"
+    xml.link news_url(:format => :rss)
+    
+    for article in @posts
+      xml.item do
+        xml.title article.title
+        xml.description article.content
+        xml.pubDate article.created_at.to_s(:rfc822)
+        xml.link news_post_url(article.url_name)
+        xml.guid news_post_url(article.url_name)
+      end
+    end
+  end
+end

data/app/views/spud/admin/news_posts/index.html.erb

@@ -17,7 +17,7 @@
 				<tr>
 					<td><%= link_to post.title, edit_spud_admin_news_post_path(post) %></td>
 					<td><%= post.author.full_name %></td>
-					<td><%= post.published_at.strftime('%m/%d/%Y') %></td>
+					<td><%= link_to(post.published_at.strftime('%m/%d/%Y'), news_post_path(post.url_name)) %></td>
 					<td align="right">
 						<%= link_to 'Delete', spud_admin_news_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'spud_admin_button_delete' %>
 					</td>

data/app/views/spud/admin/news_posts/new.html.erb

@@ -1,3 +1,3 @@
-<%= form_for @post, :url => spud_admin_news_post_path, :html => {:class => 'right_aligned_form'} do |f| %>	
+<%= form_for @post, :url => spud_admin_news_posts_path, :html => {:class => 'right_aligned_form'} do |f| %>	
 	<%= render :partial => '/spud/admin/posts/form', :locals => {:f => f} %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= form_for @post_category, :url => spud_admin_post_category_path(@post_category), :html => {:class => 'right_aligned_form'} do |f| %>	
+<%= form_for @post_category, :url => path, :html => {:class => 'right_aligned_form'} do |f| %>	
 
 	<% if @post_category.errors.any? %>
     <div class="spud_admin_form_error_list">

data/app/views/spud/admin/post_categories/edit.html.erb

@@ -1 +1 @@
-<%= render 'form' %>
+<%= render :partial => 'form', :locals => {:path => spud_admin_post_category_path(@post_category)} %>

data/app/views/spud/admin/post_categories/new.html.erb

@@ -1 +1 @@
-<%= render 'form' %>
+<%= render :partial => 'form', :locals => {:path => spud_admin_post_categories_path} %>

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

@@ -18,7 +18,7 @@
 
 	<div>
 		<%= f.label :content %>
-		<%= f.text_area :content, :class => 'wysiwym' %>
+		<%= f.text_area :content, :class => 'wysiwym tinymce' %>
 	</div>
 
 	<fieldset>
@@ -28,6 +28,15 @@
 		</ul>
 	</fieldset>
 
+	<% if Spud::Blog.config.has_custom_fields %>
+	<fieldset>
+		<legend>Custom Fields</legend>
+		<ol>
+			<%= render :partial => '/spud/admin/posts/custom_fields', :locals => {:f => f} %>
+		</ol>
+	</fieldset>
+	<% end %>
+
 	<fieldset>
 		<legend>Advanced</legend>
 		<ol>

data/app/views/spud/admin/posts/index.html.erb

@@ -18,7 +18,7 @@
 				<tr>
 					<td><%= link_to post.title, edit_spud_admin_post_path(post) %></td>
 					<td><%= post.author.full_name %></td>
-					<td><%= post.published_at.strftime('%m/%d/%Y') %></td>
+					<td><%= link_to(post.published_at.strftime('%m/%d/%Y'), blog_post_path(post.url_name)) %></td>
 					<td><%= post.comments.size %></td>
 					<td align="right">
 						<%= link_to 'Delete', spud_admin_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'spud_admin_button_delete' %>

data/app/views/spud/admin/posts/new.html.erb

@@ -1,3 +1,3 @@
-<%= form_for @post, :url => spud_admin_post_path, :html => {:class => 'right_aligned_form'} do |f| %>	
+<%= form_for @post, :url => spud_admin_posts_path, :html => {:class => 'right_aligned_form'} do |f| %>	
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

data/lib/spud_blog/configuration.rb

@@ -1,8 +1,7 @@
 module Spud
   module Blog
     include ActiveSupport::Configurable
-    config_accessor :base_layout,:news_layout, :blog_enabled, :news_enabled, :posts_per_page, :blog_path, :news_path,:enable_sitemap
-
+    config_accessor :base_layout,:news_layout, :blog_enabled, :news_enabled, :posts_per_page, :blog_path, :news_path, :enable_sitemap, :has_custom_fields, :caching_enabled, :caching_expires_in
     self.base_layout = 'application'
     self.news_layout = nil
     self.news_enabled = false
@@ -11,5 +10,8 @@ module Spud
     self.blog_path = 'blog'
     self.news_path = 'news'
     self.enable_sitemap = true
+    self.has_custom_fields = false
+    self.caching_enabled = true
+    self.caching_expires_in = 1.hour
   end
-end
+end

data/lib/spud_blog/engine.rb

@@ -24,7 +24,7 @@ module Spud
         if Spud::Blog.config.news_enabled
           Spud::Core.config.admin_applications += [{
             :name => 'News Posts',
-            :thumbnail => 'spud/admin/posts_thumb.png',
+            :thumbnail => 'spud/admin/news_thumb.png',
             :url => '/spud/admin/news_posts',
             :order => 2
           }]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,36 +9,27 @@ 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: &70274549294540 !ruby/object:Gem::Requirement
+  requirement: &70347903377340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70274549294540
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: &70274549294060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70274549294060
+  version_requirements: *70347903377340
 description: 
 email: greg@westlakedesign.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/images/spud/admin/news_thumb.png
+- app/assets/images/spud/admin/posts_thumb.png
 - app/assets/javascripts/spud/admin/news_posts.js
 - app/assets/javascripts/spud/admin/post_categories.js
 - app/assets/javascripts/spud/admin/post_comments.js
@@ -71,9 +62,11 @@ files:
 - app/views/blog/_comment.html.erb
 - app/views/blog/_comment_form.html.erb
 - app/views/blog/index.html.erb
+- app/views/blog/index.rss.builder
 - app/views/blog/show.html.erb
 - app/views/layouts/spud/admin/post.html.erb
 - app/views/news/index.html.erb
+- app/views/news/index.rss.builder
 - app/views/news/show.html.erb
 - app/views/spud/admin/news_posts/edit.html.erb
 - app/views/spud/admin/news_posts/index.html.erb