✨ switch to "interval_tree" library to search IP in ranges [story #10]

legitbot.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
   spec.add_dependency "irrc", ">= 0.2.1"
-  spec.add_dependency "segment_tree"
+  spec.add_dependency "augmented_interval_tree", ">= 0.1.1"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
 

lib/legitbot/facebook.rb

@@ -1,6 +1,6 @@
 require 'ipaddr'
 require 'irrc'
-require 'segment_tree'
+require 'interval_tree'
 
 module Legitbot
   # https://developers.facebook.com/docs/sharing/webmasters/crawler
@@ -10,7 +10,7 @@ class Facebook < BotMatch
 
     def valid?
       ip = IPAddr.new(@ip)
-      Facebook.valid_ips[ip.ipv4? ? :ipv4 : :ipv6].find(ip)
+      Facebook.valid_ips[ip.ipv4? ? :ipv4 : :ipv6].search(ip.to_i).size > 0
     end
 
     @mutex = Mutex.new
@@ -24,21 +24,24 @@ def self.reload!
     end
 
     def self.load_ips
-      w = whois
-
-      Hash[%i(ipv4 ipv6).map { |k|
-        [k, SegmentTree.new(w[k].map { |cidr|
-            [IPAddr.new(cidr).to_range, true]
-          })]
-      }]
+      whois.transform_values do |records|
+        ranges = records.map do |cidr|
+          range = IPAddr.new(cidr).to_range
+          (range.begin.to_i..range.end.to_i)
+        end
+        IntervalTree::Tree.new(ranges)
+      end
     end
 
     def self.whois
       client = Irrc::Client.new
       client.query :radb, AS
       results = client.perform
 
-      { ipv4: results[AS][:ipv4][AS], ipv6: results[AS][:ipv6][AS] }
+      %i(ipv4 ipv6).map do |family|
+        [family, results[AS][family][AS]]
+      end.to_h
+      # { ipv4: results[AS][:ipv4][AS], ipv6: results[AS][:ipv6][AS] }
     end
   end