Permalink
Browse files

Remove all Rails2/Rails3 checks as master is now Rails3 only

  • Loading branch information...
1 parent a1f7ea0 commit c38d9c3da5b9b21df07c4c7ebc8617413977c7fb @awagener awagener committed Nov 30, 2010
@@ -3,41 +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 if Rails.version >= '3.0.0'
+ respond_to :html, :js, :rss
def index
- if Rails.version < '3.0.0'
- # TODO: respond_to block
- else
- respond_with (@blog_posts) do |format|
- format.html
- format.rss
- end
+ respond_with (@blog_posts) do |format|
+ format.html
+ format.rss
end
end
def show
@blog_comment = BlogComment.new
- if Rails.version < '3.0.0'
- # TODO: respond_to block
- else
- respond_with (@blog_post) do |format|
- format.html { present(@page) }
- format.js { render :partial => 'post', :layout => false }
- end
+ 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
- if Rails.version < '3.0.0'
- Blog::CommentMailer.deliver_notification(@blog_comment, request)
- else
- Blog::CommentMailer.notification(@blog_comment, request).deliver
- end
+ Blog::CommentMailer.notification(@blog_comment, request).deliver
rescue
logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
end
@@ -63,11 +51,7 @@ def archive
:page => params[:page],
:per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
})
- if Rails.version < '3.0.0'
- # TODO: respond_to block
- else
- respond_with (@blog_posts)
- end
+ respond_with (@blog_posts)
end
protected
View
@@ -14,15 +14,9 @@ class BlogComment < ActiveRecord::Base
validates_format_of :email,
:with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
- if Rails.version < '3.0.0'
- named_scope :unmoderated, :conditions => {:state => nil}
- named_scope :approved, :conditions => {:state => 'approved'}
- named_scope :rejected, :conditions => {:state => 'rejected'}
- else
- scope :unmoderated, :conditions => {:state => nil}
- scope :approved, :conditions => {:state => 'approved'}
- scope :rejected, :conditions => {:state => 'rejected'}
- end
+ scope :unmoderated, :conditions => {:state => nil}
+ scope :approved, :conditions => {:state => 'approved'}
+ scope :rejected, :conditions => {:state => 'rejected'}
def approve!
self.update_attribute(:state, 'approved')
View
@@ -10,33 +10,16 @@ class BlogPost < ActiveRecord::Base
has_friendly_id :title, :use_slug => true
- if Rails.version < '3.0.0'
- 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"} }
- else
- 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")
- }
- end
+ 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")
+ }
- if Rails.version < '3.0.0'
- named_scope :all_previous, :conditions => ['published_at <= ?', Time.now.beginning_of_month], :order => "published_at DESC"
- else
- scope :all_previous, where(['published_at <= ?', Time.now.beginning_of_month]).order("published_at DESC")
- end
+ scope :all_previous, where(['published_at <= ?', Time.now.beginning_of_month]).order("published_at DESC")
- if Rails.version < '3.0.0'
- named_scope :live, lambda { {:conditions => ["published_at < ? and draft = ?", Time.now, false], :order => "published_at DESC"} }
- else
- scope :live, lambda { where( "published_at < ? and draft = ?", Time.now, false).order("published_at DESC") }
- end
+ scope :live, lambda { where( "published_at < ? and draft = ?", Time.now, false).order("published_at DESC") }
- if Rails.version < '3.0.0'
- 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 } }
- else
- 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) }
- end
+ 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
@@ -1,13 +1,9 @@
<% form_for [:admin, @blog_category] do |f| -%>
- <% if Rails.version < '3.0.0'%>
- <%= f.error_messages %>
- <% else %>
- <%= render :partial => "/shared/admin/error_messages",
- :locals => {
- :object => f.object,
- :include_object_name => true
- } %>
- <% end %>
+ <%= render :partial => "/shared/admin/error_messages",
+ :locals => {
+ :object => f.object,
+ :include_object_name => true
+ } %>
<div class='field'>
<%= f.label :title -%>
@@ -1,13 +1,9 @@
<% form_for [:admin, @blog_post] do |f| -%>
- <% if Rails.version < '3.0.0'%>
- <%= f.error_messages %>
- <% else %>
- <%= render :partial => "/shared/admin/error_messages",
- :locals => {
- :object => f.object,
- :include_object_name => true
- } %>
- <% end %>
+ <%= render :partial => "/shared/admin/error_messages",
+ :locals => {
+ :object => f.object,
+ :include_object_name => true
+ } %>
<div class='field'>
<%= f.label :title -%>
@@ -23,26 +23,18 @@
<h2><%= t('.comments.add') %></h2>
<% form_for [:blog_post, @blog_comment] do |f| %>
- <% if Rails.version < '3.0.0'%>
- <%= f.error_messages %>
- <% else %>
- <%= render :partial => "/shared/admin/error_messages",
- :locals => {
- :object => f.object,
- :include_object_name => true
- } %>
- <% end %>
+ <%= 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 %>
- <% if Rails.version > '3.0.0' %>
- <%= f.email_field :email %>
- <% else %>
- <%= f.text_field :email %>
- <% end %>
+ <%= f.email_field :email %>
</div>
<div class='field message_field'>
<%= f.label :message %>
View
@@ -1,73 +1,37 @@
-if Rails.version < '3.0.0'
- 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'
-
- ## what is the rails2 syntax for this? sorry ;__;
- # 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
-
- blog.resources :categories
-
- blog.resources :comments, :collection => {
- :approved => :get,
- :rejected => :get
- }, :member => {
- :approved => :get,
- :rejected => :get
- }
-
- blog.resources :settings, :collection => {
- :notification_recipients => [:get, :post],
- :moderation => :get
- }
- end
- end
+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
-else
- 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
- scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
- scope(:path => 'blog', :as => 'blog', :module => 'blog') do
- root :to => 'posts#index'
- 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
+ resources :categories
- resources :comments do
- collection do
- get :approved
- get :rejected
- end
- member do
- get :approved
- get :rejected
- end
+ resources :comments do
+ collection do
+ get :approved
+ get :rejected
end
+ member do
+ get :approved
+ get :rejected
+ end
+ end
- resources :settings do
- collection do
- get :notification_recipients
- post :notification_recipients
+ resources :settings do
+ collection do
+ get :notification_recipients
+ post :notification_recipients
- get :moderation
- end
+ get :moderation
end
end
end
View
@@ -1,25 +1,23 @@
-# About
+# Refinery CMS Blog
Simple blog engine for [Refinery CMS](http://refinerycms.com). It supports posts, categories and comments.
+Refinery CMS Blog supports Rails 2.x using the [Rails 2.x stable branch](http://github.com/resolve/refinerycms-blog/tree/rails2-stable).
+
Options:
* Comment moderation
* [ShareThis.com](http://sharethis.com) support on posts. Set your key in Refinery's settings area to enable this.
-# Install
+## Install
Open up your ``Gemfile`` and add at the bottom this line
gem 'refinerycms-blog', '= 1.0.rc16'
Now run ``bundle install``
-Next to install the blog plugin run (for Rails 2):
-
- ruby script/generate refinerycms_blog
-
-Or, for Rails 3:
+Next to install the blog plugin run:
rails generate refinerycms_blog

0 comments on commit c38d9c3

Please sign in to comment.