refinerycms-blog 0.9.8.0.rc1 → 0.9.8.0.rc2

data/Gemfile

@@ -0,0 +1 @@
+gem 'filters_spam', '~> 0.2'

data/Gemfile.lock

@@ -0,0 +1,9 @@
+GEM
+  specs:
+    filters_spam (0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  filters_spam (~> 0.2)

data/app/controllers/blog_posts_controller.rb

@@ -2,6 +2,7 @@ class BlogPostsController < ApplicationController
 
   before_filter :find_all_blog_posts, :find_all_blog_categories
   before_filter :find_page
+  before_filter :find_blog_post, :only => [:show, :comment]
 
   def index
     # you can use meta fields from your model instead (e.g. browser_title)
@@ -10,15 +11,34 @@ class BlogPostsController < ApplicationController
   end
 
   def show
-    @blog_post = BlogPost.live.find(params[:id])
+    @blog_comment = BlogComment.new
 
     # you can use meta fields from your model instead (e.g. browser_title)
     # by swapping @page for @blogs in the line below:
     present(@page)
   end
 
+  def comment
+    if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
+      if BlogComment::Moderation.enabled?
+        flash[:notice] = t('.comments.thank_you_moderated')
+        redirect_back_or_default blog_post_url(params[:id])
+      else
+        flash[:notice] = t('.comments.thank_you')
+        redirect_to blog_post_url(params[:id],
+                                  :anchor => "comment-#{@blog_comment.to_param}")
+      end
+    else
+      render :action => 'show'
+    end
+  end
+
 protected
 
+  def find_blog_post
+    @blog_post = BlogPost.live.find(params[:id])
+  end
+
   def find_all_blog_posts
     unless params[:category_id].present?
       @blog_posts = BlogPost.live

data/app/models/blog_comment.rb

@@ -1,13 +1,29 @@
 class BlogComment < ActiveRecord::Base
 
+  filters_spam :author_field => :name,
+               :email_field => :email,
+               :message_field => :body
+
   belongs_to :post, :class_name => 'BlogPost'
 
-  acts_as_indexed :fields => [:name, :email, :body]
+  acts_as_indexed :fields => [:name, :email, :message]
+
+  alias_attribute :message, :body
+
+  validates_presence_of :name, :message
+  validates_format_of :email,
+                      :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
 
   named_scope :unmoderated, :conditions => {:state => nil}
   named_scope :approved, :conditions => {:state => 'approved'}
   named_scope :rejected, :conditions => {:state => 'rejected'}
 
+  before_create do |comment|
+    unless BlogComment::Moderation.enabled?
+      comment.state = comment.spam? ? 'rejected' : 'approved'
+    end
+  end
+
   module Moderation
     class << self
       def enabled?

data/app/models/blog_post.rb

@@ -20,4 +20,12 @@ class BlogPost < ActiveRecord::Base
     }.compact
   end
 
+  class << self
+    def comments_allowed?
+      RefinerySetting.find_or_set(:comments_allowed, true, {
+        :scoping => :blog
+      })
+    end
+  end
+
 end

data/app/views/admin/blog/comments/_comment.html.erb

@@ -0,0 +1,17 @@
+<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(comment) -%>">
+  <span class='title'>
+    <%=h comment.name %>
+    <span class="preview"> - <%= truncate(comment.message, :length => 75) %></span>
+  </span>
+  <span class='actions'>
+    <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(comment.post,
+                                                                       :anchor => "comment-#{comment.to_param}"),
+        :title => t('.view_live'),
+        :target => "_blank" %>
+    <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_blog_comment_path(comment),
+         :title => t('.edit') %>
+    <%= link_to refinery_icon_tag("delete.png"), admin_blog_comment_path(comment),
+        :class => "cancel confirm-delete",
+        :title => t('.delete') %>
+  </span>
+</li>

data/app/views/admin/blog/comments/_sortable_list.html.erb

@@ -0,0 +1,7 @@
+<ul id='sortable_list'>
+  <%= render :partial => 'comment', :collection => @blog_comments %>
+</ul>
+<%= render :partial => "/shared/admin/sortable_list",
+           :locals => {
+             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
+           } %>

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

@@ -3,24 +3,28 @@
   <% if searching? %>
     <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
     <% if @blog_comments.any? %>
-      <%= will_paginate @blog_comments %>
+      <%=# will_paginate @blog_comments 
+      %>
 
       <ul>
         <%= render :partial => "blog_comments",
                    :collection => @blog_comments %>
       </ul>
 
-      <%= will_paginate @blog_comments %>
+      <%=# will_paginate @blog_comments 
+      %>
     <% else %>
       <p><%= t('admin.search_no_results') %></p>
     <% end %>
   <% else %>
     <% if @blog_comments.any? %>
-      <%= will_paginate @blog_comments %>
+      <%=# will_paginate @blog_comments 
+      %>
 
       <%= render :partial => "sortable_list" %>
 
-      <%= will_paginate @blog_comments %>
+      <%=# will_paginate @blog_comments 
+      %>
     <% else %>
       <h3>
         <%= t('.no_items_yet',

data/app/views/blog_posts/_side_bar.html.erb

@@ -2,7 +2,7 @@
 <ul class='categories'>
   <% @blog_categories.each do |category| %>
     <li>
-      <%= category.title %>
+      <%= link_to category.title, blog_category_url(category) %>
     </li>
   <% end %>
 </ul>

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

@@ -4,6 +4,7 @@
   <%= @blog_post.body %>
 
   <% if (categories = @blog_post.categories).any? %>
+    <hr />
     <div class='post_categories'>
       <span class='filed_in'><%= t('.filed_in') %></span>
       <ul>
@@ -15,6 +16,43 @@
       </ul>
     </div>
   <% end %>
+
+  <% if (comments = @blog_post.comments.approved).any? %>
+    <hr />
+    <h2><%= t('.comments.title') %></h2>
+    <% comments.each do |comment| %>
+      <div class='blog_comment_message'>
+        <p>
+          <%= comment.message.to_s.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>") %>
+        </p>
+      </div>
+      <p class='blog_comment_author'>
+        <%= t('.comments.by', :who => comment.name) %>
+        <%= t('.comments.time_ago', :time => time_ago_in_words(comment.created_at)) %>
+      </p>
+    <% end %>
+  <% end %>
+
+  <% if BlogPost.comments_allowed? %>
+    <hr />
+    <% form_for [:blog_post, @blog_comment] do |f| %>
+      <div class='field'>
+        <%= f.label :name %>
+        <%= f.text_field :name %>
+      </div>
+      <div class='field'>
+        <%= f.label :email %>
+        <%= f.text_field :email %>
+      </div>
+      <div class='field message_field'>
+        <%= f.label :message %>
+        <%= f.text_area :message, :rows => 6 %>
+      </div>
+      <div class='field form-actions'>
+        <%= f.submit t('.submit') %>
+      </div>
+    <% end %>
+  <% end %>
 <% end %>
 
 <% content_for :body_content_right do %>

data/config/locales/en.yml

@@ -55,7 +55,12 @@ en:
     index:
       read_more: Read more
     show:
+      comments:
+        title: Comments
+        by: Posted by {{who}}
+        time_ago: '{{time}} ago'
       other: Other Blog Posts
       filed_in: Filed in
       created_at_title: Publishing Date
       created_at: Posted on {{when}}
+      submit: Send comment

data/config/routes.rb

@@ -1,20 +1,25 @@
-ActionController::Routing::Routes.draw do |map|
-  map.blog_post '/blog', :controller => :blog_posts, :action => :index
-  map.blog_post '/blog/:id', :controller => :blog_posts, :action => :show
-  map.blog_category '/blog/categories/:category_id', :controller => :blog_posts, :action => :index
+if Rails.version < '3.0.0'
+  ActionController::Routing::Routes.draw do |map|
+    map.blog_post '/blog', :controller => :blog_posts, :action => :index
+    map.blog_post '/blog/:id', :controller => :blog_posts, :action => :show
+    map.blog_category '/blog/categories/:category_id', :controller => :blog_posts, :action => :index
+    map.blog_post_blog_comments '/blog/:id/comments', :controller => :blog_posts, :action => :comment
 
-  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
-    admin.namespace :blog do |blog|
-      blog.resources :posts
-      blog.resources :categories
-      blog.resources :comments, :collection => {
-        :approved => :get,
-        :rejected => :get
-      }
-      blog.resources :settings, :collection => {
-        :notification_recipients => [:get, :post],
-        :moderation => :get
-      }
+    map.namespace(:admin, :path_prefix => 'refinery') do |admin|
+      admin.namespace :blog do |blog|
+        blog.resources :posts
+        blog.resources :categories
+        blog.resources :comments, :collection => {
+          :approved => :get,
+          :rejected => :get
+        }
+        blog.resources :settings, :collection => {
+          :notification_recipients => [:get, :post],
+          :moderation => :get
+        }
+      end
     end
   end
-end
+else
+  # route for rails3 here.
+end

data/generators/refinery_blog/refinery_blog_generator.rb

@@ -43,11 +43,12 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
           },{
             :table_name => 'blog_comments',
             :attributes => [
+              Rails::Generator::GeneratedAttribute.new('blog_post_id', 'integer'),
+              Rails::Generator::GeneratedAttribute.new('spam', 'boolean'),
               Rails::Generator::GeneratedAttribute.new('name', 'string'),
               Rails::Generator::GeneratedAttribute.new('email', 'string'),
               Rails::Generator::GeneratedAttribute.new('body', 'text'),
               Rails::Generator::GeneratedAttribute.new('state', 'string'),
-              Rails::Generator::GeneratedAttribute.new('blog_post_id', 'integer')
             ], :id => true
           },{
             :table_name => 'blog_categories',

data/lib/gemspec.rb

@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\\ Digital Neoteric\\ Design)
   s.require_paths     = %w(lib)
-  s.add_dependency('refinerycms',  '~> 0.9.7.12')
+  s.add_dependency    'refinerycms',  '~> 0.9.7.13'
+  s.add_dependency    'filters_spam', '~> 0.2'
 
   s.files             = %w(
     #{files.join("\n    ")}

data/lib/refinerycms-blog.rb

@@ -1,8 +1,28 @@
+require 'filters_spam' if defined?(Bundler)
+
 module Refinery
   module Blog
+
+    class Engine < Rails::Engine
+      initializer 'blog serves assets' do
+        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+      end
+
+      config.after_initialize do
+        Refinery::Plugin.register do |plugin|
+          plugin.name = "refinerycms_blog"
+          plugin.url = {:controller => '/admin/blog/posts', :action => 'index'}
+          plugin.menu_match = /^\/?(admin|refinery)\/blog\/?(posts|comments|categories)?/
+          plugin.activity = {
+            :class => BlogPost
+          }
+        end
+      end
+    end if defined?(Rails::Engine)
+
     class << self
       def version
-        %q{0.9.8.0.rc1}
+        %q{0.9.8.0.rc2}
       end
     end
   end

data/public/stylesheets/refinerycms-blog.css

@@ -10,4 +10,7 @@
   margin: 0px;
   padding: 0px;
   display: inline;
+}
+.field.message_field label {
+  vertical-align: top;
 }

data/rails/init.rb

@@ -1,3 +1,5 @@
+require File.expand_path('../../lib/refinerycms-blog', __FILE__)
+
 Refinery::Plugin.register do |plugin|
   plugin.name = "refinerycms_blog"
   plugin.url = {:controller => '/admin/blog/posts', :action => 'index'}
@@ -5,6 +7,4 @@ Refinery::Plugin.register do |plugin|
   plugin.activity = {
     :class => BlogPost
   }
-
-  plugin.directory = directory # tell refinery where this plugin is located
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-blog
 version: !ruby/object:Gem::Version 
-  hash: 977940590
+  hash: 977940591
   prerelease: true
   segments: 
   - 0
   - 9
   - 8
   - 0
-  - rc1
-  version: 0.9.8.0.rc1
+  - rc2
+  version: 0.9.8.0.rc2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +12:00
+date: 2010-08-31 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,15 +29,30 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 9
         - 7
-        - 12
-        version: 0.9.7.12
+        - 13
+        version: 0.9.7.13
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: filters_spam
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  type: :runtime
+  version_requirements: *id002
 description: A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.
 email: info@refinerycms.com
 executables: []
@@ -62,6 +77,8 @@ files:
 - app/views/admin/blog/categories/edit.html.erb
 - app/views/admin/blog/categories/index.html.erb
 - app/views/admin/blog/categories/new.html.erb
+- app/views/admin/blog/comments/_comment.html.erb
+- app/views/admin/blog/comments/_sortable_list.html.erb
 - app/views/admin/blog/comments/index.html.erb
 - app/views/admin/blog/posts/_form.html.erb
 - app/views/admin/blog/posts/_post.html.erb
@@ -70,6 +87,8 @@ files:
 - app/views/admin/blog/posts/index.html.erb
 - app/views/admin/blog/posts/new.html.erb
 - app/views/admin/blog/settings/notification_recipients.html.erb
+- app/views/blog_posts/_categories.html.erb
+- app/views/blog_posts/_comments.html.erb
 - app/views/blog_posts/_side_bar.html.erb
 - app/views/blog_posts/index.html.erb
 - app/views/blog_posts/show.html.erb
@@ -77,6 +96,8 @@ files:
 - config/locales/nb.yml
 - config/locales/nl.yml
 - config/routes.rb
+- Gemfile
+- Gemfile.lock
 - generators/refinery_blog/refinery_blog_generator.rb
 - generators/refinery_blog/templates/migration.rb
 - generators/refinery_blog/templates/seed.rb