ack-mongoid-forums 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7de5fe678b102b183d345d7b983856cf81f89e
-  data.tar.gz: 5faabb438669005167b24827c6ec1e8bd4a5d65e
+  metadata.gz: d52971438d595ba7c1ec41ae9271a9d546627ad4
+  data.tar.gz: c2f8d9d7c42f3692706cc8ac1869415b67f4e119
 SHA512:
-  metadata.gz: 9af4a429a661a84276968f6b7c8b835b7b144b97b5e23e11d2c371074576ed2218a8c4c82637e562763647265172ce55d472c6d9b5ab40c11c54c0b06a09782b
-  data.tar.gz: 743d8a79aa8cc23f30bf764a5ad9cb4528bede9f970d3679e6f3a551d038b055b58cd742efb86db24e2acad167ddb6a40d4b9b9158f92168faf013b671423989
+  metadata.gz: d4e4e2b6a17ba4db617876dbbf3b881005fbfd23c4c090058ddae1318394b18af39b16a959b9c1c44a0022643b66652d3ed20399c571041ee557bc650c7ffe17
+  data.tar.gz: 984bfa740b097985edefff7bda6c54cef4255a29e21e24c21fc3b9d04a865ff3b075dbb5657ef276abb30e658edd9fb8f4650f7f3540c70a0cbf950f6d66435d

data/README.md

