dodgy_stalker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d60a3dcc9fdc99c8ace0e7b52f5c154ff7e789
-  data.tar.gz: 9f0b6893003afbdbf4b7de4b9b0ea122a74935f7
+  metadata.gz: 32289bb020d8d52033f2478858e43fd88db4a31c
+  data.tar.gz: 1e18c56fe677b40c5c973de25beaa2f947b89da5
 SHA512:
-  metadata.gz: 19eed3bc970fcd54a81bd745522d8d0e2fcd8552c51927d5a8f8d6a5df90a485abcf1ca66668f934dcb13974439947eb746a724493fcba0ae9a8c2dc0a823c13
-  data.tar.gz: 03d729e57525e13ee9616d5f63e51ea7463c9eb808e8ccb592d4957c937f6d380fb670676cd844304b9d42b4bb3b92c2bb82ca1af944332bd47bf2f0429b0cbf
+  metadata.gz: 5c22343a74c9e31f1f26cbf81a0167380047a2396fd33bce1905f042b5e14bd910a4d34aef08e3bf2c175260a50c8d367321b1d396b176bbf68dc57186f10015
+  data.tar.gz: fc082d7cc0d8fd820e5983c236067533d8287d411aaded59b1f6977caa7e59d7a9afcc0c369e8413b161c5b6eadc98a4c562027a0d5d563a96fe219344e8159d

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/dodgy_stalker.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pg"
   spec.add_development_dependency "database_cleaner"
 
-  spec.add_dependency "activerecord", "~> 4.0"
+  spec.add_dependency "activerecord", ">= 4.0"
   spec.add_dependency "typhoeus"
   spec.add_dependency "addressable"
 end

data/lib/dodgy_stalker/data_store.rb

@@ -4,7 +4,5 @@ module DodgyStalker
 end
 
 require "dodgy_stalker/data_store/common"
-require "dodgy_stalker/data_store/blacklist"
-require "dodgy_stalker/data_store/whitelist"
 require "dodgy_stalker/data_store/wordlist"
 

data/lib/dodgy_stalker/engines.rb

@@ -4,5 +4,4 @@ module DodgyStalker
 end
 
 require 'dodgy_stalker/engines/banned_words'
-require 'dodgy_stalker/engines/blacklist'
 require 'dodgy_stalker/engines/stop_forum_spam'

data/lib/dodgy_stalker/version.rb

@@ -1,3 +1,3 @@
 module DodgyStalker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/generators/dodgy_stalker/templates/migration.rb

@@ -10,27 +10,5 @@ class CreateDodgyStalkerTables < ActiveRecord::Migration
        t.datetime "created_at",                      null: false
        t.datetime "updated_at",                      null: false
      end
-
-     create_table "whitelist", force: true do |t| 
-       t.string   "username"
-       t.string   "email"
-       t.string   "ip_address"
-       t.string   "twitter_uid"
-       t.string   "google_uid"
-       t.string   "facebook_uid"
-       t.datetime "created_at",   null: false
-       t.datetime "updated_at",   null: false
-     end
-
-     create_table "blacklist", force: true do |t|
-       t.string   "username"
-       t.string   "email"
-       t.string   "ip_address"
-       t.string   "twitter_uid"
-       t.string   "google_uid"
-       t.string   "facebook_uid"
-       t.datetime "created_at",   null: false
-       t.datetime "updated_at",   null: false
-     end
   end
 end

data/spec/datastores/wordlist_spec.rb

@@ -7,14 +7,14 @@ describe DodgyStalker::DataStore::Wordlist do
     context "attributes :ban, :hold, :notify" do
       it "toggle one attribute, turn off others" do
         wordlist.toggle('ban')
-        wordlist.ban.should be true
-        wordlist.hold.should be false
-        wordlist.notify.should be false
+        expect(wordlist.ban).to eq(true)
+        expect(wordlist.hold).to eq(false)
+        expect(wordlist.notify).to eq(false)
 
         wordlist.toggle('hold')
-        wordlist.ban.should be false
-        wordlist.hold.should be true
-        wordlist.notify.should be false
+        expect(wordlist.ban).to eq(false)
+        expect(wordlist.hold).to eq(true)
+        expect(wordlist.notify).to eq(false)
       end
     end
   end

data/spec/engines/banned_words_spec.rb

