tkh_content 0.2.1 → 0.3

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.3
+
+* Added a comment resource and integrated it with the page show views.
+* Added a few translations. Many more to do
+
+
 ## 0.2.1
 
 * Debugged, and therefore enabled, the autocomplete of the parent page title in pages form

data/app/controllers/comments_controller.rb

@@ -0,0 +1,81 @@
+class CommentsController < ApplicationController
+  
+  before_filter :authenticate
+  before_filter :authenticate_with_admin, :except => 'create'
+  
+  def index
+    @comments = Comment.by_recent
+    switch_to_admin_layout
+  end
+  
+  # comments are shown within a page
+  # new comments are created by users from within a page
+
+  def edit
+    @comment = Comment.find params[:id]
+    switch_to_admin_layout
+  end
+
+  def create
+    @comment = Comment.new params[:comment]
+    @comment.author_id = current_user.id
+    @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')
+    else
+      redirect_to @comment.page, warning: t('comments.create.warning')
+    end
+  end
+
+  def update
+    @comment = Comment.find(params[:id])
+    if @comment.update_attributes(params[:comment])
+      redirect_to comments_path, notice: t('comments.update.notice')
+    else
+      render action: "edit", warning: t('comments.update.warning'), layout: 'admin'
+    end
+  end
+
+  def destroy
+    @comment = Comment.find(params[:id])
+    @comment.destroy
+    redirect_to comments_url, notice: t('comments.destroy.notice')
+  end
+  
+  def accept
+    @comment = Comment.find params[:id]
+    @comment.status = 'accepted'
+    if @comment.save
+      redirect_to :back, notice: t('comments.moderation.accept.notice')
+    else
+      redirect_to comments_path, warning: t('comments.moderation.accept.warning')
+    end
+  end
+  
+  def block
+    @comment = Comment.find params[:id]
+    @comment.status = 'blocked'
+    if @comment.save
+      redirect_to :back, notice: t('comments.moderation.block.notice')
+    else
+      redirect_to comments_path, warning: t('comments.moderation.block.warning')
+    end
+  end
+  
+  def pending
+    @comments = Comment.pending
+    switch_to_admin_layout
+  end
+  
+  def accepted
+    @comments = Comment.accepted.by_recent
+    switch_to_admin_layout
+  end
+
+  def blocked
+    @comments = Comment.blocked.by_recent
+    switch_to_admin_layout
+  end
+  
+end

data/app/models/comment.rb

@@ -0,0 +1,25 @@
+# this is needed for now to make mass assignment security compatible with the translation of globalize3
+Globalize::ActiveRecord::Translation.class_eval do
+  attr_accessible :locale
+end
+
+class Comment < ActiveRecord::Base
+  
+  belongs_to :author, class_name: 'User', foreign_key: 'author_id'
+  belongs_to :page
+  
+  # non-accessible attributes: author_id, :status, :locale
+  attr_accessible :body, :page_id
+  
+  validates_presence_of :page_id, :body
+  
+  scope :showable, where('status = ? OR status = ?', 'pending', 'accepted')
+  scope :pending, where('status = ?', 'pending')
+  scope :accepted, where('status = ?', 'accepted')
+  scope :blocked, where('status = ?', 'blocked')
+  scope :for_locale, lambda { |locale| where('locale = ?', locale) }
+  scope :by_recent, order('updated_at desc')
+  scope :by_created, order('created_at')
+  scope :by_recently_created, order('created_at desc')
+  
+end

data/app/models/page.rb

@@ -6,6 +6,7 @@ end
 class Page < ActiveRecord::Base
   
   belongs_to :author, class_name: 'User', foreign_key: 'author_id'
+  has_many :comments, :dependent => :destroy
   
   attr_accessible :title, :short_title, :description, :body, :for_blog, :parent_id, :tag_list, :parent_page_title
   

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

@@ -0,0 +1,16 @@
+<%= 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 />
+	  <%= f.input :body, :input_html => { :rows => 3 } %>
+	</div>
+	
+  <div class="form-actions">
+    <%= f.button :submit, :class => 'btn btn-primary' %>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,10 @@
+<%= simple_form_for Comment.new do |f| %>
+	<%= f.error_notification %>
+
+  <div class="form-inputs">
+	  <%= f.input :body, label: false, :input_html => { :rows => 8 } %>
+		<%= f.hidden_field :page_id, value: @page.id %>
+		<%= f.button :submit, :class => 'btn btn-primary' %>
+	</div>
+
+<% end %>

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

@@ -0,0 +1,10 @@
+<% @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">
+	<p>
+		<span class="comment-index"><%= index + 1 %></span>
+		<span class="comment-author-name"><%= comment.author.name %></span>
+		<span class="comment-created-date"><%= l comment.created_at, format: :tkh_default %></span>
+		<span class="comment-body"><%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></span>
+	</p>
+</div>
+<% end %>

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

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

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

@@ -0,0 +1,3 @@
+<h1>Edit a Comment</h1>
+<%= render 'form' %>
+<%= render 'shared/admin_sidebar' %>

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

@@ -0,0 +1,29 @@
+<h1>List of Comments</h1>
+
+<table class='table table-striped'>
+	<thead>
+  <tr>
+	    <th><%= t 'activerecord.attributes.comments.author' %></th>
+	    <th><%= t 'activerecord.attributes.comments.page' %></th>
+			<th><%= t 'activerecord.attributes.comments.body' %></th>
+			<th><%= t 'activerecord.attributes.comments.status' %></th>
+			<th><%= t 'activerecord.attributes.comments.locale' %></th>
+	    <th>Actions</th>
+	  </tr>
+	</thead>
+	
+	<tbody>
+		<% @comments.each do |comment| %>h
+		  <tr>
+		    <td><%= comment.author.name %></td>
+				<td><%= link_to comment.page.title, comment.page %></td>
+		    <td><%= truncate comment.body, length: 75, separator: ' ...' %></td>
+				<td><%= comment.status %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
+				<td><%= comment.locale %></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>
+		<% end %>
+	</tbody>
+</table>
+
+<%= render 'shared/admin_sidebar' %>

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

@@ -1,4 +1,4 @@
 <p class="meta-info">
-	by <%= post.author.name %> <%= post.published_at ? "on #{l(post.published_at, format: :tkh_default)}" : "- not published yet" %> | <%= link_to 'Permalink', post %>
+	by <%= post.author.name %> <%= post.published_at ? "on #{l(post.published_at, format: :tkh_default)}" : "- not published yet" %> | <%= link_to 'Permalink', post %> | <%= pluralize post.comments.showable.for_locale(I18n.locale.to_s).count, 'comments' %>
 	<%="| #{link_to 'edit', edit_page_path(post), class: 'btn btn-mini'}".html_safe if administrator? %>
 </p>

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

@@ -0,0 +1,7 @@
+<div id="comment-section">
+	<h2><%= pluralize @page.comments.showable.for_locale(I18n.locale.to_s).count, 'Comment' %></h2>
+	<%= render 'comments/list_of_comments' %>
+	<%= render 'new_comment_section' %>
+</div>
+
+<%= render( 'admin_context_menu', page: @page) if administrator? %>

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

@@ -0,0 +1,9 @@
+<div id="new-comment-section">
+	<h3>What do you think?</h3>
+	<% if current_user %>
+		<%= render 'comments/form_in_page' %>
+	<% else %>
+		<p><label class="label label-info">You need to be logged in to leave a comment</label></p>
+		<%= render 'shared/embedded_login_module' %>
+	<% end -%>
+</div>

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

@@ -2,15 +2,14 @@
 <% content_for :meta_description, @page.description %>
 
 <% unless @page.for_blog? %>
-
 	<%= raw tkhed(@page.body) %>
-	<%= render( 'admin_context_menu', page: @page) if administrator? %>
-
+	<%= render 'comment_section' 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? %>
 	
 <% end -%>
 

data/config/routes.rb

@@ -10,8 +10,22 @@ Rails.application.routes.draw do
         post :sort
       end
     end
+    
+    resources :contacts
+    
+    resources :comments do
+      collection do
+        get :pending
+        get :accepted
+        get :blocked
+      end
+      member do
+        post :accept
+        post :block
+      end
+    end
     get 'blog' => 'blog#index', as: :blog
     get 'tags/:tag', to: 'blog#index', as: :tag
-    resources :contacts
+    
   end
 end

data/lib/generators/tkh_content/create_or_update_locales/templates/de.yml

@@ -1,4 +1,11 @@
 de:
+
+  are_you_sure: 'Bist Du sicher?'
+  colon: ':'
+  delete: 'löschen'
+  edit: 'bearbeiten'
+  pages: 'Seiten'
+  sections: 'Abschnitte'
   
   time:
     formats:
@@ -41,10 +48,11 @@ de:
       notice: 'Die Seite wurde gelöscht.'
       root_warning: "Du kannst diese Seite nicht löschen, da es die Root-Seite ist. Du kannst sie nur bearbeiten."
 
-  contacts:    
+  contacts:
+    messages_from_forms: 'messages from contact form'
     send_message: 'Nachricht senden'
     sent: 'Gesendet am'
     
     create:
       notice: 'Die Nachricht wurde gesendet.'
-      warning: 'Beim Versenden der Nachricht gab es ein Problem.'
+      warning: 'Beim Versenden der Nachricht gab es ein Problem.'

data/lib/generators/tkh_content/create_or_update_locales/templates/en.yml

@@ -19,8 +19,15 @@ en:
         sender_name: "sender name"
         sender_email: 'sender email'
         body: 'message'
+        
+      comments:
+        author: 'author'
+        body: "body text"
+        locale: 'language'
+        status: 'status'
   
   are_you_sure: 'are you sure?'
+  colon: ':'
   delete: 'delete'
   edit: 'edit'
   pages: 'pages'
@@ -40,11 +47,36 @@ en:
     destroy:
       notice: 'The page was deleted'
       root_warning: "You cannot delete this page as this is the root page of the site. You should only modify it."
-  
+      
   contacts:
+    messages_from_forms: 'messages from contact form'
     send_message: 'send message'
     sent: 'Sent at'
-      
+
     create:
       notice: 'Your message has been sent'
       warning: 'There was a problem sending your message.'
+            
+  comments:
+    create:
+      notice: 'The comment was successfully created.'
+      warning: 'There was a problem saving the comment to the database'
+    update:
+      notice: 'The comment was successfully updated.'
+      warning: 'There was a problem saving this comment'
+    destroy:
+      notice: 'The comment was deleted'
+    moderation:
+      accept:
+        notice: "This comment has been accepted"
+        warning: "Some error occurred and the comment could not be moderated and accepted"
+      block:
+        notice: "This comment has been blocked"
+        warning: "Some error occurred and the comment could not be moderated and blocked"
+      actions:
+        accept: "accept!"
+        block: "block!"
+    status:
+      pending: 'pending'
+      accepted: 'accepted'
+      blocked: 'blocked'

data/lib/generators/tkh_content/create_or_update_locales/templates/es.yml

@@ -7,6 +7,7 @@ es:
       tkh_default: "%d de %B de %Y %H:%M"
   
   are_you_sure: '¿estás seguro?'
+  colon: ':'
   delete: 'borrar'
   edit: 'editar'
   pages: 'paginas'
@@ -41,7 +42,8 @@ es:
       notice: 'la página se ha eliminado'
       root_warning: "No se puede eliminar la página, ya que es la bienvenida principal. Por favor, cámbialo."
           
-  contacts:    
+  contacts:
+    messages_from_forms: 'mensajes del formulario de contacto'
     send_message: 'enviar el mensaje'
     sent: 'Enviado a las'
     

data/lib/generators/tkh_content/create_or_update_locales/templates/fr.yml

@@ -7,6 +7,7 @@ fr:
       tkh_default: "%d %b %Y à %H:%M"
   
   are_you_sure: 'êtes vous sûr ?'
+  colon: ' :'
   delete: 'supprimer'
   edit: 'modifier'
   pages: 'pages'
@@ -41,10 +42,11 @@ fr:
       notice: 'La page a été supprimée.'
       root_warning: "Vous ne pouvez pas supprimer cette page parce que c'est la page principale de bienvenue. Veuillez la modifier."
 
-  contacts:    
+  contacts:
+    messages_from_forms: 'messages du formulaire de contact'
     send_message: 'envoyez le message'
     sent: 'Envoyé le'
         
     create:
       notice: 'Votre message a bien été envoyé.'
-      warning: "Il y'a eu un probleme en envoyant votre message."
+      warning: "Il y'a eu un probleme en envoyant votre message."

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

@@ -25,6 +25,7 @@ module TkhContent
         migration_template "create_taggings.rb", "db/migrate/create_taggings.rb"
         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"
       end
  
     end

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

@@ -0,0 +1,25 @@
+class CreateComments < ActiveRecord::Migration
+  
+  def self.up
+    create_table :comments do |t|
+      t.text :body
+      t.integer :page_id
+      t.integer :author_id
+      t.string :locale
+      t.string :status, :default => 'pending'
+      t.timestamps
+    end
+    add_index :comments, :page_id
+    add_index :comments, :author_id
+    add_index :comments, :locale
+    add_index :comments, :status
+  end
+  
+  def self.down
+    drop_table :comments
+    remove_index :comments, :page_id
+    remove_index :comments, :author_id
+    remove_index :comments, :locale
+    remove_index :comments, :status
+  end
+end

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.2.1"
+  VERSION = "0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,24 +165,34 @@ files:
 - app/assets/javascripts/ckeditor/config.js.coffee
 - app/assets/javascripts/pages.js.coffee
 - app/controllers/blog_controller.rb
+- app/controllers/comments_controller.rb
 - app/controllers/contacts_controller.rb
 - app/controllers/pages_controller.rb
 - app/helpers/blog_helper.rb
 - app/helpers/pages_helper.rb
 - app/mailers/contact_mailer.rb
+- app/models/comment.rb
 - app/models/contact.rb
 - app/models/page.rb
 - app/models/tag.rb
 - app/models/tagging.rb
 - app/views/blog/index.html.erb
 - app/views/blog/index.rss.builder
+- app/views/comments/_form.html.erb
+- app/views/comments/_form_in_page.html.erb
+- app/views/comments/_list_of_comments.html.erb
+- app/views/comments/_status_buttons.html.erb
+- app/views/comments/edit.html.erb
+- app/views/comments/index.html.erb
 - app/views/contact_mailer/message_from_contact_form.text.erb
 - app/views/contacts/_form.html.erb
 - app/views/contacts/index.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/edit.html.erb
 - app/views/pages/index.html.erb
 - app/views/pages/new.html.erb
@@ -201,6 +211,7 @@ files:
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_short_title_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_various_indices_to_pages.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/create_comments.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_contacts.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_taggings.rb
@@ -256,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3916766060710411944
+      hash: 3348047770526547114
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3916766060710411944
+      hash: 3348047770526547114
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23