simple_forum 0.0.2 → 0.0.4

data/README.rdoc

@@ -6,41 +6,42 @@ Make sure you have model representing user. Default is User class. You can chang
 User model must respond to 'name'.
 
 Add simple_forum to your Rails 3 Gemfile
-
     gem "simple_forum", :git => "git@github.com:galdomedia/mountable_forum.git"
 
+And install gems with bundler
     bundle install
 
-Install the initializer
-
+Install the initializer and mount engine in routes.rb
     rails g simple_forum:install
 
 Edit the initializer located in `config/initializers/simple_forum.rb` to satisfy your needs.
 
 Copy migrations
-    rake simple_forum_engine:install
+    bundle exec rake simple_forum:install:migrations
     
 Run migrations
-    rake db:migrate
+    bundle exec rake db:migrate
 
 moderator can:
-  - close/open topics
-  - edit posts
-  - delete(mark as deleted) posts
+- close/open topics
+- edit posts
+- delete(mark as deleted) posts
+
 TODO:
-  - edit topics
-  - delete topics (?)
+- edit topics
+- delete topics (?)
 
 signed in user can:
-  - create posts
-  - edit own posts(in specified period of time)
-  - delete(mark as deleted) own posts(in specified period of time)
+- create posts
+- edit own posts(in specified period of time)
+- delete(mark as deleted) own posts(in specified period of time)
 
 When you are using friendly_id forums and topics will be automatically using it.
-If not to_param method return something like "#{id}-#{name.parameterize}".
+If not to_param method return something like:
+    "#{id}-#{name.parameterize}"
 
-TODO:
-  - add generator or rake task to copy views to user application
+You can copy and customize views to your application by running generator:
+    rails g simple_forum:views
 
 
 This project rocks and uses MIT-LICENSE.

data/app/assets/javascripts/simple_forum/application.js

@@ -12,4 +12,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-//=
+//= require_self
+
+simple_forum = {
+    'translations':{}
+};

data/app/assets/javascripts/simple_forum/moderators.js

@@ -0,0 +1,40 @@
+(function () {
+    var search_users_timeout;
+
+    var search_users = function (str) {
+        var params = {'user_name_like':str};
+        var $results = $('#search_users_result');
+        $results.html('');
+        $.getJSON(simple_forum.user_search_path, params, function (json) {
+            $.each(json, function (key, val) {
+                var $item = $('<li>' + val + ' <a href="#" class="add-moderator" data-user_id="' + key + '" data-user_name="' + val + '">[' + simple_forum.translations['add_moderator'] + ']</a></li>');
+                $results.append($item);
+            });
+        });
+    };
+
+    $(function () {
+        $('#search_users_input').keyup(function () {
+            var $input = $(this);
+            if (search_users_timeout) clearTimeout(search_users_timeout);
+            search_users_timeout = setTimeout(function () {
+                search_users($input.val());
+            }, 300);
+        });
+
+        $('a.add-moderator').live('click', function () {
+            var $this = $(this),
+                user_id = $this.data('user_id'),
+                user_name = $this.data('user_name');
+            var html = simple_forum.moderator_template.replace(/temp_user_id/g, user_id).replace(/temp_user_name/g, user_name);
+            $('#moderators').append(html);
+            return false;
+        });
+
+        $('a.remove-moderator').live('click', function () {
+            var $this = $(this);
+            $this.closest('li').remove();
+            return false;
+        });
+    });
+})();

data/app/assets/stylesheets/simple_forum/admin.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require web-app-theme/base
+ *= require web-app-theme/themes/default/style
+ *= require formtastic.css
+ *= require_self
+*/

data/app/assets/stylesheets/simple_forum/base.css

@@ -33,6 +33,16 @@ h2 {
     margin: 20px 0;
 }
 
+body ul.links {
+    float: right;
+}
+
+body ul.links li {
+    float: right;
+    padding-left: 16px;
+    list-style: none;
+}
+
 p, h2, pre {
     margin: 0;
     padding: 5px 20px;

data/app/controllers/simple_forum/admin/base_controller.rb

@@ -0,0 +1,7 @@
+class SimpleForum::Admin::BaseController < ::SimpleForum::ApplicationController
+  layout 'simple_forum/admin'
+  before_filter :forum_admin_required
+
+  protected
+
+end

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

@@ -0,0 +1,70 @@
+module SimpleForum
+  module Admin
+    class CategoriesController < ::SimpleForum::Admin::BaseController
+
+      def index
+        @categories = SimpleForum::Category.default_order.all
+
+        respond_with(@categories)
+      end
+
+      def show
+
+        respond_with([:admin, resource])
+      end
+
+      def edit
+
+        respond_with([:admin, resource])
+      end
+
+      def new
+
+        respond_with([:admin, resource])
+      end
+
+      def create
+        success = resource.save
+
+        respond_with([:admin, resource]) do |format|
+          format.html do
+            if success
+              redirect_to [:admin, resource]
+            else
+              render :new
+            end
+          end
+        end
+      end
+
+      def update
+        success = resource.update_attributes(params[:category])
+
+        respond_with([:admin, resource]) do |format|
+          format.html do
+            if success
+              redirect_to [:admin, resource]
+            else
+              render :edit
+            end
+          end
+        end
+      end
+
+      def destroy
+        resource.destroy
+
+        respond_with([:admin, resource])
+      end
+
+      private
+
+      def resource
+        @category ||= params[:id] ? SimpleForum::Category.find(params[:id]) : SimpleForum::Category.new(params[:category])
+      end
+
+      helper_method :resource
+
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module SimpleForum
+  module Admin
+    class ForumsController < ::SimpleForum::Admin::BaseController
+
+      def search_users
+        user_class = instance_eval(&SimpleForum.invoke(:user_class))
+        @users = user_class.where(["#{user_class.quoted_table_name}.email LIKE ?", "%#{params[:user_name_like].to_s.gsub(/[\%\_]/) { |m| "\\#{m}" }}%"]).limit(16)
+
+        respond_to do |format|
+          format.json do
+            render :json => @users.inject({}) { |hash, u| hash[u.id] = u.name; hash }
+          end
+        end
+      end
+
+      def index
+        @categories = SimpleForum::Category.default_order.includes({:forums => [{:recent_post => [:user, :topic]}, :moderators]})
+
+        @forums = SimpleForum::Forum.default_order.includes({:recent_post => [:user, :topic]}, :moderators)
+        @forums_by_category = @categories.inject(ActiveSupport::OrderedHash.new) { |h, c| h[c] = []; h }
+        @forums.each do |f|
+          (@forums_by_category[@categories.detect { |c| c.try(:id) == f.category_id }] ||= []) << f
+        end
+        @forums_by_category.reject! { |c, forums| forums.blank? }
+
+        respond_with(@forums)
+      end
+
+      def show
+
+        respond_with([:admin, resource])
+      end
+
+      def edit
+
+        respond_with([:admin, resource])
+      end
+
+      def new
+
+        respond_with([:admin, resource])
+      end
+
+      def create
+        success = resource.save
+
+        respond_with([:admin, resource]) do |format|
+          format.html do
+            if success
+              redirect_to [:admin, resource]
+            else
+              render :new
+            end
+          end
+        end
+      end
+
+      def update
+        success = resource.update_attributes(params[:forum])
+
+        respond_with([:admin, resource]) do |format|
+          format.html do
+            if success
+              redirect_to [:admin, resource]
+            else
+              render :edit
+            end
+          end
+        end
+      end
+
+      def destroy
+        resource.destroy
+
+        respond_with([:admin, resource])
+      end
+
+      private
+
+      def resource
+        @forum ||= params[:id] ? SimpleForum::Forum.find(params[:id]) : SimpleForum::Forum.new(params[:forum])
+      end
+
+      helper_method :resource
+
+    end
+  end
+end

data/app/controllers/simple_forum/application_controller.rb

@@ -1,27 +1,50 @@
 module SimpleForum
   class ApplicationController < ::ApplicationController #::ActionController::Base
     respond_to :html
-    protect_from_forgery
+    #protect_from_forgery
 
     layout SimpleForum.layout
 
-    helper_method :authenticated_user, :user_authenticated?
+    helper_method :authenticated_user, :user_authenticated?, :forum_admin?
+    helper_method :simple_forum_recent_activity?
 
     private
 
     def authenticated_user
-      instance_eval &AbstractAuth.invoke(:authenticated_user)
+      instance_eval &SimpleForum.invoke(:authenticated_user)
     end
 
     def user_authenticated?
-      instance_eval &AbstractAuth.invoke(:user_authenticated?)
+      instance_eval &SimpleForum.invoke(:user_authenticated?)
     end
 
     def authenticate_user
-      redirect_to :back, :alert => "You have to be logged in" unless user_authenticated?
+      redirect_to :back, :alert => t('simple_forum.controllers.you_have_to_be_signed_in_to_perform_this_action') unless user_authenticated?
+    end
+
+    def forum_admin?
+      instance_eval(&SimpleForum.invoke(:forum_admin?))
+    end
+
+    def forum_admin_required
+      redirect_to simple_forum.root_path unless forum_admin?
+    end
+
+    def simple_forum_activity_checker
+      @_simple_forum_activity_checker ||= SimpleForum::UserActivity.recent_activity_for_user(authenticated_user)
+    end
+
+    def simple_forum_recent_activity?(forum_or_topic)
+      return false unless user_authenticated?
+      simple_forum_activity_checker.recent_activity?(forum_or_topic)
     end
-  end
 
+    def bang_simple_forum_recent_activity(forum_or_topic)
+      return unless user_authenticated?
+      simple_forum_activity_checker.bang(forum_or_topic)
+    end
+
+  end
 end
 
 

data/app/controllers/simple_forum/forums_controller.rb

@@ -1,5 +1,5 @@
 module SimpleForum
-  class ForumsController < ApplicationController
+  class ForumsController < ::SimpleForum::ApplicationController
 
     before_filter :find_forum, :except => [:index]
 
@@ -10,8 +10,8 @@ module SimpleForum
     end
 
     def show
-      @forum.bang_recent_activity(authenticated_user)
-
+      bang_simple_forum_recent_activity(@forum)
+      
       scope = @forum.topics.includes([:user, {:recent_post => :user}])
       @topics = scope.respond_to?(:paginate) ? scope.paginate(:page => params[:page], :per_page => params[:per_page]) : scope.all
 
@@ -25,4 +25,4 @@ module SimpleForum
     end
 
   end
-end
+end

data/app/controllers/simple_forum/posts_controller.rb

@@ -1,5 +1,5 @@
 module SimpleForum
-  class PostsController < ApplicationController
+  class PostsController < ::SimpleForum::ApplicationController
 
     before_filter :authenticate_user, :except => [:index, :show]
 
@@ -111,4 +111,4 @@ module SimpleForum
     end
 
   end
-end
+end

data/app/controllers/simple_forum/topics_controller.rb

@@ -1,5 +1,5 @@
 module SimpleForum
-  class TopicsController < ApplicationController
+  class TopicsController < ::SimpleForum::ApplicationController
     respond_to :html
 
     before_filter :authenticate_user, :only => [:new, :create, :open, :close]
@@ -20,7 +20,7 @@ module SimpleForum
     end
 
     def show
-      @topic.bang_recent_activity(authenticated_user)
+      bang_simple_forum_recent_activity(@topic)
       @topic.increment_views_count
 
       @posts_search = @topic.posts.includes([:user, :deleted_by, :edited_by])
@@ -113,4 +113,4 @@ module SimpleForum
     end
 
   end
-end
+end

data/app/models/simple_forum/forum.rb

@@ -27,12 +27,12 @@ module SimpleForum
              :through => :moderatorships,
              :source => :user
 
-    scope :default_order, order("#{quoted_table_name}.position ASC")
+    scope :default_order, order("#{quoted_table_name}.position ASC, #{quoted_table_name}.id ASC")
 
     validates :name, :presence => true
     validates :position, :presence => true, :numericality => {:only_integer => true, :allow_nil => true}
 
-    attr_accessible :name, :body, :parent_id, :position, :moderator_ids, :category_id
+    attr_accessible :name, :body, :parent_id, :position, :moderator_ids, :category_id, :is_topicable
 
     if respond_to?(:has_friendly_id)
       has_friendly_id :name, :use_slug => true, :approximate_ascii => true
@@ -42,14 +42,6 @@ module SimpleForum
       end
     end
 
-    def recent_activity?(user)
-      SimpleForum::UserActivity.new(user).recent_activity?(self)
-    end
-
-    def bang_recent_activity(user)
-      SimpleForum::UserActivity.new(user).bang(self)
-    end
-
     def moderated_by?(user)
       return false unless user
       @moderated_by_cache ||= {}