spud_blog 0.8.14 → 0.8.15

data/app/assets/stylesheets/spud/blog/validity.css

@@ -0,0 +1,3 @@
+.comment_validity {
+      display:none;
+}

data/app/controllers/blog_controller.rb

@@ -25,7 +25,7 @@ class BlogController < ApplicationController
     @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page)
     if Spud::Core.config.multisite_mode_enabled
       @posts = @posts.for_spud_site(current_site_id)
-    end 
+    end
     respond_with @posts
   end
 
@@ -87,12 +87,16 @@ class BlogController < ApplicationController
       redirect_to blog_path and return false
     end
     @comment = @post.comments.new(params[:spud_post_comment])
+    @comment.user_agent = request.env["HTTP_USER_AGENT"]
+    @comment.user_ip = request.remote_ip
+    @comment.referrer = request.referrer
     @comment.approved = true
+    @comment.permalink = blog_post_url(@post.url_name)
     flash[:notice] = 'Your comment has been posted.' if @comment.save
     respond_with @comment do |format|
     	format.html { redirect_to blog_post_path(@post.url_name, :anchor => 'spud_post_comment_form') }
     end
-  end 
+  end
 
   private
 
@@ -104,4 +108,4 @@ class BlogController < ApplicationController
 		end
   end
 
-end
+end

data/app/models/spud_post.rb

@@ -1,12 +1,13 @@
 class SpudPost < ActiveRecord::Base
 	searchable
 
-	has_and_belongs_to_many :categories, 
+	has_and_belongs_to_many :categories,
 		:class_name => 'SpudPostCategory',
-		:join_table => 'spud_post_categories_posts', 
+		:join_table => 'spud_post_categories_posts',
 		:foreign_key => 'spud_post_id'
 	belongs_to :author, :class_name => 'SpudUser', :foreign_key => 'spud_user_id'
 	has_many :comments, :class_name => 'SpudPostComment'
+	has_many :visible_comments, :class_name => 'SpudPostComment',:conditions => {:spam => [nil,false]}
 	has_many :spud_permalinks,:as => :attachment
 	has_many :spud_post_sites, :dependent => :destroy
 
@@ -15,7 +16,7 @@ class SpudPost < ActiveRecord::Base
 	validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
 	validates_uniqueness_of :url_name
 	before_validation :set_url_name
-	
+
 	after_save :set_spud_site_ids
 
 	attr_accessible :is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,:category_ids, :spud_site_ids
@@ -62,7 +63,7 @@ class SpudPost < ActiveRecord::Base
 
  	# Returns an array of Date objects for months with public posts
 	def self.months_with_public_posts
-		# Select 
+		# Select
 		# 	Month(published_at) as published_month,
 		# 	Year(published_at) as published_year
 		# From spud_posts
@@ -140,4 +141,4 @@ class SpudPost < ActiveRecord::Base
 			self.spud_post_sites = _spud_post_sites
 		end
 	end
-end
+end

data/app/models/spud_post_comment.rb

@@ -1,7 +1,19 @@
 class SpudPostComment < ActiveRecord::Base
+  if Spud::Blog.enable_rakismet
+    include Rakismet::Model
+    before_save :rakismet_check_for_spam
+  end
+
 
 	validates_presence_of :author, :content
 	belongs_to :post, :class_name => 'SpudPost', :foreign_key => 'spud_post_id', :counter_cache => :comments_count
-	
-	attr_accessible :author,:content,:spud_post_id
-end
+
+	attr_accessible :author,:content,:spud_post_id,:referrer,:spam,:user_agent,:user_ip,:permalink
+
+
+  def rakismet_check_for_spam
+    self.spam = self.spam?
+    return true
+  end
+
+end

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

@@ -7,11 +7,14 @@
 		<%= f.label :content %>
 		<%= f.text_area :content %>
 	</div>
