govuk_content_models 28.7.0 → 28.7.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 28.7.1
+
+- Change the scheduled publishing timestamp to be London local time
+  instead of UTC.
 ## 28.7.0
 
 - Add `vehicle_recalls_and_faults_alert` artefact format

data/app/models/action.rb

@@ -52,7 +52,7 @@ class Action
   def to_s
     if request_type == SCHEDULE_FOR_PUBLISHING
       string = "Scheduled for publishing"
-      string += " on #{request_details['scheduled_time'].strftime('%d/%m/%Y %H:%M %Z')}" if request_details['scheduled_time'].present?
+      string += " on #{request_details['scheduled_time'].to_datetime.in_time_zone('London').strftime('%d/%m/%Y %H:%M')}" if request_details['scheduled_time'].present?
       string
     else
       request_type.humanize.capitalize

data/app/models/artefact.rb

@@ -88,8 +88,6 @@ class Artefact
                                   "international_development_fund",
                                   "maib_report",
                                   "manual",
-                                  "manual-change-history",
-                                  "manual-section",
                                   "medical_safety_alert",
                                   "raib_report",
                                   "vehicle_recalls_and_faults_alert"],

data/app/validators/slug_validator.rb

@@ -8,7 +8,6 @@ class SlugValidator < ActiveModel::EachValidator
       FinderEmailSignupValidator,
       GovernmentPageValidator,
       ManualPageValidator,
-      ManualChangeHistoryValidator,
       SpecialistDocumentPageValidator,
       BrowsePageValidator,
       DefaultValidator
@@ -119,7 +118,7 @@ protected
 
   class ManualPageValidator < InstanceValidator
     def applicable?
-      of_kind?('manual') || of_kind?('manual-section')
+      of_kind?('manual')
     end
 
     def validate!
@@ -148,44 +147,6 @@ protected
     end
   end
 
-  class ManualChangeHistoryValidator < InstanceValidator
-    def applicable?
-      of_kind?('manual-change-history')
-    end
-
-    def validate!
-      validate_number_of_parts!
-      validate_guidance_prefix!
-      validate_updates_suffix!
-      validate_parts_as_slugs!
-    end
-
-  private
-    def validate_number_of_parts!
-      unless url_parts.size == 3
-        record.errors[attribute] << 'must contain three path parts'
-      end
-    end
-
-    def validate_guidance_prefix!
-      unless starts_with?('guidance/')
-        record.errors[attribute] << 'must have a guidance/ prefix'
-      end
-    end
-
-    def validate_updates_suffix!
-      unless ends_with?('/updates')
-        record.errors[attribute] << 'must have a /updates suffix'
-      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?(acceptable_formats)
@@ -208,8 +169,6 @@ protected
     def unacceptable_formats
       [
         "manual",
-        "manual-change-history",
-        "manual-section",
       ]
     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.0"
+  VERSION = "28.7.1"
 end

data/test/models/action_test.rb

@@ -6,7 +6,7 @@ class ActionTest < ActiveSupport::TestCase
   end
 
   test "#to_s should contain the scheduled time when request type is SCHEDULE_FOR_PUBLISHING" do
-    assert_equal "Scheduled for publishing on 12/12/2014 00:00 UTC",
+    assert_equal "Scheduled for publishing on 12/12/2014 00:00",
       Action.new(:request_type => 'schedule_for_publishing',
                  :request_details => { 'scheduled_time' => Date.parse('12/12/2014').to_time.utc }).to_s
   end

data/test/validators/slug_validator_test.rb

@@ -104,38 +104,6 @@ class SlugTest < ActiveSupport::TestCase
     end
   end
 
-  context "Manual change history" do
-    should "allow slugs of the form guidance/manual-slug/updates" do
-      assert document_with_slug("guidance/a-manual/updates",
-                                kind: "manual-change-history").valid?
-    end
-
-    should "refuse slugs that don't start with guidance/" do
-      refute document_with_slug("manuals/a-manual/updates",
-                                kind: "manual-change-history").valid?
-    end
-
-    should "refuse slugs that don't end with /updates" do
-      refute document_with_slug("guidance/a-manual/change-history",
-                                kind: "manual-change-history").valid?
-    end
-
-    should "refuse slugs that don't have a manual-slug" do
-      refute document_with_slug("guidance/change-history",
-                                kind: "manual-change-history").valid?
-    end
-
-    should "refuse slugs that have extra sections" do
-      refute document_with_slug("guidance/a-manual/a-section/updates",
-                                kind: "manual-change-history").valid?
-    end
-
-    should "not allow invalid path segments" do
-      refute document_with_slug("guidance/bad.manual.slug/updates",
-                                kind: "manual-change-history").valid?
-    end
-  end
-
   context "Manual pages" do
     should "allow slugs starting guidance/" do
       refute document_with_slug("manuals/a-manual", kind: "manual").valid?
@@ -145,8 +113,6 @@ class SlugTest < ActiveSupport::TestCase
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 28.7.0
+  version: 28.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -356,7 +356,6 @@ files:
 - app/models/local_interaction.rb
 - app/models/local_service.rb
 - app/models/local_transaction_edition.rb
-- app/models/manual_change_history.rb
 - app/models/overview_dashboard.rb
 - app/models/part.rb
 - app/models/parted.rb
@@ -440,7 +439,6 @@ files:
 - test/models/local_authority_test.rb
 - test/models/local_service_test.rb
 - test/models/local_transaction_edition_test.rb
-- test/models/manual_change_history_test.rb
 - test/models/overview_dashboard_test.rb
 - test/models/parted_test.rb
 - test/models/prerendered_entity_tests.rb
@@ -480,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4538163114857948061
+      hash: -1030593290210728004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -489,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4538163114857948061
+      hash: -1030593290210728004
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -524,7 +522,6 @@ test_files:
 - test/models/local_authority_test.rb
 - test/models/local_service_test.rb
 - test/models/local_transaction_edition_test.rb
-- test/models/manual_change_history_test.rb
 - test/models/overview_dashboard_test.rb
 - test/models/parted_test.rb
 - test/models/prerendered_entity_tests.rb

data/app/models/manual_change_history.rb

@@ -1,15 +0,0 @@
-require "prerendered_entity"
-
-class ManualChangeHistory
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  extend PrerenderedEntity
-
-  field :updates, type: Array
-  field :slug, type: String
-  field :manual_slug, type: String
-
-  index "slug", unique: true
-
-  validates :slug, uniqueness: true
-end

data/test/models/manual_change_history_test.rb

@@ -1,10 +0,0 @@
-require "test_helper"
-require "models/prerendered_entity_tests"
-
-class ManualChangeHistoryTest < ActiveSupport::TestCase
-  include PrerenderedEntityTests
-
-  def model_class
-    ManualChangeHistory
-  end
-end