grover 1.0.6 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29220f00e289b012a01c83e1ac3a4d7fe70b034589760f3aea045069127e453
-  data.tar.gz: f90bcb0e42bab405df3d296d4f70221684652d2e523970b9018b3a38737f8694
+  metadata.gz: b99e2ab2724c1384347e40dd33199bd943fd4ec371f0cbf1c539ce6e3cca81f7
+  data.tar.gz: eb96813f2e5ef10d50ce5b1dfe4bb0cfaffc54d7dd212c10901e7f85ff8b9fdf
 SHA512:
-  metadata.gz: 2415a80b468c7bbe454cf622fbae3b2cef2b7450577f92845e30fbef54d602a3f46dbf4594258053f07badc847c7ab1f3ac53c72f04a385d993b85e054295448
-  data.tar.gz: a928a1f0bc91ba18b7059fd60e44d2348d6727e4cd7d37fbc47e13cf56b1a5e9fa04d6136189a1a3e1a673ab3a86572d5ef58e7e2ca54cc797ab355327c2db37
+  metadata.gz: 633d31ee5053ec6d6c00f0e0ac2e68c0a5768cfbf201be61b56e35b6912d1f8f1720e56457eb8fb212bd85842a74a16e3a4d806f2dccfd166223df0ffae3163d
+  data.tar.gz: 714be51eb85beae33685cf8d11812fbb62fa3dfaec16a5da599ec96b26982c3dacdf916630eed9775567275cdee229c780a00a79435be9b1237ba38ec6e72381

data/lib/grover/js/{processor.js → processor.cjs}

@@ -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/middleware.rb

@@ -117,7 +117,7 @@ class Grover
       end
       options[:cookies] = cookies if cookies.any?
 
-      Grover.new(body, options)
+      Grover.new(body, **options)
     end
 
     def add_cover_content(grover)

data/lib/grover/processor.rb

@@ -33,7 +33,7 @@ class Grover
     def spawn_process
       @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(
         'node',
-        File.expand_path(File.join(__dir__, 'js/processor.js')),
+        File.expand_path(File.join(__dir__, 'js/processor.cjs')),
         chdir: app_root
       )
     end

data/lib/grover/version.rb

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

data/lib/grover.rb

@@ -32,7 +32,7 @@ class Grover
   # @param [Hash] options Optional parameters to pass to PDF processor
   #   see https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#pagepdfoptions
   #
-  def initialize(url, options = {})
+  def initialize(url, **options)
     @url = url.to_s
     @options = OptionsBuilder.new(options, @url)
     @root_path = @options.delete 'root_path'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrew Bromwich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -170,7 +170,7 @@ files:
 - lib/grover/configuration.rb
 - lib/grover/errors.rb
 - lib/grover/html_preprocessor.rb
-- lib/grover/js/processor.js
+- lib/grover/js/processor.cjs
 - lib/grover/middleware.rb
 - lib/grover/options_builder.rb
 - lib/grover/options_fixer.rb
@@ -180,8 +180,10 @@ files:
 homepage: https://github.com/Studiosity/grover
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,18 +191,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+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