-	<div style="display:none;">
+	<div class="comment_validity">
 		<%= label_tag 'Comment Validation' %>
 		<%= text_field_tag 'comment_validation' %>
 	</div>
 	<div>
 		<%= f.submit 'Post Comment' %>
 	</div>
-<% end %>
+
+<% end %>
+<%= stylesheet_link_tag    "spud/blog/validity.css", :media => "all" %>
+

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

@@ -32,6 +32,6 @@
 		<%= render 'comment_form' %>
 	</div>
 	<ul id="spud_blog_post_comments">
-		<%= render :partial => 'comment', :collection => @post.comments %>
+		<%= render :partial => 'comment', :collection => @post.visible_comments %>
 	</ul>
-<% end %>
+<% end %>

data/db/migrate/20120825142547_add_spam_fields_to_spud_post_comments.rb

@@ -0,0 +1,8 @@
+class AddSpamFieldsToSpudPostComments < ActiveRecord::Migration
+  def change
+    add_column :spud_post_comments, :spam, :boolean
+    add_column :spud_post_comments, :user_ip, :string
+    add_column :spud_post_comments, :user_agent, :string
+    add_column :spud_post_comments, :referrer, :string
+  end
+end

data/db/migrate/20120825144506_add_permalink_to_spud_post_comments.rb

@@ -0,0 +1,5 @@
+class AddPermalinkToSpudPostComments < ActiveRecord::Migration
+  def change
+    add_column :spud_post_comments, :permalink, :string
+  end
+end

data/lib/spud_blog/configuration.rb

@@ -1,12 +1,12 @@
 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, :has_custom_fields, 
-      :enable_action_caching, :action_caching_duration, 
-      :enable_full_page_caching
+    config_accessor(
+      :base_layout, :news_layout, :blog_enabled,
+      :news_enabled, :posts_per_page, :blog_path,
+      :news_path, :enable_sitemap, :has_custom_fields,
+      :enable_action_caching, :action_caching_duration,
+      :enable_full_page_caching,:enable_rakismet
     )
     self.base_layout = 'application'
     self.news_layout = nil
@@ -20,5 +20,6 @@ module Spud
     self.enable_action_caching = false
     self.action_caching_duration = 3600
     self.enable_full_page_caching = false
+    self.enable_rakismet = false
   end
-end
+end

data/lib/spud_blog/engine.rb

