Merge pull request #83 from it3s/talk

Talk

app/assets/javascripts/components/comments.js.coffee

@@ -0,0 +1,20 @@
+
+App.components.comments = ->
+  attributes: ->
+    list:        @container.find('#comments-list')
+    identifier: 'remoteForm:comment-form'
+
+  initialize: ->
+    App.mediator.subscribe 'remoteForm:success', @onSuccess.bind(this)
+
+  onSuccess: (evt, data) ->
+    if data.identifier is @attr.identifier
+      @cleanEditor()
+      @addToList data.response.comment_html
+      App.utils.flashMessage data.response.flash
+
+  addToList: (comment_html) ->
+    @attr.list.prepend $(comment_html)
+
+  cleanEditor: ->
+    App.mediator.publish 'editor:clean', {identifier: 'editor:comment_comment'}

app/assets/javascripts/components/editor.js.coffee

@@ -15,7 +15,12 @@ App.components.editor = ->
       setup: (ed) =>
         ed.on 'change', _.debounce(@onEditorChange).bind(this)
     })
+    App.mediator.subscribe 'editor:clean', @clean.bind(this)
 
   onEditorChange: (ed)->
     App.mediator.publish 'tinymce:changed', {id: @container.attr('id'), content: ed.target.getContent()}
 
+  clean: (evt, data) ->
+    if data.identifier is @identifier
+      tinyMCE.get(@container.attr('id')).setContent ''
+

app/assets/javascripts/components/remoteForm.js.coffee

@@ -7,6 +7,7 @@ App.components.remoteForm = ->
     App.mediator.publish 'remoteForm:beforeSubmit', @container
 
   onAjaxComplete: (el, response) ->
+    @cleanErrors()
     callback = if parseInt(response.status, 10) is 200 then @onSuccess else @onError
     callback.bind(this)(el, JSON.parse(response.responseText))
 
@@ -18,7 +19,6 @@ App.components.remoteForm = ->
 
   onError: (el, response) ->
     err = response.errors || 'Error'
-    @cleanErrors()
     if _.isObject err
       _.each err, (value, key) =>
         field = @container.find("[name*='[#{key}]']").closest('.field')

app/assets/stylesheets/application.css.scss

@@ -62,3 +62,4 @@
 @import "notifications";
 @import "pictures";
 @import "import";
+@import "comments";

app/assets/stylesheets/comments.css.scss

@@ -0,0 +1,46 @@
+.comments {
+  #comment-form {
+    position: relative;
+
+    input[type=submit] {
+      margin-top: 10px;
+      position: absolute;
+      right: 0;
+    }
+  }
+
+  .comments-list {
+    margin-top: 60px;
+
+    .comment {
+      border-top: solid 1px $soft-grey;
+      padding: 10px;
+      color: $dark-grey;
+
+      .comment-headline {
+        a {
+          color: $link-color;
+          text-decoration: none;
+        }
+        .avatar {
+          width: 30px;
+          height: 30px;
+          border-radius: 15px;
+          top: 10px;
+          position: relative;
+          margin-right: 5px;
+        }
+        .comment-time {
+          color: $grey;
+          font-size: 0.9em;
+          margin-left: 10px;
+        }
+      }
+      .comment-text {
+        margin: 20px 15px;
+        border-left: solid 3px $ultra-soft-grey;
+        padding-left: 15px;
+      }
+    }
+  }
+}

app/controllers/comments_controller.rb

@@ -0,0 +1,36 @@
+class CommentsController < ApplicationController
+
+  before_action :require_login
+  before_action :find_commentable
+  after_action  :publish_commented_event
+
+  def create
+    @comment = Comment.new comment_params
+    if @comment.save
+      render json: {flash: flash_xhr(t 'comments.saved'), comment_html: comment_html}
+    else
+      render json: {errors: @comment.errors.messages}, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+    def find_commentable
+      @commentable ||= find_polymorphic_object
+    end
+
+    def comment_params
+      {user: current_user, content: @commentable, comment: params[:comment][:comment]}
+    end
+
+    def comment_html
+      render_to_string(partial: 'comments/comment', locals: {comment: @comment})
+    end
+
+    def publish_commented_event
+      if response.ok?
+        EventBus.publish "commented", object: @commentable, current_user: current_user, changes: {'comment' => @comment.comment}
+      end
+    end
+
+end

app/listeners/activity_listener.rb

@@ -27,6 +27,10 @@ def followed(payload)
     save_activity payload, :object, :follow
   end
 
+  def commented(payload)
+    save_activity payload, :object, :comment
+  end
+
   private
 
     def save_activity(params, key, action)

app/models/comment.rb

@@ -0,0 +1,8 @@
+class Comment < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :content, polymorphic: true
+
+  validates :user, :content, :comment, presence: true
+
+  default_scope { includes(:user).order('created_at desc') }
+end

app/models/concerns/commentable.rb

@@ -0,0 +1,7 @@
+module Commentable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :comments, as: :content, dependent: :destroy
+  end
+end

app/models/geo_data.rb

@@ -9,6 +9,7 @@ class GeoData < ActiveRecord::Base
   include Relationships
   include Exportable
   include PublicActivity::Common
+  include Commentable
 
   geojson_field :location
   searchable_tags :tags

app/models/map.rb

@@ -7,6 +7,7 @@ class Map < ActiveRecord::Base
   include Searchable
   include Exportable
   include PublicActivity::Common
+  include Commentable
 
   belongs_to :administrator, class_name: 'User'
 
@@ -45,4 +46,5 @@ def geo_data_features
   def geo_data_ids
     geo_data.all.map { |data| data.id }
   end
+
 end

app/views/comments/_comment.html.erb

@@ -0,0 +1,14 @@
+<div class="comment">
+  <div class="comment-headline">
+    <%= image_tag comment.user.avatar.thumb , class: "avatar", title: comment.user.name %>
+    <a href="<%= user_path(comment.user) %>">
+      <span><%= comment.user.name %></span>
+    </a>
+    <time class="comment-time" datetime="<%= comment.created_at.to_datetime.rfc3339 %>">
+      <%= t 'time_ago', time: time_ago_in_words(comment.created_at) %>
+    </time>
+  </div>
+  <div class="comment-text">
+    <%= raw comment.comment %>
+  </div>
+</div>

app/views/comments/_list.html.erb

@@ -0,0 +1,30 @@
+<div id="comments" class="comments" data-components='comments'>
+
+  <% if logged_in? && !edit_mode? %>
+
+    <%= form_tag url_for([object, :comments]), method: :post, id: "comment-form",
+                 remote: true, "data-components" => "remoteForm" do %>
+      <div class="field">
+        <textarea id="comment_comment" class="comment_input tinymce" name="comment[comment]"
+                  data-components="editor" data-editor-options='{"height":70}' >
+        </textarea>
+      </div>
+      <%= submit_tag 'Add comment' %>
+    <% end %>
+
+    <ul id="comments-list" class="comments-list">
+      <%= render comments %>
+    </ul>
+
+  <% else %>
+
+    <% if comments.empty? %>
+      <p class="empty"><%= t 'comments.empty', {name: object.name} %></p>
+    <% else %>
+      <ul id="comments-list" class="comments-list">
+        <%= render comments %>
+      </ul>
+    <% end %>
+
+  <% end %>
+</div>

app/views/geo_data/_content.html.erb

@@ -34,7 +34,7 @@
       <%= render 'pictures/gallery', object: geo_data %>
     </div>
     <div class="tab-content" id="talk">
-      Talk Placeholder
+      <%= render 'comments/list', comments: geo_data.comments, object: geo_data %>
     </div>
   </div>
 

app/views/geo_data/_content_edit.html.erb

@@ -29,7 +29,7 @@
       <%= render 'pictures/uploader', object: geo_data %>
     </div>
     <div class="tab-content" id="talk">
-      Talk Placeholder
+      <%= render 'comments/list', comments: geo_data.comments, object: geo_data %>
     </div>
   </div>
 

app/views/maps/_content.html.erb

@@ -43,7 +43,7 @@
     </div>
 
     <div class="tab-content" id="talk">
-      Talk Placeholder
+      <%= render 'comments/list', comments: map.comments, object: map %>
     </div>
   </div>
 

app/views/maps/_content_edit.html.erb

@@ -24,7 +24,7 @@
       Data Placeholder
     </div>
     <div class="tab-content" id="talk">
-      Talk Placeholder
+      <%= render 'comments/list', comments: map.comments, object: map %>
     </div>
   </div>
 

config/locales/en/activities.yml

@@ -4,7 +4,8 @@ en:
     empty: "There are no activity recorded for this user yet"
 
     event:
-      update: 'updated'
-      create: 'created'
-      delete: 'deleted'
-      follow: 'followed'
+      update:  'updated'
+      create:  'created'
+      delete:  'deleted'
+      follow:  'followed'
+      comment: 'commented'

config/locales/en/comments.yml

@@ -0,0 +1,5 @@
+en:
+  comments:
+    empty: '%{name} has no comments yet.'
+    submit: 'Add comment'
+    saved: 'Comment added'

config/locales/pt-BR/activities.yml

@@ -4,7 +4,8 @@ pt-BR:
     empty: "Não há registro de atividade para este usuário ainda"
 
     event:
-      update: 'atualizou'
-      create: 'criou'
-      delete: 'deletou'
-      follow: 'seguiu'
+      update:  'atualizou'
+      create:  'criou'
+      delete:  'deletou'
+      follow:  'seguiu'
+      comment: 'commentou'

config/locales/pt-BR/comments.yml

@@ -0,0 +1,6 @@
+pt-BR:
+  comments:
+    empty: '%{name} não possui comentários ainda.'
+    submit: 'Adicionar comentário'
+    saved: 'Comentário adicionado'
+

config/routes.rb

@@ -53,6 +53,10 @@
     resources :pictures, only: [:show, :update, :destroy]
   end
 
+  concern :commentable do
+    resource :comments, on: :member, only: [:create]
+  end
+
   resources :users, except: [:destroy, :index],
                     concerns: [:contributor, :followable, :follower] do
     member do
@@ -74,7 +78,7 @@
 
   resources :geo_data, except:   [:destroy],
                        concerns: [:contributable, :followable, :versionable,
-                                  :downloadable, :has_media] do
+                                  :downloadable, :commentable, :has_media] do
     member do
       get  :maps
       post :add_map
@@ -87,7 +91,8 @@
   end
 
   resources :maps, except:   [:destroy],
-                   concerns: [:contributable, :followable, :versionable, :downloadable] do
+                   concerns: [:contributable, :followable, :versionable,
+                              :downloadable, :commentable] do
     member do
       get  :geo_data
       post :add_geo_data

db/migrate/20141013145901_create_comments.rb

@@ -0,0 +1,11 @@
+class CreateComments < ActiveRecord::Migration
+  def change
+    create_table :comments do |t|
+      t.references :user,    null: false, index: true
+      t.references :content, null: false, index: true, polymorphic: true
+      t.text       :comment, null: false
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -11,13 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140930182821) do
+ActiveRecord::Schema.define(version: 20141013145901) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
-  enable_extension "hstore"
-  enable_extension "uuid-ossp"
   enable_extension "postgis"
+  enable_extension "hstore"
   enable_extension "pg_trgm"
   enable_extension "fuzzystrmatch"
 
@@ -46,6 +45,18 @@
     t.datetime "updated_at"
   end
 
+  create_table "comments", force: true do |t|
+    t.integer  "user_id",      null: false
+    t.integer  "content_id",   null: false
+    t.string   "content_type", null: false
+    t.text     "comment",      null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comments", ["content_id", "content_type"], :name => "index_comments_on_content_id_and_content_type"
+  add_index "comments", ["user_id"], :name => "index_comments_on_user_id"
+
   create_table "contributings", force: true do |t|
     t.integer  "contributor_id"
     t.integer  "contributable_id"