community_engine 3.0.0 → 3.2.0

data/app/helpers/base_helper.rb

@@ -3,16 +3,17 @@ require 'digest/md5'
 # Methods added to this helper will be available to all templates in the application.
 module BaseHelper
   include ActsAsTaggableOn::TagsHelper
+  include Ckeditor::ApplicationHelper
 
   def commentable_url(comment)
     if comment.recipient && comment.commentable
       if comment.commentable_type != "User"
-        polymorphic_url([comment.recipient, comment.commentable])+"#comment_#{comment.id}"
+        polymorphic_url([comment.recipient, comment.commentable])+"#comment-#{comment.id}"
       elsif comment
-        user_url(comment.recipient)+"#comment_#{comment.id}"
+        user_url(comment.recipient)+"#comment-#{comment.id}"
       end
     elsif comment.commentable
-      polymorphic_url(comment.commentable)+"#comment_#{comment.id}"
+      polymorphic_url(comment.commentable)+"#comment-#{comment.id}"
     end
   end
 
@@ -346,17 +347,6 @@ module BaseHelper
     user.gender ? (user.male? ? :his.l : :her.l)  : :their.l
   end
 
-  def tiny_mce_init_if_needed
-    if !@uses_tiny_mce.blank?
-      javascript_tag(tiny_mce_js)
-    end
-  end
-
-  def tiny_mce_js
-    selector = @tiny_mce_configuration['selector']
-    "jQuery(function(){jQuery('#{selector}').RichTextEditor(#{@tiny_mce_configuration.to_json})});".html_safe
-  end
-
   def flash_class(level)
     case level
       when :notice then "alert-info"

data/app/models/acts_as_taggable_on/tag.rb

@@ -1,58 +1,28 @@
-#require_dependency ActsAsTaggableOn::Engine.config.root.join('app', 'models', 'acts_as_taggable_on', 'tag.rb').to_s
+# require_dependency ActsAsTaggableOn::Engine.config.root.join('lib', 'acts_as_taggable_on', 'tag.rb').to_s
 
 class ActsAsTaggableOn::Tag < ActiveRecord::Base
 
   class << self
     def popular(limit = 20, type = nil)
-      tags = ActsAsTaggableOn::Tag.counts(:at_least => 0).limit(limit).order('count DESC')
-      tags = tags.where("taggings.taggable_type = ?", type.capitalize) if type
-      tags
+      if type == nil
+        ActsAsTaggableOn::Tag.most_used(limit)
+      else
+        klass = Object.const_get type
+        klass.tag_counts.most_used(limit)
+      end
     end
 
     def default_per_page
       25
     end
 
-    # Calculate the tag counts for all tags.
-    #
-    # - +:start_at+ - restrict the tags to those created after a certain time
-    # - +:end_at+   - restrict the tags to those created before a certain time
-    # - +:at_least+ - exclude tags with a frequency less than the given value
-    # - +:at_most+  - exclude tags with a frequency greater than the given value
-    #
-    # Deprecated:
-    #
-    # - +:conditions+
-    # - +:limit+
-    # - +:order+
-    #
-    def counts(options = {})
-      options.assert_valid_keys :start_at, :end_at, :at_least, :at_most, :conditions, :limit, :order, :joins
-
-      tags = select("#{quoted_table_name}.id", "#{quoted_table_name}.name", "COUNT(#{quoted_table_name}.id) AS count")
-      tags = tags.joins(:taggings)
-      tags = tags.having(["COUNT(#{ActsAsTaggableOn::Tagging.quoted_table_name}.id) >= ?", options[:at_least]]) if options[:at_least]
-      tags = tags.having(["COUNT(#{ActsAsTaggableOn::Tagging.quoted_table_name}.id) <= ?", options[:at_most]])  if options[:at_most]
-      tags = tags.where("#{ActsAsTaggableOn::Tagging.quoted_table_name}.created_at >= ?", options[:start_at]) if options[:start_at]
-      tags = tags.where("#{ActsAsTaggableOn::Tagging.quoted_table_name}.created_at <= ?", options[:end_at])   if options[:end_at]
-      tags = tags.where(options[:conditions]) if options[:conditions]
-      tags = tags.limit(options[:limit])      if options[:limit]
-      tags = tags.order(options[:order])      if options[:order]
-
-      if joins = options.delete(:joins)
-        tags = tags.joins(joins)
-      end
-
-      tags.group("#{quoted_table_name}.id, #{quoted_table_name}.name")
-    end
-
-
   end
 
   def to_param
     URI.escape(URI.escape(self.name), /[\/.?#]/)
   end
 
+
   def related_tags(limit = 10)
     taggables = self.taggings.limit(10).to_a.collect{|t| t.taggable }.compact
 
@@ -60,11 +30,9 @@ class ActsAsTaggableOn::Tag < ActiveRecord::Base
     return [] if tagging_ids.blank?
 
     ActsAsTaggableOn::Tag.where("tags.id != '#{self.id}'")
-      .select("tags.id, tags.name, COUNT(tags.id) as count")
       .joins(:taggings)
       .where({:taggings => {:id => tagging_ids }})
-      .group("tags.id, tags.name")
-      .order("count DESC")
+      .order("taggings_count DESC")
       .limit(limit)
   end
 

data/app/models/clipping.rb

@@ -21,7 +21,7 @@ class Clipping < ActiveRecord::Base
 
   def self.find_related_to(clipping, options = {})
     options.reverse_merge!({:limit => 8,
-        :order => 'created_at DESC',
+        :order => 'clippings.created_at DESC',
         :conditions => [ 'clippings.id != ?', clipping.id ]
     })
 

data/app/models/forum.rb

@@ -14,9 +14,9 @@ class Forum < ActiveRecord::Base
   belongs_to :owner, :polymorphic => true
 
   format_attribute :description
-  
+
   def to_param
     id.to_s << "-" << (name ? name.parameterize : '' )
   end
-  
+
 end

data/app/models/photo.rb

@@ -60,7 +60,7 @@ class Photo < ActiveRecord::Base
 
   def self.find_related_to(photo, options = {})
     options.reverse_merge!({:limit => 8,
-        :order => 'created_at DESC',
+        :order => 'photos.created_at DESC',
         :conditions => ['photos.id != ?', photo.id]
     })
     limit(options[:limit]).order(options[:order]).where(options[:conditions]).tagged_with(photo.tags.collect{|t| t.name }, :any => true)

data/app/models/post.rb

@@ -51,7 +51,7 @@ class Post < ActiveRecord::Base
 
     def find_related_to(post, options = {})
       options.reverse_merge!({:limit => 8,
-          :order => 'published_at DESC',
+          :order => 'posts.published_at DESC',
           :conditions => [ 'posts.id != ? AND published_as = ?', post.id, 'live' ]
       })
 

data/app/models/sb_post.rb

@@ -1,20 +1,20 @@
 class SbPost < ActiveRecord::Base
-  acts_as_activity :user, :if => Proc.new{|record| record.user } #don't record an activity if there's no user  
+  acts_as_activity :user, :if => Proc.new{|record| record.user } #don't record an activity if there's no user
   include Rakismet::Model
   rakismet_attrs :author => :username, :comment_type => 'comment', :content => :body, :user_ip => :author_ip
-  
+
   belongs_to :forum, :counter_cache => true
   belongs_to :user,  :counter_cache => true
   belongs_to :topic, :counter_cache => true
 
   format_attribute :body
   before_create { |r| r.forum_id = r.topic.forum_id }
-  after_create  { |r| 
+  after_create  { |r|
     Topic.where('id = ?', r.topic_id)
     .update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', r.created_at, r.user_id, r.id])
 
   }
-  after_destroy { |r| 
+  after_destroy { |r|
     t = Topic.find(r.topic_id)
     Topic.where('id = ?', t.id).update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', t.sb_posts.recent.last.created_at, t.sb_posts.recent.last.user_id, t.sb_posts.recent.last.id]) if t.sb_posts.recent.last
   }
@@ -27,40 +27,44 @@ class SbPost < ActiveRecord::Base
   validates_presence_of :body, :topic
 
   after_create :monitor_topic
-  after_create :notify_monitoring_users  
-  
+  after_create :notify_monitoring_users
+
   scope :with_query_options, lambda {
     select('sb_posts.*, topics.title as topic_title, forums.name as forum_name')
     .joins('inner join topics on sb_posts.topic_id = topics.id inner join forums on topics.forum_id = forums.id')
     .order('sb_posts.created_at desc')
   }
   scope :recent, -> { order('sb_posts.created_at ASC') }
-  validate :check_spam    
-    
+  validate :check_spam
+
   def monitor_topic
-    return unless user    
+    return unless user
     monitorship = Monitorship.where(:user_id => self.user.id, :topic_id => self.topic.id).first_or_initialize
     if monitorship.new_record?
       monitorship.update_attribute :active, true
     end
   end
-  
+
   def notify_monitoring_users
     topic.notify_of_new_post(self)
   end
-  
+
   def editable_by?(user)
     user && (user.id == user_id || user.admin? || user.moderator_of?(topic.forum_id))
   end
-    
+
   def username
     user ? user.login : (author_name.blank? ? :anonymous.l : author_name)
   end
-  
+
   def check_spam
     if configatron.has_key?(:akismet_key) && self.spam?
       self.errors.add(:base, :comment_spam_error.l)
     end
-  end  
-  
+  end
+
+  def dom_id
+    ['sb_posts', id].join('-')
+  end
+
 end

data/app/models/topic.rb

@@ -1,6 +1,6 @@
 class Topic < ActiveRecord::Base
   acts_as_activity :user
-  
+
   acts_as_taggable
   belongs_to :forum, :counter_cache => true
   belongs_to :user
@@ -10,14 +10,14 @@ class Topic < ActiveRecord::Base
   has_many :sb_posts, :dependent => :destroy, :inverse_of => :topic
 
   belongs_to :replied_by_user, :foreign_key => "replied_by", :class_name => "User"
-  
+
   validates_presence_of :forum, :user, :title
   before_create :set_default_replied_at_and_sticky
   after_save    :set_post_topic_id
   after_create  :create_monitorship_for_owner
-  
+
   accepts_nested_attributes_for :sb_posts
-  
+
   scope :recently_replied, -> {order('replied_at DESC')}
 
   def notify_of_new_post(post)
@@ -33,11 +33,11 @@ class Topic < ActiveRecord::Base
   def voices
     sb_posts.map { |p| p.user_id }.uniq.size
   end
-  
+
   def body
     sb_posts.first
   end
-  
+
   def hit!
     self.class.increment_counter :hits, id
   end
@@ -47,7 +47,7 @@ class Topic < ActiveRecord::Base
   def views() hits end
 
   def paged?() sb_posts_count > 25 end
-  
+
   def last_page
     (sb_posts_count.to_f / 25.0).ceil.to_i
   end
@@ -55,7 +55,7 @@ class Topic < ActiveRecord::Base
   def editable_by?(user)
     user && (user.id == user_id || user.admin? || user.moderator_of?(forum_id))
   end
-  
+
   protected
     def set_default_replied_at_and_sticky
       self.replied_at = Time.now.utc
@@ -65,9 +65,9 @@ class Topic < ActiveRecord::Base
     def set_post_topic_id
       SbPost.where('topic_id = ?', id).update_all(['forum_id = ?', forum_id])
     end
-    
+
     def create_monitorship_for_owner
       monitorship = Monitorship.find_or_initialize_by(:user_id => user.id, :topic_id => self.id)
-      monitorship.update_attribute :active, true      
+      monitorship.update_attribute :active, true
     end
 end

data/app/models/user.rb

@@ -447,7 +447,7 @@ class User < ActiveRecord::Base
       self.activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
     end
 
-    # before filters
+    # before actions
     def whitelist_attributes
       self.login = self.login.strip
       self.description = white_list(self.description )

data/app/policies/active_admin/page_policy.rb

@@ -0,0 +1,11 @@
+class ActiveAdmin::PagePolicy < ApplicationPolicy
+
+  def dashboard?
+   true
+  end
+
+  def index?
+   true
+  end
+
+end

data/app/policies/application_policy.rb

@@ -0,0 +1,59 @@
+class ApplicationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  def show?
+    true
+  end
+
+  def index?
+    true
+  end
+
+  def new?
+    create?
+  end
+
+  def create?
+    true
+  end
+
+  def edit?
+    update?
+  end
+
+  def update?
+    user.admin? || record.respond_to(:user) && record.user.eql?(user)
+  end
+
+  def destroy?
+    update?
+  end
+
+  def destroy_all?
+    user.admin?
+  end
+
+  def scope
+    Pundit.policy_scope!(user, record.class)
+  end
+
+  class Scope
+    attr_reader :user, :scope
+
+    def initialize(user, scope)
+      @user = user
+      @scope = scope
+    end
+
+    def resolve
+      scope
+    end
+  end
+
+end
+

data/app/policies/post_policy.rb

@@ -0,0 +1,13 @@
+class PostPolicy < ApplicationPolicy
+
+  class Scope < Scope
+    def resolve
+      if user.admin?
+        scope.unscoped
+      else
+        scope.unscoped.where(:user_id => user.id)
+      end
+    end
+  end
+
+end

data/app/policies/sb_post_policy.rb

@@ -0,0 +1,15 @@
+class SbPostPolicy < ApplicationPolicy
+
+  def edit?
+    update?
+  end
+
+  def destroy?
+    update?
+  end
+
+  def update?
+    record.editable_by?(user)
+  end
+
+end

data/app/policies/topic_policy.rb

@@ -0,0 +1,23 @@
+class TopicPolicy < ApplicationPolicy
+
+  def new?
+    create?
+  end
+
+  def create?
+    true
+  end
+
+  def edit?
+    update?
+  end
+
+  def destroy?
+    update?
+  end
+
+  def update?
+    record.editable_by?(user)
+  end
+
+end