govuk_content_models 21.0.0 → 22.0.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 22.0.0
+
+* Remove old unused `tags` field from Edition
+* Add browse and topic collection associations to Edition
+
 ## 21.0.0
 
 * Remove diff-ing code from content models - diffs should now be calculated on the fly

data/app/models/edition.rb

@@ -19,9 +19,12 @@ class Edition
   field :slug,                 type: String
   field :department,           type: String
   field :rejected_count,       type: Integer,  default: 0
-  field :tags,                 type: String
   field :important_note,       type: String
 
+  field :browse_pages,         type: Array
+  field :primary_topic,        type: String
+  field :additional_topics,    type: Array
+
   field :assignee,             type: String
   field :creator,              type: String
   field :publisher,            type: String
@@ -49,6 +52,7 @@ class Edition
   validates :panopticon_id, presence: true
   validates_with SafeHtml
   validates_with LinkValidator, on: :update
+  validates_with TopicValidator, BrowsePageValidator
 
   before_save :check_for_archived_artefact
   before_destroy :destroy_artefact

data/app/validators/browse_page_validator.rb

@@ -0,0 +1,9 @@
+class BrowsePageValidator < ActiveModel::Validator
+  def validate(record)
+    if (browse_pages = record.browse_pages)
+      if browse_pages.uniq.count < browse_pages.count
+        record.errors.add(:browse_pages, "can't have duplicates")
+      end
+    end
+  end
+end

data/app/validators/topic_validator.rb

@@ -0,0 +1,13 @@
+class TopicValidator < ActiveModel::Validator
+  def validate(record)
+    if (additional_topics = record.additional_topics)
+      if additional_topics.uniq.count < additional_topics.count
+        record.errors.add(:additional_topics, "can't have duplicates")
+      end
+
+      if additional_topics.include?(record.primary_topic)
+        record.errors.add(:base, "You can't have the primary topic set as an additional topic")
+      end
+    end
+  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 = "21.0.0"
+  VERSION = "22.0.0"
 end

data/test/models/edition_test.rb

@@ -77,7 +77,7 @@ class EditionTest < ActiveSupport::TestCase
   end
 
   test "it should be able to find its previous siblings" do
-    @artefact2 = FactoryGirl.create(:artefact)    
+    @artefact2 = FactoryGirl.create(:artefact)
     g1 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, version_number: 1)
     g2 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact2.id, version_number: 1)
     g3 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, version_number: 2)
@@ -1028,4 +1028,51 @@ class EditionTest < ActiveSupport::TestCase
       end
     end
   end
+
+  context "Tagging to collections" do
+    setup do
+      @edition = FactoryGirl.create(:guide_edition)
+    end
+
+    should "allow tagging to browse pages" do
+      sample_browse_pages = [
+        'education/school-admissions-transport',
+        'driving/drivers-lorries-buses'
+      ]
+
+      @edition.browse_pages = sample_browse_pages
+      @edition.save!; @edition.reload
+
+      assert_equal sample_browse_pages, @edition.browse_pages
+    end
+
+    should "allow tagging to a primary topic" do
+      sample_primary_topic = 'oil-and-gas/carbon-capture-and-storage'
+
+      @edition.primary_topic = sample_primary_topic
+      @edition.save!; @edition.reload
+
+      assert_equal sample_primary_topic, @edition.primary_topic
+    end
+
+    should "allow tagging to multiple additional topics" do
+      sample_additional_topics = [
+        'oil-and-gas/fields-and-wells',
+        'oil-and-gas/licensing'
+      ]
+
+      @edition.additional_topics = sample_additional_topics
+      @edition.save!; @edition.reload
+
+      assert_equal sample_additional_topics, @edition.additional_topics
+    end
+
+    should "validates topics" do
+      assert_includes Edition.validators.map(&:class), TopicValidator
+    end
+
+    should "validates browse pages" do
+      assert_includes Edition.validators.map(&:class), BrowsePageValidator
+    end
+  end
 end

data/test/validators/browse_page_validator_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+require 'browse_page_validator'
+
+class BrowsePageValidatorTest < ActiveSupport::TestCase
+  class Record
+    include Mongoid::Document
+
+    field :browse_pages, type: Array
+
+    validates_with BrowsePageValidator
+  end
+
+  should "allow tagging to a variety of unique browse pages" do
+    record = Record.new(
+      browse_pages: [
+        'business/tax',
+        'housing/safety-environment'
+      ]
+    )
+
+    assert record.valid?
+  end
+
+  should "be invalid if there's duplicates in the browse page list" do
+    record = Record.new(
+      browse_pages: [
+        'housing/safety-environment',
+        'housing/safety-environment'
+      ]
+    )
+
+    refute record.valid?
+  end
+end

data/test/validators/topic_validator_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+require 'topic_validator'
+
+class TopicValidatorTest < ActiveSupport::TestCase
+  class Record
+    include Mongoid::Document
+
+    field :primary_topic, type: String
+    field :additional_topics, type: Array
+
+    validates_with TopicValidator
+  end
+
+  should "allow tagging to a variety of unique topics" do
+    record = Record.new(
+      primary_topic: 'oil-and-gas/exploration',
+      additional_topics: [
+        'oil-and-gas/fields-and-wells',
+        'oil-and-gas/licensing'
+      ]
+    )
+
+    assert record.valid?
+  end
+
+  should "be invalid if there's duplicates in the additional topic list" do
+    record = Record.new(
+      additional_topics: [
+        'oil-and-gas/fields-and-wells',
+        'oil-and-gas/fields-and-wells'
+      ]
+    )
+
+    refute record.valid?
+  end
+
+  should "be invalid if the primary topic is in the additional topic list" do
+    record = Record.new(
+      primary_topic: 'oil-and-gas/fields-and-wells',
+      additional_topics: [
+        'oil-and-gas/fields-and-wells',
+        'oil-and-gas/licensing'
+      ]
+    )
+
+    refute record.valid?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 21.0.0
+  version: 22.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -368,10 +368,12 @@ files:
 - app/models/workflow_actor.rb
 - app/traits/attachable.rb
 - app/traits/taggable.rb
+- app/validators/browse_page_validator.rb
 - app/validators/link_validator.rb
 - app/validators/safe_html.rb
 - app/validators/slug_validator.rb
 - app/validators/tag_id_validator.rb
+- app/validators/topic_validator.rb
 - config/mongoid.yml
 - govuk_content_models.gemspec
 - jenkins.sh
@@ -425,10 +427,12 @@ files:
 - test/test_helper.rb
 - test/traits/attachable_test.rb
 - test/traits/taggable_test.rb
+- test/validators/browse_page_validator_test.rb
 - test/validators/link_validator_test.rb
 - test/validators/safe_html_validator_test.rb
 - test/validators/slug_validator_test.rb
 - test/validators/tag_id_validator_test.rb
+- test/validators/topic_validator_test.rb
 homepage: https://github.com/alphagov/govuk_content_models
 licenses: []
 post_install_message: 
@@ -444,7 +448,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3126132501408854274
+      hash: 2932545422585521271
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -453,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3126132501408854274
+      hash: 2932545422585521271
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -504,7 +508,9 @@ test_files:
 - test/test_helper.rb
 - test/traits/attachable_test.rb
 - test/traits/taggable_test.rb
+- test/validators/browse_page_validator_test.rb
 - test/validators/link_validator_test.rb
 - test/validators/safe_html_validator_test.rb
 - test/validators/slug_validator_test.rb
 - test/validators/tag_id_validator_test.rb
+- test/validators/topic_validator_test.rb