govuk_content_models 12.2.0 → 12.3.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 12.3.0
+
+* Show all relevant errors in LinkValidator.
+
 ## 12.2.0
 
 * Add ManualChangeHistory model and artefact kind.

data/app/validators/link_validator.rb

@@ -18,21 +18,22 @@ class LinkValidator < ActiveModel::Validator
       (\{:rel=["']external["']\})?  # optional :rel=external in literal curly brackets.
     }x
 
-    errors = []
+    errors = Set.new
 
     string.scan(link_regex) do |match|
 
-      error = if match[0] !~ %r{^(?:https?://|mailto:|/)}
-        'Internal links must start with a forward slash eg [link text](/link-destination). External links must start with http://, https://, or mailto: eg [external link text](https://www.google.co.uk)'
-      elsif match[1]
-        %q-Don't include hover text in links. Delete the text in quotation marks eg "This appears when you hover over the link."-
-      elsif match[2]
-        'Delete {:rel="external"} in links.'
+      if match[0] !~ %r{^(?:https?://|mailto:|/)}
+        errors << 'Internal links must start with a forward slash eg [link text](/link-destination). External links must start with http://, https://, or mailto: eg [external link text](https://www.google.co.uk).'
+      end
+      if match[1]
+        errors << %q-Don't include hover text in links. Delete the text in quotation marks eg "This appears when you hover over the link."-
+      end
+      if match[2]
+        errors << 'Delete {:rel="external"} in links.'
       end
 
-      errors << error if error
     end
-    errors
+    errors.to_a
   end
 
   protected

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "12.2.0"
+  VERSION = "12.3.0"
 end

data/test/validators/link_validator_test.rb

@@ -22,15 +22,25 @@ class LinkValidatorTest < ActiveSupport::TestCase
       doc = Dummy.new(body: "abc [internal](/internal)")
       assert doc.valid?
     end
-    should "start not contain hover text" do
-      doc = Dummy.new(body: 'abc [foobar](foobar.com "hover")')
+    should "not contain hover text" do
+      doc = Dummy.new(body: 'abc [foobar](http://foobar.com "hover")')
       assert doc.invalid?
       assert_includes doc.errors.keys, :body
     end
-    should "start not set rel=external" do
-      doc = Dummy.new(body: 'abc [foobar](foobar.com){:rel="external"}')
+    should "not set rel=external" do
+      doc = Dummy.new(body: 'abc [foobar](http://foobar.com){:rel="external"}')
       assert doc.invalid?
       assert_includes doc.errors.keys, :body
     end
+    should "show multiple errors" do
+      doc = Dummy.new(body: 'abc [foobar](foobar.com "bar"){:rel="external"}')
+      assert doc.invalid?
+      assert_equal 3, doc.errors[:body].first.length
+    end
+    should "only show each error once" do
+      doc = Dummy.new(body: 'abc [link1](foobar.com), ghi [link2](bazquux.com)')
+      assert doc.invalid?
+      assert_equal 1, doc.errors[:body].first.length
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -468,7 +468,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3252707521846681022
+      hash: -4200899125153312569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -477,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3252707521846681022
+      hash: -4200899125153312569
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23