grover 0.12.3 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7376874743ddb5f08d3fc68c02f84a72eb6cbe98c63306b2ce2a5f57d37867c9
-  data.tar.gz: 546007fe354d88c117f70469c8cf80ba88fd22415ebb350aa79512c64592be3f
+  metadata.gz: 7084b165657179f7954b473653ff58cb634e0444177c95978168f1a481c2a423
+  data.tar.gz: aa4497878b0d4eb55b0cd5703011db42c9d8f79fd65da906ce770956f59f032e
 SHA512:
-  metadata.gz: 010bb2d49e78af9cfe56cc0480d803f217dd1f644d99d36640fad060e8a70a2be7b4d422057a761a5d0710347649dd44d3da9efde553b4ff23bff62838973af0
-  data.tar.gz: 5879e39b9d00a6b1c5904a4e71cdf00fc695caa29de7b85ca4dbcbf7ec857d87822c2be42ded362efd3ef2466f8c5db338182e8115cbe6b4b822a6114d5e50d8
+  metadata.gz: 95f0001bdba9e31e8025f0e4c693d7d2b60c20c3e51c11b91e8ed9934dfad160f0733db6ed40344b42a4c20a59d5990a346195d08539c7098311f5de095d7b7a
+  data.tar.gz: 14a75499dd49dfa219b3dd914f2cb82601a0151a06c325805f3419a2836a228707cf1e63e9bfbecb0253be850b25134d1b8e2fbb6fe12a769b007c3c77f2f13a

data/lib/grover/middleware.rb

@@ -9,7 +9,7 @@ class Grover
   # Much of this code was sourced from the PDFKit project
   # @see https://github.com/pdfkit/pdfkit
   #
-  class Middleware
+  class Middleware # rubocop:disable Metrics/ClassLength
     def initialize(app)
       @app = app
       @pdf_request = false
@@ -30,6 +30,8 @@ class Grover
       response = update_response response, headers if grover_request? && html_content?(headers)
 
       [status, headers, response]
+    ensure
+      restore_env_from_grover_request(env) if grover_request?
     end
 
     private
@@ -94,7 +96,7 @@ class Grover
       end
     end
 
-    def create_grover_for_response(response)
+    def create_grover_for_response(response) # rubocop:disable Metrics/AbcSize
       body = response.respond_to?(:body) ? response.body : response.join
       body = body.join if body.is_a?(Array)
       body = HTMLPreprocessor.process body, root_url, protocol
@@ -135,11 +137,24 @@ class Grover
     end
 
     def configure_env_for_grover_request(env)
-      env['PATH_INFO'] = env['REQUEST_URI'] = path_without_extension
+      # Save the env params we're overriding so we can restore them after the response is fetched
+      @pre_request_env_params = env.slice('PATH_INFO', 'REQUEST_URI', 'HTTP_ACCEPT')
+
+      # Override path/URI so any downstream middleware/app doesn't try actioning the request as PDF
+      env['PATH_INFO'] = path_without_extension
+      env['REQUEST_URI'] = @request.url
       env['HTTP_ACCEPT'] = concat(env['HTTP_ACCEPT'], Rack::Mime.mime_type('.html'))
       env['Rack-Middleware-Grover'] = 'true'
     end
 
+    def restore_env_from_grover_request(env)
+      return unless @pre_request_env_params.is_a? Hash
+
+      # Restore the path/URI so any upstream middleware doesn't get confused
+      env.merge! @pre_request_env_params
+      env['REQUEST_URI'] = @request.url unless @pre_request_env_params.key? 'REQUEST_URI'
+    end
+
     def concat(accepts, type)
       (accepts || '').split(',').unshift(type).compact.join(',')
     end

data/lib/grover/options_builder.rb

@@ -8,7 +8,7 @@ class Grover
   # Build options from Grover.configuration, meta_options, and passed-in options
   #
   class OptionsBuilder < Hash
-    def initialize(options, url)
+    def initialize(options, url) # rubocop:disable Lint/MissingSuper
       @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 = '0.12.3'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.1
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -188,7 +188,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.8.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="