govuk_content_models 13.0.0 → 13.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 13.1.0
+
+* Perform link validation everytime an edition is saved,
+  irrespective of which fields changed.
+
 ## 13.0.0
 
 * Bundle metadata fields for `RenderedSpecialistDocument` into a single

data/app/validators/link_validator.rb

@@ -1,10 +1,11 @@
 class LinkValidator < ActiveModel::Validator
   def validate(record)
-    record.changes.each do |field_name, (_, new_value)|
-      if govspeak_fields(record).include?(field_name.to_sym)
-        messages = errors(new_value)
-        record.errors[field_name] << messages if messages
-      end
+    govspeak_field_names(record).each do |govspeak_field_name|
+      govspeak_field_value = record.read_attribute(govspeak_field_name)
+      next if govspeak_field_value.blank?
+
+      messages = errors(govspeak_field_value)
+      record.errors[govspeak_field_name] << messages if messages
     end
   end
 
@@ -38,7 +39,7 @@ class LinkValidator < ActiveModel::Validator
 
   protected
 
-  def govspeak_fields(record)
+  def govspeak_field_names(record)
     if record.class.const_defined?(:GOVSPEAK_FIELDS)
       record.class.const_get(:GOVSPEAK_FIELDS)
     else

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 = "13.0.0"
+  VERSION = "13.1.0"
 end

data/test/validators/link_validator_test.rb

@@ -5,12 +5,22 @@ class LinkValidatorTest < ActiveSupport::TestCase
     include Mongoid::Document
 
     field "body", type: String
+    field "assignee", type: String
     GOVSPEAK_FIELDS = [:body]
 
     validates_with LinkValidator
   end
 
   context "links" do
+    should "not be verified for blank govspeak fields" do
+      doc = Dummy.new(body: nil)
+
+      assert_nothing_raised do
+        doc.valid?
+      end
+      assert_empty doc.errors
+    end
+
     should "start with http[s]://, mailto: or /" do
       doc = Dummy.new(body: "abc [external](external.com)")
       assert doc.invalid?
@@ -22,25 +32,40 @@ class LinkValidatorTest < ActiveSupport::TestCase
       doc = Dummy.new(body: "abc [internal](/internal)")
       assert doc.valid?
     end
+
     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 "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
+
+    should "be validated when any attribute of the document changes" do
+      # already published document having link validation errors
+      doc = Dummy.new(body: 'abc [link1](foobar.com), ghi [link2](bazquux.com)')
+      doc.save(validate: false)
+
+      doc.assignee = "4fdef0000000000000000001"
+      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: 13.0.0
+  version: 13.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-30 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: -4378837483235683997
+      hash: 3968322493535116070
 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: -4378837483235683997
+      hash: 3968322493535116070
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23