spud_blog 0.2.2 → 0.4.0

data/app/assets/javascripts/spud/blog.js

@@ -0,0 +1,41 @@
+Spud = (typeof(Spud) == 'undefined') ? {} : Spud;
+
+Spud.Blog = new function(){
+  
+  var self = this;
+
+  this.init = function(){
+    $('.spud_blog_filter_form').live('submit', self.didSubmitFilterForm)
+  };
+
+  this.didSubmitFilterForm = function(event){
+    event.preventDefault();
+    var form = $(this);
+    var base = form.attr('action');
+    var url = '';
+
+    // find filter values    
+    var category_select = $(this).find('select[rel=category]');
+    if(category_select){
+      var category = category_select.val();
+    }
+    var archive_select = $(this).find('select[rel=archive]');
+    if(archive_select){
+      var archive = archive_select.val();
+    }
+
+    // build url and redirect
+    if(category && archive){
+      url = '/category/' + category + '/' + archive;
+    }
+    else if(category){
+      url = '/category/' + category;
+    }
+    else if(archive){
+      url = '/archive/' + archive;
+    }
+    window.location = base + url;
+  };
+};
+
+$(document).ready(Spud.Blog.init);

data/app/controllers/blog_controller.rb

@@ -9,30 +9,34 @@ class BlogController < ApplicationController
     respond_with @posts
   end
 
-  def category
-    @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-    if @post_category.nil?
+  # The sole purpose of this action is to redirect from a POST to an seo-friendly url
+  def filter
+    if !params[:category_url_name].blank? && !params[:archive_date].blank?
+      redirect_to blog_category_archive_path(params[:category_url_name], params[:archive_date])
+    elsif !params[:category_url_name].blank?
+      redirect_to blog_category_path(params[:category_url_name])
+    elsif !params[:archive_date].blank?
+      redirect_to blog_archive_path(params[:archive_date])
+    else
       redirect_to blog_path
+    end
+  end
+
+  def category
+    if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
+      @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
     else
-      if request.post?
-        redirect_to blog_category_path(params[:category_url_name])
-      else
-        @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page)
-        respond_with @posts do |format|
-          format.html { render 'index' }
-        end
-      end
+      @posts = []
+    end
+    respond_with @posts do |format|
+      format.html { render 'index' }
     end
   end
 
   def archive
-    if request.post?
-      redirect_to blog_archive_path(params[:archive_date])
-    else
-      @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
-      respond_with @posts do |format|
-        format.html { render 'index' }
-      end
+    @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+    respond_with @posts do |format|
+      format.html { render 'index' }
     end
   end
 

data/app/controllers/news_controller.rb

@@ -1,37 +1,41 @@
 class NewsController < ApplicationController
 
 	respond_to :html, :xml, :json
-	layout Spud::Blog.base_layout
+	layout Spud::Blog.news_layout
 
   def index
     @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page)
     respond_with @posts
   end
 
-  def category
-    @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-    if @post_category.nil?
+  # The sole purpose of this action is to redirect from a POST to an seo-friendly url
+  def filter
+    if !params[:category_url_name].blank? && !params[:archive_date].blank?
+      redirect_to news_category_archive_path(params[:category_url_name], params[:archive_date])
+    elsif !params[:category_url_name].blank?
+      redirect_to news_category_path(params[:category_url_name])
+    elsif !params[:archive_date].blank?
+      redirect_to news_archive_path(params[:archive_date])
+    else
       redirect_to news_path
+    end
+  end
+
+  def category
+    if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
+      @posts = @post_category.posts_with_children.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
     else
-      if request.post?
-        redirect_to news_category_path(params[:category_url_name])
-      else
-        @posts = @post_category.posts.public_news_posts(params[:page], Spud::Blog.config.posts_per_page)
-        respond_with @posts do |format|
-          format.html { render 'index' }
-        end
-      end
+      @posts = []
+    end
+    respond_with @posts do |format|
+      format.html { render 'index' }
     end
   end
 
   def archive
-    if request.post?
-      redirect_to news_archive_path(params[:archive_date])
-    else
-      @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
-      respond_with @posts do |format|
-        format.html { render 'index' }
-      end
+    @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+    respond_with @posts do |format|
+      format.html { render 'index' }
     end
   end
 

data/app/helpers/blog_helper.rb

@@ -1,16 +1,17 @@
 module BlogHelper
 
 	def spud_post_category_select
-		select_tag 'category_url_name', 
+		return select_tag 'category_url_name', 
 			options_for_select(SpudPostCategory.options_for_categories(:value => :url_name), params[:category_url_name]), 
-			:include_blank => true
+			:include_blank => true,
+			:rel => 'category'
 	end
 
 	def spud_post_archive_select
 		dates = SpudPost.months_with_public_posts
 		return select_tag 'archive_date', options_for_select(SpudPost.months_with_public_posts.collect{ |d| 
 			[d.strftime('%B %Y'), d.strftime('%Y-%b').downcase]
-		}, params[:archive_date]), :include_blank => true
+		}, params[:archive_date]), :include_blank => true, :rel => 'archive'
 	end
 
 end

data/app/models/spud_post.rb

@@ -12,7 +12,9 @@ class SpudPost < ActiveRecord::Base
 	before_validation :set_url_name
 
 	def self.public_posts(page, per_page)
-		return where('visible = 1 AND published_at <= ?', Time.now.utc).order('published_at desc').includes(:comments, :categories).paginate(:page => page, :per_page => per_page)
+
+		return where('visible = ? AND published_at <= ?', true,Time.now.utc).order('published_at desc').includes(:comments, :categories).paginate(:page => page, :per_page => per_page)
+
 	end
 
 	def self.public_blog_posts(page, per_page)
@@ -24,7 +26,7 @@ class SpudPost < ActiveRecord::Base
 	end
 
 	def self.recent_posts(limit=5)
-		return where('visible = 1 AND published_at <= ?', Time.now.utc).order('published_at desc').limit(limit)
+		return where('visible = ? AND published_at <= ?', true, Time.now.utc).order('published_at desc').limit(limit)
 	end
 
 	def self.recent_blog_posts(limit=5)
@@ -44,6 +46,8 @@ class SpudPost < ActiveRecord::Base
 		end
 	end
 
+	#def self.posts_for_category_archive(category, )
+
  	# Returns an array of Date objects for months with public posts
 	def self.months_with_public_posts
 		# Select 
@@ -54,8 +58,12 @@ class SpudPost < ActiveRecord::Base
 		# And published_at < '2012-01-30'
 		# Group By published_month, published_year
 		# Order By published_year desc, published_month desc
-		records = select('Month(published_at) as published_month, Year(published_at) as published_year').where('visible = 1 And published_at < ?', DateTime.now).group('published_month, published_year').order('published_year desc, published_month desc')
-		return records.collect{ |r| Date.new(r[:published_year], r[:published_month]) }
+		records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ?', true, DateTime.now).group('published_month, published_year').order('published_year desc, published_month desc')
+		begin
+			return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
+		rescue Exception => e
+			logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
+		end
 	end
 
 	def display_date

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

@@ -1,14 +1,8 @@
-<div id="spud_blog_categories">
-	<%= form_tag '/blog/category' do %>
-		<label>Filter By Category:</label>
+<div id="spud_blog_filters">
+	<%= form_tag blog_path, :class => 'spud_blog_filter_form' do %>
+		<label>Category:</label>
 		<%= spud_post_category_select %>
-		<input type="submit" value="Submit" />
-	<% end %>
-</div>
-
-<div id="spud_blog_archive">
-	<%= form_tag '/blog/archive' do %>
-		<label>Filter By Month:</label>
+		<label>Month:</label>
 		<%= spud_post_archive_select %>
 		<input type="submit" value="Submit" />
 	<% end %>

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

@@ -1,14 +1,8 @@
-<div id="spud_news_categories">
-	<%= form_tag '/news/category' do %>
-		<label>Filter By Category:</label>
+<div id="spud_news_filters">
+	<%= form_tag news_path, :class => 'spud_blog_filter_form' do %>
+		<label>Category:</label>
 		<%= spud_post_category_select %>
-		<input type="submit" value="Submit" />
-	<% end %>
-</div>
-
-<div id="spud_news_archive">
-	<%= form_tag '/news/archive' do %>
-		<label>Filter By Month:</label>
+		<label>Month:</label>
 		<%= spud_post_archive_select %>
 		<input type="submit" value="Submit" />
 	<% end %>

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

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

data/config/routes.rb

@@ -18,18 +18,33 @@ Rails.application.routes.draw do
     scope Spud::Blog.config.blog_path do
 
       # Blog Post Categories
-      get 'category/:category_url_name', :controller => 'blog', :action => 'category', :page => 1, :as => 'blog_category'
-      get 'category/:category_url_name/page/:page', :controller => 'blog', :action => 'category'
-      post 'category', :controller => 'blog', :action => 'category'
+      get 'category/:category_url_name(/page/:page)', 
+        :controller => 'blog', 
+        :action => 'category',  
+        :as => 'blog_category',
+        :defaults => {:page => 1}
+      get 'category/:category_url_name/:archive_date(/page/:page)', 
+        :controller => 'blog', 
+        :action => 'category', 
+        :as => 'blog_category_archive',
+        :defaults => {:page => 1}
 
       # Blog Post Archives
-      get 'archive/:archive_date', :controller => 'blog', :action => 'archive', :page => 1, :as => 'blog_archive'
-      get 'archive/:archive_date/page/:page', :controller => 'blog', :action => 'archive'
-      post 'archive', :controller => 'blog', :action => 'archive'
+      get 'archive/:archive_date(/page/:page)', 
+        :controller => 'blog', 
+        :action => 'archive', 
+        :as => 'blog_archive',
+        :defaults => {:page => 1}
+
+      # Category/Archive filtering
+      post '/', :controller => 'blog', :action => 'filter'
 
       # Blog Posts
-      get '/', :controller => 'blog', :action => 'index', :page => 1, :as => 'blog'
-      get 'page/:page', :controller => 'blog', :action => 'index'
+      get '/(page/:page)', 
+        :controller => 'blog', 
+        :action => 'index',
+        :as => 'blog',
+        :defaults => {:page => 1}
       resources :blog_posts, :path => '/', :controller => 'blog', :only => [:show] do
         post '/', :on => :member, :controller => 'blog', :action => 'create_comment'
       end
@@ -40,18 +55,33 @@ Rails.application.routes.draw do
     scope Spud::Blog.config.news_path do
 
       # News Post Categories
-      get 'category/:category_url_name', :controller => 'news', :action => 'category', :page => 1, :as => 'news_category'
-      get 'category/:category_url_name/page/:page', :controller => 'news', :action => 'category'
-      post 'category', :controller => 'news', :action => 'category'
+      get 'category/:category_url_name(/page/:page)', 
+        :controller => 'news', 
+        :action => 'category',
+        :as => 'news_category',
+        :defaults => {:page => 1}
+      get 'category/:category_url_name/:archive_date(/page/:page)', 
+        :controller => 'news', 
+        :action => 'category', 
+        :as => 'news_category_archive',
+        :defaults => {:page => 1}
       
       # News Post Archives
-      get 'archive/:archive_date', :controller => 'news', :action => 'archive', :page => 1, :as => 'news_archive'
-      get 'archive/:archive_date/page/:page', :controller => 'news', :action => 'archive'
-      post 'archive', :controller => 'news', :action => 'archive'
+      get 'archive/:archive_date(/page/:page)', 
+        :controller => 'news',
+        :action => 'archive', 
+        :as => 'news_archive',
+        :defaults => {:page => 1}
+
+      # Category/Archive filtering
+      post '/', :controller => 'news', :action => 'filter'
       
       # News Posts
