simple_discussion 0.9.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 584ec2c3ab8802d72c6f363f9b10ea08065caa9f
-  data.tar.gz: c53ec10ed28f235c1e5d30df9f76b8ef27c2ba88
+SHA256:
+  metadata.gz: 3f2f5e88baaa6845d27866a70baa5facf3c48e13798cb4889b83b7e6aa7cc5c3
+  data.tar.gz: 2bb6cf3b10096223a6c06cf48aab740c1ead7f9cd6515d0bef25f0151555d028
 SHA512:
-  metadata.gz: '09cce64a0c017def10cc52dca5482101f62bfcf36669f72de4afc555f1e54b70256d0eb8a16cc661ab55fd58614ffd95c1c6d1a6886d0d900c39db8b71e94048'
-  data.tar.gz: acb759aa73030f40137b16475a2d51d4d2f0ae387c3592494334eaac4468b33ebb0256f77029d1af1221c9db6dc43301d252cfea7b4e0d5d249b98e6185c370a
+  metadata.gz: bcd1f320d3ea9c3d7015315e8a924700e7f6648545e2297184c3e5eb575f7fb77fc6c7f4d8c3ad99220b638f868100a9cce51b0fe89a5e74c9512dd387c9efbe
+  data.tar.gz: 2423d0d19d3495edb17d3789b8372770a98739f19f15df2555cb7d4945624c6f34c9070ca7ec4826fe727361c93ee1e9c46763c12bbf0667742656cabe171c1a

data/.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [excid3] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/README.md

@@ -4,6 +4,8 @@ SimpleDiscussion is a Rails forum gem extracting the [forum from GoRails](https:
 
 Out of the box, SimpleDiscussion comes with styling for Boostrap v4 but you're free to customize the UI as much as you like by installing the views and tweaking the HTML.
 
+[![GoRails Forum](https://d3vv6lp55qjaqc.cloudfront.net/items/3j2p3o1j0d1O0R1w2j1Y/Screen%20Shot%202017-08-08%20at%203.12.01%20PM.png?X-CloudApp-Visitor-Id=51470&v=d439dcae)](https://d3vv6lp55qjaqc.cloudfront.net/items/3j2p3o1j0d1O0R1w2j1Y/Screen%20Shot%202017-08-08%20at%203.12.01%20PM.png?X-CloudApp-Visitor-Id=51470&v=d439dcae)
+
 ## Installation
 
 Before you get started, SimpleDiscussion requires a `User` model in your application (for now).
@@ -90,6 +92,19 @@ rails g simple_discussion:helpers
 
 **NOTE:** Keep in mind that the more customization you do, the tougher gem upgrades will be in the future.
 
+### Email And Slack Notifications
+
+By default, SimpleDiscussion will attempt to send email and slack notifications for users subscribed to threads. To turn these off you can do the following in `config/initializers/simple_discussion.rb`
+
+```ruby
+SimpleDiscussion.setup do |config|
+  config.send_email_notifications = false # Default: true
+  config.send_slack_notifications = false # Default: true
+end
+```
+
+Slack notifications require you to set `simple_discussion_slack_url` in your `config/secrets.yml`. If you don't have this value set, it will not attempt Slack notifications even if they are enabled.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -106,4 +121,4 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## Code of Conduct
 
-Everyone interacting in the SimpleDiscussion project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/simple_discussion/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the SimpleDiscussion project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/excid3/simple_discussion/blob/master/CODE_OF_CONDUCT.md).

data/app/assets/stylesheets/simple_discussion.scss

@@ -20,8 +20,28 @@
 
 /* Formatting for the forum threads */
 .forum-thread {
-  h4 a {
-    color: #222;
+  margin-bottom: -20px;
+
+  h4 {
+    margin-bottom: 4px;
+
+    a {
+      color: #222;
+      font-size: 16px;
+      font-weight: normal;
+      line-height: 1.1;
+    }
+  }
+}
+
+.forum-thread-filters a {
+  color: #555555;
+  display: block;
+
+  &:hover {
+    color: #222222;
+    font-weight: bold;
+    text-decoration: none
   }
 }
 
@@ -45,6 +65,11 @@
     font-weight: 300;
     line-height: 1em;
   }
+
+  &:hover {
+    color: #222;
+    text-decoration: none;
+  }
 }
 
 /* Formatting for the forum posts themselves */
@@ -64,3 +89,16 @@
     border: 2px solid #5cb85c;
   }
 }
+
+/* Formatting for the forum hr to match card border */
+.simple_discussion hr {
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  margin: 24px -20px;
+}
+
+.simple_discussion .text-muted {
+  color: #999;
+  margin-top: 6px;
+  font-size: 13px;
+}

data/app/controllers/simple_discussion/application_controller.rb

@@ -17,9 +17,21 @@ class SimpleDiscussion::ApplicationController < ::ApplicationController
   end
   helper_method :is_moderator?
 
-  def require_moderator_or_author!
+  def require_mod_or_author_for_post!
+    unless is_moderator_or_owner?(@forum_post)
+      redirect_to_root
+    end
+  end
+
+  def require_mod_or_author_for_thread!
     unless is_moderator_or_owner?(@forum_thread)
-      redirect_to simple_discussion.root_path, alert: "You aren't allowed to do that."
+      redirect_to_root
     end
   end
+
+  private
+
+  def redirect_to_root
+    redirect_to simple_discussion.root_path, alert: "You aren't allowed to do that."
+  end
 end

data/app/controllers/simple_discussion/forum_posts_controller.rb

