grover 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29220f00e289b012a01c83e1ac3a4d7fe70b034589760f3aea045069127e453
-  data.tar.gz: f90bcb0e42bab405df3d296d4f70221684652d2e523970b9018b3a38737f8694
+  metadata.gz: 5d224c5c20b4f34007c3da6532eeb42a475d0414a3bfda677aecfad7fc088dc9
+  data.tar.gz: b4927a9fdc5e36a0a51f84c31fea04272f21a6bf527d9dba17f3d64f4414559a
 SHA512:
-  metadata.gz: 2415a80b468c7bbe454cf622fbae3b2cef2b7450577f92845e30fbef54d602a3f46dbf4594258053f07badc847c7ab1f3ac53c72f04a385d993b85e054295448
-  data.tar.gz: a928a1f0bc91ba18b7059fd60e44d2348d6727e4cd7d37fbc47e13cf56b1a5e9fa04d6136189a1a3e1a673ab3a86572d5ef58e7e2ca54cc797ab355327c2db37
+  metadata.gz: a3b24e4d736c50fe1ca8d733ada21012335695449bce33e3f3994966c069f22c93fb519bd7a7a0ca9f681767830cf863e902a718e2318dd7fe76c5e54ac5c882
+  data.tar.gz: f1adbfea289dcc577908132f51c609f6c37d9cf2623c6f9c573079a20151c2f49c7a28401e32d50a49f3416c3d340ef08a4608110ab8dd18c844aa6e755974d9

data/lib/grover/js/processor.js

@@ -61,9 +61,10 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
 
     // Setup timeout option (if provided)
     let requestOptions = {};
-    const timeout = options.timeout; delete options.timeout;
-    if (timeout !== undefined) {
-      requestOptions.timeout = timeout;
+    let requestTimeout = options.requestTimeout; delete options.requestTimeout;
+    if (requestTimeout === undefined) requestTimeout = options.timeout;
+    if (requestTimeout !== undefined) {
+      requestOptions.timeout = requestTimeout;
     }
 
     // Setup user agent (if provided)
@@ -121,7 +122,7 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
     const raiseOnRequestFailure = options.raiseOnRequestFailure; delete options.raiseOnRequestFailure;
     if (raiseOnRequestFailure) {
       page.on('requestfinished', (request) => {
-        if (request.response() && !(request.response().ok() || request.response().status() == 304) && !request.redirectChain().length > 0) {
+        if (request.response() && !(request.response().ok() || request.response().status() === 304) && !request.redirectChain().length > 0) {
           errors.push(request);
         }
       });
@@ -230,6 +231,12 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       throw new RequestFailedError(errors);
     }
 
+    // Setup conversion timeout
+    if (options.convertTimeout !== undefined) {
+      options.timeout = options.convertTimeout;
+      delete options.convertTimeout;
+    }
+
     // If we're running puppeteer in headless mode, return the converted PDF
     if (debug === undefined || (typeof debug === 'object' && (debug.headless === undefined || debug.headless))) {
       return await page[convertAction](options);

data/lib/grover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Grover
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Bromwich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -181,7 +181,7 @@ homepage: https://github.com/Studiosity/grover
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A Ruby gem to transform HTML into PDF, PNG or JPEG by wrapping the NodeJS
   Google Puppeteer driver for Chromium