- <%= link_to "Website", safe_url(@story.website_url), class: "btn btn-secondary-outline" if @story.website_url %>
+ <%= link_to "Website", safe_url(@story.external_url), target: "_blank", rel: "noopener",
+ class: "btn btn-secondary-outline" if @story.external_url %>
<%= link_to "View",
story_path(@story),
class: "btn btn-secondary-outline" %>
diff --git a/app/views/stories/index.html.erb b/app/views/stories/index.html.erb
index b2c07e17e..c28496988 100644
--- a/app/views/stories/index.html.erb
+++ b/app/views/stories/index.html.erb
@@ -47,7 +47,7 @@
<%= link_to (image_tag story.main_image.file,
class: "w-full rounded shadow-sm border border-gray-200",
alt: story.title),
- story_path(story) %>
+ story.link_target, target: "_blank", rel: "noopener" %>
<% else %>
@@ -57,7 +57,7 @@
<%= link_to title_with_badges(story, show_hidden_badge: current_user.super_user?).html_safe,
- story_path(story),
+ story.link_target, target: "_blank", rel: "noopener",
class: "font-bold hover:text-indigo-800 hover:underline" %>
@@ -75,7 +75,8 @@
<%= story.updated_at.strftime("%b %d, %Y") %> |
- <%= link_to "View", story_path(story), class: "btn btn-secondary-outline" %>
+ <%= link_to "View", story.link_target, target: "_blank", rel: "noopener",
+ class: "btn btn-secondary-outline" %>
<% if current_user.super_user? %>
<%= link_to "Edit", edit_story_path(story),
class: "admin-only bg-blue-100 btn btn-secondary-outline" %>
diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb
index 4c26f64f8..831e44a02 100644
--- a/app/views/stories/show.html.erb
+++ b/app/views/stories/show.html.erb
@@ -10,8 +10,8 @@
<%= render "bookmarks/editable_bookmark_button", resource: @story %>
- <% if @story.website_url.present? %>
- <%= link_to "Website", safe_url(@story.website_url),
+ <% if @story.external_url.present? %>
+ <%= link_to "Website", safe_url(@story.external_url), target: "_blank", rel: "noopener",
class: "btn btn-secondary-outline" %>
<% end %>
diff --git a/app/views/taggings/_tagged_item_card.html.erb b/app/views/taggings/_tagged_item_card.html.erb
index 0648e6014..b4756cfb6 100644
--- a/app/views/taggings/_tagged_item_card.html.erb
+++ b/app/views/taggings/_tagged_item_card.html.erb
@@ -24,7 +24,7 @@
- <%= link_to item.link_target, class: "block w-full h-full" do %>
+ <%= link_to item.object_link_target, class: "block w-full h-full" do %>
<% if item.class == ResourceDecorator %>
@@ -57,7 +57,7 @@
- <%= link_to item.link_target,
+ <%= link_to item.object_link_target,
class: "inline-flex min-w-0 max-w-full text-lg font-semibold
text-gray-900 leading-tight hover:underline" do %>
<%= item.title.truncate(50) %>
diff --git a/spec/models/concerns/linkable_spec.rb b/spec/models/concerns/linkable_spec.rb
index 6b94f41f3..2ab698aec 100644
--- a/spec/models/concerns/linkable_spec.rb
+++ b/spec/models/concerns/linkable_spec.rb
@@ -1,35 +1,101 @@
-# spec/models/concerns/linkable_spec.rb
require "rails_helper"
-RSpec.describe Linkable do
- let(:model_class) do
- Class.new(ApplicationRecord) do
- self.table_name = "stories"
- include Linkable
+RSpec.describe Linkable, type: :module do
+ let(:model) { LinkableTestModel.new(id: 123, external_url_value: url) }
+
+ describe "#valid_external_url?" do
+ subject { model.send(:valid_external_url?, url) }
+
+ context "with a fully qualified http URL" do
+ let(:url) { "http://example.com" }
+ it { is_expected.to eq true }
+ end
+
+ context "with a fully qualified https URL" do
+ let(:url) { "https://example.com" }
+ it { is_expected.to eq true }
+ end
+
+ context "with a missing scheme" do
+ let(:url) { "example.com" }
+ it { is_expected.to eq true } # normalized to https://example.com
+ end
+
+ context "with an invalid URL" do
+ let(:url) { "not a url" }
+ it { is_expected.to eq false }
+ end
+
+ context "with a non-http scheme" do
+ let(:url) { "ftp://example.com" }
+ it { is_expected.to eq false }
+ end
+
+ context "with nil" do
+ let(:url) { nil }
+ it { is_expected.to eq false }
end
end
- let(:record) { model_class.new(id: 123, website_url: website_url) }
+ describe "#external_link?" do
+ subject { model.external_link? }
+
+ context "when external_url is valid" do
+ let(:url) { "example.com" }
+ it { is_expected.to eq true }
+ end
- before do
- allow(Rails.application.routes.url_helpers)
- .to receive(:polymorphic_path)
- .and_return("/stories/123")
+ context "when external_url is blank" do
+ let(:url) { "" }
+ it { is_expected.to eq false }
+ end
+
+ context "when external_url is invalid" do
+ let(:url) { "not a url" }
+ it { is_expected.to eq false }
+ end
end
- context "when website_url is present" do
- let(:website_url) { "https://example.com" }
+ describe "#normalized_url" do
+ subject { model.send(:normalized_url, url) }
+
+ context "when URL already has http" do
+ let(:url) { "http://example.com" }
+ it { is_expected.to eq "http://example.com" }
+ end
+
+ context "when URL already has https" do
+ let(:url) { "https://example.com" }
+ it { is_expected.to eq "https://example.com" }
+ end
- it "returns the website_url" do
- expect(record.link_target).to eq("https://example.com")
+ context "when URL is missing scheme" do
+ let(:url) { "example.com" }
+ it { is_expected.to eq "https://example.com" }
+ end
+
+ context "when blank" do
+ let(:url) { "" }
+ it { is_expected.to eq "" }
end
end
- context "when website_url is blank" do
- let(:website_url) { nil }
+ describe "#link_target" do
+ subject { model.link_target }
+
+ context "when external_url is present and valid" do
+ let(:url) { "example.com" }
+ it { is_expected.to eq "https://example.com" }
+ end
+
+ context "when external_url is invalid" do
+ let(:url) { "not a url" }
+ it { is_expected.to eq "/fake/123" }
+ end
- it "falls back to the polymorphic path" do
- expect(record.link_target).to eq("/stories/123")
+ context "when external_url is blank" do
+ let(:url) { "" }
+ it { is_expected.to eq "/fake/123" }
end
end
end
diff --git a/spec/support/linkable_test_model.rb b/spec/support/linkable_test_model.rb
new file mode 100644
index 000000000..1ad83d09c
--- /dev/null
+++ b/spec/support/linkable_test_model.rb
@@ -0,0 +1,17 @@
+# spec/support/linkable_test_model.rb
+class LinkableTestModel
+ include ActiveModel::Model
+ include Rails.application.routes.url_helpers
+ include Linkable
+
+ attr_accessor :id, :external_url_value
+
+ def external_url
+ external_url_value
+ end
+
+ # for internal link fallback
+ def default_link_target
+ "/fake/#{id}"
+ end
+end
|