@@ -2,14 +2,15 @@ class SimpleDiscussion::ForumPostsController < SimpleDiscussion::ApplicationCont
   before_action :authenticate_user!
   before_action :set_forum_thread
   before_action :set_forum_post, only: [:edit, :update]
-  before_action :require_moderator_or_author!, only: [:edit, :update, :solved, :unsolved]
+  before_action :require_mod_or_author_for_post!, only: [:edit, :update]
+  before_action :require_mod_or_author_for_thread!, only: [:solved, :unsolved]
 
   def create
     @forum_post = @forum_thread.forum_posts.new(forum_post_params)
     @forum_post.user_id = current_user.id
 
     if @forum_post.save
-      #ForumNotificationJob.perform_later(@forum_post.id)
+      SimpleDiscussion::ForumPostNotificationJob.perform_later(@forum_post)
       redirect_to simple_discussion.forum_thread_path(@forum_thread, anchor: "forum_post_#{@forum_post.id}")
     else
       render template: "simple_discussion/forum_threads/show"
@@ -53,7 +54,7 @@ class SimpleDiscussion::ForumPostsController < SimpleDiscussion::ApplicationCont
     end
 
     def set_forum_post
-      if current_user.moderator?
+      if is_moderator?
         @forum_post = @forum_thread.forum_posts.find(params[:id])
       else
         @forum_post = current_user.forum_posts.find(params[:id])

data/app/controllers/simple_discussion/forum_threads_controller.rb

@@ -1,7 +1,7 @@
 class SimpleDiscussion::ForumThreadsController < SimpleDiscussion::ApplicationController
   before_action :authenticate_user!, only: [:mine, :participating, :new, :create]
   before_action :set_forum_thread, only: [:show, :edit, :update]
-  before_action :require_moderator_or_author!, only: [:edit, :update]
+  before_action :require_mod_or_author_for_thread!, only: [:edit, :update]
 
   def index
     @forum_threads = ForumThread.pinned_first.sorted.includes(:user, :forum_category).paginate(page: page_number)
@@ -42,7 +42,7 @@ class SimpleDiscussion::ForumThreadsController < SimpleDiscussion::ApplicationCo
     @forum_thread.forum_posts.each{ |post| post.user_id = current_user.id }
 
     if @forum_thread.save
-      #ForumThreadNotificationJob.perform_later(@forum_thread.forum_posts.first.id)
+      SimpleDiscussion::ForumThreadNotificationJob.perform_later(@forum_thread)
       redirect_to simple_discussion.forum_thread_path(@forum_thread)
     else
       render action: :new
@@ -54,7 +54,7 @@ class SimpleDiscussion::ForumThreadsController < SimpleDiscussion::ApplicationCo
 
   def update
     if @forum_thread.update(forum_thread_params)
-      redirect_to simple_discussion.forum_thread_path(@forum_thread), notice: "Your changes were saved."
+      redirect_to simple_discussion.forum_thread_path(@forum_thread), notice: I18n.t('your_changes_were_saved')
     else
       render action: :edit
     end

data/app/jobs/simple_discussion/forum_post_notification_job.rb

@@ -0,0 +1,42 @@
+class SimpleDiscussion::ForumPostNotificationJob < ApplicationJob
+  include SimpleDiscussion::Engine.routes.url_helpers
+
+  def perform(forum_post)
+    send_emails(forum_post) if SimpleDiscussion.send_email_notifications
+    send_webhook(forum_post) if SimpleDiscussion.send_slack_notifications
+  end
+
+  def send_emails(forum_post)
+    forum_thread = forum_post.forum_thread
+    users        = forum_thread.subscribed_users - [forum_post.user]
+    users.each do |user|
+      SimpleDiscussion::UserMailer.new_post(forum_post, user).deliver_later
+    end
+  end
+
+  def send_webhook(forum_post)
+    slack_webhook_url = Rails.application.secrets.simple_discussion_slack_url
+    return if slack_webhook_url.blank?
+
+    forum_thread = forum_post.forum_thread
+    payload = {
+      fallback: "#{forum_post.user.name} replied to <#{forum_thread_url(forum_thread, anchor: ActionView::RecordIdentifier.dom_id(forum_post))}|#{forum_thread.title}>",
+      pretext: "#{forum_post.user.name} replied to <#{forum_thread_url(forum_thread, anchor: ActionView::RecordIdentifier.dom_id(forum_post))}|#{forum_thread.title}>",
+      fields: [
+        {
+          title: "Thread",
+          value: forum_thread.title,
+          short: true
+        },
+        {
+          title: "Posted By",
+          value: forum_post.user.name,
+          short: true,
+        },
+      ],
+      ts: forum_post.created_at.to_i
+    }
+
+    SimpleDiscussion::Slack.new(slack_webhook_url).post(payload)
+  end
+end

data/app/jobs/simple_discussion/forum_thread_notification_job.rb

@@ -0,0 +1,40 @@
+class SimpleDiscussion::ForumThreadNotificationJob < ApplicationJob
+  include SimpleDiscussion::Engine.routes.url_helpers
+
+  def perform(forum_thread)
+    send_emails(forum_thread) if SimpleDiscussion.send_email_notifications
+    send_webhook(forum_thread) if SimpleDiscussion.send_slack_notifications
+  end
+
+  def send_emails(forum_thread)
+    forum_thread.notify_users.each do |user|
+      SimpleDiscussion::UserMailer.new_thread(forum_thread, user).deliver_later
+    end
+  end
+
+  def send_webhook(forum_thread)
+    slack_webhook_url = Rails.application.secrets.simple_discussion_slack_url
+    return if slack_webhook_url.blank?
+
+    forum_post = forum_thread.forum_posts.first
+    payload = {
+      fallback: "A new discussion was started: <#{forum_thread_url(forum_thread, anchor: ActionView::RecordIdentifier.dom_id(forum_post))}|#{forum_thread.title}>",
+      pretext: "A new discussion was started: <#{forum_thread_url(forum_thread, anchor: ActionView::RecordIdentifier.dom_id(forum_post))}|#{forum_thread.title}>",
+      fields: [
+        {
+          title: "Thread",
+          value: forum_thread.title,
+          short: true
+        },
+        {
+          title: "Posted By",
+          value: forum_post.user.name,
+          short: true,
+        },
+      ],
+      ts: forum_post.created_at.to_i
+    }
+
+    SimpleDiscussion::Slack.new(slack_webhook_url).post(payload)
+  end
+end

data/app/mailers/simple_discussion/user_mailer.rb

@@ -0,0 +1,28 @@
+class SimpleDiscussion::UserMailer < ApplicationMailer
+  # You can set the default `from` address in ApplicationMailer
+
+  helper SimpleDiscussion::ForumPostsHelper
+  helper SimpleDiscussion::Engine.routes.url_helpers
+
+  def new_thread(forum_thread, recipient)
+    @forum_thread = forum_thread
+    @forum_post   = forum_thread.forum_posts.first
+    @recipient    = recipient
+
+    mail(
+      to: "#{@recipient.name} <#{@recipient.email}>",
+      subject: @forum_thread.title
+    )
+  end
+
+  def new_post(forum_post, recipient)
+    @forum_post   = forum_post
+    @forum_thread = forum_post.forum_thread
+    @recipient    = recipient
+
+    mail(
+      to: "#{@recipient.name} <#{@recipient.email}>",
+      subject: "New post in #{@forum_thread.title}"
+    )
+  end
+end

data/app/models/forum_thread.rb

@@ -56,20 +56,28 @@ class ForumThread < ApplicationRecord
   end
 
   def subscribed_reason(user)
-    return "You’re not receiving notifications from this thread." if user.nil?
+    return I18n.t('.not_receiving_notifications') if user.nil?
 
     subscription = subscription_for(user)
 
     if subscription.present?
       if subscription.subscription_type == "optout"
-        "You're ignoring this thread."
+        I18n.t('.ignoring_thread')
       elsif subscription.subscription_type == "optin"
-        "You're receiving notifications because you've subscribed to this thread."
+        I18n.t('.receiving_notifications_because_subscribed')
       end
     elsif forum_posts.where(user_id: user.id).any?
-      "You're receiving notifications because you've posted in this thread."
+      I18n.t('.receiving_notifications_because_posted')
     else
-      "You're not receiving notifications from this thread."
+      I18n.t('.not_receiving_notifications')
     end
   end
+
+  # These are the users to notify on a new thread. Currently this does nothing,
+  # but you can override this to provide whatever functionality you like here.
+  #
+  # For example: You might use this to send all moderators an email of new threads.
+  def notify_users
+    []
+  end
 end

data/app/views/layouts/simple_discussion.html.erb

@@ -1,25 +1,63 @@
-<div class="row">
-  <div class="col-sm-3">
+<div class="row col-md-12">
+  <h1>
+    <%= t('community') %>
+  </h1>
+</div>
+
+<div class="row simple_discussion">
+  <div class="col-md-3 mb-3">
 
-    <div class="card card-block">
-      <%= link_to 'Ask A Question', simple_discussion.new_forum_thread_path, class: "btn btn-outline-primary btn-block" %>
+    <div class="card card-body">
+      <%= link_to t('ask_a_question'), simple_discussion.new_forum_thread_path, class: "btn btn-outline-primary btn-block" %>
       <hr />
 
       <div class="forum-thread-filters">
-        <h5><strong>Filters</strong></h5>
-        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "bars" %> All Threads <% end %></div>
+        <h5>
+          <strong>
+            <%= t('filters') %>
+          </strong>
+        </h5>
+        <div>
+          <%= forum_link_to simple_discussion.forum_threads_path, exact: true do %>
+            <%= icon "bars" %>
+            <%= t('.all_threads') %>
+          <% end %>
+        </div>
         <% if user_signed_in? %>
-          <div><%= forum_link_to simple_discussion.mine_forum_threads_path do %><%= icon "user-circle-o" %> My Questions<% end %></div>
-          <div><%= forum_link_to simple_discussion.participating_forum_threads_path do %><%= icon "comments-o" %> Participating<% end %></div>
+          <div>
+            <%= forum_link_to simple_discussion.mine_forum_threads_path do %><%= icon "user-circle-o" %>
+              <%= t('.my_questions') %>
+            <% end %>
+          </div>
+          <div>
+            <%= forum_link_to simple_discussion.participating_forum_threads_path do %>
+              <%= icon "comments-o" %>
+              <%= t('.participating') %>
+            <% end %>
+          </div>
         <% end %>
-        <div><%= forum_link_to simple_discussion.answered_forum_threads_path do %><%= icon "check" %> Answered<% end %></div>
-        <div><%= forum_link_to simple_discussion.unanswered_forum_threads_path do %><%= icon "question" %> Unanswered<% end %></div>
+        <div>
+          <%= forum_link_to simple_discussion.answered_forum_threads_path do %>
+            <%= icon "check" %>
+            <%= t('.answered') %>
+          <% end %>
+        </div>
+        <div>
+          <%= forum_link_to simple_discussion.unanswered_forum_threads_path do %>
+            <%= icon "question" %>
+            <%= t('.unanswered') %>
+          <% end %>
+        </div>
       </div>
 
       <hr />
 
       <div class="forum-thread-filters">
-        <p><strong>By Category</strong></p>
+        <h6>
+          <strong>
+            <%= t('.by_category') %>
+          </strong>
+        </h6>
         <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "circle" %> All<% end %></div>
         <% ForumCategory.sorted.each do |category| %>
           <div>
@@ -35,13 +73,14 @@
         <hr />
 
         <%# User has not posted in the thread or subscribed %>
-        <h5>Notifications</h5>
+        <h5><%= t('.notifications') %></h5>
 
         <%= link_to simple_discussion.forum_thread_notifications_path(@forum_thread), method: :post, class: "btn btn-secondary btn-sm btn-block mb-2" do %>
           <% if @forum_thread.subscribed? current_user %>
-            <%= icon "bell-slash" %> Unsubscribe
+            <%= icon "bell-slash" %> t('.unsubscribe')
           <% else %>
-            <%= icon "bell" %> Subscribe
+            <%= icon "bell" %>
+            <%= t('.suscribe') %>
           <% end %>
         <% end %>
 
@@ -51,8 +90,12 @@
 
   </div>
 
-  <div class="col">
-    <%= yield %>
+  <div class="col-md-9 mb-3">
+
+    <div class="card card-body">
+      <%= yield %>
+    </div>
+
   </div>
 </div>
 

data/app/views/simple_discussion/forum_posts/_form.html.erb

@@ -15,7 +15,7 @@
   <% end %>
 
   <div class="form-group">
-    <%= f.text_area :body, placeholder: "Add a comment", rows: 8, class: "form-control simplemde", data: { behavior: "comment-body" } %>
+    <%= f.text_area :body, placeholder: t('add_a_comment'), rows: 8, class: "form-control simplemde", data: { behavior: "comment-body" } %>
   </div>
 
   <div class="text-right">
@@ -26,7 +26,7 @@
       </small>
     </div>
 
-    <%= f.button "#{"Update" unless f.object.new_record?} Comment", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving comment..."} %>
+    <%= f.button "#{f.object.new_record? ? t('comment') : t('update_comment')  }", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving_comment')}"} %>
   </div>
 
 <% end %>

data/app/views/simple_discussion/forum_posts/_forum_post.html.erb

@@ -8,7 +8,7 @@
         <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_forum_post_path(@forum_thread, forum_post),
           class: "text-muted",
           data: { toggle: "tooltip", placement: "left" },
-          title: "Edit this post"
+          title: t('edit_this_post')
         %>
       </div>
     <% end %>
@@ -20,25 +20,25 @@
         <%= forum_post.user.name %> <%= forum_user_badge(forum_post.user) %>
       </strong>
       <small>
-        commented on
+        <%= t('commented_on') %>
         <%= link_to forum_post.created_at.strftime("%b %d, %Y"), simple_discussion.forum_thread_path(@forum_thread, anchor: "forum_post_#{forum_post.id}") %>:
       </small>
     </div>
   </div>
 
-  <div class="card-block">
+  <div class="card-body">
     <%= formatted_content forum_post.body %>
   </div>
 
   <% if @forum_thread.solved? && forum_post.solved? %>
     <div class="card-footer">
       <div class="pull-right">
-        <strong class="text-success"><%= icon("check") %> Solved</strong>
+        <strong class="text-success"><%= icon("check") %> <%= t('solved') %></strong>
 
         <% if is_moderator_or_owner?(@forum_thread) %>
           <small>
-            <%= link_to "Undo", simple_discussion.unsolved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put %>
-          </small
+            <%= link_to t('undo'), simple_discussion.unsolved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put %>
+          </small>
         <% end %>
       </div>
     </div>
@@ -49,7 +49,7 @@
         <small>
           <%= link_to simple_discussion.solved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put do %>
             <%= icon("check") %>
-            This solved my question
+            <%= t('this_solved_my_question') %>
           <% end %>
         </small>
       </div>

data/app/views/simple_discussion/forum_posts/edit.html.erb

@@ -4,7 +4,8 @@
 
 <p class="thread-details">
   <strong><%= category_link(@forum_thread.forum_category) %></strong>
-  • Asked <%= time_ago_in_words @forum_thread.created_at %> by <%= @forum_thread.user.name %>
+  • <%= t('asked_time_ago', time: time_ago_in_words(@forum_thread.created_at), author: @forum_thread.user.name) %>
+</p>
 </p>
 
 <br />
@@ -14,11 +15,14 @@
     <div>
       <%= avatar_tag(@forum_post.user.email) %>
       <strong class="forum-post-user"><%= @forum_post.user.name %></strong>
-      <small> commented on <%= link_to @forum_post.created_at.strftime("%b %d, %Y"), simple_discussion.forum_thread_url(@forum_thread, anchor: "forum_post_#{@forum_post.id}") %>:</small>
+      <small>
+        <%= t('commented_on')%>
+        <%= link_to @forum_post.created_at.strftime("%b %d, %Y"), simple_discussion.forum_thread_url(@forum_thread, anchor: "forum_post_#{@forum_post.id}") %>:
+      </small>
     </div>
   </div>
 
-  <div class="card-block">
+  <div class="card-body">
     <%= render "form" %>
   </div>
 <% end %>

data/app/views/simple_discussion/forum_threads/_form.html.erb

@@ -15,29 +15,29 @@
   <% end %>
 
   <div class="form-group">
-    <%= f.label :forum_category_id, "Choose a Category" %>
-    <%= f.collection_select :forum_category_id, ForumCategory.sorted, :id, :name, {include_blank: "Pick a category..."}, {autofocus: true, class: "form-control"} %>
+    <%= f.label :forum_category_id, t('choose_a_category') %>
+    <%= f.collection_select :forum_category_id, ForumCategory.sorted, :id, :name, {include_blank: t('pick_a_category')}, {autofocus: true, class: "form-control"} %>
   </div>
 
   <div class="form-group">
-    <%= f.label :title %>
-    <%= f.text_field :title, placeholder: "How do I...?", class: "form-control" %>
+    <%= f.label t('title') %>
+    <%= f.text_field :title, placeholder: t('how_do_i'), class: "form-control" %>
   </div>
 
   <% if local_assigns.fetch(:posts, true) %>
     <%= f.fields_for :forum_posts do |p| %>
       <div class="form-group">
-        <%= p.label :body, "What do you need help with?" %>
-        <%= p.text_area :body, placeholder: "Add a comment", rows: 10, class: "form-control simplemde", data: { behavior: "comment-body" } %>
+        <%= p.label :body, t('what_help_needed') %>
+        <%= p.text_area :body, placeholder: t('add_a_comment'), rows: 10, class: "form-control simplemde", data: { behavior: "comment-body" } %>
       </div>
     <% end %>
   <% end %>
 
   <div class="form-group text-right">
     <% if f.object.new_record? %>
-      <%= f.button "Ask Your Question", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving..."} %>
+      <%= f.button t('ask_your_question'), class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving')}"} %>
     <% else %>
-      <%= f.button "Update Thread", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving..."} %>
+      <%= f.button "Update Thread", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving')}"} %>
     <% end %>
   </div>
 

data/app/views/simple_discussion/forum_threads/_forum_thread.html.erb

@@ -19,16 +19,16 @@
 
         <div class="thread-details">
           <strong><%= category_link(forum_thread.forum_category) %></strong>
-          • Asked <%= time_ago_in_words forum_thread.created_at %> by <%= forum_thread.user.name %>
+          • <%= t('asked_time_ago', time: time_ago_in_words(forum_thread.created_at), author: forum_thread.user.name) %>
         </div>
 
         <p class="text-muted"><%= truncate(forum_thread.forum_posts.first.body, length: 200) %></p>
       </div>
 
-      <div class="col-sm-1 text-center">
+      <div class="col-sm-2 text-center">
         <%= link_to simple_discussion.forum_thread_path(forum_thread), class: "thread-posts-count" do %>
           <span class="count"><%= forum_thread.forum_posts_count %></span>
-          <small><%= "post".pluralize(forum_thread.forum_posts_count) %></small>
+          <small><%= t("post", count: forum_thread.forum_posts_count) %></small>
         <% end %>
       </div>
 

data/app/views/simple_discussion/forum_threads/edit.html.erb

@@ -1,6 +1,6 @@
 <%= content_for :title, "Edit Thread" %>
 
-<h1>Edit Thread</h1>
+<h1><%= t('edit_thread') %></h1>
 
 <div class="forum_post">
   <%= render 'form', posts: false %>

data/app/views/simple_discussion/forum_threads/index.html.erb

@@ -1,11 +1,13 @@
-<div class="card card-block mb-3">
-  <%= render partial: "simple_discussion/forum_threads/forum_thread", collection: @forum_threads, spacer_template: "shared/spacer" %>
+<% if @forum_threads.none? %>
 
-  <% if @forum_threads.none? %>
-    <div>No results found for your search. Check out <%= link_to "the latest questions", simple_discussion.forum_threads_path %> instead?</div>
-  <% end %>
-</div>
+    <div><%= t('search_not_found') %>. <%= t('check_out') %> <%= link_to t('latest_questions'), simple_discussion.forum_threads_path %> <%= t('instead') %> </div>
 
-<div class="forum-threads-nav text-center">
-  <%= will_paginate @forum_threads, url_builder: simple_discussion, renderer: SimpleDiscussion::BootstrapLinkRenderer %>
-</div>
+<% else %>
+
+    <%= render partial: "simple_discussion/forum_threads/forum_thread", collection: @forum_threads, spacer_template: "shared/spacer" %>
+
+  <div class="forum-threads-nav text-center">
+    <%= will_paginate @forum_threads, url_builder: simple_discussion, renderer: SimpleDiscussion::BootstrapLinkRenderer %>
+  </div>
+
+<% end %>

data/app/views/simple_discussion/forum_threads/new.html.erb

@@ -1,4 +1,4 @@
-<h1>Start A Discussion</h1>
+<h1><%= t('start_a_discussion') %></h1>
 
 <div class="forum_post">
   <%= render 'form' %>

data/app/views/simple_discussion/forum_threads/show.html.erb

@@ -1,17 +1,22 @@
-<h1><%= icon "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h1>
-
-<% if is_moderator_or_owner?(@forum_thread) %>
-  <div class="pull-right">
-    <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_path(@forum_thread),
-      class: "text-muted",
-      data: { toggle: "tooltip", placement: "left" },
-      title: "Edit this thread" %>
+<div class="row">
+  <div class="col-md-11">
+    <h1><%= icon "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h1>
   </div>
-<% end %>
+
+  <% if is_moderator_or_owner?(@forum_thread) %>
+    <div class="col-md-1">
+      <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_path(@forum_thread),
+        class: "text-muted",
+        data: { toggle: "tooltip", placement: "left" },
+        title: t('edit_this_thread') %>
+    </div>
+  <% end %>
+
+</div>
 
 <p class="thread-details">
   <strong><%= category_link(@forum_thread.forum_category) %></strong>
-  • Asked <%= time_ago_in_words @forum_thread.created_at %> by <%= @forum_thread.user.name %>
+  • <%= t('asked_time_ago', time: time_ago_in_words(@forum_thread.created_at), author: @forum_thread.user.name) %>
 </p>
 
 <%= render partial: "simple_discussion/forum_posts/forum_post", collection: @forum_thread.forum_posts.includes(:user).sorted %>

data/app/views/simple_discussion/user_mailer/new_post.html.erb

@@ -0,0 +1,12 @@
+<div style="position: relative">
+  <%= gravatar_image_tag @forum_post.user.email, style: "float: left" %>
+
+  <div style="margin-left:60px">
+    <p><strong><%= @forum_post.user.name %></strong> <small>commented:</small></p>
+    <%= formatted_content @forum_post.body %>
+  </div>
+</div>
+
+<br />
+
+<p><%= link_to "Reply to this comment", forum_thread_url(@forum_post.forum_thread, anchor: "forum_post_#{@forum_post.id}"), style: "background:#be2126; color:#fff; text-decoration:none; padding: 10px 20px" %></p>

data/app/views/simple_discussion/user_mailer/new_thread.html.erb

@@ -0,0 +1,12 @@
+<div style="position: relative">
+  <%= gravatar_image_tag @forum_post.user.email, style: "float: left" %>
+
+  <div style="margin-left:60px">
+    <p><strong><%= @forum_post.user.name %></strong> <small>commented:</small></p>
+    <%= formatted_content @forum_post.body %>
+  </div>
+</div>
+
+<br />
+
+<p><%= link_to "Reply to this comment", forum_thread_url(@forum_post.forum_thread, anchor: "forum_post_#{@forum_post.id}"), style: "background:#be2126; color:#fff; text-decoration:none; padding: 10px 20px" %></p>

data/config/locales/en.yml

@@ -0,0 +1,45 @@
+en:
+  start_a_discussion: Start A Discussion
+  add_a_comment: Add A Comment
+  ask_a_question: Ask A Question
+  asked_time_ago: "Asked %{time} ago by %{author}"
+  choose_a_category: Choose a Category
+  comment: comment
+  commented_on: Commented on
+  community: Community
+  edit_this_post: Edit this post
+  edit_this_thread: Edit this thread
+  edit_thread: Edit thread
+  filters: Filters
+  how_do_i: How do I...?
+  ignoring_thread: You're ignoring this thread.
+  not_receiving_notifications: You’re not receiving notifications from this thread.
+  layouts:
+    simple_discussion:
+      all_threads: All Threads
+      answered: Answered
+      by_category: By Category
+      my_questions: My Questions
+      notifications: Notifications
+      participating: Participating
+      suscribe: Subscribe
+      unsubscribe: Unsubscribe
+      unanswered: Unanswered
+  pick_a_category: Pick a category...
+  post:
+    one: post
+    other: posts
+  receiving_notifications_because_subscribed: You're receiving notifications because you've subscribed to this thread.
+  receiving_notifications_because_posted: You're receiving notifications because you've posted in this thread.
+  saving_comment: Saving comment...
+  saving: Saving
+  this_solved_my_question: This solved my question
+  title: title
+  what_help_needed: What do you need help with?
+  ask_your_question: Ask Your Question
+  update_comment: Update comment
+  your_changes_were_saved: Your changes were saved
+  search_not_found: No results found for your search
+  check_out: Check out
+  latest_questions: the latest questions
+  instead: instead?

data/config/locales/es.yml

@@ -0,0 +1,41 @@
+es:
+  start_a_discussion: Iniciar una discusión
+  add_a_comment: Añade un comentario
+  ask_a_question: HAZ UNA PREGUNTA
+  asked_time_ago: "Preguntado hace %{time} por %{author}"
+  choose_a_category: Selecciona una categoría
+  comment: comenta
+  commented_on: Comentado en
+  community: Comunidad
+  edit_this_post: Edita esta publicación
+  edit_this_thread: Edita este tema
+  edit_thread: Edita el tema
+  filters: Filtros
+  how_do_i: Cómo puedo...?
+  ignoring_thread: "Estás ignorando este tema"
+  not_receiving_notifications: "No estás recibiendo notificaciones de este tema."
+  layouts:
+    simple_discussion:
+      all_threads: Todos Los Temas
+      answered: Respondidas
+      by_category: Por Categoría
+      my_questions: Mis Preguntas
+      notifications: Notificaciones
+      participating: Participando
+      suscribe: Suscribirse
+      unsubscribe: Desuscribirse
+      unanswered: Sin Responder
+  pick_a_category: Elige una categoría...
+  post:
+    one: publicación
+    other: publicaciones
+  receiving_notifications_because_subscribed: Estás recibiendo notificaciones porque te suscribiste a este tema.
+  receiving_notifications_because_posted: Estás recibiendo notificaciones porque publicaste en este tema.
+  saving_comment: Guardando comentario...
+  saving: Guardando
+  this_solved_my_question: Esto resolvió mi pregunta
+  title: Título
+  what_help_needed: Con qué necesitas ayuda?
+  ask_your_question: Haz tu pregunta
+  update_comment: Actualiza tu comentario
+  your_changes_were_saved: Tus cambios fueron guardados

data/config/locales/fr.yml

@@ -0,0 +1,47 @@
+fr:
+  start_a_discussion: Débuter une conversation
+  add_a_comment: Ajouter un Commentaire
+  ask_a_question: Poser une question
+  asked_time_ago: "Demandé il y a %{time} par %{author}"
+  choose_a_category: Choisir une catégorie
+  comment: commenter
+  commented_on: Commenté le
+  community: Communauté
+  edit_this_post: Modifier ce message
+  edit_this_thread: Modifier ce fil
+  edit_thread: Modifier le fil
+  filters: Les filtres
+  how_do_i: Comment puis-je ...?
+  ignoring_thread: Vous avez ignoré ce fil.
+  not_receiving_notifications: Vous ne recevez plus les notifications de ce fil.
+  layouts:
+    simple_discussion:
+      all_threads: Toutes les discussions
+      answered: Résolues
+      by_category: Par catégorie
+      my_questions: Mes Questions
+      notifications: Les notifications
+      participating: Participant
+      suscribe: S'abonner
+      unsubscribe: Désabonner
+      unanswered: Non Résolues
+  pick_a_category: Choisissez une catégorie ...
+  post:
+    one: message
+    other: messages
+  receiving_notifications_because_subscribed: Vous recevez les notifications parce que vous êtes abonné à ce fil.
+  receiving_notifications_because_posted: Vous recevez les notifications parce que vous avez posté dans ce fil.
+  saving_comment: Envois du commentaire ...
+  saving: Enregistrer
+  this_solved_my_question: Résolu?
+  title: titre
+  what_help_needed: Quel problème voulez-vous résoudre ?
+  ask_your_question: 'Poser votre question'
+  update_comment: Mettre à jour le commentaire
+  your_changes_were_saved: Vos modifications ont été enregistrées
+  solved: Résolu
+  undo: annuler
+  search_not_found: Aucun résultat trouvé pour votre recherche
+  check_out: Voir
+  latest_questions: les dernières questions
+  instead: à la place

data/db/migrate/20170417012930_create_forum_categories.rb

@@ -1,6 +1,6 @@
 class CreateForumCategories < ActiveRecord::Migration[4.2]
   def change
-    create_table :forum_categories, force: :cascade do |t|
+    create_table :forum_categories do |t|
       t.string   :name, null: false
       t.string   :slug, null: false
       t.string   :color, default: "000000"

data/db/migrate/20170417012931_create_forum_threads.rb

@@ -1,6 +1,6 @@
 class CreateForumThreads < ActiveRecord::Migration[4.2]
   def change
-    create_table :forum_threads, force: :cascade do |t|
+    create_table :forum_threads do |t|
       t.references :forum_category, foreign_key: true
       t.references :user, foreign_key: true
       t.string :title, null: false

data/db/migrate/20170417012932_create_forum_posts.rb

@@ -1,6 +1,6 @@
 class CreateForumPosts < ActiveRecord::Migration[4.2]
   def change
-    create_table :forum_posts, force: :cascade do |t|
+    create_table :forum_posts do |t|
       t.references :forum_thread, foreign_key: true
       t.references :user, foreign_key: true
       t.text     :body

data/db/migrate/20170417012933_create_forum_subscriptions.rb

@@ -1,6 +1,6 @@
 class CreateForumSubscriptions < ActiveRecord::Migration[4.2]
   def change
-    create_table :forum_subscriptions, force: :cascade do |t|
+    create_table :forum_subscriptions do |t|
       t.references :forum_thread, foreign_key: true
       t.references :user, foreign_key: true
       t.string   :subscription_type

data/lib/simple_discussion.rb

@@ -3,60 +3,20 @@ require 'friendly_id'
 require 'gravatar_image_tag'
 require 'will_paginate'
 
-require "simple_discussion/version"
-require "simple_discussion/engine"
-require "simple_discussion/forum_user"
-
-require 'will_paginate/view_helpers/action_view'
+require 'simple_discussion/engine'
+require 'simple_discussion/forum_user'
+require 'simple_discussion/slack'
+require 'simple_discussion/version'
+require 'simple_discussion/will_paginate'
 
 module SimpleDiscussion
-  # This code serves two purposes
-  # 1. It patches will_paginate to work with scoped and mounted Rails engines
-  #    by adding in the url_builder option
-  # 2. It adds Bootstrap 4 styling to will_paginate
-
-  class BootstrapLinkRenderer < WillPaginate::ActionView::LinkRenderer
-
-    # This method adds the `url_builder` option so we can pass in the
-    # mounted Rails engine's scope for will_paginate
-    def url(page)
-      @base_url_params ||= begin
-                             url_params = merge_get_params(default_url_params)
-                             merge_optional_params(url_params)
-                           end
-
-      url_params = @base_url_params.dup
-      add_current_page_param(url_params, page)
-
-      # Add optional url_builder support
-      (@options[:url_builder] || @template).url_for(url_params)
-    end
-
-    protected
-    def html_container(html)
-      tag :nav, tag(:ul, html, class: ul_class)
-    end
-
-    def page_number(page)
-      item_class = if(page == current_page)
-        'active page-item'
-      else
-        'page-item'
-      end
-
-      tag :li, link(page, page, :rel => rel_value(page), :class => 'page-link'), :class => item_class
-    end
-
-    def gap
-      tag :li, link('&hellip;'.html_safe, '#', :class => 'page-link'), :class => 'page-item disabled'
-    end
-
-    def previous_or_next_page(page, text, classname)
-      tag :li, link(text, page || '#', :class => 'page-link'), :class => [(classname[0..3] if  @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page), 'page-item'].join(' ')
-    end
-
-    def ul_class
-       ["pagination", container_attributes[:class]].compact.join(" ")
-    end
+  # Define who owns the subscription
+  mattr_accessor :send_email_notifications
+  mattr_accessor :send_slack_notifications
+  @@send_email_notifications = true
+  @@send_slack_notifications = true
+
+  def self.setup
+    yield self
   end
 end

data/lib/simple_discussion/engine.rb

@@ -1,5 +1,10 @@
 module SimpleDiscussion
   class Engine < ::Rails::Engine
     engine_name 'simple_discussion'
+
+    # Grab the Rails default url options and use them for sending notifications
+    config.after_initialize do
+      SimpleDiscussion::Engine.routes.default_url_options = ActionMailer::Base.default_url_options
+    end
   end
 end

data/lib/simple_discussion/slack.rb

@@ -0,0 +1,22 @@
+require 'open-uri'
+require 'net/http'
+
+module SimpleDiscussion
+  class Slack
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    def post(payload)
+      uri          = URI.parse(url)
+      request      = Net::HTTP::Post.new(uri)
+      req_options  = { use_ssl: uri.scheme == "https", }
+      request.body = "payload=#{payload.to_json}"
+      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
+        http.request(request)
+      end
+    end
+  end
+end

data/lib/simple_discussion/version.rb

@@ -1,3 +1,3 @@
 module SimpleDiscussion
-  VERSION = "0.9.2"
+  VERSION = "1.0.1"
 end

data/lib/simple_discussion/will_paginate.rb

@@ -0,0 +1,53 @@
+require 'will_paginate/view_helpers/action_view'
+
+module SimpleDiscussion
+  # This code serves two purposes
+  # 1. It patches will_paginate to work with scoped and mounted Rails engines
+  #    by adding in the url_builder option
+  # 2. It adds Bootstrap 4 styling to will_paginate
+
+  class BootstrapLinkRenderer < WillPaginate::ActionView::LinkRenderer
+
+    # This method adds the `url_builder` option so we can pass in the
+    # mounted Rails engine's scope for will_paginate
+    def url(page)
+      @base_url_params ||= begin
+                             url_params = merge_get_params(default_url_params)
+                             merge_optional_params(url_params)
+                           end
+
+      url_params = @base_url_params.dup
+      add_current_page_param(url_params, page)
+
+      # Add optional url_builder support
+      (@options[:url_builder] || @template).url_for(url_params)
+    end
+
+    protected
+    def html_container(html)
+      tag :nav, tag(:ul, html, class: ul_class)
+    end
+
+    def page_number(page)
+      item_class = if(page == current_page)
+        'active page-item'
+      else
+        'page-item'
+      end
+
+      tag :li, link(page, page, :rel => rel_value(page), :class => 'page-link'), :class => item_class
+    end
+
+    def gap
+      tag :li, link('&hellip;'.html_safe, '#', :class => 'page-link'), :class => 'page-item disabled'
+    end
+
+    def previous_or_next_page(page, text, classname)
+      tag :li, link(text, page || '#', :class => 'page-link'), :class => [(classname[0..3] if  @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page), 'page-item'].join(' ')
+    end
+
+    def ul_class
+       ["pagination", container_attributes[:class]].compact.join(" ")
+    end
+  end
+end

data/simple_discussion.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'font-awesome-sass', '~> 4.7.0'
+  spec.add_dependency 'font-awesome-sass', '>= 4.7.0'
   spec.add_dependency 'friendly_id', '>= 5.2.0'
   spec.add_dependency 'gravatar_image_tag'
   spec.add_dependency 'rails', '>= 4.2'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: simple_discussion
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris Oliver
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.0
 - !ruby/object:Gem::Dependency
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -102,6 +103,9 @@ files:
 - app/controllers/simple_discussion/notifications_controller.rb
 - app/helpers/simple_discussion/forum_posts_helper.rb
 - app/helpers/simple_discussion/forum_threads_helper.rb
+- app/jobs/simple_discussion/forum_post_notification_job.rb
+- app/jobs/simple_discussion/forum_thread_notification_job.rb
+- app/mailers/simple_discussion/user_mailer.rb
 - app/models/forum_category.rb
 - app/models/forum_post.rb
 - app/models/forum_subscription.rb
@@ -117,8 +121,13 @@ files:
 - app/views/simple_discussion/forum_threads/index.html.erb
 - app/views/simple_discussion/forum_threads/new.html.erb
 - app/views/simple_discussion/forum_threads/show.html.erb
+- app/views/simple_discussion/user_mailer/new_post.html.erb
+- app/views/simple_discussion/user_mailer/new_thread.html.erb
 - bin/console
 - bin/setup
+- config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
 - config/routes.rb
 - db/migrate/20170417012930_create_forum_categories.rb
 - db/migrate/20170417012931_create_forum_threads.rb
@@ -130,13 +139,15 @@ files:
 - lib/simple_discussion.rb
 - lib/simple_discussion/engine.rb
 - lib/simple_discussion/forum_user.rb
+- lib/simple_discussion/slack.rb
 - lib/simple_discussion/version.rb
+- lib/simple_discussion/will_paginate.rb
 - simple_discussion.gemspec
 homepage: https://github.com/excid3/simple_discussion
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A simple, extensible Rails forum
 test_files: []