Change links to refer to external_links, if present (#584)

* Change links to refer to external_link, if present for Story, CommunityNews, Resource

* Only implement link_target w Linkable, otherwise use object_link_target via decorator (called from taggings index)

Author: maebeale

app/decorators/application_decorator.rb

@@ -1,15 +1,17 @@
 class ApplicationDecorator < Draper::Decorator
 	delegate_all
 
-	def link_target
-		object.respond_to?(:website_url) && object.website_url.present? ?
-			object.website_url :
-			default_link_target
+	def object_link_target
+		if object.respond_to?(:link_target)
+			object.link_target
+		else
+			object_default_link_target
+		end
 	end
 
 	private
 
-	def default_link_target
+	def object_default_link_target
 		h.polymorphic_path(object)
 	end
 end

app/decorators/resource_decorator.rb

@@ -4,12 +4,6 @@ def detail(length: nil)
     length ? text&.truncate(length) : text  # TODO - rename field
   end
 
-  def featured_url
-    return "" if url.nil?
-    url.empty? ? h.resource_path(resource) : url
-  end
-
-
   def main_image_url
     if main_image&.file&.attached?
       Rails.application.routes.url_helpers.url_for(main_image.file)

app/models/community_news.rb

@@ -51,4 +51,8 @@ def self.search_by_params(params)
     community_news = community_news.published_search(params[:published_search]) if params[:published_search].present?
     community_news
   end
+
+  def external_url
+    reference_url
+  end
 end

app/models/concerns/linkable.rb

@@ -1,13 +1,52 @@
 module Linkable
 	extend ActiveSupport::Concern
 
+	included do
+		# Override this in each model with something like:
+		# def internal_url
+		#   Rails.application.routes.url_helpers.story_path(self)
+		# end
+	end
+
 	def link_target
-		website_url.presence || default_link_target
+		if external_link?
+			normalized_url(external_url)
+		else
+			default_link_target
+		end
+	end
+
+	def external_link?
+		external_url.present? && valid_external_url?(external_url)
+	end
+
+	# Models must implement this method.
+	def external_url
+		raise NotImplementedError, "Models including Linkable must define #external_url"
 	end
 
 	private
 
+	def valid_external_url?(value)
+		return false if value.blank?
+
+		# Only normalize *naked domains*, not scheme-bearing strings
+		if value =~ /\A[\w.-]+\.[a-z]{2,}/i
+			value = "https://#{value}" unless value =~ /\Ahttps?:\/\//i
+		end
+
+		uri = URI.parse(value)
+		uri.host.present? && %w[http https].include?(uri.scheme&.downcase)
+	rescue URI::InvalidURIError
+		false
+	end
+
 	def default_link_target
 		Rails.application.routes.url_helpers.polymorphic_path(self)
 	end
+
+	def normalized_url(value)
+		return "" if value.blank?
+		value =~ /\Ahttp(s)?:\/\// ? value : "https://#{value}"
+	end
 end

app/models/event.rb

@@ -1,5 +1,5 @@
 class Event < ApplicationRecord
-  include Linkable, TagFilterable, WindowsTypeFilterable
+  include TagFilterable, WindowsTypeFilterable
 
   belongs_to :created_by, class_name: "User", optional: true
   has_many :bookmarks, as: :bookmarkable, dependent: :destroy

app/models/facilitator.rb

@@ -1,5 +1,5 @@
 class Facilitator < ApplicationRecord
-  include Linkable, TagFilterable, WindowsTypeFilterable
+  include TagFilterable, WindowsTypeFilterable
 
   belongs_to :created_by, class_name: "User"
   belongs_to :updated_by, class_name: "User"

app/models/project.rb

@@ -1,5 +1,5 @@
 class Project < ApplicationRecord
-  include Linkable, TagFilterable, WindowsTypeFilterable
+  include TagFilterable, WindowsTypeFilterable
 
   belongs_to :project_status
   belongs_to :project_obligation, optional: true

app/models/quote.rb

@@ -1,5 +1,5 @@
 class Quote < ApplicationRecord
-  include Linkable, TagFilterable, WindowsTypeFilterable
+  include TagFilterable, WindowsTypeFilterable
 
   belongs_to :workshop, optional: true
   has_many :bookmarks, as: :bookmarkable, dependent: :destroy

app/models/resource.rb

@@ -109,6 +109,10 @@ def name
     title || id
   end
 
+  def external_url
+    url
+  end
+
   def download_attachment
     main_image || gallery_images.first || attachments.first
   end

app/models/story.rb

@@ -62,6 +62,10 @@ def name
     title
   end
 
+  def external_url
+    website_url
+  end
+
   def organization_name
     project&.name
   end