@@ -0,0 +1,120 @@
+MongoidForums
+============
+
+A forum system for Rails 4 and Mongoid. 
+Inspired by Forem.
+
+Created due to lack of functioning Rails 4 mongoid engines.
+
+# Installation
+
+```ruby
+gem 'mongoid-forums'
+```
+
+## Run the installer
+
+**Ensure that you first of all have a `User` model and some sort of authentication system set up**. We would recommend going with [Devise](http://github.com/plataformatec/devise), but it's up to
+you. All MongoidForums needs is a model to link topics and posts to.
+
+Run the installer and answer any questions that pop up. There's sensible defaults there if you don't want to answer them.
+
+```shell
+rails g mongoid_forums:install
+```
+
+## Set up helper methods in your user model
+
+MongoidForums depends on a `forum_display_name` (which defaults as `to_s`) method being available on your `User` model so that it can display the user's name in posts. Define it in your model like this:
+
+```ruby
+def forum_display_name
+  name
+end
+```
+Or simply return the user's display name as the `to_s` method in your user model.
+
+Please note that if you are using Devise, User model does not have `name` field by default,
+so you either should add it or use another column (`email` for example).
+
+The routes (along with some other designs such as Alerts system) for this project are based around Overcast Network's forum system (https://oc.tc/forums)
+
+See here for an old open source version of oc.tc/forums that this project is based on (and borrows some code from):
+https://github.com/kultus/forem-2
+
+
+## Features
+
+Here's a comprehensive list of the features currently in Mongoid Forumsf:
+
+* Forums
+  * CRUD operations (provided by an admin backend)
+* Topics
+  * Viewing all topics for a forum
+  * Creating of new topics
+  * Editing topics
+  * Locking topics
+  * Hiding topics
+  * Pinning topics
+* Posts
+  * Replying to topics
+  * Deleting own posts
+  * Blocking replies to locked topics
+  * Editing posts
+* Text Formatting
+  * Posts are HTML escaped and pre tagged by default.
+  * Pluggable formatters for other behaviour
+* [A flexible permissions system](https://github.com/radar/forem/wiki/Authorization-System) (Works exactly as Forem does, using CanCanCan and allowing overrides)
+* [Translations](https://github.com/radar/forem/wiki/Translations) (Not complete, some messages currently are hardcoded in English)
+* [Flexible configuration](https://github.com/radar/forem/wiki/Configuration) (All features of Forem except avatars, profile links, and theme. We are working hard on adding these, but you can also add them to your own project if needed through the default method of overriding rails engine controllers, models, and views!)
+
+## View Customisation
+
+If you want to customise Forem, you can copy over the views using the `mongoid_forums:views` generator:
+
+    rails g mongoid_forums:views
+
+You will then be able to edit the forem views inside the `app/views/mongoid_forums` of your application. These views will take precedence over those in the engine.
+
+
+## Extending Classes
+
+All of MongoidForum's business logic (models, controllers, helpers, etc) can easily be extended / overridden to meet your exact requirements using standard Ruby idioms.
+
+Standard practice for including such changes in your application or extension is to create a directory app/decorators. place file within the relevant app/decorators/models or app/decorators/controllers directory with the original class name with _decorator appended.
+
+### Adding a custom method to the Post model:
+
+```ruby
+# app/decorators/models/mongoid_forums/post_decorator.rb
+
+MongoidForums::Post.class_eval do
+  def some_method
+    ...
+  end
+end
+```
+
+### Adding a custom method to the PostsController:
+
+```ruby
+# app/decorators/controllers/mongoid_forums/posts_controller_decorator.rb
+
+MongoidForums::PostsController.class_eval do
+  def some_action
+    ...
+  end
+end
+```
+
+
+Planned Features:
+- [ ] [emoji](http://www.emoji-cheat-sheet.com/)
+- [ ] Mass moderation
+- [ ] Option to have to approve topics/posts manually
+- [ ] Block spammers feature
+- [ ] Archiving
+- [ ] Theming
+- [ ] User profile links
+- [ ] Avatars
+

data/app/assets/javascripts/mongoid_forums.coffee

@@ -0,0 +1 @@
+#= require mongoid_forums/application

data/app/assets/stylesheets/mongoid_forums.sass

@@ -0,0 +1 @@
+@import mongoid_forums/application

data/app/controllers/mongoid_forums/admin/categories_controller.rb

@@ -6,8 +6,8 @@ module MongoidForums
       before_action :set_category, only: [:add_group, :remove_group]
 
       def index
-        @forums = Forum.asc(:position)
-        @categories = Category.asc(:position)
+        @forums = Forum.sorted
+        @categories = Category.sorted
       end
 
       def show
@@ -72,7 +72,7 @@ module MongoidForums
       private
 
       def category_params
-        params.require(:category).permit(:name, :position)
+        params.require(:category).permit(:name)
       end
 
       def set_category

data/app/controllers/mongoid_forums/admin/forums_controller.rb

@@ -72,7 +72,7 @@ module MongoidForums
       private
 
       def forum_params
-        params.require(:forum).permit(:name, :category, :position)
+        params.require(:forum).permit(:name, :category)
       end
 
       def set_forum

data/app/controllers/mongoid_forums/admin/users_controller.rb

@@ -7,18 +7,18 @@ module MongoidForums
       before_action :set_user, only: [:add_admin, :remove_admin]
 
       def index
-        @admins = User.where(mongoid_admin: true)
-        @non_admins = User.where(mongoid_admin: false)
+        @admins = User.mongoid_forums_admins
+        @non_admins = User.non_mongoid_forums_admins
       end
 
       def add_admin
-        @user.mongoid_admin = true
+        @user.roles << "mongoid_forums_admin"
         @user.save
         redirect_to admin_users_path
       end
 
       def remove_admin
-        @user.mongoid_admin = false
+        @user.roles.delete "mongoid_forums_admin"
         @user.save
         redirect_to admin_users_path
       end

data/app/controllers/mongoid_forums/application_controller.rb

@@ -23,10 +23,10 @@ class MongoidForums::ApplicationController < ApplicationController
   end
 
   def set_categories
-    @categories = MongoidForums::Category.asc(:position)
+    @categories = MongoidForums::Category.sorted
   end
 
-    def authenticate_mongoid_forums_user
+  def authenticate_mongoid_forums_user
     if !mongoid_forums_user
       session["user_return_to"] = request.fullpath
       flash.alert = t("mongoid_forums.errors.not_signed_in")

data/app/controllers/mongoid_forums/forums_controller.rb

@@ -6,7 +6,10 @@ module MongoidForums
     before_filter :authenticate_mongoid_forums_user, :only => [:create, :new]
 
     def index
-      @categories = Category.asc(:position)
+      @categories = Category.sorted
+      unless mongoid_forums_user.mongoid_forums_admin?
+        @categories = @categories.enabled
+      end
     end
 
     def show
@@ -14,6 +17,9 @@ module MongoidForums
       register_view
 
       @topics = @forum.topics
+      unless mongoid_forums_user.mongoid_forums_admin?
+        @topics = @topics.enabled
+      end
       @topics = @topics.by_pinned_or_most_recent_post.page(params[:page]).per(MongoidForums.per_page)
     end
 

data/app/controllers/mongoid_forums/posts_controller.rb

@@ -79,7 +79,8 @@ module MongoidForums
         redirect_to @topic and return
       end
 
-      if @post.destroy
+      # if @post.destroy
+      if @post.update_attributes(is_deleted: true)
         flash[:notice] = t("mongoid_forums.post.deleted")
         redirect_to @topic
       else
@@ -88,6 +89,26 @@ module MongoidForums
       end
     end
 
+    def recovery
+      find_post
+
+      authorize! :recovery_post, @topic.forum
+
+      unless @post.owner_or_admin? mongoid_forums_user
+        flash[:alert] = t("mongoid_forums.post.cannot_recover")
+        redirect_to @topic and return
+      end
+
+      # if @post.destroy
+      if @post.update_attributes(is_deleted: false)
+        flash[:notice] = t("mongoid_forums.post.recovered")
+        redirect_to @topic
+      else
+        flash[:notice] = t("mongoid_forums.post.cannot_recover")
+        redirect_to @topic
+      end
+    end
+
     private
 
     #TODO: Decide if this should be used
@@ -119,6 +140,8 @@ module MongoidForums
 
     def current_resource
       @current_resource ||= Post.find(params[:id]) if params[:id]
+      @current_resource ||= Post.find(params[:post_id]) if params[:post_id]
+      @current_resource
     end
 
     def post_params

data/app/controllers/mongoid_forums/redirect_controller.rb

@@ -4,29 +4,29 @@ module MongoidForums
   class RedirectController < ApplicationController
 
     def forum
-        return redirect_to forum_path(params[:forum_id])
+      return redirect_to forum_path(params[:forum_id])
     end
 
     def topic
-        return redirect_to topic_path(params[:topic_id])
+      return redirect_to topic_path(params[:topic_id])
     end
 
     def posts
-        post = Post.find(params[:post_id])
-        return redirect_to root_path, :notice => "Post does not exist" if post.topic == nil
-        x = 0
+      post = Post.find(params[:post_id])
+      return redirect_to root_path, :notice => "Post does not exist" if post.topic == nil
+      x = 0
 
-        posts = post.topic.posts
+      posts = post.topic.posts
 
-        posts.each_with_index do |p, i|
-            x = i
-            break if p.id == post.id
-        end
-        return redirect_to topic_url(post.topic, :page => (x / MongoidForums.per_page) + 1) + "#" + post.id.to_s
+      posts.each_with_index do |p, i|
+          x = i
+          break if p.id == post.id
+      end
+      return redirect_to topic_url(post.topic, :page => (x / MongoidForums.per_page) + 1) + "#" + post.id.to_s
     end
 
     def subscriptions
-        return redirect_to my_subscriptions_path
+      return redirect_to my_subscriptions_path
     end
 
   end

data/app/controllers/mongoid_forums/topics_controller.rb

@@ -60,6 +60,9 @@ module MongoidForums
     def find_topic
       begin
         scope = @forum.topics # TODO: pending review stuff
+        unless mongoid_forums_user.mongoid_forums_admin?
+          scope = scope.enabled
+        end
         @topic = scope.find(params[:id])
         authorize! :read, @topic
       rescue Mongoid::Errors::DocumentNotFound
@@ -74,6 +77,8 @@ module MongoidForums
 
     def current_resource
       @current_resource ||= Topic.find(params[:id]) if params[:id]
+      @current_resource ||= Topic.find(params[:topic_id]) if params[:topic_id]
+      @current_resource
     end
 
     def topic_params

data/app/helpers/mongoid_forums/application_helper.rb

@@ -3,6 +3,10 @@ module MongoidForums
     include FormattingHelper
     # processes text with installed markup formatter
     def mongoid_forums_format(text, *options)
+      text = text.gsub(URI::regexp){ |url|
+        url = Addressable::URI.parse(url).normalize
+        "<a href='#{url}'>#{url.display_uri}</a>"
+      }.html_safe
       as_formatted_html(text)
     end
 

data/app/models/mongoid_forums/ability.rb

@@ -49,6 +49,14 @@ module MongoidForums
           user.can_destroy_mongoid_forums_posts?(forum)
         end
 
+        can :recovery_post, MongoidForums::Forum do |forum|
+          user.can_recovery_mongoid_forums_posts?(forum)
+        end
+
+        can :show_deleted_post, MongoidForums::Forum do |forum|
+          user.can_show_deleted_mongoid_forums_posts?(forum)
+        end
+
         can :moderate, MongoidForums::Forum do |forum|
           user.can_moderate_mongoid_forums_forum?(forum) || user.mongoid_forums_admin?
         end

data/app/models/mongoid_forums/alert.rb

@@ -75,6 +75,16 @@ module MongoidForums
         end
       return str
     end
+
+    rails_admin do
+      field :read, :toggle
+      field :read_at
+      field :subscription
+      field :user
+      field :mongoid_forums_topic_replier
+      field :mongoid_forums_topic_count
+      field :mongoid_forums_topic_post
+    end
   end
 
 end

data/app/models/mongoid_forums/category.rb

@@ -1,16 +1,23 @@
 module MongoidForums
   class Category
     include Mongoid::Document
+    include ::Mongoid::Timestamps
 
-    has_many :forums, :class_name => "MongoidForums::Forum",  dependent: :destroy
-    has_and_belongs_to_many :moderator_groups, :class_name => "MongoidForums::Group", inverse_of: nil
+    include Enableable
+    # include Seoable
+    include SortField
 
+    include ::ManualSlug
 
-    field :name
+    field :name, type: String
+    manual_slug :name
     validates :name, :presence => true
 
-    field :position, :type => Integer, :default => 0
-    validates :position, numericality: { only_integer: true }
+    acts_as_nested_set
+    scope :sorted, -> { order_by([:lft, :asc]) }
+
+    has_many :forums, :class_name => "MongoidForums::Forum",  dependent: :destroy
+    has_and_belongs_to_many :moderator_groups, :class_name => "MongoidForums::Group", inverse_of: nil
 
     def moderator?(user)
       return false unless user
@@ -27,5 +34,15 @@ module MongoidForums
       end
       return array
     end
+
+    rails_admin do
+      field :enabled, :toggle
+      field :name
+      field :created_at
+      field :updated_at
+      field :moderator_groups
+
+      nested_set({max_depth: 1})
+    end
   end
 end

data/app/models/mongoid_forums/forum.rb

@@ -1,8 +1,22 @@
 module MongoidForums
   class Forum
     include Mongoid::Document
+    include ::Mongoid::Timestamps
     include MongoidForums::Concerns::Viewable
 
+    include Enableable
+    # include Seoable
+    include SortField
+
+    include ::ManualSlug
+
+    field :name, type: String
+    manual_slug :name
+    validates :name, :presence => true
+
+    acts_as_nested_set
+    scope :sorted, -> { order_by([:lft, :asc]) }
+
     belongs_to :category, :class_name => "MongoidForums::Category"
     validates :category, :presence => true
 
@@ -11,14 +25,9 @@ module MongoidForums
     # Caching
     field :posts_count, :type => Integer
 
-    field :name
 
     has_and_belongs_to_many :moderator_groups, :class_name => "MongoidForums::Group", inverse_of: nil
 
-    validates :category, :name, :presence => true
-    field :position, :type => Integer, :default => 0
-    validates :position, numericality: { only_integer: true }
-
     def unread_topic_count(user)
       view = View.where(:viewable_id => id, :user_id => user.id).first
       return topics.count unless view.present?
@@ -62,6 +71,16 @@ module MongoidForums
       return array
     end
 
+    rails_admin do
+      field :enabled, :toggle
+      field :name
+      field :created_at
+      field :updated_at
+      field :category
+      field :posts_count
+      field :moderator_groups
 
+      nested_set({max_depth: 1})
+    end
   end
 end

data/app/models/mongoid_forums/group.rb

@@ -1,15 +1,27 @@
 module MongoidForums
   class Group
     include Mongoid::Document
+    include ::Mongoid::Timestamps
+
+    include Enableable
 
     validates :name, :moderator, :presence => true
 
     field :name, type: String
     field :moderator, type: Boolean
-    field :members, type: Array, default: []
+    has_and_belongs_to_many :members, class_name: MongoidForums.user_class.to_s, inverse_of: nil
 
     def to_s
       name
     end
+
+    rails_admin do
+      field :enabled, :toggle
+      field :name
+      field :created_at
+      field :updated_at
+      field :moderator
+      field :members
+    end
   end
 end

data/app/models/mongoid_forums/post.rb

@@ -3,6 +3,11 @@ module MongoidForums
     include Mongoid::Document
     include Mongoid::Timestamps
 
+    include Enableable
+
+    field :is_deleted, type: Boolean, default: false
+    alias :deleted :is_deleted
+
     after_create :set_topic_last_post_at
 
     belongs_to :topic, :class_name => "MongoidForums::Topic"
@@ -32,9 +37,19 @@ module MongoidForums
       user == other_user || (other_user.mongoid_forums_admin? || topic.forum.moderator?(other_user))
     end
 
+    rails_admin do
+      field :enabled, :toggle
+      field :is_deleted, :toggle
+      field :created_at
+      field :updated_at
+      field :topic
+      field :user
+      field :text
+    end
+
     protected
       def set_topic_last_post_at
         self.topic.update_attribute(:last_post_at, self.created_at)
       end
-    end
+  end
 end

data/app/models/mongoid_forums/subscription.rb

@@ -61,5 +61,11 @@ module MongoidForums
         raise TypeError, 'This object is not subscribable!'
       end
     end
+
+    rails_admin do
+      field :unsubscribed, :toggle
+      field :subscriber
+      field :subscribable
+    end
   end
 end

data/app/models/mongoid_forums/topic.rb

@@ -5,14 +5,29 @@ module MongoidForums
     include MongoidForums::Concerns::Subscribable
     include MongoidForums::Concerns::Viewable
 
+    include Mongoid::Document
+    include ::Mongoid::Timestamps
+
+    include Enableable
+    # include Seoable
+    # include SortField
+
+    include ::ManualSlug
+
+    field :name, type: String
+    manual_slug :name
+    validates :name, :presence => true
+
+    # acts_as_nested_set
+    # scope :sorted, -> { order_by([:lft, :asc]) }
+
     after_create :subscribe_creator
 
-    belongs_to :forum, :class_name => "MongoidForums::Forum"
-    has_many :posts, :class_name => "MongoidForums::Post", dependent: :destroy
+    belongs_to :forum,  :class_name => "MongoidForums::Forum"
+    has_many :posts,    :class_name => "MongoidForums::Post", dependent: :destroy
 
     belongs_to :user, :class_name => MongoidForums.user_class.to_s
 
-    field :name
 
     field :locked, type: Boolean, default: false
     field :pinned, type: Boolean, default: false
@@ -21,6 +36,9 @@ module MongoidForums
     validates :name, :presence => true, :length => { maximum: 255 }
     validates :user, :presence => true
 
+    scope :by_most_recent_post,           order_by([:last_post_at, :desc])
+    scope :by_pinned_or_most_recent_post, order_by([:pinned, :desc], [:last_post_at, :desc])
+
     def can_be_replied_to?
       !locked?
     end
@@ -42,14 +60,17 @@ module MongoidForums
       return count
     end
 
-    class << self
-      def by_most_recent_post
-        order_by([:last_post_at, :desc])
-      end
-
-      def by_pinned_or_most_recent_post
-        order_by([:pinned, :desc], [:last_post_at, :desc])
-      end
+    rails_admin do
+      field :enabled, :toggle
+      field :locked, :toggle
+      field :pinned, :toggle
+      field :hidden, :toggle
+      field :created_at
+      field :updated_at
+      # field :view_count
+      field :name
+      field :forum
+      field :user
     end
   end
 end

data/app/models/mongoid_forums/view.rb

@@ -21,6 +21,15 @@ module MongoidForums
       updated_at
     end
 
+    rails_admin do
+      field :created_at
+      field :updated_at
+      field :current_viewed_at
+      field :past_viewed_at
+      field :viewable
+      field :user
+    end
+
     private
     def set_viewed_at_to_now
       self.current_viewed_at = Time.now

data/app/views/layouts/mongoid_forums/application.haml

@@ -2,20 +2,22 @@
 %html
   %head
     %title Forums
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = stylesheet_link_tag    'mongoid_forums', media: 'all', async: true
+    = javascript_include_tag 'mongoid_forums'
     = csrf_meta_tags
   %body
     - if mongoid_forums_user.present?
-      - @alerts.each do |al|
-        = al.mongoid_forums_topic_replier
-        replied to
-        - topic = MongoidForums::Post.find(al.mongoid_forums_topic_post_id).topic
-        = link_to topic.name, al.link
-        = time_ago_in_words(al.created_at)
-        ago
+      - unless @alerts.blank?
+        - @alerts.each do |al|
+          = al.mongoid_forums_topic_replier
+          replied to
+          - topic = MongoidForums::Post.find(al.mongoid_forums_topic_post_id).topic
+          = link_to topic.name, al.link
+          = time_ago_in_words(al.created_at)
+          ago
 
-    - flash.each do |name, msg|
-      = content_tag :p, msg if msg.is_a?(String)
+    - unless flash.blank?
+      - flash.each do |name, msg|
+        = content_tag :p, msg if msg.is_a?(String)
 
     = yield

data/app/views/mongoid_forums/forums/index.haml

@@ -21,7 +21,7 @@
       %th
         Views
 
-    - category.forums.asc(:position).each do |forum|
+    - category.forums.sorted.each do |forum|
       %tr
         %td
           = link_to forum.name, forum

data/app/views/mongoid_forums/posts/_post.haml

@@ -10,15 +10,26 @@ ago
 = link_to 'Quote', new_topic_post_path(post.topic_id, :reply_to_id => post.id)
 - if mongoid_forums_user && post.owner_or_admin?(mongoid_forums_user)
   - if can?(:edit_post, post.topic.forum)
+    |
     = link_to "Edit", edit_topic_post_path(post.topic_id, post)
-  - if can?(:destroy_post, post.topic.forum)
-    = button_to "Delete", topic_post_path(post.topic_id, post), :method => :delete
+  - if !post.deleted and can?(:destroy_post, post.topic.forum)
+    |
+    = link_to "Delete", topic_post_path(post.topic_id, post), data: {method: :delete}
+  - if post.deleted and can?(:recovery_post, post.topic.forum)
+    |
+    = link_to "Recovery", topic_post_recovery_path(post.topic_id, post), data: {method: :post}
 
 
 %br
 - if post.reply_to_id
   = render :partial => 'mongoid_forums/posts/quoted', :locals => {:post => post}
   %br
-= mongoid_forums_format(post.text)
+- if !post.deleted or can?(:show_deleted_post, post.topic.forum)
+  - if post.deleted and can?(:show_deleted_post, post.topic.forum)
+    = "Deleted"
+    %br
+  = mongoid_forums_format(post.text)
+- else
+  = "Deleted"
 %br
 %hr

data/app/views/mongoid_forums/posts/_quoted.haml

@@ -6,4 +6,10 @@
   ago
   %br
   >
-  = mongoid_forums_format(reply_to.text)
+  - if !reply_to.deleted or can?(:show_deleted_post, reply_to.topic.forum)
+    - if reply_to.deleted and can?(:show_deleted_post, reply_to.topic.forum)
+      = "Deleted"
+      %br
+    = mongoid_forums_format(reply_to.text)
+  - else
+    = "Deleted"

data/app/views/mongoid_forums/{admin → posts/admin}/base/index.haml

@@ -1,6 +1,9 @@
 %h1 Admin Dashboard
 
 =link_to "Manage Categories", admin_categories_path
+|
 =link_to "Manage Forums", admin_forums_path
+|
 =link_to "Manage Groups", admin_groups_path
+|
 =link_to "Manage Users", admin_users_path

data/app/views/mongoid_forums/{admin → posts/admin}/categories/edit.haml

@@ -1,4 +1,3 @@
 = simple_form_for [:admin, @category] do |f|
   = f.input :name
-  = f.input :position
   = f.submit "Update Category", :class => "btn", :disable_with => "Updating..."

data/app/views/mongoid_forums/{admin → posts/admin}/categories/new.haml

@@ -1,4 +1,3 @@
 = simple_form_for [:admin, @category] do |f|
   = f.input :name
-  = f.input :position
   = f.submit "Create Category", :class => "btn", :disable_with => "Creating..."

data/app/views/mongoid_forums/{admin → posts/admin}/forums/edit.haml

@@ -1,5 +1,4 @@
 = simple_form_for [:admin, @forum] do |f|
   = f.input :name
   = f.input :category, collection: MongoidForums::Category.all
-  = f.input :position
   = f.submit "Update Forum", :class => "btn", :disable_with => "Updating..."

data/app/views/mongoid_forums/{admin → posts/admin}/forums/new.haml

@@ -1,5 +1,4 @@
 = simple_form_for [:admin, @forum] do |f|
   = f.input :name
   = f.input :category, collection: MongoidForums::Category.all
-  = f.input :position
   = f.submit "Create Forum", :class => "btn", :disable_with => "Creating..."

data/app/views/mongoid_forums/topics/show.haml

@@ -1,14 +1,18 @@
 %h1 Viewing Topic "#{@topic.name}"
 - if mongoid_forums_admin?
   = link_to t("mongoid_forums.topics.actions.hide.#{@topic.hidden}"), toggle_hide_admin_topic_path(@forum, @topic), :class => "btn"
+  |
   = link_to t("mongoid_forums.topics.actions.lock.#{@topic.locked}"), toggle_lock_admin_topic_path(@forum, @topic), :class => "btn"
+  |
   = link_to t("mongoid_forums.topics.actions.pin.#{@topic.pinned}"), toggle_pin_admin_topic_path(@forum, @topic), :class => "btn"
 
 - if @topic.can_be_replied_to? && can?(:reply, @topic)
+  |
   = link_to "Reply to topic", new_topic_post_path(@topic)
+|
 - if mongoid_forums_user && @topic.subscriber?(mongoid_forums_user.id)
   = link_to "Unsubscribe", unsubscribe_topic_path(@topic)
--elsif mongoid_forums_user
+- elsif mongoid_forums_user
   = link_to "Subscribe", subscribe_topic_path(@topic)
 %br
 = paginate @posts

data/config/routes.rb

@@ -50,7 +50,9 @@ MongoidForums::Engine.routes.draw do
   end
 
   resources :topics, :path => "/topics" do
-    resources :posts
+    resources :posts do
+      post :recovery
+    end
     member do
       get :subscribe
       get :unsubscribe

data/lib/manual_slug.rb

@@ -0,0 +1,11 @@
+module ManualSlug
+  autoload :Mongoid,      'manual_slug/mongoid'
+  autoload :ActiveRecord, 'manual_slug/active_record'
+  extend ActiveSupport::Concern
+  if RocketCMS.mongoid?
+    include ManualSlug::Mongoid
+  else
+    include ManualSlug::ActiveRecord
+  end
+end
+

data/lib/mongoid_forums.rb

@@ -7,6 +7,7 @@ require 'mongoid_forums/default_permissions'
 require 'sanitize'
 require 'haml'
 require "mongoid"
+require 'ack_rocket_cms_mongoid'
 
 module MongoidForums
   mattr_accessor :per_page, :user_class, :formatter, :email_from_address, :sign_in_path
@@ -19,15 +20,15 @@ module MongoidForums
         has_many :mongoid_forums_posts, :class_name => "MongoidForums::Post", :foreign_key => "user_id"
         has_many :mongoid_forums_topics, :class_name => "MongoidForums::Topic", :foreign_key => "user_id"
 
-        field :mongoid_admin, type: Boolean, default: false
-
-        def mongoid_forums_admin?
-          mongoid_admin
-        end unless method_defined? :mongoid_forums_admin
+        # field :mongoid_admin, type: Boolean, default: false
+        #
+        # def mongoid_forums_admin?
+        #   mongoid_admin
+        # end unless method_defined? :mongoid_forums_admin
 
         # Using +to_s+ by default for backwards compatibility
         def forum_display_name
-          to_s
+          name_or_login
         end unless method_defined? :forum_display_name
 
       end

data/lib/mongoid_forums/default_permissions.rb

@@ -47,6 +47,19 @@ module MongoidForums
         end
       end
 
+      unless method_defined?(:can_recovery_mongoid_forums_posts?)
+        def can_recovery_mongoid_forums_posts?(forum)
+          true
+        end
+      end
+
+      unless method_defined?(:can_show_deleted_mongoid_forums_posts?)
+        def can_show_deleted_mongoid_forums_posts?(forum)
+          true
+        end
+      end
+
+
       unless method_defined?(:can_read_mongoid_forums_topic?)
         def can_read_mongoid_forums_topic?(topic)
           !topic.hidden? || mongoid_forums_admin?

data/lib/mongoid_forums/version.rb

@@ -1,3 +1,3 @@
 module MongoidForums
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack-mongoid-forums
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - ack43
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ack_rocket_cms
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +188,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
+- README.md
 - Rakefile
+- app/assets/javascripts/mongoid_forums.coffee
 - app/assets/javascripts/mongoid_forums/admin/base.js
 - app/assets/javascripts/mongoid_forums/admin/categories.js
 - app/assets/javascripts/mongoid_forums/admin/forums.js
@@ -184,6 +200,7 @@ files:
 - app/assets/javascripts/mongoid_forums/forums.js
 - app/assets/javascripts/mongoid_forums/posts.js
 - app/assets/javascripts/mongoid_forums/topics.js
+- app/assets/stylesheets/mongoid_forums.sass
 - app/assets/stylesheets/mongoid_forums/admin/base.css
 - app/assets/stylesheets/mongoid_forums/admin/categories.css
 - app/assets/stylesheets/mongoid_forums/admin/forums.css
@@ -228,26 +245,26 @@ files:
 - app/models/mongoid_forums/topic.rb
 - app/models/mongoid_forums/view.rb
 - app/views/layouts/mongoid_forums/application.haml
-- app/views/mongoid_forums/admin/base/index.haml
-- app/views/mongoid_forums/admin/categories/edit.haml
-- app/views/mongoid_forums/admin/categories/index.haml
-- app/views/mongoid_forums/admin/categories/new.haml
-- app/views/mongoid_forums/admin/categories/show.haml
-- app/views/mongoid_forums/admin/forums/edit.haml
-- app/views/mongoid_forums/admin/forums/index.haml
-- app/views/mongoid_forums/admin/forums/new.haml
-- app/views/mongoid_forums/admin/forums/show.haml
-- app/views/mongoid_forums/admin/groups/edit.haml
-- app/views/mongoid_forums/admin/groups/index.haml
-- app/views/mongoid_forums/admin/groups/new.haml
-- app/views/mongoid_forums/admin/groups/show.haml
-- app/views/mongoid_forums/admin/users/index.haml
 - app/views/mongoid_forums/forums/index.haml
 - app/views/mongoid_forums/forums/new.haml
 - app/views/mongoid_forums/forums/show.haml
 - app/views/mongoid_forums/posts/_form.haml
 - app/views/mongoid_forums/posts/_post.haml
 - app/views/mongoid_forums/posts/_quoted.haml
+- app/views/mongoid_forums/posts/admin/base/index.haml
+- app/views/mongoid_forums/posts/admin/categories/edit.haml
+- app/views/mongoid_forums/posts/admin/categories/index.haml
+- app/views/mongoid_forums/posts/admin/categories/new.haml
+- app/views/mongoid_forums/posts/admin/categories/show.haml
+- app/views/mongoid_forums/posts/admin/forums/edit.haml
+- app/views/mongoid_forums/posts/admin/forums/index.haml
+- app/views/mongoid_forums/posts/admin/forums/new.haml
+- app/views/mongoid_forums/posts/admin/forums/show.haml
+- app/views/mongoid_forums/posts/admin/groups/edit.haml
+- app/views/mongoid_forums/posts/admin/groups/index.haml
+- app/views/mongoid_forums/posts/admin/groups/new.haml
+- app/views/mongoid_forums/posts/admin/groups/show.haml
+- app/views/mongoid_forums/posts/admin/users/index.haml
 - app/views/mongoid_forums/posts/edit.haml
 - app/views/mongoid_forums/posts/new.haml
 - app/views/mongoid_forums/topics/_topic.haml
@@ -257,10 +274,11 @@ files:
 - app/views/mongoid_forums/topics/show.haml
 - config/locales/en.yml
 - config/routes.rb
-- lib/ack_mongoid_forums.rb
+- lib/ack-mongoid-forums.rb
 - lib/generators/mongoid_forums/install/templates/initializer.rb
 - lib/generators/mongoid_forums/install_generator.rb
 - lib/generators/mongoid_forums/views_generator.rb
+- lib/manual_slug.rb
 - lib/mongoid_forums.rb
 - lib/mongoid_forums/default_permissions.rb
 - lib/mongoid_forums/engine.rb