govuk_content_models 13.3.0 → 13.4.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 13.4.0
+
+* Allow new formats for aaib_report and cma_case for an Artefact
+
 ## 13.3.0
 
 * Adds a `state` field to `Tag`.

data/app/models/artefact.rb

@@ -82,10 +82,12 @@ 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"    => ["manual",
+    "specialist-publisher"    => ["aaib_report",
+                                  "cma_case",
+                                  "manual",
                                   "manual-change-history",
                                   "manual-section",
-                                  "specialist-document"],
+                                  "specialist-document"], # Deprecated: Leaving in place for legacy reasons. In future use explicit document_type
     "finder-api"              => ["finder"],
     "whitehall"               => ["announcement",
                                   "authored_article",

data/app/validators/slug_validator.rb

@@ -177,7 +177,7 @@ protected
 
   class SpecialistDocumentPageValidator < InstanceValidator
     def applicable?
-      of_kind?('specialist-document')
+      of_kind?(acceptable_formats)
     end
 
     def validate!
@@ -188,6 +188,19 @@ protected
         record.errors[attribute] << "must be usable in a URL"
       end
     end
+
+  private
+    def acceptable_formats
+      Artefact::FORMATS_BY_DEFAULT_OWNING_APP["specialist-publisher"] - unacceptable_formats
+    end
+
+    def unacceptable_formats
+      [
+        "manual",
+        "manual-change-history",
+        "manual-section",
+      ]
+    end
   end
 
   class BrowsePageValidator < InstanceValidator

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.3.0"
+  VERSION = "13.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 13.3.0
+  version: 13.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -468,7 +468,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 199219386487384018
+      hash: -3402198857840524506
 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: 199219386487384018
+      hash: -3402198857840524506
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23