govuk_content_models 45.0.0 → 46.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1492dc8b606a3c38a4d8cc03f895423ab4ca427
-  data.tar.gz: bc05f53e841a08f895b42e50e446857eb5c77a96
+  metadata.gz: c6df8bc4ddc5049746a2b20c17f061238c379e8f
+  data.tar.gz: 29cab662f67c67bf0ea7dd06a970a1c1eb5b7891
 SHA512:
-  metadata.gz: 03aae6d7c3a38e8f0f27d2aeea13b0274da3a1dbd57728122dbbcbdd34d485caedf1956ad0595e9ac013f11f4495c48008b32ee07c16773d916f84cd51b108d3
-  data.tar.gz: ed71d588aa3ae483fa908afb33d28272085cb9beac57bafd66bd8135e624f45c64f0dc0ea8f61cc3475df25a33951a6e2da495b59fb6e4920f4ea649a8195407
+  metadata.gz: 3333530c567b4f52f6e8dd8faaed4066e59791ba22f9ddd4ec5b94e8f7470907f8eb75ed2eb0e7b709db24525c7d81d4378de3254fb4de9d7fd29d1d13057982
+  data.tar.gz: 280fd6e51851c234c972d5c826d9ee9bb0e2877519035fc9f5a6ef2dbec5e22a7772da1851b84f0216a85c38f9868a4c950aa7a889ed7c2530188dbce60ffae2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 46.0.0
+
+- Remove references to Whitehall
+
 ## 45.0.0
 
 - Bump dependencies to rails 5.0.2, rack 2.0.1, factory_girl to 4.8.0, mongoid to 6.1 and gds-sso to 13.2

data/README.md

@@ -1,7 +1,5 @@
 # GOV.UK Content Models
 
-A gem containing the shared models for the old GOV.UK publishing applications:
-
-- [Publisher](https://github.com/alphagov/publisher)
-- [Content API](https://github.com/alphagov/govuk_content_api)
+A gem containing the shared models for the old GOV.UK [Publisher][publisher] application.
 
+[Publisher]: https://github.com/alphagov/publisher

data/app/models/artefact.rb

@@ -74,48 +74,6 @@ class Artefact
     "specialist-publisher"    => ["manual"],
     "finder-api"              => ["finder",
                                   "finder_email_signup"],
-    "whitehall"               => ["announcement",
-                                  "authored_article",
-                                  "case_study",
-                                  "consultation",
-                                  "corporate_information_page",
-                                  "corporate_report",
-                                  "correspondence",
-                                  "decision",
-                                  "detailed_guide",
-                                  "document_collection",
-                                  "draft_text",
-                                  "fatality_notice",
-                                  "foi_release",
-                                  "form",
-                                  "government_response",
-                                  "guidance",
-                                  "impact_assessment",
-                                  "independent_report",
-                                  "international_treaty",
-                                  "map",
-                                  "national_statistics",
-                                  "news_story",
-                                  "notice",
-                                  "official_statistics",
-                                  "oral_statement",
-                                  "policy",
-                                  "policy_paper",
-                                  "press_release",
-                                  "promotional",
-                                  "publication",
-                                  "regulation",
-                                  "research",
-                                  "speaking_notes",
-                                  "statistical_data_set",
-                                  "statistics",
-                                  "statutory_guidance",
-                                  "supporting_page",
-                                  "transcript",
-                                  "transparency",
-                                  "world_location_news_article",
-                                  "worldwide_priority",
-                                  "written_statement"],
   }.freeze
 
   RETIRED_FORMATS = %w[ business_support campaign programme video]

data/app/validators/slug_validator.rb

@@ -6,9 +6,7 @@ class SlugValidator < ActiveModel::EachValidator
       ForeignTravelAdvicePageValidator,
       HelpPageValidator,
       FinderEmailSignupValidator,
-      GovernmentPageValidator,
       ManualPageValidator,
-      DetailedGuideValidator,
       DefaultValidator
     ].map { |klass| klass.new(record, attribute, value) }
 
@@ -93,29 +91,6 @@ protected
     end
   end
 
-  class GovernmentPageValidator < InstanceValidator
-    def url_parts
-      # Some inside govt slugs have a . in them (eg news articles with no english translation)
-      super.map {|part| part.gsub(/\./, '') }
-    end
-
-    def applicable?
-      record.respond_to?(:kind) && prefixed_whitehall_format_names.include?(record.kind)
-    end
-
-    def validate!
-      record.errors[attribute] << "Inside Government slugs must have a government/ prefix" unless starts_with?('government/')
-      unless url_parts.all? { |url_part| valid_slug?(url_part) }
-        record.errors[attribute] << "must be usable in a URL"
-      end
-    end
-
-  protected
-    def prefixed_whitehall_format_names
-      Artefact::FORMATS_BY_DEFAULT_OWNING_APP["whitehall"] - ["detailed_guide"]
-    end
-  end
-
   class ManualPageValidator < InstanceValidator
     def applicable?
       of_kind?('manual')
@@ -147,16 +122,6 @@ protected
     end
   end
 
-  class DetailedGuideValidator < InstanceValidator
-    def applicable?
-      of_kind?('detailed_guide')
-    end
-
-    def validate!
-      record.errors[attribute] << "must be a valid URL either at the root or under 'guidance/'" unless value.match(%r{^(guidance/)?[a-z0-9\-_]+$})
-    end
-  end
-
   class DefaultValidator < InstanceValidator
     def applicable?
       true

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -32,12 +32,6 @@ FactoryGirl.define do
     owning_app      'publisher'
     content_id      { SecureRandom.uuid }
 
-    trait :whitehall do
-      sequence(:slug) {|n| "government/slug--#{n}"}
-      owning_app      "whitehall"
-      kind            Artefact::FORMATS_BY_DEFAULT_OWNING_APP["whitehall"].first
-    end
-
     trait :with_published_edition do
       after(:create) {|object|
         self.create("#{object.kind}_edition".to_sym, panopticon_id: object.id, slug: object.slug, state: "published")
@@ -67,10 +61,6 @@ FactoryGirl.define do
 
     factory :live_artefact_with_edition, traits: [:live, :with_published_edition]
 
-    factory :whitehall_draft_artefact, traits: [:whitehall, :draft]
-    factory :whitehall_live_artefact, traits: [:whitehall, :live]
-    factory :whitehall_archived_artefact, traits: [:whitehall, :archived]
-
     factory :non_publisher_artefact, traits: [:non_publisher]
   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 = "45.0.0"
+  VERSION = "46.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 45.0.0
+  version: 46.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext