breezy_pdf_lite 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d66b946175176e3984b66d1076c738ec5c73b04dea63a12860d004b02310482
-  data.tar.gz: e20bbd337b677b0c884f36781468811668d5c47b91b16038627abcaea8d322fe
+  metadata.gz: c0d0a2c4ac70b3568da6aa15a499409ca7c4de9b602b6e9f7233fd640eca7d91
+  data.tar.gz: e2f46ce4a20952f4e5357a348e4689b2eddf427b6eb613cdb70002e00554342c
 SHA512:
-  metadata.gz: 31c7402cf0d7f78de0a70d5a8600cb7fbff7b29c122ff02c1a648464057aaadab37d3d1da9feb284c1298894e6922dc5520d90cf00a2396665df5056522adb0f
-  data.tar.gz: c741a246d806b735e3c96c070585acb01f1deb0de38b9d3bb6cf44ad2f143b15bb8edbf530fa61c8c73ddd94af696dc5250c9b736325bb2f7c16c026ac8bd403
+  metadata.gz: 26b62d5f98e2bb19b80aee67ca53fa4408a2616c9522a0320bd88743a1807f5419a49c9b331039198c034ca3a2ca3db1c6756e58f83239242415620165b196e1
+  data.tar.gz: c51834be66ab1e37422d3c8e9652b2a2c987d80608e743d6f9d271fa357665f50d27a2008d7f6ff27a3073dfaaba570a3454ffe145485ac473bc37700486ffe6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    breezy_pdf_lite (0.0.2)
+    breezy_pdf_lite (0.0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -9,10 +9,11 @@ GEM
     ast (2.4.0)
     jaro_winkler (1.5.4)
     minitest (5.14.0)
-    minitest-stub-const (0.6)
+    mocha (1.11.0)
     parallel (1.19.1)
     parser (2.7.0.2)
       ast (~> 2.4.0)
+    rack (2.1.1)
     rainbow (3.0.0)
     rake (13.0.1)
     rubocop (0.79.0)
@@ -32,7 +33,8 @@ DEPENDENCIES
   breezy_pdf_lite!
   bundler (~> 2.0)
   minitest (~> 5.0)
-  minitest-stub-const (~> 0.6)
+  mocha (= 1.11)
+  rack (~> 2.0)
   rake (~> 13.0)
   rubocop (= 0.79.0)
 

data/breezy_pdf_lite.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "rack", "~> 2.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "minitest-stub-const", "~> 0.6"
+  spec.add_development_dependency "mocha", "1.11"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rubocop", "0.79.0"
 end

data/lib/breezy_pdf_lite/intercept/base.rb

@@ -3,40 +3,10 @@
 module BreezyPDFLite::Intercept
   # :nodoc
   class Base
-    attr_reader :app, :env
+    attr_reader :body
 
-    def initialize(app, env)
-      @app = app
-      @env = env
-    end
-
-    private
-
-    def rendered_url
-      "#{base_url}#{path}#{query_string}"
-    end
-
-    def requested_url
-      "#{env['rack.url_scheme']}://#{env['SERVER_NAME']}#{port}" \
-      "#{env['PATH_INFO']}#{query_string}"
-    end
-
-    def base_url
-      "#{env['rack.url_scheme']}://#{env['SERVER_NAME']}#{port}"
-    end
-
-    def port
-      ":#{env['SERVER_PORT']}" unless [80, 443].include?(env["SERVER_PORT"].to_i)
-    end
-
-    def path
-      env["PATH_INFO"].gsub(/\.pdf/, "")
-    end
-
-    def query_string
-      return "" if env["QUERY_STRING"].nil?
-
-      env["QUERY_STRING"] == "" ? "" : "?#{env['QUERY_STRING']}"
+    def initialize(body)
+      @body = body
     end
   end
 end

data/lib/breezy_pdf_lite/intercept/html.rb

@@ -1,62 +1,34 @@
 # frozen_string_literal: true
 
+require "rack/request"
+require "rack/file"
+
 module BreezyPDFLite::Intercept
-  # :nodoc
+  # Takes the App's response body, and submits it to the breezypdf lite endpoint
+  # resulting in a file. File is then served with Rack::File
   class HTML < Base
     def call
-      raise BreezyPDFLite::Intercept::UnRenderable unless (200..299).cover?(status)
-
-      render_request = BreezyPDFLite::RenderRequest.new(body).submit
+      request = Rack::Request.new({})
+      path = render_request_file.path
 
-      if render_request.code != "201"
-        raise BreezyPDFLite::RenderError, "Status: #{render_request.status} body: #{render_request.body}"
-      end
-
-      [
-        201,
-        {
-          "Content-Type" => "application/pdf",
-          "Content-Length" => render_request.header["Content-Length"],
-          "Content-Disposition" => render_request.header["Content-Disposition"]
-        },
-        [render_request.body]
-      ]
-    rescue BreezyPDFLite::Intercept::UnRenderable
-      response
+      Rack::File.new(path, response_headers).serving(request, path)
     end
 
     private
 
-    def status
-      @status ||= response[0].to_i
-    end
-
-    def headers
-      @headers ||= response[1]
-    end
-
-    def body
-      if response[2].respond_to?(:join)
-        response[2].join
-      elsif response[2].respond_to?(:each)
-        content = []
-        response[2].each { |part| content << part }
-
-        content.join
-      else
-        response[2]
-      end
+    def render_request
+      @render_request ||= BreezyPDFLite::RenderRequest.new(body)
     end
 
-    def response
-      @response ||= app.call(doctored_env)
+    def render_request_file
+      @render_request_file ||= render_request.to_file
     end
 
-    def doctored_env
-      env.dup.tap do |hash|
-        hash["HTTP_ACCEPT"] = "text/html"
-        hash["PATH_INFO"]   = path
-      end
+    def response_headers
+      @response_headers ||= {
+        "Content-Type" => "application/pdf",
+        "Content-Disposition" => render_request.response.header["Content-Disposition"]
+      }
     end
   end
 end

data/lib/breezy_pdf_lite/interceptor.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module BreezyPDFLite
-  # Intercept a Rack request
+  # Intercept a Rack request, determining if the app's response should
+  # be intercepted or simply returned
   class Interceptor
     attr_reader :app, :env
 
@@ -10,34 +11,50 @@ module BreezyPDFLite
       @env = env
     end
 
-    def intercept!
-      if intercept?
-        intercept.new(@app, @env).call
+    def call
+      if (200..299).cover?(app_response_status) # Did the app respond well?
+        Intercept::HTML.new(app_response_body).call # Try to return a PDF
       else
-        app.call(env)
+        app_response # Bad app response, just send respond with that
       end
     end
 
     private
 
-    def intercept?
-      get? && matching_uri?
+    def app_response
+      @app_response ||= app.call(doctored_env)
     end
 
-    def matching_uri?
-      matchers.any? { |regex| env["REQUEST_URI"].match?(regex) }
+    def app_response_status
+      @app_response_status ||= app_response[0].to_i
     end
 
-    def get?
-      env["REQUEST_METHOD"].match?(/get/i)
+    def app_response_headers
+      @app_response_headers ||= app_response[1]
     end
 
-    def matchers
-      @matchers ||= BreezyPDFLite.middleware_path_matchers
+    def app_response_body
+      if app_response[2].respond_to?(:join)
+        app_response[2].join
+      elsif app_response[2].respond_to?(:each)
+        content = []
+        app_response[2].each { |part| content << part }
+
+        content.join
+      else
+        app_response[2]
+      end
+    end
+
+    def doctored_env
+      env.dup.tap do |hash|
+        hash["HTTP_ACCEPT"] = "text/html"
+        hash["PATH_INFO"]   = path
+      end
     end
 
-    def intercept
-      BreezyPDFLite::Intercept::HTML
+    def path
+      env["PATH_INFO"].gsub(/\.pdf/, "")
     end
   end
 end

data/lib/breezy_pdf_lite/middleware.rb

@@ -2,13 +2,31 @@
 
 module BreezyPDFLite
   # Rack Middleware for BreezyPDFLite
+  # Determines if the request should be intercepted or not
   class Middleware
     def initialize(app, _options = {})
       @app = app
     end
 
     def call(env)
-      Interceptor.new(@app, env).intercept!
+      if intercept?(env)
+        Interceptor.new(@app, env).call
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+
+    # Is this request applicable?
+    def intercept?(env)
+      env["REQUEST_METHOD"].match?(/get/i) && matching_uri?(env)
+    end
+
+    def matching_uri?(env)
+      BreezyPDFLite.middleware_path_matchers.any? do |regex|
+        env["REQUEST_URI"].match?(regex)
+      end
     end
   end
 end

data/lib/breezy_pdf_lite/render_request.rb

@@ -2,18 +2,19 @@
 
 module BreezyPDFLite
   # Request conversion of a HTML string to PDF
+  # If the response isn't a 201, raise an error
   class RenderRequest
     def initialize(body)
       @body = body
     end
 
-    def submit
-      client.post("/render/html", @body)
+    def response
+      @response ||= submit.tap do |resp|
+        raise RenderError, "#{resp.code}: #{resp.body}" if resp.code != "201"
+      end
     end
 
     def to_file
-      raise RenderError, "#{response.code}: #{response.body}" if response.code != "201"
-
       @to_file ||= Tempfile.new(%w[response .pdf]).tap do |file|
         file.binmode
         file.write response.body
@@ -24,8 +25,8 @@ module BreezyPDFLite
 
     private
 
-    def response
-      @response ||= submit
+    def submit
+      client.post("/render/html", @body)
     end
 
     def client

data/lib/breezy_pdf_lite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BreezyPDFLite
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: breezy_pdf_lite
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Westendorf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-stub-const
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement