bpalmen-httpbl 0.1.4 → 0.1.5

data/lib/httpbl.rb

@@ -8,12 +8,9 @@ class HttpBL
     @options = {:blocked_search_engines => [],
                 :age_threshold => 10,
                 :threat_level_threshold => 2,
-                # 8..128 aren't used as of 3/2009, but might be used in the future
-                :deny_types => [1, 2, 4, 8, 16, 32, 64, 128],
-                # DONT set this to 0
+                :deny_types => [1, 2, 4, 8, 16, 32, 64, 128], # 8..128 aren't used as of 3/2009, but might be used in the future
                 :dns_timeout => 0.5,
-                :memcached_server => nil,
-                :memcached_options => {}
+                :memcached_server => nil
                 }.merge(options)
     raise "Missing :api_key for Http:BL middleware" unless @options[:api_key]
     if @options[:memcached_server]
@@ -45,7 +42,7 @@ class HttpBL
     cache = @cache.clone if @cache
     unless response = cache.get("httpbl_#{ip}")
       response = resolve(ip)
-      cache.set("httpbl_#{ip}", response, 1.hour)
+      cache.set("httpbl_#{ip}", (response || "0.0.0.0"), 1.hour)
     end
     return response
   end
@@ -63,14 +60,11 @@ class HttpBL
     response = response.split('.').collect!(&:to_i)
     if response[0] == 127 
       if response[3] == 0
-        @blocked = true if @options[:blocked_search_engines].include? response[2]
+        @blocked = @options[:blocked_search_engines].include?(response[2])
       else 
-        @age = true if response[1] < @options[:age_threshold]
-        @threat = true if response[2] > @options[:threat_level_threshold]
-        @options[:deny_types].each do |key|
-          @deny = true if response[3] & key == key  
-        end
-        @blocked = true if @deny and @threat and @age
+        @blocked = @options[:deny_types].collect{|key| response[3] & key == key }.any?
+        @blocked = @blocked and response[2] > @options[:threat_level_threshold] 
+        @blocked = @blocked and response[1] < @options[:age_threshold]
       end
     end
     return @blocked

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bpalmen-httpbl
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Brandon Palmen