tkh_content 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddaafe17fdfb0f5223668dce65eff0e7f95548d4
-  data.tar.gz: 0dfab79e9ed637e6981f8f5af5da7307436bde5a
+  metadata.gz: cc7e2632e838c737c884c85407b4ecb138a45bb8
+  data.tar.gz: 6e6fde83fa313aa364ece8625235ed2662cb0741
 SHA512:
-  metadata.gz: f45d405a4c45ef21a1d302f3cac1c4850c40dea1b601b31f122cd4c06cf9cb3442fc2f28e09b83ce7fd82a3b9c0e661a2552c08c6f9fb6df81afb9374fad3767
-  data.tar.gz: 8b9ca69acd5ff94f6abb7bec97e6fd6706da9146428910d5a77d57cdf6935765eecb55a7c94ee89002ab593f7da2fec471a10158f320863bbbcea11ad395de69
+  metadata.gz: 8ea78f5026638811c223906318f257b27728768c0afea888cacfda3bcfead1fadf4c71c065fd61c723608686ba194d60046a728197c730aa57d37a11d5cc942c
+  data.tar.gz: 5c4782a9dc46a68ee159ac6283622bb03036c6cc8b23f2d4a39032b9a21034c5f2a9a72349ef6b654c0e771f809940a67c6c2fbd467c0662c4c0d059bfad0132

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # TKH Content
 
 
+
+## 0.9.16
+
+* Comments are now polymorphic. rake 'tkh_content:update' and 'rake db:migrate' commands needed.
+
+
 ## 0.9.14-15
 
 * Upgraded Rails and simple_form dependencies.

data/app/controllers/comments_controller.rb

@@ -22,10 +22,10 @@ class CommentsController < ApplicationController
     @comment.locale = I18n.locale.to_s
     @comment.status = 'pending' # translation not done with globalize3 but with locale files upon showing status to user
     if @comment.save
-      redirect_to @comment.page, notice: t('comments.create.notice')
+      redirect_to @comment.commentable, notice: t('comments.create.notice')
     else
       flash[:warning] = t('comments.create.warning')
-      redirect_to @comment.page
+      redirect_to @comment.commentable
     end
   end
 
@@ -94,7 +94,7 @@ class CommentsController < ApplicationController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def comment_params
-    params.require(:comment).permit(:body, :page_id)
+    params.require(:comment).permit(:body, :commentable_type, :commentable_id)
     # non-accessible attributes: author_id, :status, :locale
   end
 

data/app/models/comment.rb

@@ -6,9 +6,9 @@
 class Comment < ActiveRecord::Base
 
   belongs_to :author, class_name: 'User', foreign_key: 'author_id'
-  belongs_to :page
+  belongs_to :commentable, polymorphic: true
 
-  validates_presence_of :page_id, :body
+  validates_presence_of :commentable_type, :commentable_id, :author_id, :body
 
   scope :showable, -> { where('status = ? OR status = ?', 'pending', 'accepted') }
   scope :pending, -> { where('status = ?', 'pending') }

data/app/models/page.rb

@@ -6,7 +6,7 @@
 class Page < ActiveRecord::Base
 
   belongs_to :author, class_name: 'User'
-  has_many :comments, :dependent => :destroy
+  has_many :comments, as: :commentable, :dependent => :destroy
 
   has_many :taggings, :dependent => :destroy
   has_many :tags, through: :taggings

data/app/views/comments/_admin_individual_comment.html.erb

@@ -0,0 +1,13 @@
+<tr>
+  <td class='text-center'>
+    <% model_name = comment.commentable.class.name.underscore %>
+    <% p = model_name.to_s + '_path' %>
+    <%= comment.author.name %> - <%= link_to (comment.commentable.try(:title) || comment.commentable.try(:name)), comment.commentable %> (<%= comment.locale %>). <%= link_to l(comment.created_at, format: :tkh_default), p(comment.commentable, anchor: "comment-#{comment.id}") %>
+    <br /><br />
+    <p class="admin-comment-body"><%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></p>
+    <strong><%= t("comments.status.#{comment.status}") %></strong><br />
+    <%= render 'comments/status_buttons', comment: comment %>
+    <br /><br />
+    <%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-xs btn-default' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %>
+  </td>
+</tr>

data/app/views/comments/_comment_section.html.erb

@@ -0,0 +1,6 @@
+<div id="comment-section">
+  <% # host variable correspond to commentable polymorphic host %>
+	<h2><%= pluralize host.comments.showable.for_locale(I18n.locale.to_s).count, t('activerecord.models.comment') %></h2>
+	<%= render 'comments/list_of_comments', host: host %>
+	<%= render 'comments/new_comment_section' %>
+</div>

data/app/views/comments/_form.html.erb

@@ -1,14 +1,14 @@
 <%= simple_form_for @comment, :html => { class: 'form-horizontal' } do |f| %>
 	<%= f.error_notification %>
-	
+
   <div class="form-inputs">
 		<%= @comment.author.name %><br />
-		<%= link_to @comment.page.title, @comment.page %><br />
-		<%= f.input :short_title, hint: 'ideally one word only, used for the menu' %><br />
-		<%= render 'comments/status_buttons' %><br />
+		<%= link_to (@comment.commentable.title || @comment.commentable.name), @comment.commentable %><br />
+		<%#= f.input :short_title, hint: 'ideally one word only, used for the menu' %><br />
+		<%= render 'comments/status_buttons', comment: @comment %><br />
 	  <%= f.input :body, :input_html => { :rows => 3 } %>
 	</div>
-	
+
   <div class="form-actions">
     <%= f.button :submit, :class => 'btn btn-primary' %>
   </div>

data/app/views/comments/{_form_in_page.html.erb → _form_in_commentable.html.erb}

@@ -3,8 +3,9 @@
 
   <div class="form-inputs">
 	  <%= f.input :body, label: false, :input_html => { :rows => 8 } %>
-		<%= f.hidden_field :page_id, value: @page.id %>
+		<%= f.hidden_field :commentable_type, value: controller_name.classify %>
+    <%= f.hidden_field :commentable_id, value: params[:id] %>
 		<%= f.button :submit, :class => 'btn btn-primary' %>
 	</div>
 
-<% end %>
+<% end %>

data/app/views/comments/_list_of_comments.html.erb

@@ -1,5 +1,5 @@
-<% @page.comments.showable.for_locale(I18n.locale.to_s).by_created.each_with_index do |comment, index| %>
-	<div id="comment-<%= comment.id %>" class="individual-comment<%= " by-page-author" if comment.author_id == comment.page.author_id %>">
+<% host.comments.showable.for_locale(I18n.locale.to_s).by_created.each_with_index do |comment, index| %>
+	<div id="comment-<%= comment.id %>" class="individual-comment<%= " by-page-author" if comment.author_id == comment.commentable.try(:author_id) %>">
 		<p>
 			<span class="comment-index"><%= index + 1 %></span>
 			<span class="comment-author-name"><%= comment.author.name %></span>

data/app/views/{pages → comments}/_new_comment_section.html.erb

@@ -1,7 +1,7 @@
 <div id="new-comment-section">
 	<h3><%= t('comments.what_do_you_think') %></h3>
 	<% if current_user %>
-		<%= render 'comments/form_in_page' %>
+		<%= render 'comments/form_in_commentable' %>
 	<% else %>
     <p><label class="label label-info"><%= t('comments.login_needed') %></label></p>
     <%= render 'shared/embedded_access_control' %>

data/app/views/comments/_status_buttons.html.erb

@@ -1,7 +1,7 @@
 <% if comment.status == 'pending' %>
-	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-xs btn-default' %><%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-xs btn-default' %>
+	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-xs btn-success' %><%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-xs btn-default' %>
 <% elsif comment.status == 'accepted' %>
 	<%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-xs btn-default' %>
 <% elsif comment.status == 'blocked' %>
-	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-xs btn-default' %>
+	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-xs btn-success' %>
 <% end -%>

data/app/views/comments/accepted.html.erb

@@ -3,23 +3,9 @@
 <%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
-	<thead>
-  	<tr>
-	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
-					<%= t('activerecord.attributes.comments.body') %></th>
-			<th><%= t('activerecord.attributes.comments.status') %></th>
-	    <th><%= t('actions') %></th>
-	  </tr>
-	</thead>
-	
 	<tbody>
 		<% @comments.each do |comment| %>
-		  <tr>
-		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
-						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
-				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
-		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
-		  </tr>
+		  <%= render 'comments/admin_individual_comment', comment: comment %>
 		<% end %>
 	</tbody>
 </table>

data/app/views/comments/blocked.html.erb

@@ -3,23 +3,9 @@
 <%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
-	<thead>
-  	<tr>
-	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
-					<%= t('activerecord.attributes.comments.body') %></th>
-			<th><%= t('activerecord.attributes.comments.status') %></th>
-	    <th><%= t('actions') %></th>
-	  </tr>
-	</thead>
-	
 	<tbody>
 		<% @comments.each do |comment| %>
-		  <tr>
-		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
-						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
-				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
-		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
-		  </tr>
+		  <%= render 'comments/admin_individual_comment', comment: comment %>
 		<% end %>
 	</tbody>
 </table>

data/app/views/comments/edit.html.erb

@@ -1,6 +1,5 @@
 <h1><%= t('activerecord.models.comments') %></h1>
-
-
+<%= render 'tab_admin_menu' %>
 
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -5,24 +5,9 @@
 <%= will_paginate @comments, inner_window: 2 %>
 
 <table class='table table-striped'>
-	<thead>
-  	<tr>
-	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
-					<%= t('activerecord.attributes.comments.body') %></th>
-			<th><%= t('activerecord.attributes.comments.status') %></th>
-	    <th><%= t('actions') %></th>
-	  </tr>
-	</thead>
-
 	<tbody>
 		<% @comments.each do |comment| %>
-		  <tr>
-		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
-            <%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
-
-				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
-		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-xs btn-default' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %></td>
-		  </tr>
+		  <%= render 'comments/admin_individual_comment', comment: comment %>
 		<% end %>
 	</tbody>
 </table>

data/app/views/comments/pending.html.erb

@@ -5,23 +5,9 @@
 <p><%= t('comments.sorted_by_oldest') %></p>
 
 <table class='table table-striped'>
-	<thead>
-  	<tr>
-	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
-					<%= t('activerecord.attributes.comments.body') %></th>
-			<th><%= t('activerecord.attributes.comments.status') %></th>
-	    <th><%= t('actions') %></th>
-	  </tr>
-	</thead>
-	
 	<tbody>
 		<% @comments.each do |comment| %>
-		  <tr>
-		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
-						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
-				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
-		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
-		  </tr>
+		  <%= render 'comments/admin_individual_comment', comment: comment %>
 		<% end %>
 	</tbody>
 </table>

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

@@ -5,14 +5,14 @@
 <% unless @page.for_blog? %>
 
 	<%= raw tkhed(@page.body) %>
-	<%= render 'comment_section' if Setting.first.enable_comments_in_pages? %>
+	<%= render 'comments/comment_section', host: @page if Setting.first.enable_comments_in_pages? %>
 
 <% else %>
 
 	<%= content_tag(:h1, @page.title) %>
 	<%= render '/pages/blog_post_meta', post: @page %>
 	<%= raw tkhed(@page.body) %>
-	<%= render 'comment_section' if Setting.first.enable_comments_in_blog? %>
+	<%= render 'comments/comment_section', host: @page if Setting.first.enable_comments_in_blog? %>
   <%= render 'blog/all_tags_list' %>
 
 <% end -%>

data/lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators/migration'
- 
+
 module TkhContent
   module Generators
     class CreateOrUpdateMigrationsGenerator < ::Rails::Generators::Base
@@ -14,7 +14,7 @@ module TkhContent
         end
         @prev_migration_nr.to_s
       end
- 
+
       def copy_migrations
         puts 'creating or updating page migrations'
         migration_template "create_pages.rb", "db/migrate/create_pages.rb"
@@ -26,8 +26,9 @@ module TkhContent
         migration_template "create_contacts.rb", "db/migrate/create_contacts.rb"
         migration_template "add_various_indices_to_pages.rb", "db/migrate/add_various_indices_to_pages.rb"
         migration_template "create_comments.rb", "db/migrate/create_comments.rb"
+        migration_template "make_comments_polymorphic.rb", "db/migrate/make_comments_polymorphic.rb"
       end
- 
+
     end
   end
-end
+end

data/lib/generators/tkh_content/create_or_update_migrations/templates/make_comments_polymorphic.rb

@@ -0,0 +1,36 @@
+class MakeCommentsPolymorphic < ActiveRecord::Migration
+
+  def self.up
+    add_column :comments, :commentable_type, :string
+    add_column :comments, :commentable_id, :integer
+    add_index :comments, :commentable_id
+
+    Comment.all.each do |comment|
+      unless comment.page_id.blank?
+        comment.commentable_type = 'Page'
+        comment.commentable_id = comment.page_id
+        comment.save
+      end
+    end
+
+    # Clean up comment table. The index is removed automatically
+    remove_column :comments, :page_id
+
+  end
+
+  def self.down
+    add_column :comments, :page_id
+    add_index :comments, :page_id
+
+    Comment.all.each do |comment|
+      if comment.commentable_type == 'Page'
+        comment.page_id = comment.commentable_id
+        comment.save
+      end
+    end
+
+    remove_column :comments, :commentable_type, :string
+    remove_column :comments, :commentable_id, :integer
+
+  end
+end

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,9 +153,12 @@ files:
 - app/views/blog/by_tag.html.erb
 - app/views/blog/index.atom.builder
 - app/views/blog/index.html.erb
+- app/views/comments/_admin_individual_comment.html.erb
+- app/views/comments/_comment_section.html.erb
 - app/views/comments/_form.html.erb
-- app/views/comments/_form_in_page.html.erb
+- app/views/comments/_form_in_commentable.html.erb
 - app/views/comments/_list_of_comments.html.erb
+- app/views/comments/_new_comment_section.html.erb
 - app/views/comments/_status_buttons.html.erb
 - app/views/comments/_tab_admin_menu.html.erb
 - app/views/comments/accepted.html.erb
@@ -171,10 +174,8 @@ files:
 - app/views/contacts/show.html.erb
 - app/views/pages/_admin_context_menu.html.erb
 - app/views/pages/_blog_post_meta.html.erb
-- app/views/pages/_comment_section.html.erb
 - app/views/pages/_form.html.erb
 - app/views/pages/_individual_blog_post_in_list.html.erb
-- app/views/pages/_new_comment_section.html.erb
 - app/views/pages/_tab_admin_menu.html.erb
 - app/views/pages/edit.html.erb
 - app/views/pages/index.html.erb
@@ -204,6 +205,7 @@ files:
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_taggings.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_tags.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/make_comments_polymorphic.rb
 - lib/tasks/tkh_content_tasks.rake
 - lib/tkh_content.rb
 - lib/tkh_content/version.rb

data/app/views/pages/_comment_section.html.erb

@@ -1,5 +0,0 @@
-<div id="comment-section">
-	<h2><%= pluralize @page.comments.showable.for_locale(I18n.locale.to_s).count, t('activerecord.models.comment') %></h2>
-	<%= render 'comments/list_of_comments' %>
-	<%= render 'new_comment_section' %>
-</div>