Merge pull request #312 from Trim/fix-bookmark-link-validation

bookmark defaults scheme to HTTP and HTTP validator only check scheme and host

Author: Oumph

app/models/bookmark.rb

@@ -29,6 +29,21 @@ class Bookmark < Content
                    http_url: { message: "Le lien n'est pas valide" },
                    length: { maximum: 255, message: "Le lien est trop long" }
 
+  def link=(raw)
+    raw.strip!
+    return write_attribute :url, nil if raw.blank?
+    uri = URI.parse(raw)
+    # Default to HTTP link if neither scheme nor host is found
+    if uri.scheme.blank? && uri.host.blank?
+      raw = "http://#{raw}"
+      uri = URI.parse(raw)
+    end
+    write_attribute :link, uri.to_s
+  # Let raw value if error when parsed, HttpUrlValidator will manage it
+  rescue URI::InvalidURIError
+    write_attribute :link, raw
+  end
+
   def create_node(attrs={})
     attrs[:cc_licensed] = false
     super

app/validators/http_url_validator.rb

@@ -9,15 +9,16 @@ def validate_each(record, attribute, value)
   private
 
   def valid?(value, options)
+    # Valid links can be parsed by URI
     uri = URI.parse(value)
-    if uri.scheme.blank? && uri.host.blank?
-      value = "http://#{value}"
-      uri = URI.parse(value)
-    end
+    # Authorize protocol
     if options.has_key?(:protocols)
-      return true if options[:protocols].include?(uri.scheme)
+      return options[:protocols].include?(uri.scheme)
     end
-    uri.scheme.nil? && uri.host == MY_DOMAIN
+    # Links starting with "//MY_DOMAIN" are current scheme dependent and are valid
+    return true if uri.scheme.nil? && uri.host == MY_DOMAIN
+    # All other links are valid only if scheme and host exists
+    return uri.scheme.present? && uri.host.present?
   rescue URI::InvalidURIError
     false
   end