metainspector 5.12.1 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76e4a31936e8935cf4e2e2959fe490fcf2b35cfdd60f7ed0fc20d583eb9ac81
-  data.tar.gz: 1aac8bdb3d9f1291209ae90b0c6fd472cdc6d5e0d7ecdcf8bf858bb9123feb65
+  metadata.gz: 865fdc9794d9a0d76d8b4c99b0bc33e95c562062966d5281dc3d820f20cff900
+  data.tar.gz: 83ac1d870d8e063b2541dc49554429485adf9b5379d8d0bc9f0fb7ff16c9d083
 SHA512:
-  metadata.gz: ed3788b68ee35ba1d48861d9d9cf336772dc3c59172ab0e0a0d9191923dc139786a0487d72fec3c61f59ce38478189de2bed85e064dafbf5422041d6005f1957
-  data.tar.gz: b708194681779875e1b8e0ab33b56275e2313f2271554ab19641dc8da0c5bfb5b7c02006146e589d8973080bc782b4fcf56da1be748c9db91809280f92aafd67
+  metadata.gz: 2dca757795ccc5a8949c25f15425d39353907718a17f8c24a3b10fc88e51d5d5918f052c6128bc0cabf05f0c94f39d8d06a1d629ae91fd8c7dfa3dc3f4c34089
+  data.tar.gz: 398f9a981d22b083e4279b393ebf37f72e7d7cd7133844d38170e183afed248da4d803a4474a0da9a797cdcbf163b743aabb7c074e40f0f9cfe02beda86f4b28

data/.circleci/config.yml

@@ -4,7 +4,7 @@ orbs:
 jobs:
   test_2_6:
     docker:
-      - image: cimg/ruby:2.6.9
+      - image: cimg/ruby:2.6.10
     steps:
       - checkout
       - ruby/install-deps
@@ -13,7 +13,7 @@ jobs:
           command: bundle exec rake
   test_2_7:
     docker:
-      - image: cimg/ruby:2.7.5
+      - image: cimg/ruby:2.7.6
     steps:
       - checkout
       - ruby/install-deps
@@ -22,7 +22,16 @@ jobs:
           command: bundle exec rake
   test_3_0:
     docker:
-      - image: cimg/ruby:3.0.3
+      - image: cimg/ruby:3.0.4
+    steps:
+      - checkout
+      - ruby/install-deps
+      - run:
+          name: Run tests
+          command: bundle exec rake
+  test_3_1:
+    docker:
+      - image: cimg/ruby:3.1.2
     steps:
       - checkout
       - ruby/install-deps
@@ -35,4 +44,5 @@ workflows:
     jobs:
       - test_2_6
       - test_2_7
-      - test_3_0
+      - test_3_0
+      - test_3_1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # MetaInpector Changelog
 
+## [Changes in 5.13.0](https://github.com/metainspector/metainspector/compare/v5.12.1...v5.13.0)
+
+* Remove support for #feed that was deprecated in 5.9
+* Add support for Ruby 3.1
+
+## [Changes in 5.12.1](https://github.com/metainspector/metainspector/compare/v5.12.0...v5.12.1)
+
+* Update dependencies: rubocop, nokogiri
+
 ## [Changes in 5.12.0](https://github.com/metainspector/metainspector/compare/v5.11.2...v5.12.0)
 
 * Support Ruby 3.0

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    metainspector (5.12.1)
-      addressable (~> 2.7)
-      faraday (>= 1.4, < 3.0)
+    metainspector (5.13.0)
+      addressable (~> 2.8)
+      faraday (~> 2.5)
       faraday-cookie_jar (~> 0.0)
       faraday-encoding (~> 0.0)
-      faraday-http-cache (~> 2.2)
-      faraday_middleware (~> 1.0)
+      faraday-follow_redirects (~> 0.3)
+      faraday-gzip (~> 0.1)
+      faraday-http-cache (~> 2.4)
+      faraday-retry (~> 2.0)
       fastimage (~> 2.2)
       nesty (~> 1.0)
-      nokogiri (~> 1.11)
+      nokogiri (~> 1.13)
 
 GEM
   remote: http://rubygems.org/
@@ -25,58 +27,46 @@ GEM
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.5.1)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
     faraday-encoding (0.0.5)
       faraday
-    faraday-excon (1.1.0)
-    faraday-http-cache (2.2.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-gzip (0.1.0)
+      faraday (>= 1.0)
+      zlib (~> 2.1)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-net_http (3.0.0)
+    faraday-retry (2.0.0)
+      faraday (~> 2.0)
     fastimage (2.2.6)
     hashdiff (1.0.1)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
+    json (2.6.2)
     method_source (1.0.0)
-    multipart-post (2.1.1)
+    mini_portile2 (2.8.0)
     nesty (1.0.2)
-    nokogiri (1.13.5-arm64-darwin)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.3.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -87,31 +77,33 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.29.0)
+    rubocop (1.34.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rubocop-ast (>= 1.20.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
-    unicode-display_width (2.1.0)
-    webmock (3.14.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.2.0)
+    webmock (3.17.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zlib (2.1.1)
 
 PLATFORMS
   ruby
@@ -121,9 +113,9 @@ DEPENDENCIES
   metainspector!
   pry (~> 0.14)
   rake (~> 13.0)
-  rspec (~> 3.10)
-  rubocop (~> 1.16)
-  webmock (~> 3.13)
+  rspec (~> 3.11)
+  rubocop (~> 1.34)
+  webmock (~> 3.17)
 
 BUNDLED WITH
-   2.2.32
+   2.3.20

data/lib/meta_inspector/document.rb

@@ -75,7 +75,6 @@ module MetaInspector
         'links'            => links.to_hash,
         'images'           => images.to_a,
         'charset'          => charset,
-        'feed'             => feed,
         'feeds'            => feeds,
         'content_type'     => content_type,
         'meta_tags'        => meta_tags,

data/lib/meta_inspector/parsers/head_links.rb

@@ -40,14 +40,6 @@ module MetaInspector
             }
           end.compact
       end
-
-      def feed
-        warn "DEPRECATION: Use MetaInspector#feeds instead of #feed. The former gives you all feeds and their metadata, the latter will be removed."
-        @feed ||= begin
-          first_feed = feeds.find { |l| /\/(rss|atom)\+xml$/i =~ l[:type] } || {}
-          first_feed[:href]
-        end
-      end
     end
   end
 end

data/lib/meta_inspector/request.rb

@@ -1,9 +1,10 @@
 require 'faraday'
-require 'faraday_middleware'
-require 'faraday_middleware/response/follow_redirects'
 require 'faraday-cookie_jar'
 require 'faraday-http-cache'
 require 'faraday/encoding'
+require 'faraday/follow_redirects'
+require 'faraday/gzip'
+require 'faraday/retry'
 require 'timeout'
 
 module MetaInspector
@@ -48,7 +49,7 @@ module MetaInspector
       @response ||= fetch
     rescue Faraday::TimeoutError => e
       raise MetaInspector::TimeoutError.new(e)
-    rescue Faraday::ConnectionFailed, Faraday::SSLError, URI::InvalidURIError, FaradayMiddleware::RedirectLimitReached => e
+    rescue Faraday::ConnectionFailed, Faraday::SSLError, URI::InvalidURIError, Faraday::FollowRedirects::RedirectLimitReached => e
       raise MetaInspector::RequestError.new(e)
     end
 
@@ -61,10 +62,10 @@ module MetaInspector
         session = Faraday.new(@faraday_options) do |faraday|
           faraday.request :retry, max: @retries
 
-          faraday.use FaradayMiddleware::Gzip
+          faraday.request :gzip
 
           if @allow_redirections
-            faraday.use FaradayMiddleware::FollowRedirects, limit: 10
+            faraday.use Faraday::FollowRedirects::Middleware, limit: 10
             faraday.use :cookie_jar
           end
 

data/lib/meta_inspector/version.rb

@@ -1,3 +1,3 @@
 module MetaInspector
-  VERSION = '5.12.1'
+  VERSION = '5.13.0'
 end

data/meta_inspector.gemspec

@@ -14,20 +14,22 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MetaInspector::VERSION
 
-  gem.add_dependency 'nokogiri', '~> 1.11'
-  gem.add_dependency 'faraday', '>= 1.4', '< 3.0'
-  gem.add_dependency 'faraday_middleware', '~> 1.0'
+  gem.add_dependency 'nokogiri', '~> 1.13'
+  gem.add_dependency 'faraday', '~> 2.5'
   gem.add_dependency 'faraday-cookie_jar', '~> 0.0'
-  gem.add_dependency 'faraday-http-cache', '~> 2.2'
   gem.add_dependency 'faraday-encoding', '~> 0.0'
-  gem.add_dependency 'addressable', '~> 2.7'
+  gem.add_dependency 'faraday-follow_redirects', '~> 0.3'
+  gem.add_dependency 'faraday-gzip', '~> 0.1'
+  gem.add_dependency 'faraday-http-cache', '~> 2.4'
+  gem.add_dependency 'faraday-retry', '~> 2.0'
+  gem.add_dependency 'addressable', '~> 2.8'
   gem.add_dependency 'fastimage', '~> 2.2'
   gem.add_dependency 'nesty', '~> 1.0'
 
-  gem.add_development_dependency 'rspec', '~> 3.10'
-  gem.add_development_dependency 'webmock', '~> 3.13'
+  gem.add_development_dependency 'rspec', '~> 3.11'
+  gem.add_development_dependency 'webmock', '~> 3.17'
   gem.add_development_dependency 'awesome_print', '~> 1.9'
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'pry', '~> 0.14'
-  gem.add_development_dependency 'rubocop', '~> 1.16'
+  gem.add_development_dependency 'rubocop', '~> 1.34'
 end

data/spec/document_spec.rb

@@ -43,7 +43,6 @@ describe MetaInspector::Document do
                                                   },
                             "images"          => ["http://pagerankalert.com/images/pagerank_alert.png?1305794559"],
                             "charset"         => "utf-8",
-                            "feed"            => "http://feeds.feedburner.com/PageRankAlert",
                             "feeds"           => [{href: "http://feeds.feedburner.com/PageRankAlert", title: "PageRankAlert.com blog", type: "application/rss+xml"}],
                             "h1"              => [],
                             "h2"              => ["Track your PageRank changes"],

data/spec/meta_inspector/links_spec.rb

@@ -238,16 +238,5 @@ describe MetaInspector do
         expect(@m.feeds).to eq([])
       end
     end
-
-    describe "#feed" do
-      it "should return the first feed's href" do
-        expect(meta.feed).to eq("https://example.org/feed.rss")
-      end
-
-      it "should give a deprecation warning" do
-        warning = "DEPRECATION: Use MetaInspector#feeds instead of #feed. The former gives you all feeds and their metadata, the latter will be removed.\n"
-        expect { meta.feed }.to output(warning).to_stderr
-      end
-    end
   end
 end

data/spec/request_spec.rb

@@ -77,21 +77,13 @@ describe MetaInspector::Request do
       WebMock.disable_net_connect!
     end
 
-    it "should handle socket errors" do
-      allow(TCPSocket).to receive(:open).and_raise(SocketError)
+    it "should handle connection errors" do
+      expect(Net::HTTP).to receive(:new).and_raise(Faraday::ConnectionFailed)
 
       expect do
         MetaInspector::Request.new(url('http://example.com/fail'))
       end.to raise_error(MetaInspector::RequestError)
     end
-
-    it "should handle ssl errors" do
-      allow(TCPSocket).to receive(:open).and_raise(OpenSSL::SSL::SSLError)
-
-      expect do
-        MetaInspector::Request.new(url('https://example.com'))
-      end.to raise_error(MetaInspector::RequestError)
-    end
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metainspector
 version: !ruby/object:Gem::Version
-  version: 5.12.1
+  version: 5.13.0
 platform: ruby
 authors:
 - Jaime Iniesta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,50 +16,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: faraday-cookie_jar
+  name: faraday-encoding
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -72,48 +66,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: faraday-gzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: faraday-encoding
+  name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -148,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.17'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.34'
 description: MetaInspector lets you scrape a web page and get its links, images, texts,
   meta tags...
 email: jaimeiniesta@gmail.com
@@ -360,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: MetaInspector is a ruby gem for web scraping purposes, that returns metadata