simple_discussion 0.1.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccd77ab6f6bada74b16f90eee01c740e0ebee5c
-  data.tar.gz: 4addcafed220fc33c5f07992b5b91243976c419b
+  metadata.gz: ea112341c29ae6d453a260175e1fab4fe8742243
+  data.tar.gz: '08670316d53d01df1dfc1f0101d59f43e46be643'
 SHA512:
-  metadata.gz: 936726f1d48dcf6ae2bef9bdd12b07b67e5e182d4ef5b6dabe21d4aea3369cb46d0a1c0fda4e726ecef5189e92fc93727ddb3c31f72e9423751399de124b01c1
-  data.tar.gz: 13f97674b2989cb98ec77c4771c59b8df9c153825a0910642ca4cf7d20bc22589ea77aef3b268f349470b152542ac90711f7fbe568d17b19b03dd236c84b48d1
+  metadata.gz: 87914991332ab15ab141c77baf1924fc8c89b4f4e01c1fc9121eff52309daa4a23c1310833db545750d25dc82dd9c8805647ff834147d7fca3ed1da96d336390
+  data.tar.gz: fde66ad800d05ea86cf1251950f490f2d221d10b8e8807d67863c41f022a54a713391e0e10148a7ea9ede736276dcba5d03a92babd0f1c66fa1b45f084332846

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store

data/README.md

@@ -1,11 +1,13 @@
 # SimpleDiscussion
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/simple_discussion`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+SimpleDiscussion is a Rails forum gem extracting the forum from
+[GoRails' forum](https://gorails.com/forum). It includes categories,
+simple moderation, the ability to mark threads as solved, and more.
 
 ## Installation
 
+Before you get started, SimpleDiscussion requires a `User` model in your application (for now). 
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -14,15 +16,57 @@ gem 'simple_discussion'
 
 And then execute:
 
-    $ bundle
+```bash
+bundle
+```
+
+Install the migrations and migrate:
+
+```bash
+rails simple_discussion:install:migrations
+rails db:migrate
+```
+
+Add SimpleDiscussion to your `User` model. The model **must** have `name` method which will be used to display the user's name on the forum. Currently only a model named `User` will work, but this will be fixed shortly.
+
+```ruby
+class User < ActiveRecord::Base
+  include SimpleDiscussion::ForumUser
+
+  def name
+    "#{first_name} #{last_name}"
+  end
+end
+```
+
+Optionally, you can add a `moderator` flag to the `User` model to allow users to edit threads and posts they didn't write.
+
+```bash
+rails g migration AddModeratorToUsers moderator:boolean
+rails db:migrate
+```
+
+Add the following line to your `config/routes.rb` file:
 
-Or install it yourself as:
+```ruby
+mount SimpleDiscussion::Engine => "/forum"
+```
 
-    $ gem install simple_discussion
+You can also add the CSS to your `application.css` to load some helpful default styles.
+
+```javascript
+//= require simple_discussion
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+To get all the basic functionality, the only thing you need to do is add a link to SimpleDiscussion in your navbar.
+
+```erb
+<%= link_to "Forum", simple_discussion_path %>
+```
+
+This will take the user to the views inside the Rails engine.
 
 ## Development
 
@@ -32,7 +76,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/simple_discussion. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/excid3/simple_discussion. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/app/assets/stylesheets/simple_discussion.scss

@@ -0,0 +1,63 @@
+/* Allow pagination to be centered */
+.forum-threads-nav nav {
+  display: inline-block;
+}
+
+/* Highlight the active navigation item in the sidebar */
+.forum-thread-filters {
+  a {
+    color: #555;
+  }
+
+  .active {
+    color: #222;
+    font-weight: bolder;
+  }
+}
+
+/* Formatting for the forum threads */
+.forum-thread {
+  h4 a {
+    color: #222;
+  }
+}
+
+.thread-details {
+  color: #999;
+  font-size: 12px;
+  text-transform: uppercase;
+}
+
+/* Display the forum post count above the "posts" text on the index page */
+.thread-posts-count {
+  color: #222;
+  text-align: center;
+
+  span, small {
+    display: block;
+  }
+
+  .count {
+    font-size: 1.5em;
+    font-weight: 300;
+    line-height: 1em;
+  }
+}
+
+/* Formatting for the forum posts themselves */
+.forum-post {
+  position: relative;
+
+  /* When the URL anchor matches a post id, highlight that item */
+  &:target {
+    background-color: rgb(248, 238, 199);
+  }
+
+  /* Fill this out if you want to highlight the OPs posts */
+  &.original-poster {
+  }
+
+  &.solved {
+    border: 2px solid #5cb85c;
+  }
+}

data/app/controllers/simple_discussion/application_controller.rb

@@ -0,0 +1,25 @@
+class SimpleDiscussion::ApplicationController < ::ApplicationController
+  layout "simple_discussion"
+
+  def page_number
+    page = params.fetch(:page, '').gsub(/[^0-9]/, '').to_i
+    page = "1" if page.zero?
+    page
+  end
+
+  def is_moderator_or_owner?(object)
+    is_moderator? || object.user == current_user
+  end
+  helper_method :is_moderator_or_owner?
+
+  def is_moderator?
+    current_user.respond_to?(:moderator) && current_user.moderator?
+  end
+  helper_method :is_moderator?
+
+  def require_moderator_or_author!
+    unless is_moderator_or_owner?(@forum_thread)
+      redirect_to simple_discussion.root_path, alert: "You aren't allowed to do that."
+    end
+  end
+end

data/app/controllers/simple_discussion/forum_categories_controller.rb

@@ -0,0 +1,17 @@
+class SimpleDiscussion::ForumCategoriesController < SimpleDiscussion::ApplicationController
+  before_action :set_category
+
+  def index
+    @forum_threads = ForumThread.where(forum_category: @category) if @category.present?
+    @forum_threads = @forum_threads.pinned_first.sorted.includes(:user, :forum_category).paginate(per_page: 10, page: page_number)
+    render "simple_discussion/forum_threads/index"
+  end
+
+  private
+
+    def set_category
+      @category = ForumCategory.friendly.find(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      redirect_to simple_discussion.forum_threads_path
+    end
+end

data/app/controllers/simple_discussion/forum_posts_controller.rb

@@ -0,0 +1,66 @@
+class SimpleDiscussion::ForumPostsController < SimpleDiscussion::ApplicationController
+  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]
+
+  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)
+      redirect_to simple_discussion.forum_thread_path(@forum_thread, anchor: "forum_post_#{@forum_post.id}")
+    else
+      render template: "simple_discussion/forum_threads/show"
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @forum_post.update(forum_post_params)
+      redirect_to simple_discussion.forum_thread_path(@forum_thread)
+    else
+      render action: :edit
+    end
+  end
+
+  def solved
+    @forum_post = @forum_thread.forum_posts.find(params[:id])
+
+    @forum_thread.forum_posts.update_all(solved: false)
+    @forum_post.update_column(:solved, true)
+    @forum_thread.update_column(:solved, true)
+
+    redirect_to simple_discussion.forum_thread_path(@forum_thread, anchor: ActionView::RecordIdentifier.dom_id(@forum_post))
+  end
+
+  def unsolved
+    @forum_post = @forum_thread.forum_posts.find(params[:id])
+
+    @forum_thread.forum_posts.update_all(solved: false)
+    @forum_thread.update_column(:solved, false)
+
+    redirect_to simple_discussion.forum_thread_path(@forum_thread, anchor: ActionView::RecordIdentifier.dom_id(@forum_post))
+  end
+
+  private
+
+    def set_forum_thread
+      @forum_thread = ForumThread.friendly.find(params[:forum_thread_id])
+    end
+
+    def set_forum_post
+      if current_user.moderator?
+        @forum_post = @forum_thread.forum_posts.find(params[:id])
+      else
+        @forum_post = current_user.forum_posts.find(params[:id])
+      end
+    end
+
+    def forum_post_params
+      params.require(:forum_post).permit(:body)
+    end
+end

data/app/controllers/simple_discussion/forum_threads_controller.rb

@@ -0,0 +1,72 @@
+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]
+
+  def index
+    @forum_threads = ForumThread.pinned_first.sorted.includes(:user, :forum_category).paginate(page: page_number)
+  end
+
+  def answered
+    @forum_threads = ForumThread.solved.sorted.includes(:user, :forum_category).paginate(page: page_number)
+    render action: :index
+  end
+
+  def unanswered
+    @forum_threads = ForumThread.unsolved.sorted.includes(:user, :forum_category).paginate(page: page_number)
+    render action: :index
+  end
+
+  def mine
+    @forum_threads = ForumThread.where(user: current_user).sorted.includes(:user, :forum_category).paginate(page: page_number)
+    render action: :index
+  end
+
+  def participating
+    @forum_threads = ForumThread.includes(:user, :forum_category).joins(:forum_posts).where(forum_posts: { user_id: current_user.id }).distinct(forum_posts: :id).sorted.paginate(page: page_number)
+    render action: :index
+  end
+
+  def show
+    @forum_post = ForumPost.new
+    @forum_post.user = current_user
+  end
+
+  def new
+    @forum_thread = ForumThread.new
+    @forum_thread.forum_posts.new
+  end
+
+  def create
+    @forum_thread = current_user.forum_threads.new(forum_thread_params)
+    @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)
+      redirect_to simple_discussion.forum_thread_path(@forum_thread)
+    else
+      render action: :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @forum_thread.update(forum_thread_params)
+      redirect_to simple_discussion.forum_thread_path(@forum_thread), notice: "Your changes were saved."
+    else
+      render action: :edit
+    end
+  end
+
+  private
+
+    def set_forum_thread
+      @forum_thread = ForumThread.friendly.find(params[:id])
+    end
+
+    def forum_thread_params
+      params.require(:forum_thread).permit(:title, :forum_category_id, forum_posts_attributes: [:body])
+    end
+end

data/app/controllers/simple_discussion/notifications_controller.rb

@@ -0,0 +1,19 @@
+class SimpleDiscussion::NotificationsController < SimpleDiscussion::ApplicationController
+  before_action :authenticate_user!
+  before_action :set_forum_thread
+
+  def create
+    @forum_thread.toggle_subscription(current_user)
+    redirect_to simple_discussion.forum_thread_path(@forum_thread)
+  end
+
+  def show
+    redirect_to simple_discussion.forum_thread_path(@forum_thread)
+  end
+
+  private
+
+    def set_forum_thread
+      @forum_thread = ForumThread.friendly.find(params[:forum_thread_id])
+    end
+end

data/app/helpers/simple_discussion/forum_posts_helper.rb

@@ -0,0 +1,29 @@
+module SimpleDiscussion::ForumPostsHelper
+  # Override this to use avatars from other places than Gravatar
+  def avatar_tag(email)
+    gravatar_image_tag(email, gravatar: { size: 40 }, class: "rounded avatar")
+  end
+
+  def category_link(category)
+    link_to category.name, simple_discussion.forum_category_forum_threads_path(category),
+      style: "color: #{category.color}"
+  end
+
+  # Override this method to provide your own content formatting like Markdown
+  def formatted_content(text)
+    simple_format(text)
+  end
+
+  def forum_post_classes(forum_post)
+    klasses = ["forum-post", "card", "mb-3"]
+    klasses << "solved" if forum_post.solved?
+    klasses << "original-poster" if forum_post.user == @forum_thread.user
+    klasses
+  end
+
+  def forum_user_badge(user)
+    if user.respond_to?(:moderator) && user.moderator?
+      content_tag :span, "Mod", class: "badge badge-default"
+    end
+  end
+end

data/app/helpers/simple_discussion/forum_threads_helper.rb

@@ -0,0 +1,28 @@
+module SimpleDiscussion::ForumThreadsHelper
+  # Used for flagging links in the navbar as active
+  def forum_link_to(path, opts={}, &block)
+    link_to path, class: forum_link_class(path, opts), &block
+  end
+
+  def forum_link_class(matches, opts={})
+    case matches
+    when Array
+      "active" if matches.any?{ |m| request.path.starts_with?(m) }
+    when String
+      "active" if opts.fetch(:exact, false) ? request.path == matches : request.path.starts_with?(matches)
+    end
+  end
+
+  # A nice hack to manipulate the layout so we can have sub-layouts
+  # without any changes in the user's application.
+  #
+  # We use this for rendering the sidebar layout for all the forum pages
+  #
+  # https://mattbrictson.com/easier-nested-layouts-in-rails
+  #
+  def parent_layout(layout)
+    @view_flow.set(:layout, output_buffer)
+    output = render(file: "layouts/#{layout}")
+    self.output_buffer = ActionView::OutputBuffer.new(output)
+  end
+end

data/app/models/forum_category.rb

@@ -0,0 +1,13 @@
+class ForumCategory < ApplicationRecord
+  extend FriendlyId
+  friendly_id :name, use: :slugged
+
+  scope :sorted, ->{ order(name: :asc) }
+
+  validates :name, :slug, :color, presence: true
+
+  def color
+    colour = super
+    colour.start_with?("#") ? colour : "##{colour}"
+  end
+end

data/app/models/forum_post.rb

@@ -0,0 +1,15 @@
+class ForumPost < ApplicationRecord
+  belongs_to :forum_thread, counter_cache: true, touch: true
+  belongs_to :user
+  has_many :reactions, as: :reactable
+
+  validates :user_id, :body, presence: true
+
+  scope :sorted, ->{ order(:created_at) }
+
+  after_update :solve_forum_thread, if: :solved?
+
+  def solve_forum_thread
+    forum_thread.update(solved: true)
+  end
+end

data/app/models/forum_subscription.rb

@@ -0,0 +1,19 @@
+class ForumSubscription < ApplicationRecord
+  belongs_to :forum_thread
+  belongs_to :user
+
+  scope :optin, ->{ where(subscription_type: :optin) }
+  scope :optout, ->{ where(subscription_type: :optout) }
+
+  validates :subscription_type, presence: true, inclusion: { in: %w{ optin optout } }
+  validates :user_id, uniqueness: { scope: :forum_thread_id }
+
+  def toggle!
+    case subscription_type
+    when "optin"
+      update(subscription_type: "optout")
+    when "optout"
+      update(subscription_type: "optin")
+    end
+  end
+end

data/app/models/forum_thread.rb

@@ -0,0 +1,75 @@
+class ForumThread < ApplicationRecord
+  extend FriendlyId
+  friendly_id :title, use: :slugged
+
+  belongs_to :forum_category
+  belongs_to :user
+  has_many :forum_posts
+  has_many :forum_subscriptions
+  has_many :optin_subscribers,  ->{ where(forum_subscriptions: { subscription_type: :optin }) },  through: :forum_subscriptions, source: :user
+  has_many :optout_subscribers, ->{ where(forum_subscriptions: { subscription_type: :optout }) }, through: :forum_subscriptions, source: :user
+  has_many :users, through: :forum_posts
+
+  accepts_nested_attributes_for :forum_posts
+
+  validates :forum_category, presence: true
+  validates :user_id, :title, presence: true
+  validates_associated :forum_posts
+
+  scope :pinned_first, ->{ order(pinned: :desc) }
+  scope :solved,       ->{ where(solved: true) }
+  scope :sorted,       ->{ order(updated_at: :desc) }
+  scope :unpinned,     ->{ where.not(pinned: true) }
+  scope :unsolved,     ->{ where.not(solved: true) }
+
+  def subscribed_users
+    (users + optin_subscribers).uniq - optout_subscribers
+  end
+
+  def subscription_for(user)
+    return nil if user.nil?
+    forum_subscriptions.find_by(user_id: user.id)
+  end
+
+  def subscribed?(user)
+    return false if user.nil?
+
+    subscription = subscription_for(user)
+
+    if subscription.present?
+      subscription.subscription_type == "optin"
+    else
+      forum_posts.where(user_id: user.id).any?
+    end
+  end
+
+  def toggle_subscription(user)
+    subscription = subscription_for(user)
+
+    if subscription.present?
+      subscription.toggle!
+    elsif forum_posts.where(user_id: user.id).any?
+      forum_subscriptions.create(user: user, subscription_type: "optout")
+    else
+      forum_subscriptions.create(user: user, subscription_type: "optin")
+    end
+  end
+
+  def subscribed_reason(user)
+    return "You’re not receiving notifications from this thread." if user.nil?
+
+    subscription = subscription_for(user)
+
+    if subscription.present?
+      if subscription.subscription_type == "optout"
+        "You're ignoring this thread."
+      elsif subscription.subscription_type == "optin"
+        "You're receiving notifications because you've subscribed to this thread."
+      end
+    elsif forum_posts.where(user_id: user.id).any?
+      "You're receiving notifications because you've posted in this thread."
+    else
+      "You're not receiving notifications from this thread."
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+<div class="row">
+  <div class="col-sm-3">
+
+    <div class="card card-block">
+      <%= link_to '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>
+        <% 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>
+        <% 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>
+
+      <hr />
+
+      <div class="forum-thread-filters">
+        <p><strong>By Category</strong></p>
+        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "circle" %> All<% end %></div>
+        <% ForumCategory.sorted.each do |category| %>
+          <div>
+            <%= forum_link_to simple_discussion.forum_category_forum_threads_path(category) do %>
+              <%= icon "circle", style: "color: #{category.color}" %>
+              <%= category.name %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+
+      <% if @forum_thread.present? && @forum_thread.persisted? %>
+        <hr />
+
+        <%# User has not posted in the thread or subscribed %>
+        <h5>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
+          <% else %>
+            <%= icon "bell" %> Subscribe
+          <% end %>
+        <% end %>
+
+        <small><%= @forum_thread.subscribed_reason(current_user) %></small>
+      <% end %>
+    </div>
+
+  </div>
+
+  <div class="col">
+    <%= yield %>
+  </div>
+</div>
+
+<% parent_layout("application") %>

data/app/views/shared/_spacer.html.erb

@@ -0,0 +1 @@
+<hr/>

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

@@ -0,0 +1,32 @@
+<%= form_for [@forum_thread, @forum_post],
+  url: (@forum_post.persisted? ? simple_discussion.forum_thread_forum_post_path(@forum_thread, @forum_post) : simple_discussion.forum_thread_forum_posts_path(@forum_thread)),
+  html: { data: { behavior: "comment-form" } } do |f| %>
+
+  <% if @forum_post.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@forum_post.errors.count, "error") %> prohibited this forum_post from being saved:</h2>
+
+      <ul>
+        <% @forum_post.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="form-group">
+    <%= f.text_area :body, placeholder: "Add a comment", rows: 8, class: "form-control simplemde", data: { behavior: "comment-body" } %>
+  </div>
+
+  <div class="text-right">
+    <div class="pull-left">
+      <small>
+        <%# Describe text formatting options here with a link %>
+        <%#= link_to "Parsed with Markdown", "https://guides.github.com/features/mastering-markdown/", target: "_blank" %>
+      </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..."} %>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,58 @@
+<%# We don't currently cache the forum posts because they have permissions to deal with %>
+
+<%= content_tag :div, id: dom_id(forum_post), class: forum_post_classes(forum_post) do %>
+  <div class="card-header">
+
+    <% if is_moderator_or_owner?(forum_post) %>
+      <div class="pull-right">
+        <%= 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"
+        %>
+      </div>
+    <% end %>
+
+    <div>
+      <%= avatar_tag(forum_post.user.email) %>
+
+      <strong class="forum-post-user">
+        <%= forum_post.user.name %> <%= forum_user_badge(forum_post.user) %>
+      </strong>
+      <small>
+        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">
+    <%= 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>
+
+        <% 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
+        <% end %>
+      </div>
+    </div>
+
+  <% elsif is_moderator_or_owner?(@forum_thread) %>
+    <div class="card-footer">
+      <div class="pull-right">
+        <small>
+          <%= link_to simple_discussion.solved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put do %>
+            <%= icon("check") %>
+            This solved my question
+          <% end %>
+        </small>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,24 @@
+<p><small><%= link_to "← Back to the thread", simple_discussion.forum_thread_path(@forum_thread) %></small></p>
+
+<h2><%= content_tag :span, "Pinned", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h2>
+
+<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 %>
+</p>
+
+<br />
+
+<%= content_tag :div, id: dom_id(@forum_post), class: forum_post_classes(@forum_post) do %>
+  <div class="card-header">
+    <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>
+    </div>
+  </div>
+
+  <div class="card-block">
+    <%= render "form" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,44 @@
+<%= form_for @forum_thread,
+   url: (@forum_thread.persisted? ? simple_discussion.forum_thread_path(@forum_thread) : simple_discussion.forum_threads_path),
+   html: { data: {behavior: "comment-form"} } do |f| %>
+
+  <% if @forum_thread.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@forum_thread.errors.count, "error") %> prohibited this forum_thread from being saved:</h2>
+
+      <ul>
+      <% @forum_thread.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% 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"} %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :title %>
+    <%= f.text_field :title, placeholder: "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" } %>
+      </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..."} %>
+    <% else %>
+      <%= f.button "Update Thread", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving..."} %>
+    <% end %>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,37 @@
+<%= cache forum_thread do %>
+  <div class="forum-thread">
+    <div class="row">
+
+      <div class="col-sm-1 text-center">
+          <%= avatar_tag(forum_thread.user.email) %>
+      </div>
+
+      <div class="col">
+        <h4>
+          <% if forum_thread.solved? %>
+            <span class="text-success"><%= icon "check-circle" %></span>
+          <% end %>
+
+          <%= link_to simple_discussion.forum_thread_path(forum_thread) do %>
+            <%= icon "thumb-tack", class: "text-muted" if forum_thread.pinned? %> <%= forum_thread.title %>
+          <% end %>
+        </h4>
+
+        <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 %>
+        </div>
+
+        <p class="text-muted"><%= truncate(forum_thread.forum_posts.first.body, length: 200) %></p>
+      </div>
+
+      <div class="col-sm-1 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>
+        <% end %>
+      </div>
+
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%= content_for :title, "Edit Thread" %>
+
+<h1>Edit Thread</h1>
+
+<div class="forum_post">
+  <%= render 'form', posts: false %>
+</div>

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

@@ -0,0 +1,11 @@
+<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? %>
+    <div>No results found for your search. Check out <%= link_to "the latest questions", simple_discussion.forum_threads_path %> instead?</div>
+  <% end %>
+</div>
+
+<div class="forum-threads-nav text-center">
+  <%= will_paginate @forum_threads, url_builder: simple_discussion, renderer: SimpleDiscussion::BootstrapLinkRenderer %>
+</div>

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

@@ -0,0 +1,5 @@
+<h1>Start A Discussion</h1>
+
+<div class="forum_post">
+  <%= render 'form' %>
+</div>

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

@@ -0,0 +1,19 @@
+<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>
+<% end %>
+
+<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 %>
+</p>
+
+<%= render partial: "simple_discussion/forum_posts/forum_post", collection: @forum_thread.forum_posts.includes(:user).sorted %>
+
+<%= render partial: "simple_discussion/forum_posts/form" if user_signed_in? %>

data/config/routes.rb

@@ -0,0 +1,24 @@
+SimpleDiscussion::Engine.routes.draw do
+  scope module: :simple_discussion do
+    resources :forum_threads, path: :threads do
+      collection do
+        get :answered
+        get :unanswered
+        get :mine
+        get :participating
+        get "category/:id", to: "forum_categories#index", as: :forum_category
+      end
+
+      resources :forum_posts, path: :posts do
+        member do
+          put :solved
+          put :unsolved
+        end
+      end
+
+      resource :notifications
+    end
+  end
+
+  root to: "simple_discussion/forum_threads#index"
+end

data/db/migrate/20170417012930_create_forum_categories.rb

@@ -0,0 +1,23 @@
+class CreateForumCategories < ActiveRecord::Migration[4.2]
+  def change
+    create_table :forum_categories, force: :cascade do |t|
+      t.string   :name, null: false
+      t.string   :slug, null: false
+      t.string   :color, default: "000000"
+
+      t.timestamps
+    end
+
+    ForumCategory.reset_column_information
+
+    ForumCategory.create(
+      name: "General",
+      color: "#4ea1d3",
+    )
+
+    ForumCategory.create(
+      name: "Feedback",
+      color: "#16bc9c",
+    )
+  end
+end

data/db/migrate/20170417012931_create_forum_threads.rb

@@ -0,0 +1,15 @@
+class CreateForumThreads < ActiveRecord::Migration[4.2]
+  def change
+    create_table :forum_threads, force: :cascade do |t|
+      t.references :forum_category, foreign_key: true
+      t.references :user, foreign_key: true
+      t.string :title, null: false
+      t.string :slug, null: false
+      t.integer :forum_posts_count, default: 0
+      t.boolean :pinned, default: false
+      t.boolean :solved, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170417012932_create_forum_posts.rb

@@ -0,0 +1,12 @@
+class CreateForumPosts < ActiveRecord::Migration[4.2]
+  def change
+    create_table :forum_posts, force: :cascade do |t|
+      t.references :forum_thread, foreign_key: true
+      t.references :user, foreign_key: true
+      t.text     :body
+      t.boolean  :solved, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170417012933_create_forum_subscriptions.rb

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

data/lib/simple_discussion/engine.rb

@@ -0,0 +1,5 @@
+module SimpleDiscussion
+  class Engine < ::Rails::Engine
+    engine_name 'simple_discussion'
+  end
+end

data/lib/simple_discussion/forum_user.rb

@@ -0,0 +1,11 @@
+module SimpleDiscussion
+  module ForumUser
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :forum_threads
+      has_many :forum_posts
+      has_many :forum_subscriptions
+    end
+  end
+end

data/lib/simple_discussion/version.rb

@@ -1,3 +1,3 @@
 module SimpleDiscussion
-  VERSION = "0.1.0"
+  VERSION = "0.9.0"
 end

data/lib/simple_discussion.rb

@@ -1,5 +1,61 @@
+require 'friendly_id'
+require 'will_paginate'
+require 'gravatar_image_tag'
+
 require "simple_discussion/version"
+require "simple_discussion/engine"
+require "simple_discussion/forum_user"
+
+require 'will_paginate/view_helpers/action_view'
 
 module SimpleDiscussion
-  # Your code goes here...
+  # 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,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.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'
+  spec.add_dependency 'will_paginate', '>= 3.1.0'
 end

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: simple_discussion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
+        version: 4.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: 5.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: gravatar_image_tag
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 3.1.0
 description: A simple, extensible Rails forum
 email:
 - excid3@gmail.com
@@ -66,9 +94,39 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/stylesheets/simple_discussion.scss
+- app/controllers/simple_discussion/application_controller.rb
+- app/controllers/simple_discussion/forum_categories_controller.rb
+- app/controllers/simple_discussion/forum_posts_controller.rb
+- app/controllers/simple_discussion/forum_threads_controller.rb
+- app/controllers/simple_discussion/notifications_controller.rb
+- app/helpers/simple_discussion/forum_posts_helper.rb
+- app/helpers/simple_discussion/forum_threads_helper.rb
+- app/models/forum_category.rb
+- app/models/forum_post.rb
+- app/models/forum_subscription.rb
+- app/models/forum_thread.rb
+- app/views/layouts/simple_discussion.html.erb
+- app/views/shared/_spacer.html.erb
+- app/views/simple_discussion/forum_posts/_form.html.erb
+- app/views/simple_discussion/forum_posts/_forum_post.html.erb
+- app/views/simple_discussion/forum_posts/edit.html.erb
+- app/views/simple_discussion/forum_threads/_form.html.erb
+- app/views/simple_discussion/forum_threads/_forum_thread.html.erb
+- app/views/simple_discussion/forum_threads/edit.html.erb
+- 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
 - bin/console
 - bin/setup
+- config/routes.rb
+- db/migrate/20170417012930_create_forum_categories.rb
+- db/migrate/20170417012931_create_forum_threads.rb
+- db/migrate/20170417012932_create_forum_posts.rb
+- db/migrate/20170417012933_create_forum_subscriptions.rb
 - lib/simple_discussion.rb
+- lib/simple_discussion/engine.rb
+- lib/simple_discussion/forum_user.rb
 - lib/simple_discussion/version.rb
 - simple_discussion.gemspec
 homepage: https://github.com/excid3/simple_discussion