grover 1.0.2 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afca67d672e63071ee66a65dc2d2a65e728eb06715b2c59b43cf44dce587ab1c
-  data.tar.gz: 50313e3201d5f1bbbf8e6d9c92147c3ddc373fbdd51145ee3315a616b69b303c
+  metadata.gz: b29220f00e289b012a01c83e1ac3a4d7fe70b034589760f3aea045069127e453
+  data.tar.gz: f90bcb0e42bab405df3d296d4f70221684652d2e523970b9018b3a38737f8694
 SHA512:
-  metadata.gz: f8aa164f8b52ef008c70fe7ff4918194859db0be10cee102556cc67d49fe9cf5035ee181f9dac64dce87dfa7b7295effe090b851504dd9774e33a23ecab7e15e
-  data.tar.gz: cd5b46accc2bbbdc5f3d149d62099c4d47c36744aa877876966680e687bfa0fc69f9ad6045c0a4b9a1e3f135c90279ffd595d526f373daddda02a5fb42db754d
+  metadata.gz: 2415a80b468c7bbe454cf622fbae3b2cef2b7450577f92845e30fbef54d602a3f46dbf4594258053f07badc847c7ab1f3ac53c72f04a385d993b85e054295448
+  data.tar.gz: a928a1f0bc91ba18b7059fd60e44d2348d6727e4cd7d37fbc47e13cf56b1a5e9fa04d6136189a1a3e1a673ab3a86572d5ef58e7e2ca54cc797ab355327c2db37

data/lib/grover/configuration.rb

@@ -5,13 +5,15 @@ class Grover
   # Configuration of the options for Grover HTML to PDF conversion
   #
   class Configuration
-    attr_accessor :options, :meta_tag_prefix, :ignore_path, :root_url,
-                  :use_pdf_middleware, :use_png_middleware, :use_jpeg_middleware
+    attr_accessor :options, :meta_tag_prefix, :ignore_path, :ignore_request,
+                  :root_url, :use_pdf_middleware, :use_png_middleware,
+                  :use_jpeg_middleware
 
     def initialize
       @options = {}
       @meta_tag_prefix = 'grover-'
       @ignore_path = nil
+      @ignore_request = nil
       @root_url = nil
       @use_pdf_middleware = true
       @use_png_middleware = false

data/lib/grover/js/processor.js

@@ -91,7 +91,7 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
     // Emulate the media features, if specified
     const mediaFeatures = options.mediaFeatures; delete options.mediaFeatures;
     if (Array.isArray(mediaFeatures)) {
-      page.emulateMediaFeatures(mediaFeatures);
+      await page.emulateMediaFeatures(mediaFeatures);
     }
 
     // Emulate timezone (if provided)
@@ -100,34 +100,28 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       await page.emulateTimezone(timezone);
     }
 
-    // Emulate vision deficiency (if provided)
-    const visionDeficiency = options.visionDeficiency; delete options.visionDeficiency;
-    if (visionDeficiency !== undefined) {
-      page.emulateVisionDeficiency(type);
-    }
-
     // Bypass CSP (content security policy), if provided
     const bypassCSP = options.bypassCSP; delete options.bypassCSP;
     if (bypassCSP !== undefined) {
-      page.setBypassCSP(bypassCSP);
+      await page.setBypassCSP(bypassCSP);
     }
 
     // Add extra HTTP headers (if provided)
     const extraHTTPHeaders = options.extraHTTPHeaders; delete options.extraHTTPHeaders;
     if (extraHTTPHeaders !== undefined) {
-      page.setExtraHTTPHeaders(extraHTTPHeaders);
+      await page.setExtraHTTPHeaders(extraHTTPHeaders);
     }
 
     // Set geolocation (if provided)
     const geolocation = options.geolocation; delete options.geolocation;
     if (geolocation !== undefined) {
-      page.setGeolocation(geolocation);
+      await page.setGeolocation(geolocation);
     }
 
     const raiseOnRequestFailure = options.raiseOnRequestFailure; delete options.raiseOnRequestFailure;
     if (raiseOnRequestFailure) {
       page.on('requestfinished', (request) => {
-        if (request.response() && !request.response().ok() && !request.redirectChain().length > 0) {
+        if (request.response() && !(request.response().ok() || request.response().status() == 304) && !request.redirectChain().length > 0) {
           errors.push(request);
         }
       });
@@ -145,11 +139,15 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       // Request is some HTML content. Use request interception to assign the body
       requestOptions.waitUntil = waitUntil || 'networkidle0';
       await page.setRequestInterception(true);
-      page.once('request', request => {
-        request.respond({ body: urlOrHtml === '' ? ' ' : urlOrHtml });
-        // Reset the request interception
-        // (we only want to intercept the first request - ie our HTML)
-        page.on('request', request => request.continue());
+      let htmlIntercepted = false;
+      page.on('request', request => {
+        // We only want to intercept the first request - ie our HTML
+        if (htmlIntercepted)
+          request.continue();
+        else {
+          htmlIntercepted = true
+          request.respond({ body: urlOrHtml === '' ? ' ' : urlOrHtml });
+        }
       });
       const displayUrl = options.displayUrl; delete options.displayUrl;
       await page.goto(displayUrl || 'http://example.com', requestOptions);
@@ -197,6 +195,12 @@ const _processPage = (async (convertAction, urlOrHtml, options) => {
       await page.waitForTimeout(waitForTimeout);
     }
 
+    // Emulate vision deficiency (if provided)
+    const visionDeficiency = options.visionDeficiency; delete options.visionDeficiency;
+    if (visionDeficiency !== undefined) {
+      await page.emulateVisionDeficiency(visionDeficiency);
+    }
+
     // If specified, focus on the specified selector
     const focusSelector = options.focus; delete options.focus;
     if (focusSelector !== undefined) {

data/lib/grover/middleware.rb

@@ -56,10 +56,10 @@ class Grover
     end
 
     def grover_request?
-      (pdf_request || png_request || jpeg_request) && !ignore_request?
+      (pdf_request || png_request || jpeg_request) && !ignore_path? && !ignore_request?
     end
 
-    def ignore_request?
+    def ignore_path?
       ignore_path = Grover.configuration.ignore_path
       case ignore_path
       when String then @request.path.start_with? ignore_path
@@ -68,6 +68,13 @@ class Grover
       end
     end
 
+    def ignore_request?
+      ignore_request = Grover.configuration.ignore_request
+      return unless ignore_request.is_a?(Proc)
+
+      ignore_request.call @request
+    end
+
     def html_content?(headers)
       headers['Content-Type'] =~ %r{text/html|application/xhtml\+xml}
     end

data/lib/grover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.6
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf