grover 0.5.5 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b134a553f30ceb3fa72cc1699eaa46457dc055
-  data.tar.gz: d927e1b38d32982d7578657c67fb4ccfcd664e8a
+  metadata.gz: 6c26dbbef85a97e2a0efaaac225c73ef4621c3a2
+  data.tar.gz: 644ba163ea5e742ae0f9b245ed1d5a7381968865
 SHA512:
-  metadata.gz: 80630d162e38555c0eec975009ade34104fcaa21addb3b2215ff57dc9f46625d5335254827161aa3d0654413e237d7cb775999709a5f1051ecf691f31f2bd912
-  data.tar.gz: 32bf0d1016b22a24877404052165226c104c0f90bad13298fb69feeb18cfcb295f93ad80b02328ff137fd0448d1b1fac26d2c659511cc5cf120d877e3b1fcaf7
+  metadata.gz: 6eb0f8320d0fe7d53c13b9474a014cc9ab1fab300d70ef15c8dae1d6dfd45569005a3073f5339882b28898d6d297b26329c28a152dd9ae6a709bfc9e6de31d5d
+  data.tar.gz: 8135ebc0aae3ba810577be644f2efd184d799f79c943dd8c07d431eb9d1e8fb8eff8fa5a2b3277b17c01cd7554de907abd4b0570304588c99ac55c6782f87eb5

data/lib/grover.rb

@@ -24,37 +24,52 @@ class Grover
       ENV['CI'] == 'true' ? "{args: ['--no-sandbox', '--disable-setuid-sandbox']}" : ''
     end
 
-    method :convert_pdf, Utils.squish(<<-FUNCTION)
-      async (url, options) => {
+    method :convert_pdf, <<-FUNCTION
+      async (url_or_html, options) => {
         let browser;
         try {
+          // Launch the browser and create a page
           browser = await puppeteer.launch(#{launch_params});
           const page = await browser.newPage();
 
+          // Set caching flag (if provided)
           const cache = options.cache; delete options.cache;
-          if (cache != undefined) { 
+          if (cache != undefined) {
             await page.setCacheEnabled(cache);
           }
 
+          // Setup timeout option (if provided)
           let request_options = {};
           const timeout = options.timeout; delete options.timeout;
           if (timeout != undefined) {
             request_options.timeout = timeout;
           }
 
-          if (url.match(/^http/i)) {
+          if (url_or_html.match(/^http/i)) {
+            // Request is for a URL, so request it
             request_options.waitUntil = 'networkidle2';
-            await page.goto(url, request_options);
+            await page.goto(url_or_html, request_options);
           } else {
+            // Request is some HTML content. Use request interception to assign the body
             request_options.waitUntil = 'networkidle0';
-            await page.goto(`data:text/html,${url}`, request_options);
+            await page.setRequestInterception(true);
+            page.once('request', request => {
+              request.respond({ body: url_or_html });
+              // Reset the request interception
+              // (we only want to intercept the first request - ie our HTML)
+              page.on('request', request => request.continue());
+            });
+            const displayUrl = options.displayUrl; delete options.displayUrl;
+            await page.goto(displayUrl || 'http://example.com', request_options);
           }
 
+          // If specified, emulate the media type
           const emulateMedia = options.emulateMedia; delete options.emulateMedia;
           if (emulateMedia != undefined) {
             await page.emulateMedia(emulateMedia);
           }
 
+          // Return the converted PDF
           return await page.pdf(options);
         } finally {
           if (browser) {
@@ -66,11 +81,9 @@ class Grover
   end
   private_constant :Processor
 
-  DISPLAY_URL_PLACEHOLDER = '{{display_url}}'.freeze
-
   DEFAULT_HEADER_TEMPLATE = "<div class='date text left'></div><div class='title text center'></div>".freeze
   DEFAULT_FOOTER_TEMPLATE = Utils.strip_heredoc(<<-HTML).freeze
-    <div class='text left grow'>#{DISPLAY_URL_PLACEHOLDER}</div>
+    <div class='url text left grow'></div>
     <div class='text right'><span class='pageNumber'></span>/<span class='totalPages'></span></div>
   HTML
 
@@ -159,7 +172,6 @@ class Grover
     Utils.deep_merge! combined, Utils.deep_stringify_keys(options)
     Utils.deep_merge! combined, meta_options unless url_source?
 
-    fix_templates! combined
     fix_boolean_options! combined
     fix_numeric_options! combined
 
@@ -190,19 +202,6 @@ class Grover
     @url.match(/^http/i)
   end
 
-  def fix_templates!(options)
-    display_url = options.delete 'display_url'
-    return unless display_url
-
-    options['footer_template'] ||= DEFAULT_FOOTER_TEMPLATE
-
-    %w[header_template footer_template].each do |key|
-      next unless options[key].is_a? ::String
-
-      options[key] = options[key].gsub(DISPLAY_URL_PLACEHOLDER, display_url)
-    end
-  end
-
   def fix_boolean_options!(options)
     %w[display_header_footer print_background landscape prefer_css_page_size].each do |opt|
       next unless options.key? opt

data/lib/grover/version.rb

@@ -1,3 +1,3 @@
 class Grover
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Bromwich