Download as
Browse Code »

Commit 40426a5af4fb565097ca785abf8fa9c07696c174

Authored by Rodrigo Souto
1 parent 52500266
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

spammable: fail safe measures 

   * Avoiding module inclusion on models that doesn't have a spam
     attribute.
   * Avoiding named_scope filters on models that doesn't have
     named_scope.
Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
lib/spammable.rb
  Diff comments   View file @40426a5
1 module Spammable 1 module Spammable
2 def self.included(recipient) 2 def self.included(recipient)
  3 + raise "This model should have a spam attribute!" if !recipient.new.respond_to?('spam=')
3 recipient.extend(ClassMethods) 4 recipient.extend(ClassMethods)
4 end 5 end
5 6
6 module ClassMethods 7 module ClassMethods
7 def self.extended (base) 8 def self.extended (base)
8 - base.class_eval do  
9 - named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]  
10 - named_scope :spam, :conditions => ['spam = ?', true] 9 + if base.respond_to?(:named_scope)
  10 + base.class_eval do
  11 + named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
  12 + named_scope :spam, :conditions => ['spam = ?', true]
  13 + end
11 end 14 end
12 end 15 end
13 end 16 end
plugins/anti_spam/test/unit/anti_spam_plugin_test.rb
  Diff comments   View file @40426a5
@@ -4,8 +4,6 @@ class AntiSpamPluginTest < ActiveSupport::TestCase @@ -4,8 +4,6 @@ class AntiSpamPluginTest < ActiveSupport::TestCase
4 4
5 class SpammableContent 5 class SpammableContent
6 attr_accessor :spam 6 attr_accessor :spam
7 - def self.named_scope(*args); end  
8 -  
9 include Spammable 7 include Spammable
10 8
11 def save!; end 9 def save!; end