@@ -9,53 +9,54 @@ describe DodgyStalker::Engines::BannedWords do
     it "returns a list of banned words in input" do
       datastore.create(word: 'fuck!', ban: true)
       datastore.create(word: 'ass', ban: true)
-      engine.banned.should =~ ['fuck!', 'ass']
+      expect(engine.banned).to include('fuck!', 'ass')
     end
   end
 
   describe "#blacklisted_email" do
     it "returns a list of blacklisted emails" do
       datastore.create(word: '@wp.pl', blacklist_email: true)
-      described_class.new('piotr@wp.pl').blacklisted_email.should =~ ['@wp.pl']
+      engine = described_class.new('piotr@wp.pl')
+      expect(engine.blacklisted_email).to include('@wp.pl')
     end
   end
 
   describe "#on_hold" do
     it "returns a list of hold words in input" do
       datastore.create(word: 'viagra', hold: true)
-      engine.on_hold.should =~ ['viagra']
+      expect(engine.on_hold).to include('viagra')
     end
   end
 
   describe "#notify" do
     it "returns a list of notify words in input" do
       datastore.create(word: 'underage', notify: true)
-      engine.notify.should =~ ['underage']
+      expect(engine.notify).to include('underage')
     end
   end
 
   describe "#match" do
     it "matches full words (no partials)" do
       datastore.create(word: 'fuck', ban: true)
-      engine.banned.should be_empty
+      expect(engine.banned.size).to eq(0)
     end
 
     it "ignores quotes on matches" do
       datastore.create(word: 'quoted', ban: true)
-      engine.banned.to_a.should have(1).word
+      expect(engine.banned.to_a.size).to eq(1)
     end
 
     it "allows to change word separator via config" do
       old_separator = DodgyStalker::Config.new.word_separator
       DodgyStalker.configure {|c| c.word_separator = %q{(^|\s|\A|\Z|$|\.|,|\+)} }
       datastore.create(word: 'plused', ban: true)
-      engine.banned.to_a.should have(1).word
+      expect(engine.banned.to_a.size). to eq(1)
       DodgyStalker.configure {|c| c.word_separator = old_separator }
     end
 
     it "matches with partials" do
       datastore.create(word: 'fuck', ban: true)
-      engine.to_a(true).should have(1).element
+      expect(engine.to_a(true).size).to eq(1)
     end
   end
 end

data/spec/engines/stop_form_spam_spec.rb

@@ -7,13 +7,13 @@ describe DodgyStalker::Engines::StopForumSpam do
 
   context "when user is in sfs database" do
     it "returns true confidence is above 0.75" do
-      engine.stub(:confidence_for).and_return(0.76)
-      engine.on_blacklist?.should be true
+      allow(engine).to receive(:confidence_for) { 0.76 }
+      expect(engine.on_blacklist?).to eq(true)
     end
 
     it "returns false when confidence is below 0.75" do
-      engine.stub(:confidence_for).and_return(0.74)
-      engine.on_blacklist?.should be false
+      allow(engine).to receive(:confidence_for) { 0.74 }
+      expect(engine.on_blacklist?).to eq(false)
     end
   end
 end

data/spec/policy_spec.rb

@@ -6,12 +6,12 @@ describe DodgyStalker::Policy do
 
   describe "#validate" do
     it "returns true if there are any blacklist results" do
-      policy.validate.should be true
+      expect(policy.validate).to eq(true)
     end
 
     it "returns false if there are no blacklist entries" do
-      policy.stub(:spamcheck_results).and_return([])
-      policy.validate.should be false
+      allow(policy).to receive(:spamcheck_results) { [] }
+      expect(policy.validate).to eq(false)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dodgy_stalker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - robuye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,14 +126,14 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -172,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -181,23 +182,17 @@ files:
 - lib/dodgy_stalker.rb
 - lib/dodgy_stalker/config.rb
 - lib/dodgy_stalker/data_store.rb
-- lib/dodgy_stalker/data_store/blacklist.rb
 - lib/dodgy_stalker/data_store/common.rb
-- lib/dodgy_stalker/data_store/whitelist.rb
 - lib/dodgy_stalker/data_store/wordlist.rb
 - lib/dodgy_stalker/engines.rb
 - lib/dodgy_stalker/engines/banned_words.rb
