govuk_content_models 13.2.1 → 13.3.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 13.3.0
+
+* Adds a `state` field to `Tag`.
+
 ## 13.2.1
 
 * Assigning an edition doesn't require the entire edition

data/app/models/tag.rb

@@ -3,15 +3,17 @@ require 'tag_id_validator'
 
 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 :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 :parent_id,         type: String
+  field :state,             type: String, default: 'live'
 
   GOVSPEAK_FIELDS = []
+  STATES = ['draft', 'live']
 
   index :tag_id
   index [ [:tag_id, Mongo::ASCENDING], [:tag_type, Mongo::ASCENDING] ], unique: true
@@ -22,6 +24,8 @@ class Tag
   validates_with TagIdValidator
   validates_with SafeHtml
 
+  validates :state, inclusion: { in: STATES }
+
   class MissingTags < RuntimeError
     attr_reader :tag_ids
 

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 = "13.2.1"
+  VERSION = "13.3.0"
 end

data/test/models/tag_test.rb

@@ -115,4 +115,38 @@ class TagTest < ActiveSupport::TestCase
   test "should validate with TagIdValidator" do
     assert_includes Tag.validators.map(&:class), TagIdValidator
   end
+
+  context "state" do
+    setup do
+      @atts = { tag_type: 'section', tag_id: 'test', title: 'Test' }
+    end
+
+    should "be created in live state" do
+      tag = Tag.create(@atts.merge(state: 'live'))
+
+      assert tag.persisted?
+      assert_equal 'live', tag.state
+    end
+
+    should "be created in draft state" do
+      tag = Tag.create(@atts.merge(state: 'draft'))
+
+      assert tag.persisted?
+      assert_equal 'draft', tag.state
+    end
+
+    should "not be created in another state" do
+      tag = Tag.create(@atts.merge(state: 'foo'))
+
+      assert !tag.valid?
+      assert tag.errors.has_key?(:state)
+    end
+
+    should "be created in live state by default" do
+      tag = Tag.create(@atts)
+
+      assert tag.persisted?
+      assert_equal 'live', tag.state
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 13.2.1
+  version: 13.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -468,7 +468,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2244656321309357788
+      hash: 199219386487384018
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -477,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2244656321309357788
+      hash: 199219386487384018
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23