Validate origin URI. Address review comments

Author: fbacall

app/helpers/application_helper.rb

@@ -95,7 +95,7 @@ def event_status_icon(event, size = nil)
   end
 
   def exchange_icon(resource, size = nil)
-    return unless resource.origin_uri
+    return unless resource.origin_uri.present?
     "<span class='exchange-icon pull-right'>#{icon_for(:exchanged, size)}</span>".html_safe
   end
 

app/models/event.rb

@@ -157,6 +157,8 @@ class Event < ApplicationRecord
   validates :presence, inclusion: { in: presences.keys, allow_blank: true }
   validates :keywords, length: { maximum: 20 }
   validate :allowed_url
+  validates :origin_uri, url: { allow_blank: true }
+
   clean_array_fields(:keywords, :fields, :event_types, :target_audience,
                      :eligibility, :host_institutions, :sponsors)
   update_suggestions(:keywords, :target_audience, :host_institutions)

app/models/material.rb

@@ -123,6 +123,7 @@ class Material < ApplicationRecord
   validates :url, url: true
   validates :other_types, presence: true, if: proc { |m| m.resource_type.include?('other') }
   validates :keywords, length: { maximum: 20 }
+  validates :origin_uri, url: { allow_blank: true }
 
   clean_array_fields(:keywords, :fields,
                      :target_audience, :resource_type, :subsets)

lib/ingestors/oai_pmh_ingestor.rb

@@ -91,7 +91,7 @@ def read_oai_rdf(client, tess_instance: false)
 
         extra_metadata = {}
         if tess_instance
-          origin_uri = metadata_tag.at_xpath('//rdf:RDF/*/@rdf:about', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')&.to_s
+          origin_uri = metadata_tag.at_xpath('//rdf:RDF/*/@rdf:about', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')&.value
           extra_metadata[:origin_uri] = origin_uri
         end
 

test/models/material_test.rb

@@ -751,4 +751,21 @@ class MaterialTest < ActiveSupport::TestCase
     bioschemas = m.to_bioschemas.first.generate
     refute bioschemas.key?(:license)
   end
+
+  test 'validates origin_uri' do
+    @material.origin_uri = nil
+    assert @material.valid?
+
+    @material.origin_uri = ''
+    assert @material.valid?
+
+    @material.origin_uri = 'https://tess-instance.org/materials/123'
+    assert @material.valid?
+
+    @material.origin_uri = 'hamster'
+    refute @material.valid?
+
+    @material.origin_uri = 'ftp://tess-instance.org/materials/123'
+    refute @material.valid?
+  end
 end