From bb900f1995d973a51840c50b71e7371dd42afc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=A3is=20Ozols?= Date: Fri, 9 Mar 2012 17:07:24 +0200 Subject: [PATCH 01/12] Add rake db:seed to install steps. --- readme.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 3e92f38..db70dfc 100644 --- a/readme.md +++ b/readme.md @@ -27,10 +27,14 @@ Next, to install the blog plugin run: rails generate refinery:blog -Finally migrate your database and you're done. +Run database migrations: rake db:migrate - + +Finally seed your database and you're done. + + rake db:seed + ## Developing & Contributing The version of Refinery to develop this engine against is defined in the gemspec. To override the version of refinery to develop against, edit the project Gemfile to point to a local path containing a clone of refinerycms. From 822c933f56603e811b8a4d4bc97736700614d911 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Tue, 27 Mar 2012 12:12:54 +1300 Subject: [PATCH 02/12] Update seo_meta dependency to ~> 1.3.0 --- refinerycms-blog.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 8335c56..2dd8e1e 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency 'refinerycms-settings', '~> 2.0.1' s.add_dependency 'filters_spam', '~> 0.2' s.add_dependency 'acts-as-taggable-on' - s.add_dependency 'seo_meta', '~> 1.2.0' + s.add_dependency 'seo_meta', '~> 1.3.0' s.add_dependency 'rails_autolink' # Development dependencies From 5b0828b4088ea325a6663deb627009e2cc30e6cb Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Tue, 27 Mar 2012 12:53:32 +1300 Subject: [PATCH 03/12] Specify a minimum version of refinerycms and Gemfile it so that it can be used to test the next release. --- Gemfile | 2 +- refinerycms-blog.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b6ba6ac..3641ffb 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" gemspec -gem 'refinerycms', '~> 2.0.0' +gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git', :branch => '2-0-stable' group :development, :test do require 'rbconfig' diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 2dd8e1e..293db25 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- spec/*`.split("\n") # Runtime dependencies - s.add_dependency 'refinerycms-core', '~> 2.0.1' + s.add_dependency 'refinerycms-core', '~> 2.0.3' s.add_dependency 'refinerycms-settings', '~> 2.0.1' s.add_dependency 'filters_spam', '~> 0.2' s.add_dependency 'acts-as-taggable-on' From 93c2726f0b22ea6e796609feefce8d842321d14c Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Fri, 6 Apr 2012 22:29:07 +1200 Subject: [PATCH 04/12] We can now depend on refinerycms ~> 2.0.3 and mark this as version 2.0.2 --- Gemfile | 2 +- lib/refinery/blog/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 3641ffb..0ae62bd 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" gemspec -gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git', :branch => '2-0-stable' +gem 'refinerycms', '~> 2.0.3' group :development, :test do require 'rbconfig' diff --git a/lib/refinery/blog/version.rb b/lib/refinery/blog/version.rb index ff7cb39..45511ad 100644 --- a/lib/refinery/blog/version.rb +++ b/lib/refinery/blog/version.rb @@ -3,7 +3,7 @@ module Refinery class Version @major = 2 @minor = 0 - @tiny = 1 + @tiny = 2 class << self attr_reader :major, :minor, :tiny From 87b9aacb9815ec21b8330ea5391a10ebc4b0d987 Mon Sep 17 00:00:00 2001 From: Michael Gall Date: Wed, 11 Apr 2012 14:16:29 +1000 Subject: [PATCH 05/12] Fix page caching on index when pages param is present. fixes #145 Conflicts: app/controllers/refinery/blog/posts_controller.rb --- app/controllers/refinery/blog/posts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index bde3a9c..bdd870a 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -2,7 +2,7 @@ module Refinery module Blog class PostsController < BlogController - caches_page :index + caches_page :index, :unless => proc {|c| c.refinery_user_signed_in? || c.flash.any? || params[:page].present? } before_filter :find_all_blog_posts, :except => [:archive] before_filter :find_blog_post, :only => [:show, :comment, :update_nav] From 6cbf130c83d0ad013fa06794ac3063e522bf1e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=A3is=20Ozols?= Date: Thu, 19 Apr 2012 17:42:03 +0300 Subject: [PATCH 06/12] Notification recipients should be specified using :to instead of :recipients. Fixes #226. --- app/mailers/refinery/blog/comment_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/refinery/blog/comment_mailer.rb b/app/mailers/refinery/blog/comment_mailer.rb index d868354..69a7da4 100644 --- a/app/mailers/refinery/blog/comment_mailer.rb +++ b/app/mailers/refinery/blog/comment_mailer.rb @@ -5,7 +5,7 @@ module Refinery def notification(comment, request) @comment = comment mail :subject => Blog::Comment::Notification.subject, - :recipients => Blog::Comment::Notification.recipients, + :to => Blog::Comment::Notification.recipients, :from => "\"#{Refinery::Core.site_name}\" " end From e9406d2693de6a91b1efed36ac664f72b326cedd Mon Sep 17 00:00:00 2001 From: Matt Garrison Date: Wed, 18 Apr 2012 10:40:04 -0500 Subject: [PATCH 07/12] Adding attr_accessible for Rails 3.2 mass assignment fixes. --- app/models/refinery/categorization.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/refinery/categorization.rb b/app/models/refinery/categorization.rb index 086c2d1..ec51ea7 100644 --- a/app/models/refinery/categorization.rb +++ b/app/models/refinery/categorization.rb @@ -4,6 +4,7 @@ module Refinery self.table_name = 'refinery_blog_categories_blog_posts' belongs_to :blog_post, :class_name => 'Refinery::Blog::Post', :foreign_key => :blog_post_id belongs_to :blog_category, :class_name => 'Refinery::Blog::Category', :foreign_key => :blog_category_id - + + attr_accessible :blog_category_id, :blog_post_id end end \ No newline at end of file From 172134f9715333c5c2f5db2b3ef62da15bc3714e Mon Sep 17 00:00:00 2001 From: Pete Higgins Date: Sun, 1 Apr 2012 16:23:15 -0700 Subject: [PATCH 08/12] Fix MassAssignmentSecurity::Error in integration test. --- app/models/refinery/blog/category.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/refinery/blog/category.rb b/app/models/refinery/blog/category.rb index 05e6994..6deb5c5 100644 --- a/app/models/refinery/blog/category.rb +++ b/app/models/refinery/blog/category.rb @@ -11,6 +11,8 @@ module Refinery validates :title, :presence => true, :uniqueness => true + attr_accessible :title + def post_count posts.select(&:live?).count end @@ -20,4 +22,4 @@ module Refinery end end -end \ No newline at end of file +end From b335ea5482f6a496b92e6bd31ad3f5fe47f28a43 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 14 May 2012 16:57:31 +1200 Subject: [PATCH 09/12] Increment version to 2.0.3 --- lib/refinery/blog/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/refinery/blog/version.rb b/lib/refinery/blog/version.rb index 45511ad..f5e9022 100644 --- a/lib/refinery/blog/version.rb +++ b/lib/refinery/blog/version.rb @@ -3,7 +3,7 @@ module Refinery class Version @major = 2 @minor = 0 - @tiny = 2 + @tiny = 3 class << self attr_reader :major, :minor, :tiny From 940046daf6eb977d80752701afa71ffb191bf55c Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 14 May 2012 16:59:06 +1200 Subject: [PATCH 10/12] Incrementing version to 2.0.4 as I wasn't up to date with git when I pushed that last gem :( --- lib/refinery/blog/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/refinery/blog/version.rb b/lib/refinery/blog/version.rb index f5e9022..6188bb7 100644 --- a/lib/refinery/blog/version.rb +++ b/lib/refinery/blog/version.rb @@ -3,7 +3,7 @@ module Refinery class Version @major = 2 @minor = 0 - @tiny = 3 + @tiny = 4 class << self attr_reader :major, :minor, :tiny From 6359997b053e6bb3d1278916df1d093e179e6f99 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Tue, 15 May 2012 12:22:31 +1200 Subject: [PATCH 11/12] fixed deprecation warnings --- app/views/refinery/blog/categories/show.html.erb | 4 ++-- app/views/refinery/blog/posts/archive.html.erb | 2 +- app/views/refinery/blog/posts/index.html.erb | 2 +- app/views/refinery/blog/posts/show.html.erb | 2 +- app/views/refinery/blog/posts/tagged.html.erb | 2 +- app/views/refinery/blog/shared/_body_content_right.html.erb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/refinery/blog/categories/show.html.erb b/app/views/refinery/blog/categories/show.html.erb index aa4abaf..51206c8 100644 --- a/app/views/refinery/blog/categories/show.html.erb +++ b/app/views/refinery/blog/categories/show.html.erb @@ -1,6 +1,6 @@ <% content_for :body_content_title, @category.title %> -<% content_for :body_content_left do %> +<% content_for :body do %> <% if @posts.any? %>
<%= render :partial => "/refinery/blog/shared/post", :collection => @posts %> @@ -13,7 +13,7 @@ <% end %> <% end %> -<% content_for :body_content_right do %> +<% content_for :side_body do %> <%= render :partial => "/refinery/blog/shared/categories" %> <% end %> diff --git a/app/views/refinery/blog/posts/archive.html.erb b/app/views/refinery/blog/posts/archive.html.erb index bda6c45..1c3342c 100644 --- a/app/views/refinery/blog/posts/archive.html.erb +++ b/app/views/refinery/blog/posts/archive.html.erb @@ -1,6 +1,6 @@ <% content_for :title, "#{t('.blog_archive_for', :date => @archive_date.strftime('%B %Y'))}" %> -<% content_for :body_content_left do %> +<% content_for :body do %>

<%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %>

<% if @posts.any? %>
diff --git a/app/views/refinery/blog/posts/index.html.erb b/app/views/refinery/blog/posts/index.html.erb index 2e8837c..976fb67 100644 --- a/app/views/refinery/blog/posts/index.html.erb +++ b/app/views/refinery/blog/posts/index.html.erb @@ -1,4 +1,4 @@ -<% content_for :body_content_left do %> +<% content_for :body do %> <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %> <% if @posts.any? %> diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb index 2ca168e..935db8b 100644 --- a/app/views/refinery/blog/posts/show.html.erb +++ b/app/views/refinery/blog/posts/show.html.erb @@ -1,4 +1,4 @@ -<% content_for :body_content_left do %> +<% content_for :body do %>
<%= render 'post' %>
diff --git a/app/views/refinery/blog/posts/tagged.html.erb b/app/views/refinery/blog/posts/tagged.html.erb index 3a3ee75..80547ee 100644 --- a/app/views/refinery/blog/posts/tagged.html.erb +++ b/app/views/refinery/blog/posts/tagged.html.erb @@ -2,7 +2,7 @@ <% content_for :body_content_title, "#{t('.posts_tagged')} “#{@tag_name.titleize}”".html_safe -%> -<% content_for :body_content_left do %> +<% content_for :body do %> <% if @posts.any? %>
<%= render :partial => "/refinery/blog/shared/post", :collection => @posts %> diff --git a/app/views/refinery/blog/shared/_body_content_right.html.erb b/app/views/refinery/blog/shared/_body_content_right.html.erb index bd73d1c..cc897cc 100644 --- a/app/views/refinery/blog/shared/_body_content_right.html.erb +++ b/app/views/refinery/blog/shared/_body_content_right.html.erb @@ -1,4 +1,4 @@ -<% content_for :body_content_right do %> +<% content_for :side_body do %> <%= yield(:body_content_right_prepend) %> <%= render :partial => "/refinery/blog/shared/rss_feed" %> <%= render :partial => "/refinery/blog/shared/categories" %> From 7856e98f6aebb8fa8d2c70e6caf3856a7a3e2898 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Tue, 15 May 2012 12:25:49 +1200 Subject: [PATCH 12/12] Do we really need a model called comment_mailer? --- app/models/refinery/blog/comment_mailer.rb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/models/refinery/blog/comment_mailer.rb diff --git a/app/models/refinery/blog/comment_mailer.rb b/app/models/refinery/blog/comment_mailer.rb deleted file mode 100644 index 7013355..0000000 --- a/app/models/refinery/blog/comment_mailer.rb +++ /dev/null @@ -1 +0,0 @@ -require File.expand_path('../../../../mailers/refinery/blog/comment_mailer', __FILE__)