mongoid-forums 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a00ce068be722969563d03aa5b241dc8458bc5
-  data.tar.gz: 997217696967e803e059181b22ef5a078ee7867c
+  metadata.gz: c266cda2076fe7b0bb1cdad4798d635db146f328
+  data.tar.gz: f19e5cb56aebfc83d236ffb054b462a5deb24f64
 SHA512:
-  metadata.gz: 599d86aadd02dd03575a51b777fa20f5034edf536438edb936a14aa62301bf13ed62303cd9d7f9d7b9839e31fc683ff3fe00fc9a0616fa1ff016d4318583e72b
-  data.tar.gz: 12df9211a061dcad6acb25983aadd4d5bfdbe687cdd5ac7297c113fb416ffa6fcc5b86bb37c031282c09dfbb950cd53e2a2079a04b3f1fade1da22735c4aed01
+  metadata.gz: f671646679c467022155880c3981cacd7f630d9dd0d64de91dfb2b33bf3cecff302ea9ba8be199cfa506b49d89e0d75f73491213e870d8a578ec317bf5d7dcb1
+  data.tar.gz: 6b508b2572cbcc9c1b0ae9ea0acfe8f5af5afb23429a1c8fa06949ee067d3b7d6cecd8ddeea210e2271b254734fc50b413e7c9c19b57a55ec14ffeffb1b54640

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

@@ -21,10 +21,10 @@ module MongoidForums
 
       def create
         if @category = Category.create(category_params)
-          flash[:notice] = "Category created successfully"
+          flash[:notice] = t("mongoid_forums.admin.category.created")
           redirect_to admin_categories_path
         else
-          flash.now.alert = "Category could not be created"
+          flash.now.alert = t("mongoid_forums.admin.category.not_created")
           render :action => "new"
         end
       end
@@ -36,23 +36,19 @@ module MongoidForums
       def update
         @category = Category.find(params[:id])
         if @category.update(category_params)
-          flash[:notice] = "Category updated successfully"
+          flash[:notice] = t("mongoid_forums.admin.category.updated")
           redirect_to admin_categories_path
         else
-          flash.now.alert = "Category could not be updated"
+          flash[:notice] = t("mongoid_forums.admin.category.not_updated")
           render :action => "edit"
         end
       end
 
       def destroy
         @category = Category.find(params[:id])
-        if @category.destroy
-          flash[:notice] = "Category destroyed successfully"
-          redirect_to admin_categories_path
-        else
-          flash.now.alert = "Category could not be destroyed"
-          render :action => "index"
-        end
+        @category.destroy
+        flash[:notice] = t("mongoid_forums.admin.category.deleted")
+        redirect_to admin_categories_path
       end
 
       ### Temporary Methods - Try Not To Cringe Too Much <3 ###

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

@@ -16,10 +16,10 @@ module MongoidForums
       def create
         @forum = Forum.new(forum_params)
         if @forum.save
-          flash[:notice] = "Forum created successfully"
+          flash[:notice] = t("mongoid_forums.admin.forum.created")
           redirect_to [:admin, @forum]
         else
-          flash.now.alert = "Forum could not be created"
+          flash.now.alert = t("mongoid_forums.admin.forum.not_created")
           render :action => "new"
         end
       end
@@ -36,23 +36,19 @@ module MongoidForums
       def update
         @forum = Forum.find(params[:id])
         if @forum.update(forum_params)
-          flash[:notice] = "Forum updated successfully"
+          flash[:notice] = t("mongoid_forums.admin.forum.updated")
           redirect_to @forum
         else
-          flash.now.alert = "Forum could not be updated"
+          flash.now.alert = t("mongoid_forums.admin.forum.not_updated")
           render :action => "edit"
         end
       end
 
       def destroy
         @forum = Forum.find(params[:id])
-        if @forum.destroy
-          flash[:notice] = "Forum destroyed successfully"
-          redirect_to admin_forums_path
-        else
-          flash.now.alert = "Forum could not be destroyed"
-          render :action => "index"
-        end
+        @forum.destroy
+        flash[:notice] = t("mongoid_forums.admin.forum.deleted")
+        redirect_to admin_forums_path
       end
 
       ### Temporary Methods - Try Not To Cringe Too Much <3 ###

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

@@ -13,11 +13,12 @@ module MongoidForums
       end
 
       def create
-        if @group = Group.create(params.require(:group).permit(:name, :moderator, :members))
-          flash[:notice] = "Group created successfully"
+        @group =  Group.new(params.require(:group).permit(:name, :moderator, :members))
+        if @group.save
+          flash[:notice] = t("mongoid_forums.admin.group.created")
           redirect_to [:admin, @group]
         else
-          flash.now.alert = "Group could not be created"
+          flash[:notice] = t("mongoid_forums.admin.group.not_created")
           render :action => "new"
         end
       end
@@ -29,10 +30,10 @@ module MongoidForums
       def update
         @group = Group.find(params[:id])
         if @group.update_attributes(params.require(:group).permit(:name, :members))
-          flash[:notice] = "Group updated successfully"
+          flash[:notice] = t("mongoid_forums.admin.group.updated")
           redirect_to [:admin, @group]
         else
-          flash[:notice] = "Group could not be updated"
+          flash[:notice] = t("mongoid_forums.admin.group.not_updated")
           render :action => "edit"
         end
       end
@@ -45,14 +46,9 @@ module MongoidForums
 
       def destroy
         @group = Group.find(params[:id])
-
-        if @group.destroy
-          flash[:notice] = "Group destroyed successfully"
-          redirect_to admin_groups_path
-        else
-          flash.now.alert = "Group could not be destroyed"
-          redirect_to admin_groups_path
-        end
+        @group.destroy
+        flash[:notice] = t("mongoid_forums.admin.group.deleted")
+        redirect_to admin_groups_path
       end
 
       ### Temporary Methods - Try Not To Cringe Too Much <3 ###

data/app/controllers/mongoid_forums/application_controller.rb

@@ -29,7 +29,7 @@ class MongoidForums::ApplicationController < ApplicationController
     def authenticate_mongoid_forums_user
     if !mongoid_forums_user
       session["user_return_to"] = request.fullpath
-      flash.alert = "You must be signed in"
+      flash.alert = t("mongoid_forums.errors.not_signed_in")
       devise_route = "new_#{MongoidForums.user_class.to_s.underscore}_session_path"
       sign_in_path = MongoidForums.sign_in_path ||
         (main_app.respond_to?(devise_route) && main_app.send(devise_route)) ||

data/app/controllers/mongoid_forums/forums_controller.rb

@@ -43,10 +43,10 @@ module MongoidForums
       @topic.posts << @post
 
       if @topic.save && @topic.posts.first.save
-        flash[:notice] = "Topic created successfully"
+        flash[:notice] = t("mongoid_forums.topic.created")
         redirect_to @topic
       else
-        flash.now.alert = "Topic could not be created"
+        flash.now.alert = t("mongoid_forums.topic.not_created")
         render :action => "new"
       end
     end

data/app/controllers/mongoid_forums/posts_controller.rb

@@ -4,6 +4,7 @@ module MongoidForums
   class PostsController < ApplicationController
     before_filter :find_topic
     before_filter :authenticate_mongoid_forums_user, except: :show
+    before_filter :reject_locked_topic!, only: [:new, :create]
 
     def new
       authorize! :reply, @topic
@@ -11,33 +12,34 @@ module MongoidForums
       @post.topic = @topic.id
       if params[:reply_to_id]
         find_reply_to_post
-      end
-    end
-
-    def create
-      authorize! :reply, @topic
-      @post = @topic.posts.build(post_params)
-      @post.user = mongoid_forums_user
 
-      if @post.reply_to_id && @post.reply_to_id == @topic.posts.first.id
-        flash[:alert] = "You may not quote the original post"
-        redirect_to @topic
-        return
+        if @reply_to.id && @reply_to.id == @topic.posts.first.id
+          flash[:alert] = t("mongoid_forums.post.not_created_quote_original_post")
+          redirect_to @topic
+          return
+        end
       end
 
       if @topic.locked
-        flash[:alert] = "You may not post on a locked topic"
+        flash[:alert] = t("mongoid_forums.post.not_created_topic_locked")
         redirect_to @topic
         return
       end
 
+    end
+
+    def create
+      authorize! :reply, @topic
+      @post = @topic.posts.build(post_params)
+      @post.user = mongoid_forums_user
+
       if @post.save
         @topic.alert_subscribers(mongoid_forums_user.id)
         @topic.forum.increment_posts_count
-        flash[:notice] = "Reply created successfully"
+        flash[:notice] = t("mongoid_forums.post.created")
         redirect_to @topic
       else
-        flash.now.alert = "Reply could not be created"
+        flash.now.alert = t("mongoid_forums.post.not_created")
         render :action => "new"
       end
     end
@@ -51,19 +53,13 @@ module MongoidForums
     end
 
     def update
-      if @topic.locked?
-        flash.alert = "You may not update a post on a locked topic!"
-        redirect_to [@topic] and return
-      end
-
       authorize! :edit_post, @topic.forum
       find_post
 
       if @post.owner_or_admin?(mongoid_forums_user) && @post.update_attributes(post_params)
-        flash[:notice] = "Reply updated successfully"
-        redirect_to @topic
+        redirect_to @topic, :notice => t('edited', :scope => 'mongoid_forums.post')
       else
-        flash[:notice] = "Reply could not be updated"
+        flash.now.alert = t("mongoid_forums.post.not_edited")
         render :action => "edit"
       end
     end
@@ -71,7 +67,7 @@ module MongoidForums
     def destroy
       find_post
       if @topic.posts.first == @post
-        flash[:alert] = "You may not delete the first post!"
+        flash[:alert] = t("mongoid_forums.post.cannot_delete_first_post")
         redirect_to @topic
         return
       end
@@ -84,24 +80,32 @@ module MongoidForums
       end
 
       if @post.destroy
-        flash[:notice] = "Post deleted successfully"
+        flash[:notice] = t("mongoid_forums.post.deleted")
         redirect_to @topic
       else
-        flash[:notice] = "Post could not be deleted"
+        flash[:notice] = t("mongoid_forums.post.cannot_delete")
         redirect_to @topic
       end
     end
 
     private
 
+    #TODO: Decide if this should be used
     def destroy_successful
       if @post.topic.posts.count == 0
         @post.topic.destroy
         flash[:notice] = "Post was deleted successfully along with it's topic."
-        redirect_to [@topic.forum]
+        redirect_to @topic.forum
       else
         flash[:notice] = "Post was deleted successfully"
-        redirect_to [@topic.forum, @topic]
+        redirect_to @topic
+      end
+    end
+
+    def reject_locked_topic!
+      if @topic.locked?
+        flash.alert = t("mongoid_forums.post.not_created_topic_locked")
+        redirect_to @topic and return
       end
     end
 

data/app/controllers/mongoid_forums/topics_controller.rb

@@ -38,7 +38,7 @@ module MongoidForums
     def subscribe
       if find_topic
         @topic.subscribe_user(mongoid_forums_user.id)
-        flash[:notice] = "Successfully subscribed to topic"
+        flash[:notice] = t("mongoid_forums.topic.subscribed")
         redirect_to topic_url(@topic)
       end
     end
@@ -46,7 +46,7 @@ module MongoidForums
     def unsubscribe
       if find_topic
         @topic.unsubscribe_user(mongoid_forums_user.id)
-        flash[:notice] = "Successfully unsubscribed to topic"
+        flash[:notice] = t("mongoid_forums.topic.unsubscribed")
         redirect_to topic_url(@topic)
       end
     end
@@ -63,7 +63,7 @@ module MongoidForums
         @topic = scope.find(params[:id])
         authorize! :read, @topic
       rescue Mongoid::Errors::DocumentNotFound
-        flash.alert = t("forem.topic.not_found")
+        flash.alert = t("mongoid_forums.topic.not_found")
         redirect_to @forum and return
       end
     end

data/config/locales/en.yml

@@ -38,6 +38,8 @@ en:
         index: Manage Groups
         created: The group was successfully created.
         not_created: Group could not be created.
+        updated: The group was successfully updated.
+        not_updated: Group could not be updated.
         deleted: The selected group has been deleted.
       groups:
         show:
@@ -145,11 +147,13 @@ en:
       edit: Edit
       not_created: Your reply could not be posted.
       not_created_topic_locked: You cannot reply to a locked topic.
+      not_created_quote_original_post: You cannot quote the original post.
       edited: Your post has been edited.
       not_edited: Your post could not be edited.
       deleted: Your post has been deleted.
       deleted_with_topic: Only post in topic deleted. Topic also deleted.
       cannot_delete: You cannot delete a post you do not own.
+      cannot_delete_first_post: You cannot delete the first post in a topic.
       in_reply_to: In reply to
     posts:
       moderation:

data/lib/mongoid_forums/version.rb

@@ -1,4 +1,3 @@
 module MongoidForums
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end
-