filters_spam 0.3 → 0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0df64a0b5c2e0e4c04f8b22f9974791b9710154
+  data.tar.gz: b6de56c62d62a340eec4cec4df8b180f2b74cd61
+SHA512:
+  metadata.gz: fae7eca9e41ed5925beab0b013f3bb9ce88cb01e9cb26cf5ff69af84dfa778ed2746a894815fa465b6961dc0aefbd6520b9c7935bc8a5bd14aea2116df19bd17
+  data.tar.gz: 6bb7e68cd97280415e51d950873467287a09d13ec2fd4cecb2d971a6c60dd7ed9693a37275479ac40f4b4bf4af16e75a8568846241ae96582012371639d5ae0d

data/lib/filters_spam.rb

@@ -1,7 +1,7 @@
 # Just call filters_spam in your model with any of the options you want.
 def filters_spam(options = {})
   options = {
-    :message_field => :message,
+    :message_field => :nil,
     :email_field => :email,
     :author_field => :author,
     :other_fields => [],
@@ -13,8 +13,8 @@ def filters_spam(options = {})
       named_scope :ham, :conditions => {:spam => false}
       named_scope :spam, :conditions => {:spam => true}
     else
-      scope :ham, :conditions => {:spam => false}
-      scope :spam, :conditions => {:spam => true}
+      scope :ham, lambda { where(:spam => false) }
+      scope :spam, lambda { where(:spam => true) }
     end
     before_validation(:on => :create) { |spammable| spammable.send(:calculate_spam_score) }
 
@@ -61,7 +61,7 @@ def filters_spam(options = {})
     def score_for_previous_submissions
       current_score = 0
 
-      self.class.find(:all, :conditions => {:#{options[:email_field]} => #{options[:email_field]}}).each do |i|
+      self.class.where(:#{options[:email_field]} => #{options[:email_field]}).each do |i|
         if i.spam?
           current_score -= 1
         else
@@ -78,7 +78,7 @@ def filters_spam(options = {})
       spam_words.each do |word|
         regex = /\#{word}/i
         if #{options[:message_field]} =~ regex ||
-           #{options[:author_field]} =~ regex #{" || #{options[:other_fields].join(' =~ regex ')} =~ regex" if options[:other_fields].any?}
+           #{options[:author_field]} =~ regex #{" || #{options[:other_fields].join(' =~ regex || ')} =~ regex" if options[:other_fields].any?}
           current_score -= 1
         end
       end
@@ -107,7 +107,7 @@ def filters_spam(options = {})
     end
 
     def score_for_same_message
-      self.class.count(:conditions => {:#{options[:message_field]} => #{options[:message_field]}}) * -1
+      self.class.where(:#{options[:message_field]} => #{options[:message_field]}).count * -1
     end
 
     def score_for_consonant_runs
@@ -124,14 +124,14 @@ def filters_spam(options = {})
 
     def calculate_spam_score
       score = 0
-      score += score_for_message_links
-      score += score_for_message_length
+      score += score_for_message_links if #{options[:message_field]}
+      score += score_for_message_length if #{options[:message_field]}
       score += score_for_previous_submissions
       score += score_for_spam_words
-      score += score_for_suspect_tld
-      score += score_for_lame_message_start
+      score += score_for_suspect_tld if #{options[:message_field]}
+      score += score_for_lame_message_start if #{options[:message_field]}
       score += score_for_author_link
-      score += score_for_same_message
+      score += score_for_same_message if #{options[:message_field]}
       score += score_for_consonant_runs
       self.spam = (score < 0)
 
@@ -140,4 +140,4 @@ def filters_spam(options = {})
       true
     end
   }
-end
+end

data/readme.md

@@ -1,14 +1,17 @@
 # FiltersSpam
 
-This is a small Ruby on Rails plugin that can be installed as a gem in your ``Gemfile``
+This is a small Ruby on Rails plugin that can be installed as a gem in your `Gemfile`
 that allows models to attach to it to provide spam filtering functionality.
 
 ## Rails Quickstart
 
-    # Add to Gemfile
-    gem 'filters_spam', '~> 0.3'
+Add to your Gemfile:
 
-    bundle install
+```ruby
+gem 'filters_spam', '~> 0.4'
+```
+
+Run `bundle install`.
 
 ## Usage
 
@@ -25,31 +28,37 @@ The same thing in Rails 3:
 
 Now, you can use it by calling the function in your model like so:
 
-    filters_spam
+```ruby
+filters_spam
+```
 
 If you want to change the default fields that are used by ``filters_spam``
 then you can pass them in to the method as options. All options are optional.
 
 All of the possible options are outlined below with the default values for each:
 
-    filters_spam({
-      :message_field => :message,
-      :email_field => :email,
-      :author_field => :author,
-      :other_fields => [],
-      :extra_spam_words => %w()
-    })
+```ruby
+filters_spam({
+  :message_field => :message,
+  :email_field => :email,
+  :author_field => :author,
+  :other_fields => [],
+  :extra_spam_words => %w()
+})
+```
 
 So, say you wanted to mark 'ruby' and 'rails' as spam words you simply pass them
 in using the ``:extra_spam_words`` option:
 
-    filters_spam({
-      :extra_spam_words => %w(ruby rails)
-    })
+```ruby
+filters_spam({
+  :extra_spam_words => %w(ruby rails)
+})
+```
 
 Enjoy a life with less spam.
 
 ## Credits
 
 This code was inspired by Russel Norris' [acts_as_snook plugin](http://github.com/rsl/acts_as_snook)
-and ideas presented by [Jonathan Snook](http://snook.ca/archives/other/effective_blog_comment_spam_blocker)
+and ideas presented by [Jonathan Snook](http://snook.ca/archives/other/effective_blog_comment_spam_blocker)

metadata

@@ -1,68 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: filters_spam
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  version: "0.3"
+version: !ruby/object:Gem::Version
+  version: '0.4'
 platform: ruby
-authors: 
+authors:
 - Philip Arndt
 - David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-14 00:00:00 +12:00
-default_executable: 
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies: []
-
-description: This is a small Ruby on Rails plugin that can be installed as a gem in your Gemfile that allows models to attach to it to provide spam filtering functionality.
+description: This is a small Ruby on Rails plugin that can be installed as a gem in
+  your Gemfile that allows models to attach to it to provide spam filtering functionality.
 email: info@resolvedigital.co.nz
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- readme.md
+files:
 - lib/filters_spam.rb
-has_rdoc: true
+- readme.md
 homepage: http://www.resolvedigital.co.nz
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attach to your model to have this filter out the spam using scoring techniques.
 test_files: []
-
+has_rdoc: