refactor SpamFilter

Author: seuros

.gitignore

@@ -14,7 +14,8 @@
 .rspec-local
 .yardoc
 /.bundle
-/config/application.yml
+config/application.yml
+config/database.yml
 /db/*.sqlite3
 /db/*.sqlite3-journal
 /log/*.log

Gemfile

@@ -145,7 +145,6 @@ source 'https://rubygems.org' do
     gem 'annotate'
     gem 'fabrication-rails'
     gem 'ffaker'
-    gem 'jazz_hands', github: 'nixme/jazz_hands', branch: 'bring-your-own-debugger'
     gem 'launchy'
     gem 'pry-byebug'
     #gem 'pry-rescue'
@@ -171,7 +170,7 @@ source 'https://rubygems.org' do
     gem 'timecop'
     gem 'vcr'
     gem 'webmock', '<1.16'
-    gem 'stripe-ruby-mock', git: 'https://github.com/rebelidealist/stripe-ruby-mock', branch: 'live-tests'
+    gem 'stripe-ruby-mock'
   end
 
   group :production do

Gemfile.lock

@@ -1,30 +1,3 @@
-GIT
-  remote: git://github.com/nixme/jazz_hands.git
-  revision: 5e4b48f145883ecb14b55bf04eacc28ac9662676
-  branch: bring-your-own-debugger
-  specs:
-    jazz_hands (0.5.2)
-      awesome_print (~> 1.2)
-      coolline (>= 0.4.2)
-      hirb (~> 0.7.1)
-      pry (~> 0.9.12)
-      pry-doc (~> 0.4.6)
-      pry-git (~> 0.2.3)
-      pry-rails (~> 0.3.2)
-      pry-remote (>= 0.1.7)
-      pry-stack_explorer (~> 0.4.9)
-      railties (>= 3.0, < 5.0)
-
-GIT
-  remote: https://github.com/rebelidealist/stripe-ruby-mock
-  revision: f603978fd1a38b1c27ff67cfa7d6ac95b71abe5c
-  branch: live-tests
-  specs:
-    stripe-ruby-mock (2.0.0)
-      dante (>= 0.2.0)
-      jimson-temp
-      stripe (>= 1.15.0)
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -150,8 +123,6 @@ GEM
       sprockets (< 2.13)
     connection_pool (2.2.0)
     cookiejar (0.3.2)
-    coolline (0.5.0)
-      unicode_utils (~> 1.4)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
@@ -167,7 +138,6 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    diffy (3.0.7)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
@@ -342,10 +312,6 @@ GEM
       json
       mime-types
       oauth
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
     guard (2.12.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -368,7 +334,6 @@ GEM
       rack (>= 1.4.5)
     highline (1.7.2)
     hike (1.2.3)
-    hirb (0.7.3)
     hitimes (1.2.2)
     http (0.5.1)
       http_parser.rb
@@ -493,7 +458,6 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
-    posix-spawn (0.3.11)
     postgres_ext (1.0.0)
       activerecord (~> 3.2.0)
       pg_array_parser (~> 0.0.9)
@@ -505,21 +469,6 @@ GEM
     pry-byebug (1.3.2)
       byebug (~> 2.7)
       pry (~> 0.9.12)
-    pry-doc (0.4.6)
-      pry (>= 0.9)
-      yard (>= 0.8)
-    pry-git (0.2.3)
-      diffy
-      grit
-      pry (>= 0.9.8)
-    pry-rails (0.3.4)
-      pry (>= 0.9.10)
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
     pubnub (0.1.9)
       em-http-request (>= 1.0.2)
       json
@@ -707,6 +656,10 @@ GEM
     stripe (1.21.0)
       json (~> 1.8.1)
       rest-client (~> 1.4)
+    stripe-ruby-mock (2.1.0)
+      dante (>= 0.2.0)
+      jimson-temp
+      stripe (>= 1.20.1)
     strong_parameters (0.2.3)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -767,7 +720,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    unicode_utils (1.4.0)
     vcr (2.9.3)
     webmock (1.15.2)
       addressable (>= 2.2.7)
@@ -778,7 +730,6 @@ GEM
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -792,19 +743,19 @@ DEPENDENCIES
   awesome_print!
   better_errors!
   binding_of_caller!
-  bugsnag
-  capybara
-  capybara-screenshot
+  bugsnag!
+  capybara!
+  capybara-screenshot!
   carrierwave!
   carrierwave_backgrounder!
   chronic!
   clockwork!
-  codeclimate-test-reporter
+  codeclimate-test-reporter!
   coffee-rails!
   color!
   compass-rails!
   createsend!
-  database_cleaner
+  database_cleaner!
   dotenv-rails!
   elasticsearch-model!
   elasticsearch-rails!
@@ -817,20 +768,19 @@ DEPENDENCIES
   foreman!
   friendly_id (= 4.0.10.1)!
   fukuzatsu!
-  fuubar
+  fuubar!
   geocoder!
   github-markdown!
   grackle!
   guard-rspec!
   haml!
   hashie!
-  heroku-deflater
-  jazz_hands!
+  heroku-deflater!
   jbuilder!
   jquery-rails (= 2.0.3)!
   kaminari!
   kramdown!
-  launchy
+  launchy!
   linkedin!
   local_time!
   mail_view (~> 2.0.4)!
@@ -839,7 +789,7 @@ DEPENDENCIES
   mixpanel!
   multi_json!
   never_wastes!
-  newrelic_rpm
+  newrelic_rpm!
   nokogiri!
   octokit!
   oj!
@@ -849,37 +799,37 @@ DEPENDENCIES
   omniauth-linkedin (~> 0.0.6)!
   omniauth-twitter (~> 0.0.16)!
   pg!
-  poltergeist
+  poltergeist!
   postgres_ext!
-  pry-byebug
+  pry-byebug!
   pubnub (= 0.1.9)!
-  puma
+  puma!
   querystring!
-  quiet_assets
-  rack_session_access
+  quiet_assets!
+  rack_session_access!
   rails (~> 3.2)!
   rails-assets-font-awesome!
   rails-assets-jquery-cookie (= 1.4.0)!
   rails-assets-jquery-dropdown!
   rails-erd!
-  rails_12factor
+  rails_12factor!
   rails_autolink!
   rakismet!
   redcarpet!
   redis-rails (= 3.2.4)!
   rest-client!
-  rspec-rails
+  rspec-rails!
   rubocop!
   ruby-progressbar!
   sanitize!
   sass!
   sass-rails!
   selectize-rails!
-  selenium-webdriver
-  shoulda-matchers
+  selenium-webdriver!
+  shoulda-matchers!
   sidekiq!
   simple_form!
-  simplecov
+  simplecov!
   sinatra!
   sitemap_generator!
   slim-rails!
@@ -888,13 +838,13 @@ DEPENDENCIES
   stripe!
   stripe-ruby-mock!
   strong_parameters!
-  syntax
-  timecop
+  syntax!
+  timecop!
   tire!
   travis!
-  turnip
+  turnip!
   tweet-button!
   twitter!
   uglifier!
-  vcr
-  webmock (< 1.16)
+  vcr!
+  webmock (< 1.16)!

app/models/comment.rb

@@ -17,13 +17,11 @@
 
 class Comment < ActiveRecord::Base
   include ActsAsCommentable::Comment
-  include Rakismet::Model
+  include SpamFilter
 
   belongs_to :commentable, polymorphic: true
   has_many :likes, as: :likable, dependent: :destroy
-  has_one :spam_report, as: :spammable
   after_create :generate_event
-  after_save :analyze_spam
   after_save :commented_callback
 
   default_scope order: 'likes_cache DESC, created_at ASC'
@@ -33,13 +31,6 @@ class Comment < ActiveRecord::Base
   alias_method :author, :user
   alias_attribute :body, :comment
 
-  rakismet_attrs author: :user_name,
-                 author_email: :user_email,
-                 content: :comment,
-                 blog: ENV['AKISMET_URL'],
-                 user_ip: :remote_ip,
-                 user_agent: :user_agent
-
   validates :comment, length: { minimum: 2 }
 
   def self.latest_comments_as_strings(count=5)
@@ -148,8 +139,4 @@ def event_type(options={})
       :new_comment
     end
   end
-
-  def analyze_spam
-    AnalyzeSpamJob.perform_async({ id: id, klass: self.class.name })
-  end
 end

app/models/concerns/spam_filter.rb

@@ -0,0 +1,21 @@
+module SpamFilter
+  extend ActiveSupport::Concern
+
+  included do
+    after_save :analyze_spam
+    has_one :spam_report, as: :spammable
+    include Rakismet::Model
+
+    rakismet_attrs author: :user_name,
+                   author_email: :user_email,
+                   content: :body,
+                   blog: ENV['AKISMET_URL'],
+                   user_ip: :remote_ip,
+                   user_agent: :user_agent
+
+    def analyze_spam
+      AnalyzeSpamJob.perform_async({ id: id, klass: self.class.name })
+    end
+
+  end
+end

app/models/protip.rb

@@ -40,27 +40,20 @@ class Protip < ActiveRecord::Base
   include Tire::Model::Search
   include Scoring::HotStream
   include SearchModule
-  include Rakismet::Model
-
   acts_as_commentable
 
   include ProtipMapping
+  include SpamFilter
 
   paginates_per(PAGESIZE = 18)
 
   URL_REGEX = /(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?]))/
 
   has_many :likes, as: :likable, dependent: :destroy, after_add: :reset_likes_cache, after_remove: :reset_likes_cache
   has_many :protip_links, autosave: true, dependent: :destroy, after_add: :reset_links_cache, after_remove: :reset_links_cache
-  has_one :spam_report, as: :spammable
   belongs_to :user , autosave: true
 
-  rakismet_attrs  author: proc { self.user.name },
-    author_email: proc { self.user.email },
-    content: :body,
-    blog: ENV['AKISMET_URL'],
-    user_ip: proc { self.user.last_ip },
-    user_agent: proc { self.user.last_ua }
+
 
   acts_as_taggable_on :topics, :users
   attr_accessor :upvotes
@@ -108,7 +101,7 @@ class Protip < ActiveRecord::Base
   after_save :index_search
   after_destroy :index_search_after_destroy
   after_create :update_network
-  after_save :analyze_spam
+
   # End of test failing lines
 
   attr_accessor :upvotes_value
@@ -999,9 +992,4 @@ def need_to_extract_data_from_links
   def adjust_like_value(user, like_value)
     user.is_a?(User) && self.author.team_member_of?(user) ? [like_value/2, 1].max : like_value
   end
-
-  def analyze_spam
-    AnalyzeSpamJob.perform_async({ id: id, klass: self.class.name })
-  end
-
 end

db/migrate/20150504132134_add_author_details_to_protip.rb

@@ -0,0 +1,8 @@
+class AddAuthorDetailsToProtip < ActiveRecord::Migration
+  def change
+    add_column :protips, :user_name, :string
+    add_column :protips, :user_email, :string
+    add_column :protips, :user_agent, :string
+    add_column :protips, :user_ip, :inet
+  end
+end