rails_http_preload 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab167b50cca5eecf4e8b289c407f12cd14fd96b343bd4562276c797fc8d0b7f
-  data.tar.gz: 9fc88a983e9e44f7c03ee37e8eb915c8f7766ad63410f8e18fc82b1279fbb855
+  metadata.gz: 61c3fa6d2a963768a57379057000200b6cbd12dcce2dd7b1f196025ddd293ac9
+  data.tar.gz: 6e02d5a4bef38c2e0b10767e0a0b9e3ca497e64ace257e2d21181b458156746f
 SHA512:
-  metadata.gz: 5ac3bb7fd8268eba569957770020c54fde8b67409d3376c41f6ac30e4373eb64e73636047338dd47dcc684b1f33da16af2d84e2171b8ec7d84a1105ebd72e180
-  data.tar.gz: 28f2a8d1585a17d899279ffab85979d5eb4744af9c1f6cfdf3ea98008ae47320c9d154bc46d224a0f0be056614b4f9951a8c1323eb82d273cb38da1191363b9b
+  metadata.gz: 5c9a33394ef06842c7e75bca1a91f5aa3c043589acae80ebfd246d5e4d4b0417b704bce8af2d5178159966db42f1302e4460f3cfbc12223e0043f454b60af9c7
+  data.tar.gz: b34234412e0b00c63ff2c33ef838fb0b7b571200f80650e592a8dbebcc7d4e84aba16db0c90795f5b5b868d5c0152b59e8ae23361be17cf5471a19da01f389fd

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.3.0] - 2022-05-29
+
+- Removed unnecessary require statement
+
+## [0.2.0] - 2022-05-29
+
+- Bugfix: blank asset hosts should not add a blank link header
+- Bugfix: don't overwrite existing link headers in responses
+
 ## [0.1.0] - 2022-11-21
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_http_preload (0.1.0)
+    rails_http_preload (0.3.0)
       actionpack
       actionview
       rails
@@ -9,86 +9,86 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     date (3.3.3)
     erubi (1.12.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.8.0)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -96,8 +96,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.16.3)
+    minitest (5.18.0)
     net-imap (0.3.4)
       date
       net-protocol
@@ -107,39 +106,41 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
     racc (1.6.2)
-    rack (2.2.5)
-    rack-test (2.0.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.0.5)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -161,15 +162,15 @@ GEM
     rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    thor (1.2.1)
-    timeout (0.3.1)
-    tzinfo (2.0.5)
+    thor (1.2.2)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-22

data/README.md

@@ -47,7 +47,7 @@ In the best case scenario, your observed Largest Contentful Paint times should b
 
 ### Worst Case Scenario
 
-In the worst case, nothing happens. For example, your CDN doesn't support early hints. No problem, you've just added ~1kb of HTTP headers to your responses, it's basically a no-op. You cannot really create new bugs or bad behavior by including this header.
+In the worst case, nothing happens. For example, your CDN doesn't support early hints. No problem, you've just added a few bytes of HTTP headers to your responses, it's basically a no-op. You cannot really create new bugs or bad behavior by including this header.
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/rails_http_preload/middleware.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "action_view/helpers/asset_url_helper"
-require "active_support/concern"
 require "action_dispatch"
 
 module RailsHttpPreload
@@ -13,7 +11,7 @@ module RailsHttpPreload
     def call(env)
       response = @app.call(env)
 
-      response[1]["Link"] = preconnect_header if required?(response, ActionDispatch::Request.new(env))
+      response[1]["Link"] = preconnect_header(response) if required?(response, ActionDispatch::Request.new(env))
 
       response
     end
@@ -21,8 +19,7 @@ module RailsHttpPreload
     # TODO: Should we just add it to every response anyway and let the browser
     # figure it out?
     def required?(response, request)
-      html?(response) &&
-        !already_connected?(request)
+      config.asset_host.present? && html?(response) && !already_connected?(request)
     end
 
     # Adding this header to, for example, a JSON response would be pointless
@@ -31,18 +28,26 @@ module RailsHttpPreload
       response[1]["Content-Type"].match?("html")
     end
 
+    def current_asset_host
+      ActionController::Base.helpers.compute_asset_host("", host: config.asset_host)
+    end
+
     # If the asset host is equal to the request domain, no need to add.
     def already_connected?(request)
-      protocol = request.protocol.gsub("://", "")
-      ActionController::Base.helpers.compute_asset_host("", host: config.asset_host) ==
-        ActionController::Base.helpers.compute_asset_host("", { protocol: protocol, host: request.domain })
+      request.base_url == current_asset_host
     end
 
-    def preconnect_header
-      [
-        ActionController::Base.helpers.compute_asset_host("", host: config.asset_host),
+    def preconnect_header(response)
+      header = [
+        current_asset_host,
         *config.additional_urls
       ].compact.map { |url| create_link_header(url) }.join(", ")
+
+      if response[1]["Link"]
+        "#{header}, #{response[1]["Link"]}"
+      else
+        header
+      end
     end
 
     def create_link_header(url)

data/lib/rails_http_preload/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_http_preload
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nate Berkopec
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Automatically add an HTTP header to Rails apps to use 103 Early Hints