legitbot 1.0.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0b43dcf4386a8427415729bf9ba5edfe3c0efc24a002bb4301ff98d43c4ee0d
-  data.tar.gz: 9f18f03e613473a97cda23e8663d44da10cfd32b3fd271e1ffd5ee20cfdef48d
+  metadata.gz: 783bc47b1bc8f80e5d4818f150663a2cb6fb90e5dd2378bae456eb2fb1d78823
+  data.tar.gz: 0e274e1eaa295ffa0e00a8d6e2884194ed53108da9ecb75c3ef2ef4746048c9e
 SHA512:
-  metadata.gz: 73ad2e000c4513880bc5558c7fe5f7c7c04d01b1a820ef7b12541c8c9d6cc5dddd20c785d67ef489d5b00664632c6b88a805c3bb1e2a060517126c7d7292d661
-  data.tar.gz: a578a30a512495523e906ec1d6a650f4f472a58856caa542714d3e57a0b99f764ee015f11624c4a20cae79a3975eb41eaf8ced106977dd994981d71c288b5653
+  metadata.gz: ec7c2f2cb78cc8a586a35bea72e39b12835679089f4b4d5cba754aa0caccee0c9e8c1c94461a7fd8fcb1cf4f8195f196346ea4abe7bd96a080c5c831f9d68c7a
+  data.tar.gz: a92ea8ff049127871988e8dbad7cb76b3c53f13dde97a157509e9013898c1da2cc3e573ae695d9af2e82372bf478348aeca6ec77a673798b52ac1e3ab623e214

data/.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2

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/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.0.2'
+  VERSION = '1.4.0'
 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.0.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexander Azarov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-05-28 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
@@ -137,6 +137,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".github/workflows/build.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -167,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
@@ -191,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?'
@@ -210,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