govuk_content_models 10.2.2 → 10.3.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 10.3.0
+
+*  Add artefacts for specialist sector tags
+
 ## 10.2.2
 
--  Prevent a Mongo error when tag_ids are set to nil 
+-  Prevent a Mongo error when tag_ids are set to nil
 
 ## 10.2.0
 

data/app/models/artefact.rb

@@ -122,7 +122,8 @@ class Artefact
                                   "transparency",
                                   "world_location_news_article",
                                   "worldwide_priority",
-                                  "written_statement"]
+                                  "written_statement"],
+    "panopticon"              => ["specialist_sector"],
   }.freeze
 
   FORMATS = FORMATS_BY_DEFAULT_OWNING_APP.values.flatten

data/app/validators/slug_validator.rb

@@ -7,6 +7,7 @@ class SlugValidator < ActiveModel::EachValidator
       HelpPageValidator,
       GovernmentPageValidator,
       SpecialistDocumentPageValidator,
+      BrowsePageValidator,
       DefaultValidator
     ].map { |klass| klass.new(record, attribute, value) }
 
@@ -114,6 +115,21 @@ protected
     end
   end
 
+  class BrowsePageValidator < InstanceValidator
+    def applicable?
+      of_kind?('specialist_sector')
+    end
+
+    def validate!
+      unless [1, 2].include?(url_parts.size)
+        record.errors[attribute] << "must contains one or two path parts"
+      end
+      unless url_parts.all? { |url_part| valid_slug?(url_part) }
+        record.errors[attribute] << "must be usable in a URL"
+      end
+    end
+  end
+
   class DefaultValidator < InstanceValidator
     def applicable?
       true

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 = "10.2.2"
+  VERSION = "10.3.0"
 end

data/test/validators/slug_validator_test.rb

@@ -85,4 +85,22 @@ class SlugTest < ActiveSupport::TestCase
       refute document_with_slug("some-finder/my-specialist-document/not-allowed", kind: "specialist-document").valid?
     end
   end
+
+  context "Specialist sector browse pages" do
+    should "allow a single path part" do
+      assert document_with_slug("oil-and-gas", kind: "specialist_sector").valid?
+    end
+
+    should "allow two path parts" do
+      assert document_with_slug("oil-and-gas/fields-and-wells", kind: "specialist_sector").valid?
+    end
+
+    should "not allow three path parts" do
+      refute document_with_slug("oil-and-gas/fields-and-wells/development", kind: "specialist_sector").valid?
+    end
+
+    should "not allow invalid path segments" do
+      refute document_with_slug("oil-and-gas/not.a.valid.slug", kind: "specialist_sector").valid?
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 10.2.2
+  version: 10.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -465,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -333607112453720263
+      hash: -1098545351621195273
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -474,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -333607112453720263
+      hash: -1098545351621195273
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23