grover 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 605a1ddd3d51f652e03c28d8f6ab97b45e9f026884da2ea4772b57fc83287dd2
-  data.tar.gz: c4bc0069f551b4e15df0b59b42175b20bc3d8130fb2981b947b832e0f2e48e14
+  metadata.gz: a1de71127ef3e7173bce45deeec104ec9c876dea335ad73dfc80016da64c64f7
+  data.tar.gz: 50dce7d9aa7ef01e12144f303868667e4d6587d0dc9a7be337c34d9679e483c0
 SHA512:
-  metadata.gz: cfdb35168bba8db20bc0ba7cf027d13ebb61670f2a89f059710129cdd3c7460f0b95f80a0cc7fbd2f334ca25348e733eccd1ce00bd380e6d65282e3018161572
-  data.tar.gz: '08cdc3c9c5ce2bf8c3d9c7d155db3cb558dd77e718008f7c8d5662188bf78071b611e3ad3aa2b3f32800b6595c492222c6f1a99768a2be983aa4e5e7f37b12f5'
+  metadata.gz: '084b8e564818202eead00cb7faef9c181e5bd394e41113fb4b87233fa9fe44ed434318240034a375f20799af909a647fc8dd816f9d74aa79ad101efaa329387f'
+  data.tar.gz: 5f03611f7f945dac5b75424bc879f90e639f4a97430759028f3cf36727c4c490813dc15fc68271767b1996716278484eae0d7383a42741fbd24f2d572124d4e2

data/lib/grover/js/processor.cjs

@@ -16,35 +16,46 @@ const path = require('path');
 
 const _processPage = (async (convertAction, urlOrHtml, options) => {
   let browser, errors = [], tmpDir;
-  try {
-    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'grover-'));
-
-    const launchParams = {
-      args: process.env.GROVER_NO_SANDBOX === 'true' ? ['--no-sandbox', '--disable-setuid-sandbox'] : [],
-      userDataDir: tmpDir
-    };
 
+  try {
     // Configure puppeteer debugging options
     const debug = options.debug; delete options.debug;
-    if (typeof debug === 'object' && !!debug) {
-      if (debug.headless !== undefined) { launchParams.headless = debug.headless; }
-      if (debug.devtools !== undefined) { launchParams.devtools = debug.devtools; }
-    }
-
-    // Configure additional launch arguments
-    const args = options.launchArgs; delete options.launchArgs;
-    if (Array.isArray(args)) {
-      launchParams.args = launchParams.args.concat(args);
-    }
+    const browserWsEndpoint = options.browserWsEndpoint; delete options.browserWsEndpoint;
+    if (typeof browserWsEndpoint === "string") {
+      const connectParams = {
+        browserWSEndpoint: browserWsEndpoint,
+      };
 
-    // Set executable path if given
-    const executablePath = options.executablePath; delete options.executablePath;
-    if (executablePath) {
-      launchParams.executablePath = executablePath;
+      browser = await puppeteer.connect(connectParams);
+    } else {
+      tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'grover-'));
+
+      const launchParams = {
+        args: process.env.GROVER_NO_SANDBOX === 'true' ? ['--no-sandbox', '--disable-setuid-sandbox'] : [],
+        userDataDir: tmpDir
+      };
+  
+      if (typeof debug === 'object' && !!debug) {
+        if (debug.headless !== undefined) { launchParams.headless = debug.headless; }
+        if (debug.devtools !== undefined) { launchParams.devtools = debug.devtools; }
+      }
+  
+      // Configure additional launch arguments
+      const args = options.launchArgs; delete options.launchArgs;
+      if (Array.isArray(args)) {
+        launchParams.args = launchParams.args.concat(args);
+      }
+  
+      // Set executable path if given
+      const executablePath = options.executablePath; delete options.executablePath;
+      if (executablePath) {
+        launchParams.executablePath = executablePath;
+      }
+  
+      // Launch the browser and create a page
+      browser = await puppeteer.launch(launchParams);
     }
 
-    // Launch the browser and create a page
-    browser = await puppeteer.launch(launchParams);
     const page = await browser.newPage();
 
     // Basic auth

data/lib/grover/middleware.rb

@@ -70,7 +70,7 @@ class Grover
 
     def ignore_request?
       ignore_request = Grover.configuration.ignore_request
-      return unless ignore_request.is_a?(Proc)
+      return false unless ignore_request.is_a?(Proc)
 
       ignore_request.call @request
     end

data/lib/grover/options_builder.rb

@@ -8,7 +8,8 @@ class Grover
   # Build options from Grover.configuration, meta_options, and passed-in options
   #
   class OptionsBuilder < Hash
-    def initialize(options, url) # rubocop:disable Lint/MissingSuper
+    def initialize(options, url)
+      super()
       @url = url
       combined = grover_configuration
       Utils.deep_merge! combined, Utils.deep_stringify_keys(options)

data/lib/grover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.18'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -208,14 +250,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+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