flavicon 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e563783a7460208b999fa27b864ed99b5601a14530013b1305aa4d7756f88fa3
-  data.tar.gz: 8da3ccc3dc46b41051f86ee134fd9607c84addae46b11ec1d75382a544d36ea9
+  metadata.gz: 7f1322382cafcb279436a2b1cb8acd95929d37f4a088033852f0c3f29bb1f0f1
+  data.tar.gz: 447b61454abd88505d85befda16f41593f3cfa596a984f0691577c03b3e361c4
 SHA512:
-  metadata.gz: 9e91756d0691ed894ce82608842f06e67a9a8489a655e0329e07e6797662780a8ac40352c135ed96fd429888e3e512b7094f6dfa9994113b6b267cf1aff8d978
-  data.tar.gz: 4e66b54722a0754f412ee4f46ac4f72d8a0f6ca652918917b1e6297529334d1a0816aadbc1507ae52bc9d25f73a2fa4271a96707391bb3edd795fd5c06259fd8
+  metadata.gz: 6530105b3ee054b15ecf6b161d268107ed33d31fbc6556e7f251a9c9c745d295481321f10025b67139e53d4fe1095f23e226232c9e00145817eda1e3799b4b9d
+  data.tar.gz: 12b79a6b748350435e9b5f0d6d436bfce14ddeae60eb1a222a8a6a882466eb416ec14c843ea4f26be438b3245344e161e7911ae67f8319aa51d002037952e5b9

data/.github/workflows/linters.yml

@@ -0,0 +1,25 @@
+name: Linters
+
+on: [pull_request]
+
+jobs:
+  ruby:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+
+      - name: RuboCop Linter
+        uses: reviewdog/action-rubocop@v2.1.0
+        with:
+          rubocop_version: gemfile
+          rubocop_extensions: rubocop-rspec:gemfile
+          rubocop_flags: '--parallel --force-exclusion'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Brakeman Linter
+        uses: reviewdog/action-brakeman@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 3.0
+          - 3.1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests with RSpec
+        uses: paambaati/codeclimate-action@v2.5.4
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        with:
+          coverageCommand: bundle exec rspec
+          debug: false

data/.rubocop.yml

@@ -1,9 +1,10 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.6
+  NewCops: enable
+  TargetRubyVersion: 2.7
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Style/Documentation:

data/.ruby-version

@@ -1 +1 @@
-2.6.2
+3.1.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.1.0

data/Gemfile.lock

@@ -1,36 +1,37 @@
 PATH
   remote: .
   specs:
-    flavicon (0.2.0)
+    flavicon (0.3.0)
       nokogiri (~> 1.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    coderay (1.1.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    coderay (1.1.3)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.3)
-    docile (1.3.1)
-    hashdiff (0.4.0)
-    jaro_winkler (1.5.2)
-    json (2.2.0)
-    method_source (0.8.2)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    public_suffix (3.1.0)
-    rainbow (3.0.0)
+    docile (1.4.0)
+    hashdiff (1.0.1)
+    method_source (1.0.0)
+    mini_portile2 (2.7.1)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rainbow (3.1.1)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -44,26 +45,29 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.33.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-rspec (2.7.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.5.0)
-    unicode-display_width (1.6.0)
-    webmock (3.6.0)
-      addressable (>= 2.3.6)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -75,9 +79,9 @@ DEPENDENCIES
   flavicon!
   pry (~> 0)
   rspec (~> 3.8)
-  rubocop-rspec (~> 1.33)
-  simplecov (~> 0.16)
+  rubocop-rspec (~> 2)
+  simplecov (~> 0.21)
   webmock (~> 3.6)
 
 BUNDLED WITH
-   2.0.1
+   2.3.4

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/flavicon.gemspec

@@ -12,9 +12,12 @@ Gem::Specification.new do |spec|
 
   spec.summary = 'fetch favicon url for provided url'
   spec.description = 'fetch favicon url by parsing html and falling back on /favicon.ico as default'
-  spec.homepage = 'http://github.com/hasghari/flavicon'
+  spec.homepage = 'https://github.com/hasghari/flavicon'
   spec.license = 'MIT'
 
+  spec.required_ruby_version = '>= 2.7'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -25,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry', '~> 0'
   spec.add_development_dependency 'rspec', '~> 3.8'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.33'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
   spec.add_development_dependency 'webmock', '~> 3.6'
 end

data/lib/flavicon/finder.rb

@@ -16,8 +16,10 @@ module Flavicon
 
     def find
       response, resolved = request(url)
-      favicon_url = extract_from_html(response.body, resolved) || default_path(resolved)
-      verify_favicon_url(favicon_url)
+
+      extract_from_html(response.body, resolved)
+        .push(default_path(resolved))
+        .find { |url| verify_favicon_url(url) }
     end
 
     def verify_favicon_url(url)
@@ -28,18 +30,16 @@ module Flavicon
     end
 
     def extract_from_html(html, url)
-      link = Nokogiri::HTML(html).css('head link').find do |node|
-        node[:rel] =~ /\A(shortcut )?icon\z/i
+      Nokogiri::HTML(html).css('head link').filter_map do |node|
+        URI.join(url, node[:href]).to_s if node[:rel] =~ /\A(shortcut )?icon\z/i
       end
-
-      URI.join(url, link[:href]).to_s if link
     end
 
     def default_path(url)
       URI.join(url, '/favicon.ico').to_s
     end
 
-    # rubocop:disable Metrics/AbcSize,MethodLength
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def request(url, limit = 10)
       raise TooManyRedirects if limit.negative?
 
@@ -60,7 +60,7 @@ module Flavicon
         [response, url]
       end
     end
-    # rubocop:enable Metrics/AbcSize,MethodLength
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
 
     # While the soon-to-be obsolete IETF standard RFC 2616 (HTTP 1.1) requires a complete absolute URI for redirection,
     # the most popular web browsers tolerate the passing of a relative URL as the value for a Location header field.

data/lib/flavicon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flavicon
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flavicon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hamed Asghari
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -117,12 +117,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/linters.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -133,11 +134,12 @@ files:
 - lib/flavicon.rb
 - lib/flavicon/finder.rb
 - lib/flavicon/version.rb
-homepage: http://github.com/hasghari/flavicon
+homepage: https://github.com/hasghari/flavicon
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,15 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: fetch favicon url for provided url
 test_files: []

data/.ruby-gemset

@@ -1 +0,0 @@
-flavicon

data/.travis.yml

@@ -1,21 +0,0 @@
----
-sudo: false
-env:
-  global:
-    - CC_TEST_REPORTER_ID=e365747cb5bcc556a4ce69b2deca895b8cc1a39601d63db9e3e82c83c9c9b39e
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-cache: bundler
-before_install: gem install bundler -v 2.0.1
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rspec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT