html-proofer 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b2c47bd5d3ea56e4d6f2a5f4ee3ba01ed43b337
-  data.tar.gz: 381527e029581dcb0249372f345d838a2950f136
+  metadata.gz: e3e81446e89bd9cd6e2bb65fdc374f02304c1d9f
+  data.tar.gz: f0fdfa24b5c7a5e8e5b2934adbc060f6ecbb9582
 SHA512:
-  metadata.gz: 0a72bfe1b0702177843865d6b36008a1136a1e8366c37ffce4ea37a91d8dc876e394167328a77068ae1f2b70d2fa48f7fa0bcd82d0d8b7518d219949ae8cd056
-  data.tar.gz: 25a3d37a3dcf3ff4f8ea439ac1344bdac5f55b4d5621017f7b8b22d4e963fb5f7c8e49d774a223a251117e7407afad464aae471839bdb04f4174edaa3f170370
+  metadata.gz: 36b29e1f9bcc2a498fed44d1a0ddb3bfd725b2061b4a9d5493827238967ef74201209f5b1c103bf672ec6edab7de866d0dc94f40fe8c5a05891f2086f9fc9051
+  data.tar.gz: 0781163094e5a85ddde161a2e1e5b07b9fbe3903f004ec8766cb838f52048668b86a6212413b3c6974a2365f72359036f4c5bcc741a9634e5e2e2f5396af048c

data/lib/html/proofer.rb

@@ -22,7 +22,7 @@ module HTML
   class Proofer
     include HTML::Proofer::Utils
 
-    attr_reader :options, :typhoeus_opts, :hydra_opts, :parallel_opts, :validation_opts, :external_urls
+    attr_reader :options, :typhoeus_opts, :hydra_opts, :parallel_opts, :validation_opts, :external_urls, :iterable_external_urls
 
     TYPHOEUS_DEFAULTS = {
       :followlocation => true,
@@ -147,6 +147,7 @@ module HTML
     def validate_urls
       url_validator = HTML::Proofer::UrlValidator.new(logger, @external_urls, @options, @typhoeus_opts, @hydra_opts)
       @failed_tests.concat(url_validator.run)
+      @iterable_external_urls = url_validator.iterable_external_urls
     end
 
     def files

data/lib/html/proofer/check_runner.rb

@@ -24,7 +24,6 @@ module HTML
         @alt_ignores = @options[:alt_ignore]
         @empty_alt_ignore = @options[:empty_alt_ignore]
         @external_urls = {}
-        @external_domain_paths_with_queries = {}
       end
 
       def run
@@ -37,13 +36,7 @@ module HTML
 
       def add_to_external_urls(url, line)
         return if @external_urls[url]
-        uri = Addressable::URI.parse(url)
-
-        if uri.query.nil?
-          add_path_for_url(url)
-        else
-          new_url_query_values?(uri, url)
-        end
+        add_path_for_url(url)
       end
 
       def add_path_for_url(url)
@@ -54,26 +47,6 @@ module HTML
         end
       end
 
-      def new_url_query_values?(uri, url)
-        queries = uri.query_values.keys.join('-')
-        domain_path = extract_domain_path(uri)
-        if @external_domain_paths_with_queries[domain_path].nil?
-          add_path_for_url(url)
-          # remember queries we've seen, ignore future ones
-          @external_domain_paths_with_queries[domain_path] = [queries]
-        else
-          # add queries we haven't seen
-          unless @external_domain_paths_with_queries[domain_path].include?(queries)
-            add_path_for_url(url)
-            @external_domain_paths_with_queries[domain_path] << queries
-          end
-        end
-      end
-
-      def extract_domain_path(uri)
-        uri.host + uri.path
-      end
-
       def self.checks
         classes = []
 

data/lib/html/proofer/url_validator.rb

@@ -7,22 +7,55 @@ module HTML
     class UrlValidator
       include HTML::Proofer::Utils
 
-      attr_accessor :logger, :external_urls, :hydra
+      attr_accessor :logger, :external_urls, :iterable_external_urls, :hydra
 
       def initialize(logger, external_urls, options, typhoeus_opts, hydra_opts)
         @logger = logger
         @external_urls = external_urls
+        @iterable_external_urls = {}
         @failed_tests = []
         @options = options
         @hydra = Typhoeus::Hydra.new(hydra_opts)
         @typhoeus_opts = typhoeus_opts
+        @external_domain_paths_with_queries = {}
       end
 
       def run
-        external_link_checker(external_urls)
+        @iterable_external_urls = remove_query_values
+        external_link_checker(@iterable_external_urls)
         @failed_tests
       end
 
+      def remove_query_values
+        return if @external_urls.nil?
+        iterable_external_urls = @external_urls.dup
+        @external_urls.keys.each do |url|
+          uri = Addressable::URI.parse(url)
+          next if uri.query.nil?
+          iterable_external_urls.delete(url) unless new_url_query_values?(uri)
+        end
+        iterable_external_urls
+      end
+
+      # remember queries we've seen, ignore future ones
+      def new_url_query_values?(uri)
+        queries = uri.query_values.keys.join('-')
+        domain_path = extract_domain_path(uri)
+        if @external_domain_paths_with_queries[domain_path].nil?
+          @external_domain_paths_with_queries[domain_path] = [queries]
+          true
+        elsif !@external_domain_paths_with_queries[domain_path].include?(queries)
+          @external_domain_paths_with_queries[domain_path] << queries
+          true
+        else
+          false
+        end
+      end
+
+      def extract_domain_path(uri)
+        uri.host + uri.path
+      end
+
       # Proofer runs faster if we pull out all the external URLs and run the checks
       # at the end. Otherwise, we're halting the consuming process for every file during
       # the check_directory_of_files process.

data/lib/html/proofer/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Proofer
-    VERSION = '2.5.0'
+    VERSION = '2.5.1'
   end
 end

data/spec/html/proofer/links_spec.rb

@@ -371,6 +371,6 @@ describe 'Links test' do
   it 'does not check links with parameters multiple times' do
     fixture = "#{FIXTURES_DIR}/links/check_just_once.html"
     proofer = run_proofer(fixture)
-    expect(proofer.external_urls.length).to eq 2
+    expect(proofer.iterable_external_urls.length).to eq 2
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Garen Torikian