antispam 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9976b110e83413c117ba4e2aadebe3ee782a2e22075b4d005b8ee23f859b6c
-  data.tar.gz: b103e465db532012980a7a37e01d0b337a11bf58c5182e6951471ee2a344c427
+  metadata.gz: deb7098b89c7771c3a67061353ea1333960830b49a5181487ae0ffddb5aaab40
+  data.tar.gz: 7ada271f3c917b2869cb4a92fa7d5b70606d9c5020c4d4eb5e44934d25abcad9
 SHA512:
-  metadata.gz: c74852eabd842ab4d54b5dc99cc99224ee40c930d4a1e047a77506c3cc4a6a04bb445c0a92d3946dbdbf81116c1f9334046e4631574af9001b4b13bfee8eebaf
-  data.tar.gz: 34c5bd57b1db3f574f16a7b467a9e16fb3eb01271a172491eca71d6362f454f8df42cd4c468bfa7059e72466904fbe778f5e26aa7748f29c45bf53820ffb72bf
+  metadata.gz: d3ef0076d08ed077460f8b98f90b38b4bcada5a6c50916a8fada274afea6c3786f04ce311471aace68a39dd732193c09cb15b2afa43ce5502ee577a5c3fe70e5
+  data.tar.gz: 41eda0779322117d6a2235b5ef8a5303e3ce6d7c9dcb66cecae9b2252d98b793364a9e6014f51858419a84a2f39896b44549462d1e8f91608248c35d2a88e29e

data/lib/antispam/tools.rb

@@ -8,32 +8,31 @@ module Antispam
         scrutinize_countries_except: nil,
         verbose: false
       )
-      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)
+      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.10'
+  VERSION = '0.2.11'
 end

metadata

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