antispam 0.2.8 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68d75de5897063bea19649fbf62e3e75c56196412003615d22c1bf6d465150e
-  data.tar.gz: 5e731f9168becf1eb99e28bcd29b2b2b5d72cd251f6e08bcd2efccecdeb0139b
+  metadata.gz: deb7098b89c7771c3a67061353ea1333960830b49a5181487ae0ffddb5aaab40
+  data.tar.gz: 7ada271f3c917b2869cb4a92fa7d5b70606d9c5020c4d4eb5e44934d25abcad9
 SHA512:
-  metadata.gz: 6a1395289f3440fc68ff37f25bf33611a1d871bd70524d98e20d5ed1152939e94225eadfbf800ed28edadef06b7e14596cfd5ca7a6ec722a5532c81fb882e6f6
-  data.tar.gz: 1d33c4449ef09163e9454a36db0e82df7b5723ad429b9fef17467181394f6a231d4cf654549e86385f5b1bc7d9aacfb69a9b394bea76fa6e0439b2ab5082d36e
+  metadata.gz: d3ef0076d08ed077460f8b98f90b38b4bcada5a6c50916a8fada274afea6c3786f04ce311471aace68a39dd732193c09cb15b2afa43ce5502ee577a5c3fe70e5
+  data.tar.gz: 41eda0779322117d6a2235b5ef8a5303e3ce6d7c9dcb66cecae9b2252d98b793364a9e6014f51858419a84a2f39896b44549462d1e8f91608248c35d2a88e29e

data/README.md

@@ -108,7 +108,7 @@ You need to add this to your routes.rb
 Then add to your application controller:
 ```
 before_action do
-  check_ip_against_database({ip_blacklists: {default: 'your_api_key_here'}, verbose: true})
+  check_ip_against_database(ip_blacklists: {default: 'your_api_key_here'}, verbose: true)
 end
 ```
 

data/lib/antispam/tools.rb

@@ -2,33 +2,37 @@ module Antispam
   module Tools
     # Checks spam against an IP database of spammers.
     # Usage: before_action :check_ip_against_database
-    def check_ip_against_database(options = {ip_blacklists: {default: ''}})
-      if (options[:methods])
-        return if request.get? unless options[:methods].include?(:get)
-        return if request.post? unless options[:methods].include?(:post)
-        return if request.put? unless options[:methods].include?(:put)
-        return if request.patch? unless options[:methods].include?(:patch)
-        return if request.delete? unless options[:methods].include?(:delete)
+    def check_ip_against_database(
+        ip_blacklists: { default: '' },
+        methods: nil,
+        scrutinize_countries_except: nil,
+        verbose: false
+      )
+      if methods
+        return if request.get? && !methods.include?(:get)
+        return if request.post? && !methods.include?(:post)
+        return if request.put? && !methods.include?(:put)
+        return if request.patch? && !methods.include?(:patch)
+        return if request.delete? && !methods.include?(:delete)
       else
         return if request.get?
       end
+    
       return if skip_if_user_whitelisted
-      return if controller_name.in?["validate","challenges"]
+      return if controller_name.in?(%w[validate challenges])
+    
       ip = request.remote_ip
-      # First, check IP blacklists.
-      if (options[:ip_blacklists])
-        if options[:ip_blacklists][:default]
-          options[:ip_blacklists][:httpbl] = options[:ip_blacklists][:default]
-          options[:ip_blacklists].delete(:default)
-        end
-        check_ip_against_blacklists(ip, options[:ip_blacklists], options[:verbose])
-      end
-      # Second, check for weird countries.
-      if (options[:scrutinize_countries_except])
-
+    
+      # Handle IP blacklists
+      if ip_blacklists
+        ip_blacklists[:httpbl] ||= ip_blacklists.delete(:default)
+        check_ip_against_blacklists(ip, ip_blacklists, verbose)
       end
-      Rails.logger.info "Completed IP database check. #{ip}" if options[:verbose]
-    end
+    
+      # Country checks, if necessary
+      # (expand logic as needed)
+      Rails.logger.info "Completed IP database check. #{ip}" if verbose
+    end    
     # Checks the specific blacklists
     def check_ip_against_blacklists(ip, lists, verbose)
       results = []

data/lib/antispam/version.rb

@@ -1,3 +1,3 @@
 module Antispam
-  VERSION = '0.2.8'
+  VERSION = '0.2.11'
 end

data/lib/antispam.rb

@@ -8,14 +8,6 @@ require "antispam/results"
 
 module Antispam
   ActiveSupport.on_load(:action_controller_base) do
-    # Include Antispam::Tools into the application's ApplicationController
-    # Use ::ApplicationController to reference the top-level class
-    if defined?(::ApplicationController)
-      ::ApplicationController.include Antispam::Tools
-    else
-      Rails.application.config.to_prepare do
-        ::ApplicationController.include Antispam::Tools
-      end
-    end
+    ActionController::Base.include Antispam::Tools
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: antispam
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.11
 platform: ruby
 authors:
 - Ryan Kopf