legitbot 1.1.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ad027c85951667c22f02a0fde2347e5d1503493b07f4f041ab1f0965eae096b
-  data.tar.gz: a967d17674592fb06cefbebf8abe7fce9b72e49281f116ab337d0f888d46d326
+  metadata.gz: 88b7c118fb39080f7bbed1839c41173f67501f816ccc2409378a0c974e353633
+  data.tar.gz: cd97cd5656347126b11999d38c450fd35ce88a523186c01d4a8417aa7bf9edd6
 SHA512:
-  metadata.gz: be5c129e2d5e4f381a056744daa29907da3bb42849ff2ff33b7b45525d1175ad465e01f6f3e1b523b5163608ad747edbebea1c4bd3e355d927b3102ad3dca016
-  data.tar.gz: 9562a862188263637923035e0cc8b533f1f4153bc863c07a1b01538f2487c1052b0c68a4ca00dcf4085eb6a031c2cc92d264985fd429ecf47f8aadd46801eca0
+  metadata.gz: 45cebed5ce8a638612496ca824eb3706e7f198ea4b1a0e394a62eb41b2069d0a28ae44d226897373ef7747dfe44926263dbfc1e6ea2620908c2d341d70f75e09
+  data.tar.gz: d008044692ddfb2dc31b03d3d91eb3c6de3d79f0888e093432a27233d4a8c944e0bc7e951857c8a6663670047f0518565a8f128375ea658ab99c8ba3f1a01723

data/.github/workflows/build.yml

@@ -1,6 +1,10 @@
 name: build
 
-on: [pull_request, push]
+on:
+  pull_request:
+  push:
+  schedule:
+  - cron: '29 6 * * 6'
 
 jobs:
   test:
@@ -9,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ jruby, 2.6 ]
+        ruby: [ jruby, 2.5, 2.6, 2.7 ]
 
     steps:
     - uses: actions/checkout@v2
@@ -37,7 +41,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [ 2.6 ]
+        ruby: [ 2.7 ]
 
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -1,3 +1,10 @@
 AllCops:
   CacheRootDirectory: 'vendor'
   NewCops: enable
+  SuggestExtensions: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4
+2.7.3

data/README.md

@@ -1,4 +1,4 @@
-# Legitbot ![](https://github.com/alaz/legitbot/workflows/build/badge.svg) [![Gem Version](https://badge.fury.io/rb/legitbot.svg)](https://badge.fury.io/rb/legitbot)
+# Legitbot ![](https://github.com/alaz/legitbot/workflows/build/badge.svg) ![](https://badge.fury.io/rb/legitbot.svg)
 
 Ruby gem to check that an IP belongs to a bot, typically a search
 engine. This can be of help in protecting a web site from fake search

data/legitbot.gemspec

@@ -14,13 +14,13 @@ Gem::Specification.new do |spec|
   spec.summary = 'Validate requests from Web crawlers: impersonating or not?'
   spec.description = 'Does Web request come from a real search engine or from an impersonating agent?'
 
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.add_dependency 'augmented_interval_tree', '~> 0.1', '>= 0.1.1'
   spec.add_dependency 'irrc', '~> 0.2', '>= 0.2.1'
   spec.add_development_dependency 'bump', '~> 0.8', '>= 0.8.0'
   spec.add_development_dependency 'minitest', '~> 5.1', '>= 5.1.0'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.90', '< 0.91'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.0'
+  spec.add_development_dependency 'rubocop', '~> 1.15.0', '>= 1.15.0'
 
   spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.rdoc_options = ['--charset=UTF-8']

data/lib/legitbot/apple.rb

@@ -8,13 +8,5 @@ module Legitbot # :nodoc:
     ip_ranges '17.0.0.0/8'
   end
 
-  # https://support.apple.com/en-us/HT204683
-  # rubocop:disable Naming/ClassAndModuleCamelCase
-  class Apple_as_Google < BotMatch
-    ip_ranges '17.0.0.0/8'
-  end
-  # rubocop:enable Naming/ClassAndModuleCamelCase
-
   rule Legitbot::Apple, %w[Applebot]
-  rule Legitbot::Apple_as_Google, %w[Googlebot]
 end

data/lib/legitbot/duckduckgo.rb

@@ -4,14 +4,15 @@ module Legitbot # :nodoc:
   # https://duckduckgo.com/duckduckbot
   class DuckDuckGo < BotMatch
     ip_ranges %w[
+      20.191.45.212
       23.21.227.69
       40.88.21.235
       50.16.241.113
       50.16.241.114
       50.16.241.117
       50.16.247.234
-      52.204.97.54
       52.5.190.19
+      52.204.97.54
       54.197.234.188
       54.208.100.253
       54.208.102.37

data/lib/legitbot/validators/ip_ranges.rb

@@ -40,7 +40,7 @@ module Legitbot
 
           obj = IPAddr.new(ip)
           ranges = valid_ips[obj.ipv4? ? :ipv4 : :ipv6].search(obj.to_i)
-          !ranges.empty?
+          !ranges.nil? && !ranges.empty?
         end
 
         def valid_ips

data/lib/legitbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Legitbot
-  VERSION = '1.1.0'
+  VERSION = '1.4.1'
 end

data/test/legitbot/validators/ip_ranges_test.rb

@@ -51,6 +51,11 @@ module Legitbot
       ip_ranges { nil }
     end
 
+    class Ipv4Ranges
+      include IpRanges
+      ip_ranges { ['66.220.144.0/21'] }
+    end
+
     class IpRangesTest < Minitest::Test
       def test_partition_method
         empty = NoRanges.partition_ips([])
@@ -117,6 +122,10 @@ module Legitbot
       def test_nil_ranges
         assert NilRanges.valid_ip?('127.0.0.1')
       end
+
+      def test_ipv4_only_ranges
+        refute Ipv4Ranges.valid_ip?('2a03:2880:f234:0:0:0:0:1')
+      end
     end
   end
 end

data/test/pinterest_test.rb

@@ -34,7 +34,7 @@ class PinterestTest < Minitest::Test
     assert bot.valid?, msg: 'Valid Pinterest'
   end
 
-  # rubocop:disable Metrics/LineLength
+  # rubocop:disable Layout/LineLength
   def test_android_not_bot
     bot = Legitbot.bot(
       'Mozilla/5.0 (Linux; Android 8.0.0; SM-G965F Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.64 Mobile Safari/537.36 [Pinterest/Android]',
@@ -42,7 +42,7 @@ class PinterestTest < Minitest::Test
     )
     assert_nil bot
   end
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 
   def test_engine_name
     bot = Legitbot.bot(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legitbot
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Alexander Azarov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: augmented_interval_tree
@@ -96,40 +96,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.90'
-    - - "<"
+        version: 1.15.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.91'
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.90'
-    - - "<"
+        version: 1.15.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.91'
+        version: 1.15.0
 description: Does Web request come from a real search engine or from an impersonating
   agent?
 email: self@alaz.me
@@ -168,7 +168,6 @@ files:
 - lib/legitbot/yandex.rb
 - test/ahrefs_test.rb
 - test/alexa_test.rb
-- test/apple_as_google_test.rb
 - test/apple_test.rb
 - test/botmatch_test.rb
 - test/facebook_test.rb
@@ -192,14 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: 'Validate requests from Web crawlers: impersonating or not?'
@@ -211,7 +210,6 @@ test_files:
 - test/alexa_test.rb
 - test/ahrefs_test.rb
 - test/apple_test.rb
-- test/apple_as_google_test.rb
 - test/oracle_test.rb
 - test/google_test.rb
 - test/botmatch_test.rb

data/test/apple_as_google_test.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-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