-- lib/dodgy_stalker/engines/blacklist.rb
 - lib/dodgy_stalker/engines/stop_forum_spam.rb
 - lib/dodgy_stalker/policy.rb
 - lib/dodgy_stalker/version.rb
 - lib/generators/dodgy_stalker/migration_generator.rb
 - lib/generators/dodgy_stalker/templates/migration.rb
-- spec/datastores/blacklist_spec.rb
-- spec/datastores/whitelist_spec.rb
 - spec/datastores/wordlist_spec.rb
 - spec/engines/banned_words_spec.rb
-- spec/engines/blacklist_spec.rb
 - spec/engines/stop_form_spam_spec.rb
 - spec/migrations/001_create_dodgy_stalker_tables.rb
 - spec/policy_spec.rb
@@ -222,16 +217,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Filters to detect spam, trolls and unwanted content
 test_files:
-- spec/datastores/blacklist_spec.rb
-- spec/datastores/whitelist_spec.rb
 - spec/datastores/wordlist_spec.rb
 - spec/engines/banned_words_spec.rb
-- spec/engines/blacklist_spec.rb
 - spec/engines/stop_form_spam_spec.rb
 - spec/migrations/001_create_dodgy_stalker_tables.rb
 - spec/policy_spec.rb

data/lib/dodgy_stalker/data_store/blacklist.rb

@@ -1,9 +0,0 @@
-module DodgyStalker
-  module DataStore
-    class Blacklist < ActiveRecord::Base
-      self.table_name = 'blacklist'
-
-      include Common
-    end
-  end
-end

data/lib/dodgy_stalker/data_store/whitelist.rb

@@ -1,14 +0,0 @@
-module DodgyStalker
-  module DataStore
-    class Whitelist < ActiveRecord::Base
-      self.table_name = 'whitelist'
-
-      include Common
-
-      def on_list(attr)
-        conditions = attributes.with_indifferent_access.except(:id, :created_at, :updated_at).merge(attr)
-        model.where(conditions)
-      end
-    end
-  end
-end

data/lib/dodgy_stalker/engines/blacklist.rb

@@ -1,55 +0,0 @@
-module DodgyStalker
-  module Engines
-    class Blacklist
-      def initialize(attributes)
-        @attributes = attributes
-      end
-
-      def banned_ip?(ip)
-        return false if ip.nil?
-        DataStore::Blacklist.where(ip_address: ip).exists?
-      end
-
-      def on_blacklist?
-        return false if whitelist.on_list(attributes).exists?
-
-        Policy.new(fetched_results).validate
-      end
-
-      def blacklist!(opts={})
-        if (blacklist.add(attributes.merge(opts)) && whitelist.remove(attributes))
-          true
-        else
-          false
-        end
-      end
-
-      #Remove attributes from blacklist and add to whitelist
-      def remove!
-        if (blacklist.remove(attributes) && whitelist.add(attributes))
-          true
-        else
-          false
-        end
-      end
-
-      private
-
-      def fetched_results
-        @fetched_results ||= blacklist.on_list(attributes).to_a
-      end
-
-      def blacklist
-        DataStore::Blacklist.new
-      end
-
-      def whitelist
-        DataStore::Whitelist.new
-      end
-
-      def attributes
-        @attributes
-      end
-    end
-  end
-end

data/spec/datastores/blacklist_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe DodgyStalker::DataStore::Blacklist do
-  let(:list) { described_class.new }
-  let(:user) { double('User', username: 'Rob', email: 'email@domain.com') }
-  let(:attributes) { { email: user.email, username: user.username } }
-
-  describe "#on_list" do
-    it "returns matches for any attributes" do
-      list.add(username: user.username)
-      list.add(email: user.email)
-      list.on_list(attributes).should have(2).entries
-    end
-  end
-
-  describe "#add" do
-    it "adds new entry to blacklist" do
-      expect { list.add(attributes) }.to change { DodgyStalker::DataStore::Blacklist.count }.
-        from(0).to(1)
-    end
-
-    it "does not add duplicates" do
-      list.add(attributes)
-      expect { list.add(attributes) }.to_not change { DodgyStalker::DataStore::Blacklist.count }
-    end
-  end
-
-  describe "#remove" do
-    it "removes user from blacklist" do
-      list.add(attributes)
-      expect { list.remove(attributes) }.to change { DodgyStalker::DataStore::Blacklist.count }.
-        from(1).to(0)
-    end
-
-    it "removes only exact matches" do
-      list.add(attributes.merge(facebook_uid: '123'))
-      expect { list.remove(attributes) }.to_not change { DodgyStalker::DataStore::Blacklist.count }
-    end
-  end
-end

data/spec/datastores/whitelist_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe DodgyStalker::DataStore::Whitelist do
-  let(:list) { described_class.new }
-  let(:user) { double('User', email: 'rob@example.com', username: 'rob') }
-  let(:attributes) { { email: user.email, username: user.username } }
-
-  describe "#on_list" do
-    it "returns only exact matches" do
-      list.add(username: user.username)
-      list.add(email: user.email)
-      list.add(attributes)
-
-      list.on_list(attributes).should have(1).entry
-
-      list.on_list(username: user.username, email: 'mail@domain.com').should have(0).entries
-    end
-  end
-
-  describe "#add" do
-    it "adds new entry to whitelist" do
-      expect { list.add(attributes) }.to change { DodgyStalker::DataStore::Whitelist.count }.
-        from(0).to(1)
-    end
-
-    it "does not add duplicates" do
-      list.add(attributes)
-      expect { list.add(attributes) }.to_not change { DodgyStalker::DataStore::Whitelist.count }
-    end
-  end
-
-  describe "#remove" do
-    it "removes user from whitelist" do
-      list.add(attributes)
-      expect { list.remove(attributes) }.to change { DodgyStalker::DataStore::Whitelist.count }.
-        from(1).to(0)
-    end
-
-    it "removes only exact matches" do
-      list.add(attributes.merge(facebook_uid: '123'))
-      expect { list.remove(attributes) }.to_not change { DodgyStalker::DataStore::Whitelist.count }
-    end
-  end
-end

data/spec/engines/blacklist_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe DodgyStalker::Engines::Blacklist do
-  let(:engine) { described_class.new(attributes) }
-  let(:user)   { double('User', username: 'rob', email: 'rob@example.com') }
-  let(:attributes) { { email: user.email, username: user.username } }
-
-  describe "#on_blacklist?" do
-    context "when there is no whitelist entry" do
-      it "returns true when user is on blacklist" do
-        DodgyStalker::DataStore::Blacklist.new.add(attributes)
-        engine.on_blacklist?.should be true
-      end
-
-      it "returns false when user is not on blacklist" do
-        engine.on_blacklist?.should be false
-      end
-    end
-
-    it "returns false when there is whitelist entry" do
-      DodgyStalker::DataStore::Whitelist.new.add(attributes)
-      DodgyStalker::DataStore::Blacklist.new.add(attributes)
-      engine.on_blacklist?.should be false
-    end
-  end
-
-  describe "#blacklist!" do
-    it "adds user to blacklist" do
-      expect { engine.blacklist! }.to change { DodgyStalker::DataStore::Blacklist.count }.
-        from(0).to(1)
-    end
-
-    it "removes user from whitelist" do
-      DodgyStalker::DataStore::Whitelist.new.add(attributes)
-      expect { engine.blacklist! }.to change { DodgyStalker::DataStore::Whitelist.count }.
-        from(1).to(0)
-    end
-  end
-
-  describe "#banned_ip?" do
-    it "returns false if passed ip is nil" do
-      engine.banned_ip?(nil).should be false
-    end
-
-    it "returns false if IP is not on blacklist" do
-      engine.banned_ip?('0.0.0.0').should be false
-    end
-
-    it "returns true if IP is on blacklist" do
-      DodgyStalker::DataStore::Blacklist.new.add(ip_address: '1.2.3.4')
-      engine.banned_ip?('1.2.3.4').should be true
-    end
-  end
-
-  describe "#remove!" do
-    it "removes the user from blacklist" do
-      DodgyStalker::DataStore::Blacklist.new.add(attributes)
-      expect { engine.remove! }.to change { DodgyStalker::DataStore::Blacklist.count }.
-        from(1).to(0)
-    end
-
-    it "adds the user to whitelist" do
-      expect { engine.remove! }.to change { DodgyStalker::DataStore::Whitelist.count }.
-        from(0).to(1)
-    end
-  end
-end