govuk_content_models 8.6.0 → 8.7.0

data/app/models/attachment.rb

@@ -9,6 +9,8 @@ class Attachment
   field :filename
   attaches :file
 
+  embedded_in :specialist_document_edition
+
   validates_with SafeHtml
 
   def url

data/app/validators/slug_validator.rb

@@ -5,7 +5,6 @@ class SlugValidator < ActiveModel::EachValidator
       DonePageValidator,
       ForeignTravelAdvicePageValidator,
       HelpPageValidator,
-      DetailedGuidePageValidator,
       GovernmentPageValidator,
       SpecialistDocumentPageValidator,
       DefaultValidator
@@ -39,7 +38,10 @@ protected
     end
 
     def valid_slug?(url_part)
-      ActiveSupport::Inflector.parameterize(url_part.to_s) == url_part.to_s
+      # Regex taken from ActiveSupport::Inflector.parameterize
+      # We don't want to use this method because it also does a number of cosmetic tidy-ups
+      # which lead to false-positives (eg merging consecutive '-'s)
+      ! url_part.to_s.match(/[^a-z0-9\-_]/)
     end
   end
 
@@ -74,45 +76,21 @@ protected
     end
   end
 
-  class WhitehallFormatValidator < InstanceValidator
+  class GovernmentPageValidator < InstanceValidator
     def url_parts
-      normalize_last_part_for_friendly_id(super)
+      # Some inside govt slugs have a . in them (eg news articles with no english translation)
+      super.map {|part| part.gsub(/\./, '') }
     end
 
-    def validate!
-      unless url_parts.all? { |url_part| valid_slug?(url_part) }
-        record.errors[attribute] << "must be usable in a URL"
-      end
-    end
-
-  protected
-
-    def normalize_last_part_for_friendly_id(url_parts)
-      url_parts[0...-1] + url_parts[-1..-1].map do |url_part|
-        normalize_for_friendly_id(url_part)
-      end
-    end
-
-    def normalize_for_friendly_id(url_part)
-      url_part.sub('--', '-')
-    end
-
-  end
-
-  class DetailedGuidePageValidator < WhitehallFormatValidator
-    def applicable?
-      of_kind?('detailed_guide')
-    end
-  end
-
-  class GovernmentPageValidator < WhitehallFormatValidator
     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/')
-      super
+      unless url_parts.all? { |url_part| valid_slug?(url_part) }
+        record.errors[attribute] << "must be usable in a URL"
+      end
     end
 
   protected
@@ -121,7 +99,7 @@ protected
     end
   end
 
-  class SpecialistDocumentPageValidator < WhitehallFormatValidator
+  class SpecialistDocumentPageValidator < InstanceValidator
     def applicable?
       of_kind?('specialist-document')
     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 = "8.6.0"
+  VERSION = "8.7.0"
 end

data/test/models/specialist_document_edition_test.rb

@@ -8,7 +8,9 @@ class SpecialistDocumentEditionTest < ActiveSupport::TestCase
 
   setup do
     @original_asset_api_client = Attachable.asset_api_client
+    @success_response = stub("asset manager response", id: "/test-id")
     Attachable.asset_api_client = stub("asset_api_client")
+    Attachable.asset_api_client.stubs(:create_asset).returns(@success_response)
   end
 
   teardown do
@@ -60,12 +62,24 @@ class SpecialistDocumentEditionTest < ActiveSupport::TestCase
       edition = SpecialistDocumentEdition.new(basic_specialist_document_fields)
       file = OpenStruct.new(original_filename: "document.pdf")
 
-      success_response = stub("asset manager response", id: "/test-id")
-      Attachable.asset_api_client.expects(:create_asset).with(file: file).returns(success_response)
+      Attachable.asset_api_client.expects(:create_asset).with(file: file).returns(@success_response)
 
       edition.build_attachment(title: "baz", file: file)
       edition.save!
     end
+
+    should "be able to remove an attachment from the list of attachments" do
+      attributes = basic_specialist_document_fields.merge(
+        attachments: [Attachment.new(title: "example", filename: "example.pdf")]
+      )
+      edition = SpecialistDocumentEdition.create!(attributes)
+      assert_equal 1, edition.attachments.count
+
+      edition.attachments = []
+      edition.save!
+
+      edition.reload
+      assert_equal [], edition.attachments
+    end
   end
 end
-

data/test/validators/slug_validator_test.rb

@@ -28,6 +28,25 @@ class SlugTest < ActiveSupport::TestCase
     should "allow a normal slug" do
       assert document_with_slug("normal-slug").valid?
     end
+
+    should "allow consecutive dashes in a slug" do
+      # Gems like friendly_id use -- to de-dup slug collisions
+      assert document_with_slug("normal-slug--1").valid?
+    end
+
+    should "allow a done page slug" do
+      assert document_with_slug("done/normal-slug").valid?
+    end
+  end
+
+  context "Foreign travel advice pages" do
+    should "allow a travel-advice page to start with 'foreign-travel-advice/'" do
+      assert document_with_slug("foreign-travel-advice/aruba", kind: "travel-advice").valid?
+    end
+
+    should "not allow other types to start with 'foreign-travel-advice/'" do
+      refute document_with_slug("foreign-travel-advice/aruba", kind: "answer").valid?
+    end
   end
 
   context "Help pages" do
@@ -35,6 +54,10 @@ class SlugTest < ActiveSupport::TestCase
       refute document_with_slug("test", kind: "help_page").valid?
       assert document_with_slug("help/test", kind: "help_page").valid?
     end
+
+    should "not allow non-help pages to start with help/" do
+      refute document_with_slug("help/test", kind: "answer").valid?
+    end
   end
 
   context "Inside government slugs" do
@@ -43,8 +66,13 @@ class SlugTest < ActiveSupport::TestCase
       assert document_with_slug("government/test", kind: "policy").valid?
     end
 
-    should "allow friendly_id suffixes to pass" do
-      assert document_with_slug("government/policy/test--3", kind: "policy").valid?
+    should "allow abritrarily deep slugs" do
+      assert document_with_slug("government/test/foo", kind: "policy").valid?
+      assert document_with_slug("government/test/foo/bar", kind: "policy").valid?
+    end
+
+    should "allow . in slugs" do
+      assert document_with_slug("government/world-location-news/221033.pt", kind: "news_story").valid?
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 8.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-18 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: 4252404017043972541
+      hash: 515922098811798624
 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: 4252404017043972541
+      hash: 515922098811798624
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23