@@ -24,7 +24,7 @@ module Spud
         end
         if Spud::Blog.config.blog_enabled
           Spud::Core.config.admin_applications += [{
-            :name => 'Blog Posts', 
+            :name => 'Blog Posts',
             :thumbnail => 'spud/admin/posts_thumb.png',
             :url => '/spud/admin/posts',
             :order => 1
@@ -40,7 +40,7 @@ module Spud
         end
       end
       initializer :assets do
-        Rails.application.config.assets.precompile += ['spud/admin/posts.css']
+        Rails.application.config.assets.precompile += ['spud/admin/posts.css','spud/blog/validity.css']
       end
       initializer :associations do
         SpudUser.class_eval do
@@ -52,6 +52,12 @@ module Spud
           Spud::Core.config.news_layout = Spud::Core.config.base_layout
         end
       end
+
+      initializer :rakismet do
+        if Spud::Blog.enable_rakismet
+          require 'rakismet'
+        end
+      end
     end
   end
 end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.8.14"
+	  VERSION = "0.8.15"
 	end
 end

data/test/dummy/log/development.log

@@ -0,0 +1,36 @@
+Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
+Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
+Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
+   (153.8ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (287.7ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Migrating to CreateSpudPosts (20120125180945)
+   (163.8ms)  CREATE TABLE `spud_posts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `title` varchar(255), `content` text, `comments_enabled` tinyint(1) DEFAULT 0, `visible` tinyint(1) DEFAULT 1, `published_at` datetime, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (225.6ms)  CREATE INDEX `index_spud_posts_on_spud_user_id` ON `spud_posts` (`spud_user_id`)
+   (178.6ms)  CREATE INDEX `index_spud_posts_on_visible` ON `spud_posts` (`visible`)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125180945')
+Migrating to CreateSpudPostCategories (20120125181022)
+   (214.2ms)  CREATE TABLE `spud_post_categories` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (209.6ms)  CREATE TABLE `spud_post_categories_posts` (`spud_post_id` int(11), `spud_post_category_id` int(11)) ENGINE=InnoDB
+   (182.2ms)  CREATE INDEX `index_spud_post_categories_posts_on_spud_post_category_id` ON `spud_post_categories_posts` (`spud_post_category_id`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125181022')
+Migrating to CreateSpudPostComments (20120125181359)
+   (171.4ms)  CREATE TABLE `spud_post_comments` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_post_id` int(11), `author` varchar(255), `content` text, `approved` tinyint(1) DEFAULT 0, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (237.9ms)  CREATE INDEX `index_spud_post_comments_on_spud_post_id` ON `spud_post_comments` (`spud_post_id`)
+   (227.0ms)  CREATE INDEX `index_spud_post_comments_on_approved` ON `spud_post_comments` (`approved`)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125181359')
+Migrating to AddUrlToSpudPosts (20120127143054)
+   (239.3ms)  ALTER TABLE `spud_posts` ADD `url_name` varchar(255)
+   (234.5ms)  CREATE INDEX `index_spud_posts_on_url_name` ON `spud_posts` (`url_name`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127143054')
+Migrating to AddUrlToSpudPostCategories (20120127144942)
+   (196.9ms)  ALTER TABLE `spud_post_categories` ADD `parent_id` int(11) DEFAULT 0
+   (220.7ms)  ALTER TABLE `spud_post_categories` ADD `url_name` varchar(255)
+   (179.0ms)  CREATE INDEX `index_spud_post_categories_on_parent_id` ON `spud_post_categories` (`parent_id`)
+   (178.4ms)  CREATE INDEX `index_spud_post_categories_on_url_name` ON `spud_post_categories` (`url_name`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127144942')
+Migrating to AddIsNewsToSpudPosts (20120210165540)
+   (207.1ms)  ALTER TABLE `spud_posts` ADD `is_news` tinyint(1) DEFAULT 0
+   (212.3ms)  CREATE INDEX `index_spud_posts_on_is_news` ON `spud_posts` (`is_news`)
+   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120210165540')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,6 +214,7 @@ files:
 - app/assets/stylesheets/spud/admin/post_comments.css
 - app/assets/stylesheets/spud/admin/posts.css
 - app/assets/stylesheets/spud/blog/sitemaps.css
+- app/assets/stylesheets/spud/blog/validity.css
 - app/controllers/blog_controller.rb
 - app/controllers/news_controller.rb
 - app/controllers/spud/admin/news_posts_controller.rb
@@ -268,6 +269,8 @@ files:
 - db/migrate/20120309181917_add_meta_to_posts.rb
 - db/migrate/20120413020437_add_comments_counter_to_spud_posts.rb
 - db/migrate/20120713150446_create_spud_post_sites.rb
+- db/migrate/20120825142547_add_spam_fields_to_spud_post_comments.rb
+- db/migrate/20120825144506_add_permalink_to_spud_post_comments.rb
 - lib/generators/spud/blog/random_posts_generator.rb
 - lib/generators/spud/blog/views_generator.rb
 - lib/spud_blog/configuration.rb
@@ -278,6 +281,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - Readme.markdown
+- test/dummy/log/development.log
 - test/fixtures/spud_post_sites.yml
 - test/unit/spud_post_site_test.rb
 homepage: http://github.com/davydotcom/spud_blog
@@ -294,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4202281715850105173
+      hash: 1089695411037407557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4202281715850105173
+      hash: 1089695411037407557
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -311,5 +315,6 @@ signing_key:
 specification_version: 3
 summary: Spud Blog Engine.
 test_files:
+- test/dummy/log/development.log
 - test/fixtures/spud_post_sites.yml
 - test/unit/spud_post_site_test.rb