Fix analytics, loading of file URLs

Author: lsegal

app/controllers/yard_controller.rb

@@ -74,20 +74,13 @@ def respond
       expires_in 1.day, public: true
     end
 
-    if use_template?
+    if status == 200 && Mime::Type.lookup(headers["Content-Type"]).html?
       render :show
     else
       render plain: body.first, status: status, headers: headers, content_type: headers["Content-Type"]
     end
   end
 
-  def use_template?
-    return false if status != 200
-    return false if %w[/search /static].any? { |path| request.path.starts_with?(path) }
-    return false if params[:rest].to_s.starts_with?("file/")
-    true
-  end
-
   def visit_library
     FileUtils.touch(library_version.source_path)
   end

app/views/layouts/_analytics.html.erb

@@ -12,15 +12,21 @@
   <script async src="https://www.googletagmanager.com/gtag/js?id=<%= Rubydoc.config.integrations.google_analytics %>"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('consent', 'update', {
+    if (window.gtag) {
+      gtag('event', 'page_view', {
+        page_title: document.title,
+        page_location: window.location.href,
+      });
+    } else {
+      function gtag(){dataLayer.push(arguments);}
+      gtag('consent', 'update', {
       'ad_user_data': 'denied',
       'ad_personalization': 'denied',
       'ad_storage': 'denied',
       'analytics_storage': 'denied'
-    });
-    gtag('js', new Date());
-
-    gtag('config', '<%= Rubydoc.config.integrations.google_analytics %>');
+      });
+      gtag('js', new Date());
+      gtag('config', '<%= Rubydoc.config.integrations.google_analytics %>');
+    }
   </script>
 <% end %>