Return original license value as-is from normalization if no match

Author: fbacall

app/validators/license_validator.rb

@@ -1,11 +1,9 @@
 class LicenseValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    return if Seek::License.find(value)
-    # Try looking up by URI
-    license = Seek::License.normalize(license)
-    if license
-      record.send("#{attribute}=", license)
+    normalized_license = Seek::License.normalize(value)
+    if Seek::License.find(normalized_license)
+      record.send("#{attribute}=", normalized_license)
       return
     end
     record.errors.add(attribute, options[:message] || "isn't a recognized license")

lib/seek/license.rb

@@ -52,11 +52,10 @@ def self.normalize(license)
       return nil if license.blank?
       license = license.strip
       if license.start_with?(/https?:/)
-        license = uri_to_id(license)
+        uri_to_id(license) || license
       else
-        license = normalized_id_map[license.downcase]
+        normalized_id_map[license.downcase] || license
       end
-      license
     end
 
     def is_null_license?

test/unit/license_test.rb

@@ -180,7 +180,9 @@ class LicenseTest < ActiveSupport::TestCase
     assert_equal 'CC-BY-4.0', Seek::License.normalize('cc-by-4.0')
     assert_equal 'CC-BY-4.0', Seek::License.normalize('cc-By-4.0')
     assert_equal 'CC-BY-4.0', Seek::License.normalize("         cc-By-4.0\n  ")
-    assert_nil Seek::License.normalize('huh what')
+    assert_equal 'HUH what', Seek::License.normalize('HUH what'), 'Should not modify unrecognized licenses'
+    assert_equal 'huh what', Seek::License.normalize('huh what'), 'Should not modify unrecognized licenses'
+    assert_equal 'http://cool-license.golf', Seek::License.normalize('http://cool-license.golf'), 'Should not modify unrecognized licenses'
     assert_nil Seek::License.normalize(nil)
     assert_nil Seek::License.normalize('')
   end