selenium_download_helper 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa84829d0e2102bcba993d16dfad54b041afb314f99a271e8f2575398d1ad413
-  data.tar.gz: e4512c0f922cec27f3bfa779d8531a6cebdb95f1132caa5b74cce96891692ff6
+  metadata.gz: def57c20317984adb28e0c8172d28df8bb4e476725670ad5419da5220db6d8a0
+  data.tar.gz: 3c540b24dcbb3f3ad6deb2076dcd7bcce80369a86f94b5607a31079f601482e6
 SHA512:
-  metadata.gz: 97a0da523c03be13c9fba644030934346382c2cbc78b7f927a14a2e359076188301249ef8589659faec89b7d4e54dbdc21cc70947a387ef8ad029031c8dd852e
-  data.tar.gz: 6e3cd2dc07cfcc004803e3b08332321b0a064fdf648ec9e955f6c98e77f12c35604c936f29036f55e6cd51747c6da490ace90a9e2ef1c04556fa43e866e9ab45
+  metadata.gz: 165cdbdc81f4669786265d56cd9772d3ea1a53be066f14f1ecf902437f45fd880d42682651ee6fc3aa2e6cffa711dab2e6f761e68ab42190b53d96ca9657ceb8
+  data.tar.gz: 45290576fb05da2cdb4cfa14aa5c738253302fc2ec60362194de1445359a0db8aa5f3e638e82f8d49f25310b23046eebad4a642c8f08f20fc7322de64584ea95

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    selenium_download_helper (1.1.0)
+    selenium_download_helper (1.2.1)
       rails (>= 7.0)
       selenium-webdriver
 
@@ -119,12 +119,8 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.14.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     psych (5.1.2)
       stringio

data/lib/selenium_download_helper/errors.rb

@@ -0,0 +1,12 @@
+module SeleniumDownloadHelper
+  class TimeoutError < StandardError
+    def initialize(error, download_path)
+      @download_path = download_path
+      super("#{error.message}\nDownloaded files:\n#{downloaded_files.join("\n")}")
+    end
+
+    def downloaded_files
+      Dir[File.join(@download_path, '*')]
+    end
+  end
+end

data/lib/selenium_download_helper/version.rb

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

data/lib/selenium_download_helper.rb

@@ -5,10 +5,14 @@ require 'fileutils'
 require 'selenium-webdriver'
 require 'active_support/concern'
 require_relative 'selenium_download_helper/version'
+require_relative 'selenium_download_helper/errors'
 
 module SeleniumDownloadHelper
   extend ActiveSupport::Concern
 
+  TEMPORARY_DOWNLOAD_FILENAME_PATTERN = /(\.crdownload|^downloads.html)$/
+
+
   included do
     after(:all) do
       FileUtils.rm_rf(base_download_dir)
@@ -21,6 +25,8 @@ module SeleniumDownloadHelper
     yield
     Selenium::WebDriver::Wait.new(timeout: timeout, interval: interval).until { downloaded?(download_path, filename:) }
     downloaded_files(download_path, filename:).then { |files| all ? files : files.first }
+  rescue Selenium::WebDriver::Error::TimeoutError => e
+    raise TimeoutError.new(e, download_path)
   end
 
   private
@@ -37,11 +43,11 @@ module SeleniumDownloadHelper
     def downloaded_files(download_path, filename: nil)
       Dir[File.join(download_path, '*')]
         .map { |filepath| Pathname.new(filepath) }
+        .reject { |file| TEMPORARY_DOWNLOAD_FILENAME_PATTERN.match?(file.basename.to_s) }
         .select { |file| filename.nil? || filename === file.basename.to_s }
     end
 
     def downloaded?(download_path, filename: nil)
-      files = downloaded_files(download_path, filename:)
-      files.map(&:to_s).grep(/\.crdownload$/).none? && files.any?
+      downloaded_files(download_path, filename:).any?
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selenium_download_helper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - aki77
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,6 +58,7 @@ files:
 - bin/console
 - bin/setup
 - lib/selenium_download_helper.rb
+- lib/selenium_download_helper/errors.rb
 - lib/selenium_download_helper/version.rb
 - selenium_download_helper.gemspec
 homepage: https://github.com/SonicGarden/selenium_download_helper