legitbot 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9624f762d4c29b00c2baf6f53ec6f6dacaec29d4
-  data.tar.gz: e6c2650c5471cb9075e9450fd8a5894f074ee05b
+  metadata.gz: '09d1957d911120207a2518f7ddd87673fb780206'
+  data.tar.gz: 7a8acb9e1bca9d0f409d84055a029baadf9a6c03
 SHA512:
-  metadata.gz: dfa1e4d4ec277f2785e49f5af55a630aed08271fa4c7dd24d93d2155d8da8f9522947169a392a2111d6519ab74a0fa3d6410f184f7f67e067403c421ab56ecc7
-  data.tar.gz: f3e765ee7215424adc1a91e990734bc8409634e321a0c2c37dab83e426c438be7134f432cf0424097489d7ce2397fd4a56711da3349f84cbef83ef26aace1f22
+  metadata.gz: 6372a1064b86b8a63e043fd0e737c5a87c394f0dd601bf96fe9d9d5945002ed286ce5f84928f3cfb7fb894d9cf3c7e7c970c6b4a59aef729f19100ffa484e4a1
+  data.tar.gz: c4538f8f81fdb71aa65dff43ea41c49c2bd51de9c664778bf2d86b7ca0483de614330dac32fde87db5933a2781e4e21fd6862e1b4ecf4d8be16c83932384f062

data/.gitignore

@@ -2,4 +2,5 @@ Gemfile.lock
 .bundle
 *.gem
 *.gemfile.lock
+/pkg
 /tags

data/README.md

@@ -17,7 +17,7 @@ bot = Legitbot.bot(userAgent, ip)
 it will be an instance with methods
 
 ```ruby
-bot.detected_as # => "Google"
+bot.detected_as # => :google
 bot.valid? # => true
 bot.fake? # => false
 ```
@@ -42,13 +42,6 @@ end
 * [Pinterest](https://help.pinterest.com/en/articles/about-pinterest-crawler-0)
 * [Yandex robots](https://yandex.com/support/webmaster/robot-workings/check-yandex-robots.xml)
 
-## Issues, problems, plans
-
-* Rails middleware
-* More testing for Facebook
-* Make it possible to reload Facebook IP ranges
-* Bots masquerading as someone else, e.g. `Telegram (like Twitter)` - what to do?
-
 ## License
 
 Apache 2.0

data/lib/legitbot/apple.rb

@@ -12,5 +12,9 @@ module Legitbot
     end
   end
 
+  class Apple_as_Google < Apple
+  end
+
   rule Legitbot::Apple, %w(Applebot)
+  rule Legitbot::Apple_as_Google, %w(Googlebot)
 end

data/lib/legitbot/botmatch.rb

@@ -43,7 +43,7 @@ module Legitbot
     end
 
     def detected_as
-      self.class.name.split('::').last
+      self.class.name.split('::').last.downcase.to_sym
     end
 
     def fake?

data/lib/legitbot/legitbot.rb

@@ -11,12 +11,15 @@ module Legitbot
   # :yields: a found bot
   #
   def self.bot(userAgent, ip, resolver_config = nil)
-    bot =
+    bots =
       @rules.select { |rule|
         rule[:fragments].any? {|f| userAgent.index f}
       }.map { |rule|
         rule[:class].new(ip, resolver_config)
-      }.first
+      }
+
+    bot = bots.select { |bot| bot.valid? }.first if bots.size > 1
+    bot = bots.first if bot.nil?
 
     if bot && block_given?
       yield bot

data/lib/legitbot/version.rb

@@ -1,3 +1,3 @@
 module Legitbot
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/test/apple_as_google_test.rb

@@ -0,0 +1,22 @@
+require 'minitest/autorun'
+require 'legitbot'
+
+class AppleAsGoogleTest < Minitest::Test
+  def test_valid_ip
+    ip = "17.58.98.60"
+    match = Legitbot::Apple_as_Google.new(ip)
+    assert match.valid?, msg: "#{ip} is a valid Applebot IP"
+  end
+
+  def test_invalid_ip
+    ip = "127.0.0.1"
+    match = Legitbot::Apple_as_Google.new(ip)
+    assert match.fake?, msg: "#{ip} is a fake Applebot IP"
+  end
+
+  def test_user_agent
+    bot = Legitbot.bot("Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)", "17.58.98.60")
+    assert_equal :apple_as_google, bot.detected_as
+    assert bot.valid?, msg: "A valid Applebot User-agent and IP"
+  end
+end

data/test/apple_test.rb

@@ -16,7 +16,7 @@ class AppleTest < Minitest::Test
 
   def test_user_agent
     bot = Legitbot.bot("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/8.0.2 Safari/600.2.5 (Applebot/0.1; +http://www.apple.com/go/applebot)", "17.58.98.60")
-    assert_equal "Apple", bot.detected_as
+    assert_equal :apple, bot.detected_as
     assert bot.valid?, msg: "A valid Applebot User-agent and IP"
   end
 end

data/test/facebook_test.rb

@@ -16,7 +16,7 @@ class FacebookTest < Minitest::Test
 
   def test_user_agent
     bot = Legitbot.bot("facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)", "31.13.76.56")
-    assert_equal "Facebook", bot.detected_as
+    assert_equal :facebook, bot.detected_as
     assert bot.valid?, msg: "A valid Facebook User-agent and IP"
   end
 end

data/test/google_test.rb

@@ -32,6 +32,6 @@ class GoogleTest < Minitest::Test
 
   def test_engine_name
     bot = Legitbot.bot("Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)", "66.249.64.141")
-    assert_equal "Google", bot.detected_as
+    assert_equal :google, bot.detected_as
   end
 end

data/test/pinterest_test.rb

@@ -32,6 +32,6 @@ class PinterestTest < Minitest::Test
 
   def test_engine_name
     bot = Legitbot.bot("Mozilla/5.0 (compatible; Pinterestbot/1.0; +https://www.pinterest.com/bot.html)", "54.236.1.11")
-    assert_equal "Pinterest", bot.detected_as
+    assert_equal :pinterest, bot.detected_as
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legitbot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Azarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irrc
@@ -92,6 +92,7 @@ files:
 - lib/legitbot/pinterest.rb
 - lib/legitbot/version.rb
 - lib/legitbot/yandex.rb
+- test/apple_as_google_test.rb
 - test/apple_test.rb
 - test/botmatch_test.rb
 - test/facebook_test.rb
@@ -127,6 +128,7 @@ test_files:
 - test/legitbot_test.rb
 - test/pinterest_test.rb
 - test/apple_test.rb
+- test/apple_as_google_test.rb
 - test/google_test.rb
 - test/botmatch_test.rb
 - test/facebook_test.rb