lib/legitbot/facebook.rb in legitbot-0.2.0 vs lib/legitbot/facebook.rb in legitbot-0.2.1

@@ -1,31 +1,39 @@
-require 'segment_tree'
-require 'irrc'
-require 'monitor'
 require 'ipaddr'
+require 'irrc'
+require 'segment_tree'
 
 module Legitbot
   # https://developers.facebook.com/docs/sharing/webmasters/crawler
 
   class Facebook < BotMatch
-    lock = Monitor.new
-
     AS = 'AS32934'
-    ValidIPs = lock.synchronize do
+
+    def valid?
+      ip = IPAddr.new(@ip)
+      Facebook.valid_ips[ip.ipv4? ? :ipv4 : :ipv6].find(ip)
+    end
+
+    @mutex = Mutex.new
+
+    def self.valid_ips
+      @mutex.synchronize { @ips ||= load_ips }
+    end
+
+    def self.reload!
+      @mutex.synchronize { @ips = load_ips }
+    end
+
+    def self.load_ips
       client = Irrc::Client.new
-      client.query :radb, 'AS32934'
+      client.query :radb, AS
       results = client.perform
 
       Hash[%i(ipv4 ipv6).map { |k|
         [k, SegmentTree.new(results[AS][k][AS].map { |cidr|
             [IPAddr.new(cidr).to_range, true]
           })]
       }]
-    end
-
-    def valid?
-      ip = IPAddr.new(@ip)
-      ValidIPs[ip.ipv4? ? :ipv4 : :ipv6].find(ip)
     end
   end
 
   rule Legitbot::Facebook, %w(facebookhit facebookexternalhit)
 end