grover 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f700a9f110114c8de7c64f68ada3c60b183e002
-  data.tar.gz: 10038b11d2dc0e3a7deb9c8be59c17ce9fe75f5a
+  metadata.gz: c7d5ea905a539c2326c8f58e7bade296648fa300
+  data.tar.gz: c87e18907dab9181629998302b3e88b90c064f58
 SHA512:
-  metadata.gz: '08d9ea6100709712c0ac3a3adaf6c00c80ae45fca0fe38176d808e4f4c89efe8b900128d750056ca9b4a7db73dae1f099cec4d5f97851501459728480d181ab4'
-  data.tar.gz: df95c29b666dd3eb53bbb5c23acfd328f3750cdd2931dd08a9432805ec4089a9f13f17303b7f3a1cffe7655179f1ea97fb16d270f51287736692dc38fc085227
+  metadata.gz: 5490e256b29f0684a5c41ea0cdb193347ef9b01eb69e35d52d03302a6d49b4fb9aeb3e3dd7ea77b69bff789fa1491f0c71a6db08bc72b189a7b72daf6cb92a79
+  data.tar.gz: fe20dafde8aa7987f09e60691d9dcfafab7af3366ea6e0892971a4e9b3f29b1d8d9cb37ef04f3fd33d152ad40b1771af243e08000c3181a2120d7f35648dc672

data/lib/grover.rb

@@ -32,6 +32,12 @@ class Grover
           } else {
             await page.goto(`data:text/html,${url}`, { waitUntil: 'networkidle0' });
           }
+
+          const emulateMedia = options.emulateMedia; delete options.emulateMedia;
+          if (emulateMedia) {
+            await page.emulateMedia(emulateMedia);
+          }
+
           return await page.pdf(options);
         } finally {
           if (browser) {
@@ -98,9 +104,30 @@ class Grover
     Processor.new(root_path)
   end
 
+  def options_with_template_fix
+    options = @options.dup
+    display_url = options.delete :display_url
+    if display_url
+      options[:footer_template] ||= DEFAULT_FOOTER_TEMPLATE
+
+      %i[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
+    options
+  end
+
   def normalized_options(path)
-    options = Utils.normalize_object @options
+    options = Utils.normalize_object options_with_template_fix
     options['path'] = path if path
     options
   end
+
+  DISPLAY_URL_PLACEHOLDER = '{{display_url}}'.freeze
+
+  DEFAULT_FOOTER_TEMPLATE = Utils.strip_heredoc(<<-HTML).freeze
+    <div class='text left grow'>#{DISPLAY_URL_PLACEHOLDER}</div>
+    <div class='text right'><span class='pageNumber'></span>/<span class='totalPages'></span></div>
+  HTML
 end

data/lib/grover/middleware.rb

@@ -47,8 +47,8 @@ class Grover
       body = response.respond_to?(:body) ? response.body : response.join
       body = body.join if body.is_a?(Array)
 
-      body = HTMLPreprocessor.process body, request_url, protocol
-      Grover.new(body).to_pdf
+      body = HTMLPreprocessor.process body, root_url, protocol
+      Grover.new(body, display_url: request_url).to_pdf
     end
 
     def update_headers(headers, body)
@@ -63,11 +63,8 @@ class Grover
     def configure_env_for_pdf_request(env)
       @render_pdf = true
 
-      path = @request.path.sub(PDF_REGEX, '')
-      path = path.sub(@request.script_name, '')
-
-      %w[PATH_INFO REQUEST_URI].each { |e| env[e] = path }
-
+      env['PATH_INFO'] = path_without_extension
+      env['REQUEST_URI'] = path_without_extension
       env['HTTP_ACCEPT'] = concat(env['HTTP_ACCEPT'], Rack::Mime.mime_type('.html'))
     end
 
@@ -75,14 +72,24 @@ class Grover
       (accepts || '').split(',').unshift(type).compact.join(',')
     end
 
-    def request_url
-      "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
+    def root_url
+      @root_url ||= "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
     end
 
     def protocol
       env['rack.url_scheme']
     end
 
+    def path_without_extension
+      return @path_without_extension if defined? @path_without_extension
+      path = @request.path.sub(PDF_REGEX, '')
+      @path_without_extension = path.sub(@request.script_name, '')
+    end
+
+    def request_url
+      "#{root_url.sub(%r{/\z}, '')}#{path_without_extension}"
+    end
+
     def env
       @request.env
     end

data/lib/grover/utils.rb

@@ -20,6 +20,16 @@ class Grover
         gsub(/[[:space:]]+/, ' ')
     end
 
+    #
+    # Remove minimum spaces from the front of all lines within a string
+    #
+    # Based on active_support/core_ext/string/strip.rb
+    #
+    def self.strip_heredoc(string, inline: false)
+      string = string.gsub(/^#{string.scan(/^[ \t]*(?=\S)/).min}/, ''.freeze)
+      inline ? string.delete("\n") : string
+    end
+
     #
     # Recursively normalizes hash objects with camelized string keys
     #

data/lib/grover/version.rb

@@ -1,3 +1,3 @@
 class Grover
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Bromwich
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement