refinerycms-blog 1.0.1 → 1.1

data/app/controllers/blog/posts_controller.rb

@@ -3,21 +3,29 @@ class Blog::PostsController < BlogController
   before_filter :find_all_blog_posts, :except => [:archive]
   before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
 
+  respond_to :html, :js, :rss
+
   def index
-    # TODO: respond_to block
+    respond_with (@blog_posts) do |format|
+      format.html
+      format.rss
+    end
   end
 
   def show
     @blog_comment = BlogComment.new
 
-    # TODO: respond_to block
+    respond_with (@blog_post) do |format|
+      format.html { present(@page) }
+      format.js { render :partial => 'post', :layout => false }
+    end
   end
 
   def comment
     if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
       if BlogComment::Moderation.enabled? or @blog_comment.ham?
         begin
-          Blog::CommentMailer.deliver_notification(@blog_comment, request)
+          Blog::CommentMailer.notification(@blog_comment, request).deliver
         rescue
           logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
         end
@@ -43,7 +51,7 @@ class Blog::PostsController < BlogController
       :page => params[:page],
       :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
     })
-    # TODO: respond_to block
+    respond_with (@blog_posts)
   end
 
 protected

data/app/models/blog_comment.rb

@@ -14,9 +14,9 @@ class BlogComment < ActiveRecord::Base
   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'}
+  scope :unmoderated, :conditions => {:state => nil}
+  scope :approved, :conditions => {:state => 'approved'}
+  scope :rejected, :conditions => {:state => 'rejected'}
 
   def approve!
     self.update_attribute(:state, 'approved')

data/app/models/blog_post.rb

@@ -10,14 +10,16 @@ class BlogPost < ActiveRecord::Base
 
   has_friendly_id :title, :use_slug => true
 
-  named_scope :by_archive, lambda { |archive_date| {:conditions => ['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month], :order => "published_at DESC"} }
+  scope :by_archive, lambda { |archive_date|
+    where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month]).order("published_at DESC")
+  }
 
-  named_scope :all_previous, :conditions => ['published_at <= ?', Time.now.beginning_of_month], :order => "published_at DESC"
+  scope :all_previous, where(['published_at <= ?', Time.now.beginning_of_month]).order("published_at DESC")
 
-  named_scope :live, lambda { {:conditions => ["published_at < ? and draft = ?", Time.now, false], :order => "published_at DESC"} }
+  scope :live, lambda { where( "published_at < ? and draft = ?", Time.now, false).order("published_at DESC") }
 
-  named_scope :previous, lambda { |i| { :conditions => ["published_at < ?", i.published_at], :order => "published_at DESC", :limit => 1 } }
-  named_scope :next, lambda { |i| { :condtions => ["published_at > ?", i.published_at], :order => "published_at ASC", :limit => 1 } }
+  scope :previous, lambda { |i| where(["published_at < ?", i.published_at]).order("published_at DESC").limit(1) }
+  scope :next, lambda { |i| where(["published_at > ?", i.published_at]).order("published_at ASC").limit(1) }
 
   def next
     self.class.next(self).first

data/app/views/admin/blog/categories/_form.html.erb

@@ -1,5 +1,9 @@
 <% form_for [:admin, @blog_category] do |f| -%>
-  <%= f.error_messages %>
+  <%= render :partial => "/shared/admin/error_messages",
+             :locals => {
+               :object => f.object,
+               :include_object_name => true
+             } %>
 
   <div class='field'>
     <%= f.label :title -%>

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

@@ -1,5 +1,9 @@
 <% form_for [:admin, @blog_post] do |f| -%>
-  <%= f.error_messages %>
+  <%= render :partial => "/shared/admin/error_messages",
+             :locals => {
+               :object => f.object,
+               :include_object_name => true
+             } %>
 
   <div class='field'>
     <%= f.label :title -%>

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

@@ -23,15 +23,18 @@
 
       <h2><%= t('.comments.add') %></h2>
       <% form_for [:blog_post, @blog_comment] do |f| %>
-        <%= f.error_messages %>
-
+        <%= render :partial => "/shared/admin/error_messages",
+                   :locals => {
+                     :object => f.object,
+                     :include_object_name => true
+                   } %>
         <div class='field'>
           <%= f.label :name %>
           <%= f.text_field :name %>
         </div>
         <div class='field'>
           <%= f.label :email %>
-          <%= f.text_field :email %>
+          <%= f.email_field :email %>
         </div>
         <div class='field message_field'>
           <%= f.label :message %>

data/config/locales/en.yml

@@ -9,17 +9,17 @@ en:
           edit: Edit this category
           delete: Delete this category forever
         index:
-          no_items_yet: 'There are no categories yet. Click "{{create}}" to add your first category.'
+          no_items_yet: 'There are no categories yet. Click "%{create}" to add your first category.'
       comments:
-        approved: 'The comment from "{{author}}" has been approved.'
+        approved: 'The comment from "%{author}" has been approved.'
         comment:
           view_live: View this comment live <br/><em>(opens in a new window)</em>
           read: Read this comment
           reject: Reject this comment
           approve: Approve this comment
-        rejected: 'The comment from "{{author}}" has been rejected.'
+        rejected: 'The comment from "%{author}" has been rejected.'
         index:
-          no_items_yet: 'There are no {{type}} comments.'
+          no_items_yet: 'There are no %{type} comments.'
         show:
           comment: Comment
           blog_post: Blog Post
@@ -39,7 +39,7 @@ en:
           save_as_draft: Save as Draft
           published_at: Publish Date
         index:
-          no_items_yet: 'There are no Blog Posts yet. Click "{{create}}" to add your first blog post.'
+          no_items_yet: 'There are no Blog Posts yet. Click "%{create}" to add your first blog post.'
         post:
           view_live: View this blog post live <br/><em>(opens in a new window)</em>
           edit: Edit this blog post
@@ -50,7 +50,7 @@ en:
           explanation: 'Every time someone comments on a blog post, Refinery sends out an email to say there is a new comment.'
           hint: 'When a new comment is added, Refinery will send an email notification to you.'
           example: "Enter your email address(es) like: jack@work.com, jill@office.com"
-          updated: 'Notification recipients have been set to "{{recipients}}"'
+          updated: 'Notification recipients have been set to "%{recipients}"'
       submenu:
         categories:
           title: Categories
@@ -58,7 +58,7 @@ en:
           new: Create new category
         comments:
           title: Comments
-          title_with_count: 'Comments ({{new_count}} new)'
+          title_with_count: 'Comments (%{new_count} new)'
           new: New
           unmoderated: New
           approved: Approved
@@ -90,7 +90,7 @@ en:
         title: RSS Feed
       posts:
         other: Other Posts
-        created_at: 'Posted on {{when}}'
+        created_at: 'Posted on %{when}'
         read_more: Read more
       comments:
         singular: comment
@@ -101,8 +101,8 @@ en:
     posts:
       comment: comment
       comments:
-        by: 'Posted by {{who}}'
-        time_ago: '{{time}} ago'
+        by: 'Posted by %{who}'
+        time_ago: '%{time} ago'
         thank_you: 'Thank you for commenting.'
         thank_you_moderated: 'Thank you for commenting. Your message has been placed in the moderation queue and will appear shortly.'
       show:

data/config/locales/it.yml

@@ -9,17 +9,17 @@ it:
           edit: Modifica questa categoria
           delete: Elimina questa categoria per sempre
         index:
-          no_items_yet: 'Nessuna categoria ancora presente. Fare click su "{{create}}" per aggiungere la tua prima categoria.'
+          no_items_yet: 'Nessuna categoria ancora presente. Fare click su "%{create}" per aggiungere la tua prima categoria.'
       comments:
-        approved: 'Il commento di "{{author}}" è stato approvato.'
+        approved: 'Il commento di "%{author}" è stato approvato.'
         comment:
           view_live: Visualizza questo commento <em> <br/> live (si apre in una nuova finestra) </ em>
           read: Leggi questo commento
           reject: Rifiuta questo commento
           approve: Approva questo commento
-        rejected: 'Il commento di "{{author}}" è stato rifiutato.'
+        rejected: 'Il commento di "%{author}" è stato rifiutato.'
         index:
-          no_items_yet: 'Non ci sono {{type}} commenti.'
+          no_items_yet: 'Non ci sono %{type} commenti.'
         show:
           comment: Commento
           blog_post: Messaggio del Blog
@@ -39,7 +39,7 @@ it:
           save_as_draft: Salva come Bozza
           published_at: Data di Pubblicazione
         index:
-          no_items_yet: 'Non ci sono ancora Messaggi per questo Blog. Clicca "{{create}}" per aggiungere il tuo primo messaggio.'
+          no_items_yet: 'Non ci sono ancora Messaggi per questo Blog. Clicca "%{create}" per aggiungere il tuo primo messaggio.'
         post:
           view_live: Visualizza questo messaggio live <br/><em>(si apre in una nuova finestra)</em>
           edit: Modifica questo messaggio
@@ -50,7 +50,7 @@ it:
           explanation: "Ogni volta che qualcuno commenta un messaggio del blog, Refinery invia una mail per avvisare che c'è un nuovo comemnto"
           hint: 'Quando viene aggiunto un nuovo commento Refinery ti invierà una email di notifica.'
           example: "Inserisci il tuo indirizzo email. È possibile insierire più indirizzi separati dalla virgola. Es: jack@work.com, jill@office.com"
-          updated: 'I destinatari delle notifiche sono stati impostati "{{recipients}}"'
+          updated: 'I destinatari delle notifiche sono stati impostati "%{recipients}"'
       submenu:
         categories:
           title: Categorie
@@ -58,7 +58,7 @@ it:
           new: Crea nuova categoria
         comments:
           title: Commenti
-          title_with_count: 'Comment1 ({{new_count}} nuovi)'
+          title_with_count: 'Comment1 (%{new_count} nuovi)'
           new: Nuovo
           unmoderated: Nuovo
           approved: Approvato
@@ -79,7 +79,7 @@ it:
         title: RSS Feed
       posts:
         other: Altri Messaggi
-        created_at: 'Pubblicato il {{when}}'
+        created_at: 'Pubblicato il %{when}'
         read_more: Per saperne di più
       comments:
         singular: commento
@@ -91,8 +91,8 @@ it:
     posts:
       comment: commento
       comments:
-        by: 'Pubblicato da {{who}}'
-        time_ago: '{{time}} fa'
+        by: 'Pubblicato da %{who}'
+        time_ago: '%{time} fa'
         thank_you: 'Grazie per aver scritto un commento.'
         thank_you_moderated: 'Grazie per aver scritto un commento. Il tuo messaggio è stato inserito nella coda di moderazione e sarà visibile a breve.'
       show:

data/config/routes.rb

@@ -1,33 +1,39 @@
-ActionController::Routing::Routes.draw do |map|
-  map.namespace(:blog) do |blog|
-    blog.rss_feed 'feed.rss', :controller => 'posts', :action => 'index', :format => 'rss'
-    blog.root :controller => "posts", :action => 'index'
-    blog.post ':id', :controller => "posts", :action => 'show'
-    blog.category 'categories/:id', :controller => "categories", :action => 'show'
-    blog.post_blog_comments ':id/comments', :controller => 'posts', :action => 'comment'
-
-    ## TODO: what is the rails2 syntax for this? sorry ;__;
-    # get 'archive/:year/:month', :to => 'posts#archive', :as => 'archive_blog_posts'
+Refinery::Application.routes.draw do
+  scope(:path => 'blog', :module => 'blog') do
+    root :to => 'posts#index', :as => 'blog_root'
+    match 'feed.rss', :to => 'posts#index.rss', :as => 'blog_rss_feed'
+    match ':id', :to => 'posts#show', :as => 'blog_post'
+    match 'categories/:id', :to => 'categories#show', :as => 'blog_category'
+    match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'
+    get 'archive/:year/:month', :to => 'posts#archive', :as => 'archive_blog_posts'
   end
 
-  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
-    admin.namespace :blog do |blog|
-      blog.resources :posts
+  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
+    scope(:path => 'blog', :as => 'blog', :module => 'blog') do
+      root :to => 'posts#index'
+      resources :posts
+
+      resources :categories
 
-      blog.resources :categories
+      resources :comments do
+        collection do
+          get :approved
+          get :rejected
+        end
+        member do
+          get :approved
+          get :rejected
+        end
+      end
 
-      blog.resources :comments, :collection => {
-        :approved => :get,
-        :rejected => :get
-      }, :member => {
-        :approved => :get,
-        :rejected => :get
-      }
+      resources :settings do
+        collection do
+          get :notification_recipients
+          post :notification_recipients
 
-      blog.resources :settings, :collection => {
-        :notification_recipients => [:get, :post],
-        :moderation => :get
-      }
+          get :moderation
+        end
+      end
     end
   end
 end

data/lib/gemspec.rb

@@ -17,7 +17,7 @@ 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.13'
+  s.add_dependency    'refinerycms',  '>= 0.9.8'
   s.add_dependency    'filters_spam', '~> 0.2'
 
   s.files             = %w(

data/lib/refinerycms-blog.rb

@@ -42,7 +42,7 @@ module Refinery
 
     class << self
       def version
-        %q{1.0.1}
+        %q{1.1}
       end
     end
   end

data/readme.md

@@ -1,9 +1,8 @@
-# Refinery CMS Blog - Rails 2 branch
+# Refinery CMS Blog
 
-Simple blog engine for [Refinery CMS](http://refinerycms.com).
-It supports posts, categories and comments.
+Simple blog engine for [Refinery CMS](http://refinerycms.com). It supports posts, categories and comments.
 
-Refinery CMS Blog supports Rails 3 on the [master branch](http://github.com/resolve/refinerycms-blog).
+Refinery CMS Blog supports Rails 2.3.x using the [Rails 2.3.x stable branch](http://github.com/resolve/refinerycms-blog/tree/rails2-stable).
 
 Options:
 
@@ -12,23 +11,20 @@ Options:
 
 ## Requirements
 
-Please note that this requires a RefineryCMS installation between version >= 0.9.7.13
-and < 0.9.8 as it works only with the later versions of Rails 2 compatible RefineryCMS.
-Also note that any version of this engine 1.1 or greater is not compatible with Rails 2 at all
-and is meant for Rails 3 (Refinery CMS >= 0.9.8).
+Refinery CMS version 0.9.8 or above.
 
-# Install
+## Install
 
 Open up your ``Gemfile`` and add at the bottom this line:
 
-    gem 'refinerycms-blog', '~> 1.0.1'
+    gem 'refinerycms-blog', '~> 1.1'
 
 Now, run ``bundle install``
 
-Next, to install the blog plugin:
+Next, to install the blog plugin run:
 
-    ruby script/generate refinerycms_blog
+    rails generate refinerycms_blog
 
 Finally migrate your database and you're done.
 
-    rake db:migrate
+    rake db:migrate

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  version: "1.1"
 platform: ruby
 authors: 
 - Resolve Digital
@@ -24,14 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 9
-        - 7
-        - 13
-        version: 0.9.7.13
+        - 8
+        version: 0.9.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency