repsheet_visualizer 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    repsheet_visualizer (0.0.8)
+    repsheet_visualizer (0.1.3)
       geoip
       json
       redis

data/lib/repsheet_visualizer/application/app.rb

@@ -47,25 +47,42 @@ class RepsheetVisualizer < Sinatra::Base
     suspects = {}
     blacklisted = {}
 
-    connection.keys("*:requests").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
-      detected = connection.smembers("#{actor}:detected").join(", ")
-      blacklist = connection.get("#{actor}:repsheet:blacklist")
-
-      if !detected.empty? && blacklist != "true"
+    if connection.exists("offenders")
+      connection.zrevrangebyscore("offenders", "+inf", "0").each do |actor|
         suspects[actor] = Hash.new 0
-        suspects[actor][:detected] = detected
-        connection.smembers("#{actor}:detected").each do |rule|
-          suspects[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
-        end
+        suspects[actor][:detected] = connection.smembers("#{actor}:detected").join(", ")
+        suspects[actor][:total] = connection.zscore("offenders", actor)
       end
 
-      if blacklist == "true"
+      connection.keys("*:*:blacklist").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
+        connection.get("#{actor}:repsheet:blacklist") == "true"
         blacklisted[actor] = Hash.new 0
-        blacklisted[actor][:detected] = detected
+        blacklisted[actor][:detected] = connection.smembers("#{actor}:detected").join(", ")
         connection.smembers("#{actor}:detected").each do |rule|
           blacklisted[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
         end
       end
+    else
+      connection.keys("*:requests").map {|d| d.split(":").first}.reject {|ip| ip.empty?}.each do |actor|
+        detected = connection.smembers("#{actor}:detected").join(", ")
+        blacklist = connection.get("#{actor}:repsheet:blacklist")
+
+        if !detected.empty? && blacklist != "true"
+          suspects[actor] = Hash.new 0
+          suspects[actor][:detected] = detected
+          connection.smembers("#{actor}:detected").each do |rule|
+            suspects[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
+          end
+        end
+
+        if blacklist == "true"
+          blacklisted[actor] = Hash.new 0
+          blacklisted[actor][:detected] = detected
+          connection.smembers("#{actor}:detected").each do |rule|
+            blacklisted[actor][:total] += connection.get("#{actor}:#{rule}:count").to_i
+          end
+        end
+      end
     end
 
     [suspects.sort_by{|k,v| -v[:total]}.take(10), blacklisted]

data/lib/repsheet_visualizer/version.rb

@@ -1,3 +1,3 @@
 module RepsheetVisualizer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repsheet_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoip