govuk_content_models 11.1.0 → 11.2.0

data/CHANGELOG.md

@@ -1,6 +1,14 @@
+## 11.2.0
+
+* Added manual and manual-section formats with custom slug validation.
+
+## 11.1.0
+
+* Add area field to business support editions.
+
 ## 11.0.1
 
-*  Destroyng an edition lets siblings know
+*  Destroying an edition lets siblings know.
 
 ## 11.0.0
 

data/app/models/artefact.rb

@@ -82,7 +82,9 @@ class Artefact
     "smartanswers"            => ["smart-answer"],
     "custom-application"      => ["custom-application"], # In this case the owning_app is overriden. eg calendars, licencefinder
     "travel-advice-publisher" => ["travel-advice"],
-    "specialist-publisher"    => ["specialist-document"],
+    "specialist-publisher"    => ["manual",
+                                  "manual-section",
+                                  "specialist-document"],
     "finder-api"              => ["finder"],
     "whitehall"               => ["announcement",
                                   "authored_article",

data/app/validators/slug_validator.rb

@@ -6,6 +6,7 @@ class SlugValidator < ActiveModel::EachValidator
       ForeignTravelAdvicePageValidator,
       HelpPageValidator,
       GovernmentPageValidator,
+      ManualPageValidator,
       SpecialistDocumentPageValidator,
       BrowsePageValidator,
       DefaultValidator
@@ -100,6 +101,37 @@ protected
     end
   end
 
+  class ManualPageValidator < InstanceValidator
+    def applicable?
+      of_kind?('manual') || of_kind?('manual-section')
+    end
+
+    def validate!
+      validate_number_of_parts!
+      validate_guidance_prefix!
+      validate_parts_as_slugs!
+    end
+
+  private
+    def validate_number_of_parts!
+      unless [2, 3].include?(url_parts.size)
+        record.errors[attribute] << 'must contains two or three path parts'
+      end
+    end
+
+    def validate_guidance_prefix!
+      unless starts_with?('guidance/')
+        record.errors[attribute] << 'Manual slugs must have a guidance/ prefix'
+      end
+    end
+
+    def validate_parts_as_slugs!
+      unless url_parts.all? { |url_part| valid_slug?(url_part) }
+        record.errors[attribute] << 'must be usable in a URL'
+      end
+    end
+  end
+
   class SpecialistDocumentPageValidator < InstanceValidator
     def applicable?
       of_kind?('specialist-document')

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 = "11.1.0"
+  VERSION = "11.2.0"
 end

data/test/validators/slug_validator_test.rb

@@ -103,4 +103,22 @@ class SlugTest < ActiveSupport::TestCase
       refute document_with_slug("oil-and-gas/not.a.valid.slug", kind: "specialist_sector").valid?
     end
   end
+
+  context "Manual pages" do
+    should "allow slugs starting guidance/" do
+      refute document_with_slug("manuals/a-manual", kind: "manual").valid?
+      assert document_with_slug("guidance/a-manual", kind: "manual").valid?
+    end
+
+    should "allow two or three path parts" do
+      refute document_with_slug("guidance", kind: "manual").valid?
+      assert document_with_slug("guidance/a-manual", kind: "manual").valid?
+      assert document_with_slug("guidance/a-manual/a-section", kind: "manual-section").valid?
+      refute document_with_slug("guidance/a-manual/a-section/a-subsection", kind: "manual-section").valid?
+    end
+
+    should "not allow invalid path segments" do
+      refute document_with_slug("guidance/bad.manual.slug", kind: "manual").valid?
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -463,7 +463,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1779108246502469995
+      hash: 1863412532211958025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1779108246502469995
+      hash: 1863412532211958025
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23