diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 4828e1827..b336a924a 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -13,7 +13,6 @@ class DebatesController < ApplicationController @debates = @debates.page(params[:page]).for_render.send("sort_by_#{@order}") @tag_cloud = Debate.tag_counts.order(taggings_count: :desc, name: :asc).limit(20) set_debate_votes(@debates) - ahoy.track_visit end def show @@ -24,7 +23,6 @@ class DebatesController < ApplicationController @all_visible_comments = @root_comments + @comments set_comment_flags(@all_visible_comments) - ahoy.track_visit end def new diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 595de397f..fe224eb8d 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -4,7 +4,6 @@ class StatsController < ApplicationController def show @event_types = Ahoy::Event.select(:name).uniq.pluck(:name) - @debates_created_count = Ahoy::Event.where(name: 'debate_created').count end private diff --git a/app/helpers/cache_keys_helper.rb b/app/helpers/cache_keys_helper.rb index 6bcd8ca91..be23439dd 100644 --- a/app/helpers/cache_keys_helper.rb +++ b/app/helpers/cache_keys_helper.rb @@ -22,4 +22,9 @@ module CacheKeysHelper user_status end + # when commentable id and type are used but no need to update cache on updated_at changes + def commentable_cache_key(commentable) + "#{commentable.class.name}-#{commentable.id}" + end + end \ No newline at end of file diff --git a/app/jobs/stats_job.rb b/app/jobs/stats_job.rb deleted file mode 100644 index 14e530bc5..000000000 --- a/app/jobs/stats_job.rb +++ /dev/null @@ -1,6 +0,0 @@ -class StatsJob < ActiveJob::Base - queue_as :default - - def perform(*args) - end -end diff --git a/app/models/comment.rb b/app/models/comment.rb index 657994d8e..5997276d0 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -4,7 +4,7 @@ class Comment < ActiveRecord::Base acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases acts_as_votable - has_ancestry + has_ancestry touch: true attr_accessor :as_moderator, :as_administrator diff --git a/app/models/debate.rb b/app/models/debate.rb index e976bcef9..645d6146b 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -39,6 +39,9 @@ class Debate < ActiveRecord::Base scope :sort_by_most_commented, -> { order(comments_count: :desc) } scope :sort_by_random, -> { order("RANDOM()") } + # Ahoy setup + visitable # Ahoy will automatically assign visit_id on create + def likes cached_votes_up end diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index d29c19ebe..0ac6b9be1 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -1,102 +1,104 @@ -
-
+<% cache [locale_and_user_status(comment), comment, commentable_cache_key(@commentable), comment.author, (@comment_flags[comment.id] if @comment_flags)] do %> +
+
- <% if comment.hidden? || comment.user.hidden? %> - <% if select_children(@comments, comment).size > 0 %> -
-

<%= t("debates.comment.deleted") %>

-
- <% end %> - <% else %> - <% if comment.as_administrator? %> - <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar left") %> - <% elsif comment.as_moderator? %> - <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %> + <% if comment.hidden? || comment.user.hidden? %> + <% if select_children(@comments, comment).size > 0 %> +
+

<%= t("debates.comment.deleted") %>

+
+ <% end %> <% else %> - <% if comment.user.organization? %> - <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %> + <% if comment.as_administrator? %> + <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar left") %> + <% elsif comment.as_moderator? %> + <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %> <% else %> - <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %> - <% end %> - <% if comment.user.hidden? %> - - <% end %> - <% end %> - -
-
- - <% if comment.as_administrator? %> - <%= t("debates.comment.admin") %> #<%= comment.administrator_id%> - <% elsif comment.as_moderator? %> - <%= t("debates.comment.moderator") %> #<%= comment.moderator_id%> + <% if comment.user.organization? %> + <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %> <% else %> + <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %> + <% end %> + <% if comment.user.hidden? %> + + <% end %> + <% end %> - <% if comment.user.hidden? %> - <%= t("debates.comment.user_deleted") %> +
+
+ + <% if comment.as_administrator? %> + <%= t("debates.comment.admin") %> #<%= comment.administrator_id%> + <% elsif comment.as_moderator? %> + <%= t("debates.comment.moderator") %> #<%= comment.moderator_id%> <% else %> - <%= comment.user.name %> - <% if comment.user.official? %> + + <% if comment.user.hidden? %> + <%= t("debates.comment.user_deleted") %> + <% else %> + <%= comment.user.name %> + <% if comment.user.official? %> +  •  + + <%= comment.user.official_position %> + + <% end %> + <% end %> + <% if comment.user.verified_organization? %>  •  - - <%= comment.user.official_position %> + + <%= t("shared.collective") %> <% end %> - <% end %> - <% if comment.user.verified_organization? %> -  •  - - <%= t("shared.collective") %> - - <% end %> - <% if comment.user_id == @commentable.author_id %> -  •  - - <%= t("debates.comment.author") %> - + <% if comment.user_id == @commentable.author_id %> +  •  + + <%= t("debates.comment.author") %> + + <% end %> + <% end %> +  •  +
+ + <% if comment.as_administrator? %> +

<%= comment.body %>

+ <% elsif comment.as_moderator? %> +

<%= comment.body %>

+ <% elsif comment.user.official? && comment.user_id == @commentable.author_id %> +

<%= comment.body %>

+ <% elsif comment.user.official? %> +

<%= comment.body %>

+ <% elsif comment.user_id == @commentable.author_id %> +

<%= comment.body %>

+ <% else %> +

<%= comment.body %>

<% end %> + + <%= render 'comments/votes', comment: comment %> + -  • <%= time_ago_in_words(comment.created_at) %> +
+ <%= t("debates.comment.responses", count: select_children(@comments, comment).size) %> + + <% if user_signed_in? %> +  |  + <%= link_to(comment_link_text(comment), "", + class: "js-add-comment-link", data: {'id': dom_id(comment)}) %> + + <%= render 'comments/actions', comment: comment %> + + <%= render 'comments/form', {commentable: @commentable, parent_id: comment.id, toggeable: true} %> + <% end %> +
- - <% if comment.as_administrator? %> -

<%= comment.body %>

- <% elsif comment.as_moderator? %> -

<%= comment.body %>

- <% elsif comment.user.official? && comment.user_id == @commentable.author_id %> -

<%= comment.body %>

- <% elsif comment.user.official? %> -

<%= comment.body %>

- <% elsif comment.user_id == @commentable.author_id %> -

<%= comment.body %>

- <% else %> -

<%= comment.body %>

+ <% end %> +
+ <% select_children(@comments, comment).each do |child| %> + <%= render 'comments/comment', comment: child %> <% end %> - - <%= render 'comments/votes', comment: comment %> - - -
- <%= t("debates.comment.responses", count: select_children(@comments, comment).size) %> - - <% if user_signed_in? %> -  |  - <%= link_to(comment_link_text(comment), "", - class: "js-add-comment-link", data: {'id': dom_id(comment)}) %> - - <%= render 'comments/actions', comment: comment %> - - <%= render 'comments/form', {commentable: @commentable, parent_id: comment.id, toggeable: true} %> - <% end %> -
- <% end %> -
- <% select_children(@comments, comment).each do |child| %> - <%= render 'comments/comment', comment: child %> - <% end %> +
-
-
\ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index 7efe50110..cde2bf824 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -1,26 +1,28 @@ -<% css_id = parent_or_commentable_dom_id(parent_id, commentable) %> -
> - <%= form_for [commentable, Comment.new], remote: true do |f| %> - <%= label_tag "comment-body-#{css_id}", t("comments.form.leave_comment") %> - <%= f.text_area :body, id: "comment-body-#{css_id}", maxlength: Comment::BODY_LENGTH[:maximum], label: false %> - <%= f.hidden_field :commentable_type, value: commentable.class.name %> - <%= f.hidden_field :commentable_id, value: commentable.id %> - <%= f.hidden_field :parent_id, value: parent_id %> +<% cache [locale_and_user_status, parent_id, commentable_cache_key(commentable)] do %> + <% css_id = parent_or_commentable_dom_id(parent_id, commentable) %> +
> + <%= form_for [commentable, Comment.new], remote: true do |f| %> + <%= label_tag "comment-body-#{css_id}", t("comments.form.leave_comment") %> + <%= f.text_area :body, id: "comment-body-#{css_id}", maxlength: Comment::BODY_LENGTH[:maximum], label: false %> + <%= f.hidden_field :commentable_type, value: commentable.class.name %> + <%= f.hidden_field :commentable_id, value: commentable.id %> + <%= f.hidden_field :parent_id, value: parent_id %> - <%= f.submit comment_button_text(parent_id), class: "button radius small inline-block" %> + <%= f.submit comment_button_text(parent_id), class: "button radius small inline-block" %> + + <% if can? :comment_as_moderator, commentable %> +
+ <%= f.check_box :as_moderator, id: "comment-as-moderator-#{css_id}", label: false %> + <%= label_tag "comment-as-moderator-#{css_id}", t("comments.form.comment_as_moderator"), class: "checkbox" %> +
+ <% end %> + <% if can? :comment_as_administrator, commentable %> +
+ <%= f.check_box :as_administrator, id: "comment-as-administrator-#{css_id}",label: false %> + <%= label_tag "comment-as-administrator-#{css_id}", t("comments.form.comment_as_admin"), class: "checkbox" %> +
+ <% end %> - <% if can? :comment_as_moderator, commentable %> -
- <%= f.check_box :as_moderator, id: "comment-as-moderator-#{css_id}", label: false %> - <%= label_tag "comment-as-moderator-#{css_id}", t("comments.form.comment_as_moderator"), class: "checkbox" %> -
<% end %> - <% if can? :comment_as_administrator, commentable %> -
- <%= f.check_box :as_administrator, id: "comment-as-administrator-#{css_id}",label: false %> - <%= label_tag "comment-as-administrator-#{css_id}", t("comments.form.comment_as_admin"), class: "checkbox" %> -
- <% end %> - - <% end %> -
+
+<% end %> diff --git a/app/views/debates/_comments.html.erb b/app/views/debates/_comments.html.erb index 5fbea960d..2a2fb518e 100644 --- a/app/views/debates/_comments.html.erb +++ b/app/views/debates/_comments.html.erb @@ -1,28 +1,29 @@ -
-
-
+<% cache [locale_and_user_status, commentable_cache_key(@debate), @all_visible_comments, @all_visible_comments.map(&:author), @debate.comments_count, @comment_flags] do %> +
+
+
+

+ <%= t("debates.show.comments_title") %> + (<%= @debate.comments_count %>) +

-

- <%= t("debates.show.comments_title") %> - (<%= @debate.comments_count %>) -

+ <% if user_signed_in? %> + <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %> + <% else %> +
- <% if user_signed_in? %> - <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %> - <% else %> -
+
+ <%= t("debates.show.login_to_comment", + signin: link_to(t("votes.signin"), new_user_session_path), + signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> +
+ <% end %> -
- <%= t("debates.show.login_to_comment", - signin: link_to(t("votes.signin"), new_user_session_path), - signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> -
- <% end %> - - <% @root_comments.each do |comment| %> - <%= render 'comments/comment', comment: comment %> - <% end %> - <%= paginate @root_comments %> + <% @root_comments.each do |comment| %> + <%= render 'comments/comment', comment: comment %> + <% end %> + <%= paginate @root_comments %> +
-
-
\ No newline at end of file + +<% end %> \ No newline at end of file diff --git a/app/views/stats/show.html.erb b/app/views/stats/show.html.erb index ff6765318..f5df82b98 100644 --- a/app/views/stats/show.html.erb +++ b/app/views/stats/show.html.erb @@ -4,7 +4,7 @@

Stats

-

Visits (<%= Visit.count %>)

+

Visits

<%= visits_chart_tag id: "visits" %>
@@ -15,7 +15,7 @@
<% @event_types.each do |event_type| %> -

<%= event_type.titleize %> (<%= @debates_created_count %>)

+

<%= event_type.titleize %>

<%= events_chart_tag event_type %> <% end %>
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb index 378b21eb1..9a1215c68 100644 --- a/config/initializers/ahoy.rb +++ b/config/initializers/ahoy.rb @@ -1,11 +1,9 @@ class Ahoy::Store < Ahoy::Stores::ActiveRecordStore - def track_visit(options) - StatsJob.perform_later(super, name: "visit") - end - # Track user IP def track_event(name, properties, options) - StatsJob.perform_later(super { |event| event.ip = request.ip }, name: "event") + super do |event| + event.ip = request.ip + end end -end \ No newline at end of file +end diff --git a/config/locales/rails.en.yml b/config/locales/rails.en.yml index cb5bdc38f..e45dfce7e 100644 --- a/config/locales/rails.en.yml +++ b/config/locales/rails.en.yml @@ -20,3 +20,6 @@ # available at http://guides.rubyonrails.org/i18n.html. en: + time: + formats: + datetime: "%Y-%m-%d %H:%M:%S" diff --git a/config/locales/rails.es.yml b/config/locales/rails.es.yml index 9a6e698d2..31cc02e92 100644 --- a/config/locales/rails.es.yml +++ b/config/locales/rails.es.yml @@ -196,4 +196,5 @@ es: default: "%A, %d de %B de %Y %H:%M:%S %z" long: "%d de %B de %Y %H:%M" short: "%d de %b %H:%M" + datetime: "%d/%m/%Y %H:%M:%S" pm: pm \ No newline at end of file diff --git a/spec/controllers/debates_controller_spec.rb b/spec/controllers/debates_controller_spec.rb index 23c49bcf2..f87635a6b 100644 --- a/spec/controllers/debates_controller_spec.rb +++ b/spec/controllers/debates_controller_spec.rb @@ -11,30 +11,6 @@ describe DebatesController do SimpleCaptcha.always_pass = @original_captcha_pass_value end - describe 'GET show' do - it 'should create an ahoy visit' do - debate = create(:debate) - sign_in create(:user) - - get :show, id: debate.id - - expect(Visit.count).to eq 1 - expect(Visit.first.landing_page).to eq debate_url(debate) - end - end - - describe 'GET index' do - it 'should create an ahoy visit' do - debate = create(:debate) - sign_in create(:user) - - get :index - - expect(Visit.count).to eq 1 - expect(Visit.first.landing_page).to eq debates_url - end - end - describe 'POST create' do it 'should create an ahoy event' do diff --git a/spec/features/active_jobs_spec.rb b/spec/features/active_jobs_spec.rb deleted file mode 100644 index bfb289641..000000000 --- a/spec/features/active_jobs_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'rails_helper' - -feature 'ActiveJob' do - include ActiveJob::TestHelper - - let(:admin) { create(:administrator) } - - scenario 'use queue to track visits' do - debate = create(:debate) - - visit debate_path(debate) - - expect(enqueued_jobs.size).to eq(1) - perform_enqueued_jobs { StatsJob.perform_now(enqueued_jobs.first) } - - login_as(admin.user) - visit stats_path - - expect(page).to have_content 'Visits (1)' - end - - scenario "use queue to track new debates" do - user = create(:user) - - login_as(user) - visit new_debate_path - - create_a_debate - - expect(enqueued_jobs.size).to eq(2) - - expect(enqueued_jobs.first[:args][1]["name"]).to eq("event") - expect(enqueued_jobs.last[:args][1]["name"]).to eq("visit") - - perform_enqueued_jobs do - enqueued_jobs.each { |job| StatsJob.perform_now(job) } - end - - login_as(admin.user) - visit stats_path - - expect(page).to have_content 'Debate Created (1)' - end - -end \ No newline at end of file diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb index 2bdd380bd..40e75a281 100644 --- a/spec/features/comments_spec.rb +++ b/spec/features/comments_spec.rb @@ -14,7 +14,7 @@ feature 'Comments' do comment = Comment.last within first('.comment') do expect(page).to have_content comment.user.name - expect(page).to have_content time_ago_in_words(comment.created_at) + expect(page).to have_content I18n.l(comment.created_at, format: :datetime) expect(page).to have_content comment.body end end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 407c8292d..4753abbbb 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -34,17 +34,6 @@ module CommonActions click_button 'Send me reset password instructions' end - def create_a_debate - fill_in 'debate_title', with: 'Acabar con los desahucios' - fill_in 'debate_description', with: 'Esto es un tema muy importante porque...' - fill_in 'debate_captcha', with: correct_captcha_text - check 'debate_terms_of_service' - - click_button 'Start a debate' - - expect(page).to have_content 'Debate was successfully created.' - end - def comment_on(debate) user = create(:user)