breezy_pdf 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57bddc027c8cdfec7911f2cc59222a96c6122f87
-  data.tar.gz: 98ab1ae786bfa5b1a9f402ff07d2d3bea9268a8d
+  metadata.gz: 762863805d9fbb8d35df18758beda176b0d50d4c
+  data.tar.gz: f674de70104e792945f1a9482331cf3154875473
 SHA512:
-  metadata.gz: 4ac74f57b8b524fa6b2c30c940eef02a791a98602739b82133ab71bff13d3e9999743ad5f48c958b44f6d631e81028197944dec6827ecf03d136ba0df36cbc24
-  data.tar.gz: 1b2a275727eeac5f202907d89689053762d1e97eea896cad4710ce782770ff291b0ba32c221c9c8123571dd8302339acb5cb51e19b977d7426dd4e3ae0a3d24d
+  metadata.gz: 39aff3f2f39f8e685abb5dae0f00dacac3f6bc580c1877e14574200b284636e2ea46f6693b2358540733b6cccf06109b78d91cc14b2c1e543ba0977c251c6b7f
+  data.tar.gz: 3cb320f2a666c40d9f526313e9682fcef067252a68c1030792b757cad41ea44109722d0e31c8499b57d8afded7feb9ff427be273283b7a802733f571bc3da142

data/lib/breezy_pdf/html/publicize.rb

@@ -7,6 +7,7 @@ module BreezyPDF::HTML
       @base_url      = base_url
       @html_fragment = html_fragment
       @log_queue     = []
+      @upload_ids    = []
     end
 
     def public_fragment
@@ -15,6 +16,12 @@ module BreezyPDF::HTML
       end.to_html
     end
 
+    def upload_ids
+      public_fragment
+
+      @upload_ids
+    end
+
     private
 
     def publicize!
@@ -50,9 +57,12 @@ module BreezyPDF::HTML
         asset_element[attr] = BreezyPDF.asset_cache.fetch(asset_element[attr], expires_in: 601_200) do
           asset = BreezyPDF::Resources::Asset.new(@base_url, asset_element[attr])
 
-          BreezyPDF::Uploads::Base.new(
+          upload = BreezyPDF::Uploads::Base.new(
             asset.filename, asset.content_type, asset.file_path
-          ).public_url
+          )
+          @upload_ids.push(upload.id)
+
+          upload.public_url
         end
       end
     end

data/lib/breezy_pdf/intercept/base.rb

@@ -9,5 +9,41 @@ module BreezyPDF::Intercept
       @app = app
       @env = env
     end
+
+    private
+
+    def metadata
+      {
+        "requested_url" => requested_url, "rendered_url" => rendered_url
+      }
+    end
+
+    def rendered_url
+      "#{env['rack.url_scheme']}://#{env['SERVER_NAME']}#{port}" \
+      "#{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']}"
+    end
   end
 end

data/lib/breezy_pdf/intercept/private_url.rb

@@ -7,10 +7,10 @@ module BreezyPDF::Intercept
       raise BreezyPDF::Intercept::UnRenderable unless (200..299).cover?(status)
 
       BreezyPDF.logger.info(
-        "[BreezyPDF] Requesting render of #{public_url} with metadata: #{html_private_asset.metadata}"
+        "[BreezyPDF] Requesting render of #{rendered_url} with metadata: #{metadata}"
       )
 
-      render_request = BreezyPDF::RenderRequest.new(public_url, html_private_asset.metadata).submit
+      render_request = BreezyPDF::RenderRequest.new(public_url, metadata).submit
 
       BreezyPDF.logger.info("[BreezyPDF] Redirect to pdf at #{render_request.download_url}")
       [
@@ -27,9 +27,23 @@ module BreezyPDF::Intercept
     private
 
     def public_url
-      @public_url ||= BreezyPDF::Uploads::Base.new(
+      @public_url ||= upload.public_url
+    end
+
+    def metadata
+      super.merge(
+        "upload_ids" => upload_ids
+      ).merge(html_private_asset.metadata)
+    end
+
+    def upload_ids
+      [upload.id] + html_private_asset.upload_ids
+    end
+
+    def upload
+      @upload ||= BreezyPDF::Uploads::Base.new(
         html_private_asset.filename, html_private_asset.content_type, html_private_asset.file_path
-      ).public_url
+      )
     end
 
     def html_private_asset
@@ -58,17 +72,5 @@ module BreezyPDF::Intercept
         hash["PATH_INFO"]   = path
       end
     end
-
-    def path
-      env["PATH_INFO"].gsub(/\.pdf/, "")
-    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
   end
 end

data/lib/breezy_pdf/intercept/public_url.rb

@@ -4,8 +4,8 @@ module BreezyPDF::Intercept
   # :nodoc
   class PublicUrl < Base
     def call
-      BreezyPDF.logger.info("[BreezyPDF] Requesting render of #{public_url}")
-      response = BreezyPDF::RenderRequest.new(public_url).submit
+      BreezyPDF.logger.info("[BreezyPDF] Requesting render of #{rendered_url}")
+      response = BreezyPDF::RenderRequest.new(rendered_url, metadata).submit
 
       [
         302,
@@ -13,26 +13,5 @@ module BreezyPDF::Intercept
         []
       ]
     end
-
-    private
-
-    def public_url
-      "#{env['rack.url_scheme']}://#{env['SERVER_NAME']}#{port}" \
-      "#{path}?#{env['QUERY_STRING']}"
-    end
-
-    def path
-      path = env["PATH_INFO"]
-
-      BreezyPDF.middleware_path_matchers.each do |regex|
-        path = path.gsub(regex, "")
-      end
-
-      path
-    end
-
-    def port
-      ":#{env['SERVER_PORT']}" unless [80, 443].include?(env["SERVER_PORT"].to_i)
-    end
   end
 end

data/lib/breezy_pdf/resources/html.rb

@@ -6,6 +6,7 @@ module BreezyPDF::Resources
     def initialize(base_url, html_fragment)
       @base_url      = base_url
       @html_fragment = html_fragment
+      @upload_ids    = []
     end
 
     def content_type
@@ -24,6 +25,12 @@ module BreezyPDF::Resources
       @metadata ||= BreezyPDF.extract_metadata ? Hash[*meta_tags] : {}
     end
 
+    def upload_ids
+      modified_html_fragment
+
+      @upload_ids
+    end
+
     private
 
     def file
@@ -45,9 +52,11 @@ module BreezyPDF::Resources
       end
 
       if BreezyPDF.upload_assets
-        @html_fragment = BreezyPDF::HTML::Publicize.new(
+        publiciser = BreezyPDF::HTML::Publicize.new(
           @base_url, @html_fragment
-        ).public_fragment
+        )
+        @upload_ids    = publiciser.upload_ids
+        @html_fragment = publiciser.public_fragment
       end
 
       @html_fragment

data/lib/breezy_pdf/uploads/base.rb

@@ -18,6 +18,10 @@ module BreezyPDF::Uploads
       resource.presigned_url
     end
 
+    def id
+      resource.id
+    end
+
     private
 
     def client

data/lib/breezy_pdf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BreezyPDF
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breezy_pdf
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Daniel Westendorf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-01 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby