From 756b4af9e5461fa7f5e85cff1947fd7c9dbc8638 Mon Sep 17 00:00:00 2001
From: Ben Purinton <ben.purinton@gmail.com>
Date: Fri, 18 Oct 2024 13:28:50 -0700
Subject: [PATCH 1/5] Add view source button

---
 README.md                     | 1 +
 lib/dev_toolbar/middleware.rb | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0dda464..6d97bbe 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ Then, add a configuration file with the names and routes you want links for:
 # config/initializers/dev_toolbar.rb
 DevToolbar.configure do |config|
   config.links = [
+    { name: "View Source", path: "/to-do" },
     { name: "Routes", path: "/rails/info/routes" },
     { name: "Database", path: "/rails/db" }, # rails_db gem must be installed
     { name: "Data Model", path: "/erd.png" }, # erd.png must be in public/ folder
diff --git a/lib/dev_toolbar/middleware.rb b/lib/dev_toolbar/middleware.rb
index 9b05b0d..a64f89b 100644
--- a/lib/dev_toolbar/middleware.rb
+++ b/lib/dev_toolbar/middleware.rb
@@ -8,6 +8,7 @@ def call(env)
       status, headers, response = @app.call(env)
 
       if Rails.env.development? && headers["Content-Type"]&.include?("text/html")
+        request = Rack::Request.new(env)
         response_body = response.body
         toolbar_html = <<-HTML
           <div id="dev-toolbar">
@@ -15,7 +16,7 @@ def call(env)
               <a id="dev-toolbar-toggle">🛠️</a>
             </div>
             <div id="dev-toolbar-links" class="hidden">
-              #{toolbar_links}
+              #{toolbar_links(request)}
             </div>
           </div>
           <style>
@@ -79,9 +80,10 @@ def call(env)
 
     private
 
-    def toolbar_links
+    def toolbar_links(request)
       DevToolbar.configuration.links.map do |link|
-        "<a href='#{link[:path]}' target='_blank' class='dev-toolbar-link'>#{link[:name]}</a>"
+        href = link[:name] == "View Source" ? "view-source:#{request.base_url}" : link[:path]
+        "<a href='#{href}' target='_blank' class='dev-toolbar-link'>#{link[:name]}</a>"
       end.join(' ')
     end
   end

From 7056fd26c557edbde63fa63aa06ac7843fcf9d5b Mon Sep 17 00:00:00 2001
From: Ben Purinton <ben.purinton@gmail.com>
Date: Fri, 18 Oct 2024 13:37:15 -0700
Subject: [PATCH 2/5] use JS

---
 README.md                     |  2 +-
 lib/dev_toolbar/middleware.rb | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6d97bbe..0069ddf 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Then, add a configuration file with the names and routes you want links for:
 # config/initializers/dev_toolbar.rb
 DevToolbar.configure do |config|
   config.links = [
-    { name: "View Source", path: "/to-do" },
+    { name: "View Source" },
     { name: "Routes", path: "/rails/info/routes" },
     { name: "Database", path: "/rails/db" }, # rails_db gem must be installed
     { name: "Data Model", path: "/erd.png" }, # erd.png must be in public/ folder
diff --git a/lib/dev_toolbar/middleware.rb b/lib/dev_toolbar/middleware.rb
index a64f89b..7dffe77 100644
--- a/lib/dev_toolbar/middleware.rb
+++ b/lib/dev_toolbar/middleware.rb
@@ -8,7 +8,6 @@ def call(env)
       status, headers, response = @app.call(env)
 
       if Rails.env.development? && headers["Content-Type"]&.include?("text/html")
-        request = Rack::Request.new(env)
         response_body = response.body
         toolbar_html = <<-HTML
           <div id="dev-toolbar">
@@ -16,7 +15,7 @@ def call(env)
               <a id="dev-toolbar-toggle">🛠️</a>
             </div>
             <div id="dev-toolbar-links" class="hidden">
-              #{toolbar_links(request)}
+              #{toolbar_links}
             </div>
           </div>
           <style>
@@ -82,8 +81,11 @@ def call(env)
 
     def toolbar_links(request)
       DevToolbar.configuration.links.map do |link|
-        href = link[:name] == "View Source" ? "view-source:#{request.base_url}" : link[:path]
-        "<a href='#{href}' target='_blank' class='dev-toolbar-link'>#{link[:name]}</a>"
+        if link[:name] == "View Source"
+          "<a href='#' onclick='window.open(\"view-source:\" + window.location.href); return false;' class='dev-toolbar-link'>#{link[:name]}</a>"
+        else
+          "<a href='#{link[:path]}' target='_blank' class='dev-toolbar-link'>#{link[:name]}</a>"
+        end
       end.join(' ')
     end
   end

From 2c4d7d15875df13c6b9222f78bb67d8675589918 Mon Sep 17 00:00:00 2001
From: Ben Purinton <ben.purinton@gmail.com>
Date: Fri, 18 Oct 2024 13:40:08 -0700
Subject: [PATCH 3/5] drop arg

---
 lib/dev_toolbar/middleware.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dev_toolbar/middleware.rb b/lib/dev_toolbar/middleware.rb
index 7dffe77..afc6793 100644
--- a/lib/dev_toolbar/middleware.rb
+++ b/lib/dev_toolbar/middleware.rb
@@ -79,7 +79,7 @@ def call(env)
 
     private
 
-    def toolbar_links(request)
+    def toolbar_links
       DevToolbar.configuration.links.map do |link|
         if link[:name] == "View Source"
           "<a href='#' onclick='window.open(\"view-source:\" + window.location.href); return false;' class='dev-toolbar-link'>#{link[:name]}</a>"

From 349f8d7cdd5fc100bb807e55f1de304e5b272284 Mon Sep 17 00:00:00 2001
From: Ben Purinton <ben.purinton@gmail.com>
Date: Fri, 18 Oct 2024 13:43:14 -0700
Subject: [PATCH 4/5] try a different way

---
 lib/dev_toolbar/middleware.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dev_toolbar/middleware.rb b/lib/dev_toolbar/middleware.rb
index afc6793..b72c147 100644
--- a/lib/dev_toolbar/middleware.rb
+++ b/lib/dev_toolbar/middleware.rb
@@ -82,7 +82,7 @@ def call(env)
     def toolbar_links
       DevToolbar.configuration.links.map do |link|
         if link[:name] == "View Source"
-          "<a href='#' onclick='window.open(\"view-source:\" + window.location.href); return false;' class='dev-toolbar-link'>#{link[:name]}</a>"
+          "<a href='view-source:' class='dev-toolbar-link'>#{link[:name]}</a>"
         else
           "<a href='#{link[:path]}' target='_blank' class='dev-toolbar-link'>#{link[:name]}</a>"
         end

From 52a8103f1e959c2297c7da8dffa69b6ac4655e71 Mon Sep 17 00:00:00 2001
From: Ben Purinton <ben.purinton@gmail.com>
Date: Fri, 18 Oct 2024 13:45:17 -0700
Subject: [PATCH 5/5] wip

---
 lib/dev_toolbar/middleware.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dev_toolbar/middleware.rb b/lib/dev_toolbar/middleware.rb
index b72c147..afc6793 100644
--- a/lib/dev_toolbar/middleware.rb
+++ b/lib/dev_toolbar/middleware.rb
@@ -82,7 +82,7 @@ def call(env)
     def toolbar_links
       DevToolbar.configuration.links.map do |link|
         if link[:name] == "View Source"
-          "<a href='view-source:' class='dev-toolbar-link'>#{link[:name]}</a>"
+          "<a href='#' onclick='window.open(\"view-source:\" + window.location.href); return false;' class='dev-toolbar-link'>#{link[:name]}</a>"
         else
           "<a href='#{link[:path]}' target='_blank' class='dev-toolbar-link'>#{link[:name]}</a>"
         end