govuk_content_models 41.1.1 → 42.0.0

data/test/validators/slug_validator_test.rb

@@ -76,24 +76,6 @@ class SlugTest < ActiveSupport::TestCase
     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
-
   context "Detailed guides slugs" do
     should "allow a '/' in the slug" do
       assert document_with_slug("guidance/british-forces-overseas-posting-cyprus", kind: "detailed_guide").valid?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 41.1.1
+  version: 42.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -335,7 +335,6 @@ files:
 - app/models/business_support_edition.rb
 - app/models/campaign_edition.rb
 - app/models/completed_transaction_edition.rb
-- app/models/curated_list.rb
 - app/models/downtime.rb
 - app/models/edition.rb
 - app/models/guide_edition.rb
@@ -353,7 +352,6 @@ files:
 - app/models/simple_smart_answer_edition.rb
 - app/models/simple_smart_answer_edition/node.rb
 - app/models/simple_smart_answer_edition/node/option.rb
-- app/models/tag.rb
 - app/models/transaction_edition.rb
 - app/models/travel_advice_edition.rb
 - app/models/user.rb
@@ -361,14 +359,10 @@ files:
 - app/models/workflow.rb
 - app/traits/attachable.rb
 - app/traits/recordable_actions.rb
-- app/traits/taggable.rb
-- app/validators/browse_page_validator.rb
 - app/validators/link_validator.rb
 - app/validators/reviewer_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
@@ -399,12 +393,10 @@ files:
 - lib/govuk_content_models/test_helpers/local_services.rb
 - lib/govuk_content_models/version.rb
 - lib/mongoid/monkey_patches.rb
-- test/fixtures/contactotron_api_response.json
 - test/fixtures/uploads/image.jpg
 - test/models/action_test.rb
 - test/models/artefact_action_test.rb
 - test/models/artefact_external_link_test.rb
-- test/models/artefact_tag_test.rb
 - test/models/artefact_test.rb
 - test/models/business_support/business_size_test.rb
 - test/models/business_support/business_type_test.rb
@@ -416,7 +408,6 @@ files:
 - test/models/business_support_edition_test.rb
 - test/models/campaign_edition_test.rb
 - test/models/completed_transaction_edition_test.rb
-- test/models/curated_list_test.rb
 - test/models/downtime_test.rb
 - test/models/edition_scheduled_for_publishing_test.rb
 - test/models/edition_test.rb
@@ -431,7 +422,6 @@ files:
 - test/models/simple_smart_answer_edition_test.rb
 - test/models/simple_smart_answer_node_test.rb
 - test/models/simple_smart_answer_option_test.rb
-- test/models/tag_test.rb
 - test/models/time_zone_test.rb
 - test/models/transaction_edition_test.rb
 - test/models/travel_advice_edition_test.rb
@@ -440,13 +430,9 @@ files:
 - test/models/workflow_test.rb
 - 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: []
 metadata: {}
@@ -472,12 +458,10 @@ signing_key:
 specification_version: 4
 summary: Shared models for Panopticon and Publisher, as a Rails Engine
 test_files:
-- test/fixtures/contactotron_api_response.json
 - test/fixtures/uploads/image.jpg
 - test/models/action_test.rb
 - test/models/artefact_action_test.rb
 - test/models/artefact_external_link_test.rb
-- test/models/artefact_tag_test.rb
 - test/models/artefact_test.rb
 - test/models/business_support/business_size_test.rb
 - test/models/business_support/business_type_test.rb
@@ -489,7 +473,6 @@ test_files:
 - test/models/business_support_edition_test.rb
 - test/models/campaign_edition_test.rb
 - test/models/completed_transaction_edition_test.rb
-- test/models/curated_list_test.rb
 - test/models/downtime_test.rb
 - test/models/edition_scheduled_for_publishing_test.rb
 - test/models/edition_test.rb
@@ -504,7 +487,6 @@ test_files:
 - test/models/simple_smart_answer_edition_test.rb
 - test/models/simple_smart_answer_node_test.rb
 - test/models/simple_smart_answer_option_test.rb
-- test/models/tag_test.rb
 - test/models/time_zone_test.rb
 - test/models/transaction_edition_test.rb
 - test/models/travel_advice_edition_test.rb
@@ -513,10 +495,6 @@ test_files:
 - test/models/workflow_test.rb
 - 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

data/app/models/curated_list.rb

@@ -1,28 +0,0 @@
-require "traits/taggable"
-require_dependency "safe_html"
-
-class CuratedList
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  include Taggable
-  stores_tags_for :sections
-
-  field "slug", type: String
-  has_and_belongs_to_many :artefacts, class_name: "Artefact"
-
-  index slug: 1
-
-  validates :slug, presence: true, uniqueness: true, slug: true
-
-  def self.find_by_slug(slug)
-    where(slug: slug).first
-  end
-
-  # Returns the artefacts in order, skipping missing artefacts
-  def artefacts
-    Artefact.where(:_id.in => artefact_ids).sort_by do |artefact|
-      artefact_ids.index(artefact.id)
-    end
-  end
-end

data/app/models/tag.rb

@@ -1,113 +0,0 @@
-require_dependency "safe_html"
-require 'tag_id_validator'
-require 'state_machines-mongoid'
-
-class Tag
-  include Mongoid::Document
-
-  field :tag_id,            type: String
-  field :title,             type: String
-  field :tag_type,          type: String #TODO: list of accepted types?
-  field :description,       type: String
-  field :short_description, type: String
-  field :parent_id,         type: String
-  field :state,             type: String, default: 'draft'
-  field :content_id,        type: String
-
-  STATES = ['draft', 'live']
-
-  index tag_id: 1
-  index({ tag_id: 1, tag_type: 1 }, unique: true)
-  index tag_type: 1
-
-  validates_presence_of :tag_id, :title, :tag_type
-  validates_uniqueness_of :tag_id, scope: :tag_type
-  validates_with TagIdValidator
-
-  validates :state, inclusion: { in: STATES }
-
-  class MissingTags < RuntimeError
-    attr_reader :tag_ids
-
-    def initialize(tag_ids)
-      super("Missing tags: #{tag_ids.join(", ")}")
-      @tag_ids = tag_ids
-    end
-  end
-
-  # This doesn't get set automatically: the code that loads tags
-  # should go through them and set this attribute manually
-  attr_accessor :uniquely_named
-
-  state_machine initial: :draft do
-    event :publish do
-      transition draft: :live
-    end
-  end
-
-  def as_json(options = {})
-    {
-      id: self.tag_id,
-      title: self.title,
-      type: self.tag_type,
-      description: self.description,
-      short_description: self.short_description
-    }
-  end
-
-  def has_parent?
-    parent_id.present?
-  end
-
-  def parent
-    Tag.by_tag_id(parent_id, type: self.tag_type, draft: true) if has_parent?
-  end
-
-  def unique_title
-    self.uniquely_named ? self.title : "#{self.title} [#{self.tag_id}]"
-  end
-
-  def to_s
-    title
-  end
-
-  def self.by_tag_id(tag_id, tag_type_or_options = nil)
-    by_tag_ids([tag_id], tag_type_or_options).first
-  end
-
-  def self.by_tag_ids(tag_id_list, tag_type_or_options = nil)
-    if tag_type_or_options.is_a?(String)
-      # Providing the type as a string argument is deprecated in favour of providing the type as an option
-      options = {type: tag_type_or_options}
-    else
-      options = tag_type_or_options || {}
-    end
-
-    tag_scope = options[:type] ? Tag.where(tag_type: options[:type]) : Tag
-
-    unless options[:draft]
-      tag_scope = tag_scope.where(:state.ne => 'draft')
-    end
-
-    tag_scope = tag_scope.any_in(tag_id: tag_id_list)
-
-    # Sort by id list because MongoID 2.x doesn't preserve order
-    tags_by_id = tag_scope.each_with_object({}) do |tag, hash|
-      hash[tag.tag_id] = tag
-    end
-    tag_id_list.map { |tag_id| tags_by_id[tag_id] }.compact
-  end
-
-  def self.by_tag_types_and_ids(tag_types_and_ids)
-    list = tag_types_and_ids.map {|hash| hash.slice(:tag_id, :tag_type) }
-    any_of(list)
-  end
-
-  # Validate a list of tags by tag ID. Any missing tags raise an exception.
-  # Draft tags are considered present for internal validation.
-  def self.validate_tag_ids(tag_id_list, tag_type = nil)
-    found_tags = by_tag_ids(tag_id_list, type: tag_type, draft: true)
-    missing_tag_ids = tag_id_list - found_tags.map(&:tag_id)
-    raise MissingTags.new(missing_tag_ids) if missing_tag_ids.any?
-  end
-end

data/app/traits/taggable.rb

@@ -1,99 +0,0 @@
-module Taggable
-  module ClassMethods
-    def stores_tags_for(*tag_types)
-      tag_types = tag_types.map {|tag_type|
-        raise ArgumentError.new("Please provide tag types as symbols") unless tag_type.is_a?(Symbol)
-        tag_type.to_s
-      }
-
-      class_attribute :tag_types
-      self.tag_types = tag_types
-
-      tag_types.each do |tag_type|
-        define_method("#{tag_type}=") do |tag_ids|
-          set_tags_of_type(tag_type, tag_ids)
-        end
-        alias_method :"#{tag_type.singularize}_ids=", :"#{tag_type}="
-
-        define_method(tag_type) do |*args|
-          include_draft = args.first
-          tags_of_type(tag_type.singularize, include_draft)
-        end
-
-        define_method("#{tag_type.singularize}_ids") do |*args|
-          send(tag_type, *args).map(&:tag_id)
-        end
-      end
-    end
-
-    def has_primary_tag_for(*tag_types)
-      tag_types = tag_types.map {|tag_type|
-        raise ArgumentError.new("Please provide tag types as symbols") unless tag_type.is_a?(Symbol)
-        tag_type.to_s
-      }
-
-      class_attribute :primary_tag_types
-      self.primary_tag_types = tag_types
-
-      tag_types.each do |tag_type|
-        define_method("primary_#{tag_type}=") do |tag_id|
-          set_primary_tag_of_type(tag_type, tag_id)
-        end
-
-        define_method("primary_#{tag_type}") do
-          tags_of_type(tag_type).first
-        end
-      end
-    end
-  end
-
-  def self.included(klass)
-    klass.extend         ClassMethods
-    klass.field          :tag_ids, type: Array, default: []
-    klass.field          :tags, type: Array, default: []
-
-    klass.index          tag_ids: 1
-    klass.__send__       :private, :tag_ids=
-  end
-
-  def set_tags_of_type(collection_name, tag_ids)
-    tag_type = collection_name.singularize
-    tag_ids = Array(tag_ids)
-
-    Tag.validate_tag_ids(tag_ids, tag_type)
-
-    current_tags = attributes['tags'].reject {|t| t['tag_type'] == tag_type }
-
-    self.tags = current_tags + tag_ids.map {|tag_id|
-      {'tag_id' => tag_id, 'tag_type' => tag_type}
-    }
-  end
-
-  # The primary tag is simply the first one of its
-  # type. If that tag is already applied this method
-  # moves it to the start of the list. If it's not then
-  # we add it at the start of the list.
-  def set_primary_tag_of_type(tag_type, tag_id)
-    Tag.validate_tag_ids([tag_id], tag_type)
-
-    tag_tuple = {'tag_id' => tag_id, 'tag_type' => tag_type}
-
-    current_tags = attributes['tags'].dup
-    current_tags.delete(tag_tuple)
-
-    self.tags = current_tags.unshift(tag_tuple)
-  end
-
-  def tags_of_type(tag_type, include_draft = false)
-    tags(include_draft).select { |t| t.tag_type == tag_type }
-  end
-
-  def tags=(new_tag_tuples)
-    self.tag_ids = new_tag_tuples.map {|tuple| tuple['tag_id'] }
-    super(new_tag_tuples)
-  end
-
-  def tags(include_draft = false)
-    Tag.by_tag_ids(tag_ids, draft: include_draft)
-  end
-end

data/app/validators/browse_page_validator.rb

@@ -1,9 +0,0 @@
-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/tag_id_validator.rb

@@ -1,37 +0,0 @@
-class TagIdValidator < ActiveModel::Validator
-
-  def validate(record)
-    unless valid_tag_id?(record)
-      record.errors[:tag_id] << "ID must be valid in a URL and have no more than one slash"
-    end
-  end
-
-private
-
-  def valid_tag_id?(tag)
-    tag_contains_correct_characters(tag.tag_id) &&
-    tag_doesnt_end_with_slash(tag.tag_id) &&
-    tag_contains_correct_number_of_slashes(tag.tag_id, child?: tag_is_child_tag?(tag))
-  end
-
-  def tag_contains_correct_characters(tag_id)
-    tag_id =~ %r{^[a-z0-9/-]+$}
-  end
-
-  def tag_doesnt_end_with_slash(tag_id)
-    !tag_id.end_with?('/')
-  end
-
-  def tag_contains_correct_number_of_slashes(tag_id, options = {})
-    if options[:child?]
-      tag_id.count('/') <= 1
-    else
-      tag_id.count('/') == 0
-    end
-  end
-
-  def tag_is_child_tag?(tag)
-    tag.respond_to?(:parent_id) && tag.parent_id.present?
-  end
-
-end

data/app/validators/topic_validator.rb

@@ -1,14 +0,0 @@
-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")
-        record.errors.add(:additional_topics, "can't have the primary topic set as an additional topic")
-      end
-    end
-  end
-end

data/test/fixtures/contactotron_api_response.json

@@ -1 +0,0 @@
-{"created_at":"2011-12-02T12:02:43Z","email_address":"contact@example.com","id":189,"name":"Contact Name","opening_hours":null,"postal_address":"1 High Street\nTown","updated_at":"2011-12-02T12:02:43Z","website_url":"http://www.example.com/","phone_numbers":[{"contact_id":189,"created_at":"2011-12-02T12:02:43Z","id":447,"kind":"phone","label":null,"updated_at":"2011-12-02T12:02:43Z","value":"0113 496 0123"},{"contact_id":189,"created_at":"2011-12-02T12:02:43Z","id":448,"kind":"fax","label":null,"updated_at":"2011-12-02T12:02:43Z","value":"028 9018 1337"}]}

data/test/models/artefact_tag_test.rb

@@ -1,50 +0,0 @@
-require "test_helper"
-
-class ArtefactTagTest < ActiveSupport::TestCase
-
-  TEST_KEYWORDS = [['cheese', 'Cheese'], ['bacon', 'Bacon']]
-
-  setup do
-    parent_section = FactoryGirl.create(:live_tag, :tag_id => 'crime', :tag_type => 'section', :title => 'Crime')
-    FactoryGirl.create(:live_tag, :tag_id => 'crime/the-police', :tag_type => 'section', :title => 'The Police', :parent_id => parent_section.id)
-    FactoryGirl.create(:live_tag, :tag_id => 'crime/batman', :tag_type => 'section', :title => 'Batman', :parent_id => parent_section.id)
-
-    TEST_KEYWORDS.each do |tag_id, title|
-      FactoryGirl.create(:live_tag, :tag_id => tag_id, :tag_type => 'keyword', :title => title)
-    end
-  end
-
-  test "return primary section title when asked for its section" do
-    a = FactoryGirl.create(:artefact)
-    a.sections = ['crime', 'crime/the-police']
-    a.primary_section = 'crime'
-
-    assert_equal 'Crime', a.section
-  end
-
-  test "returns title of parent and child tags when its primary section has a parent" do
-    parent = Tag.by_tag_id('crime', 'section')
-    child = Tag.by_tag_id('crime/batman', 'section')
-    child.update_attributes parent_id: parent.tag_id
-
-    a = FactoryGirl.create(:artefact)
-    a.primary_section = child.tag_id
-
-    assert_equal "#{parent.title}:#{child.title}", a.section
-  end
-
-  test "stores the tag type and tag id for each tag" do
-    a = FactoryGirl.create(:artefact)
-
-    a.sections = ['crime', 'crime/the-police']
-    a.keywords = ['bacon']
-
-    expected_tags = [
-      { "tag_id" => "crime", "tag_type" => "section" },
-      { "tag_id" => "crime/the-police", "tag_type" => "section" },
-      { "tag_id" => "bacon", "tag_type" => "keyword" },
-    ]
-    assert_equal ["crime", "crime/the-police", "bacon"], a.tag_ids
-    assert_equal expected_tags, a.attributes["tags"]
-  end
-end

data/test/models/curated_list_test.rb

@@ -1,32 +0,0 @@
-require "test_helper"
-
-class CuratedListTest < ActiveSupport::TestCase
-  test "should validate format of slug" do
-    cl = CuratedList.new(slug: 'I am not a valid slug')
-    assert !cl.valid?
-    assert cl.errors[:slug].any?, "Doesn't have error on slug"
-  end
-
-  test "should include ability to have a section tag" do
-    cl = FactoryGirl.create(:curated_list)
-    tag = FactoryGirl.create(:live_tag, tag_id: 'batman', title: 'Batman', tag_type: 'section')
-
-    cl.sections = ['batman']
-    cl.save
-
-    assert_equal [tag], cl.sections
-  end
-
-  test "should return artefacts in relationship order, not their natural order" do
-    a = FactoryGirl.create(:artefact, name: "A")
-    b = FactoryGirl.create(:artefact, name: "B")
-    cl = FactoryGirl.create(:curated_list, artefact_ids: [b._id, a._id])
-    assert_equal ["B", "A"], cl.artefacts.map(&:name)
-  end
-
-  test "should translate string IDs to BSON::ObjectIds for artefacts set via artefact_ids" do
-    a = FactoryGirl.create(:artefact, name: "A")
-    cl = FactoryGirl.create(:curated_list, artefact_ids: [a.id.to_s])
-    assert cl.artefact_ids.first.is_a?(BSON::ObjectId)
-  end
-end