-      get '/', :controller => 'news', :action => 'index', :page => 1, :as => 'news'
-      get 'page/:page', :controller => 'news', :action => 'index'
+      get '/(page/:page)', 
+        :controller => 'news', 
+        :action => 'index', 
+        :as => 'news',
+        :defaults => {:page => 1}
       resources :news_posts, :path => '/', :controller => 'news', :only => [:show]
     end
   end

data/lib/generators/spud/blog/views_generator.rb

@@ -0,0 +1,19 @@
+require 'rails/generators/migration'
+
+class Spud::Blog::ViewsGenerator < ::Rails::Generators::Base
+  
+  source_root File.expand_path('../../../../../app/views', __FILE__)
+
+  def install
+    if Spud::Blog.config.blog_enabled
+      copy_file 'blog/_comment.html.erb', 'app/views/blog/_comment.html.erb'
+      copy_file 'blog/_comment_form.html.erb', 'app/views/blog/_comment_form.html.erb'
+      copy_file 'blog/index.html.erb', 'app/views/blog/index.html.erb'
+      copy_file 'blog/show.html.erb', 'app/views/blog/show.html.erb'
+    end
+    if Spud::Blog.config.news_enabled
+      copy_file 'news/index.html.erb', 'app/views/news/index.html.erb'
+      copy_file 'news/show.html.erb', 'app/views/news/show.html.erb'
+    end
+  end
+end

data/lib/scripts/random_data.rb

@@ -0,0 +1,31 @@
+# Quick script for faking up some data
+
+def random_word
+  chars = 'abcdefghjkmnpqrstuvwxyz'
+  return (1..6).collect{ chars[rand(chars.length)] }.join('').capitalize
+end
+
+def random_title
+  return (1..4).collect{ random_word }.join(' ')
+end
+
+def random_time
+  return Time.at(1.year.ago + rand * (Time.now.to_f - 1.year.ago.to_f))
+end
+
+100.times do
+  post = SpudPost.create({
+    :title => random_title,
+    :content => 'Hello, World!',
+    :published_at => random_time,
+    :visible => 1,
+    :spud_user_id => 1
+  })
+end
+
+category_ids = SpudPostCategory.all.collect{ |c| c.id }
+
+SpudPost.all.each do |p|
+  p.category_ids = [category_ids[rand(category_ids.length)]]
+  p.save
+end

data/lib/spud_blog/configuration.rb

@@ -1,8 +1,10 @@
 module Spud
   module Blog
     include ActiveSupport::Configurable
-    config_accessor :base_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
+
     self.base_layout = 'application'
+    self.news_layout = nil
     self.news_enabled = false
     self.blog_enabled = true
     self.posts_per_page = 5

data/lib/spud_blog/engine.rb

@@ -39,6 +39,11 @@ module Spud
           has_many :posts, :class_name => 'SpudPost'
         end
       end
+      initializer :news_layout do
+        if Spud::Core.config.news_layout.nil?
+          Spud::Core.config.news_layout = Spud::Core.config.base_layout
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70355129523080 !ruby/object:Gem::Requirement
+  requirement: &70273322548400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70355129523080
+  version_requirements: *70273322548400
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70355129522600 !ruby/object:Gem::Requirement
+  requirement: &70273322547920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355129522600
+  version_requirements: *70273322547920
 description: 
 email: greg@westlakedesign.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/news.js
 - app/assets/javascripts/spud/admin/news_posts.js
 - app/assets/javascripts/spud/admin/post_categories.js
 - app/assets/javascripts/spud/admin/post_comments.js
 - app/assets/javascripts/spud/admin/posts.js
+- app/assets/javascripts/spud/blog.js
 - app/assets/javascripts/spud/blog/sitemaps.js
 - app/assets/stylesheets/news.css
 - app/assets/stylesheets/spud/admin/news_posts.css
@@ -92,6 +92,8 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/routes.rb
+- lib/generators/spud/blog/views_generator.rb
+- lib/scripts/random_data.rb
 - lib/spud_blog.rb
 - lib/spud_blog/configuration.rb
 - lib/spud_blog/engine.rb

data/app/assets/javascripts/news.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.