govuk_content_models 28.7.1 → 28.8.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 28.8.0
+
+- Add `redirect_url` to artefact
+
 ## 28.7.1
 
 - Change the scheduled publishing timestamp to be London local time

data/app/models/artefact.rb

@@ -48,6 +48,7 @@ class Artefact
   field "need_extended_font",   type: Boolean, default: false
   field "latest_change_note",   type: String
   field "public_timestamp",     type: DateTime
+  field "redirect_url",         type: String
 
   index "slug", :unique => true
 
@@ -173,6 +174,7 @@ class Artefact
   validates_with CannotEditSlugIfEverPublished
   validate :validate_prefixes_and_paths
   validate :format_of_new_need_ids, if: :need_ids_changed?
+  validate :validate_redirect_url
 
   scope :relatable_items, proc {
     where(:kind.ne => "completed_transaction", :state.ne => "archived")
@@ -404,4 +406,11 @@ class Artefact
   rescue URI::InvalidURIError
     false
   end
+
+  def validate_redirect_url
+    return unless self.redirect_url.present?
+    unless valid_url_path?(self.redirect_url)
+      errors[:redirect_url] << "is not a valid redirect target"
+    end
+  end
 end

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 = "28.7.1"
+  VERSION = "28.8.0"
 end

data/test/models/artefact_test.rb

@@ -231,6 +231,19 @@ class ArtefactTest < ActiveSupport::TestCase
     end
   end
 
+  should "validate redirect_url" do
+    artefact = FactoryGirl.create(:artefact)
+
+    artefact.redirect_url = "foobar"
+    refute artefact.valid?
+
+    artefact.redirect_url = "/foobar"
+    assert artefact.valid?
+
+    artefact.redirect_url = "http://foo.bar/"
+    refute artefact.valid?
+  end
+
   test "should translate kind into internally normalised form" do
     a = Artefact.new(kind: "benefit / scheme")
     a.normalise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 28.7.1
+  version: 28.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -478,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1030593290210728004
+      hash: -3441532495869852238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1030593290210728004
+      hash: -3441532495869852238
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23